From 54e6200ffef7f9f06815be15ff71c10f6435bdf7 Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Fri, 21 Jul 2023 18:21:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20python=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=203.11=20=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/serializers/mixin.py |  7 ++++++-
 requirements/requirements.txt    | 11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/common/serializers/mixin.py b/apps/common/serializers/mixin.py
index 4d3e6ddc8..d665d6346 100644
--- a/apps/common/serializers/mixin.py
+++ b/apps/common/serializers/mixin.py
@@ -1,5 +1,10 @@
-from collections import Iterable, defaultdict, OrderedDict
+import sys
+from collections import defaultdict, OrderedDict
 
+if sys.version_info.major >= 3 and sys.version_info.minor >= 10:
+    from collections.abc import Iterable
+else:
+    from collections import Iterable
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import NOT_PROVIDED
 from rest_framework import serializers
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 65004e605..8f95d2d6c 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,10 +1,12 @@
+# 临时解决 cython 3.0 造成的错误
+cython==0.29.36
 aiofiles==22.1.0
 amqp==5.0.9
 git+https://github.com/jumpserver/ansible@master#egg=ansible-core
 ansible==7.1.0
 ansible-runner==2.2.1
 asn1crypto==0.24.0
-bcrypt==3.1.4
+bcrypt==4.0.1
 billiard==3.6.4.0
 certifi==2022.12.7
 cffi==1.15.1
@@ -94,7 +96,7 @@ django-proxy==1.2.1
 channels-redis==4.0.0
 python-daemon==2.3.0
 eventlet==0.33.1
-greenlet==1.1.2
+greenlet==2.0.2
 gunicorn==20.1.0
 celery==5.2.7
 flower==1.2.0
@@ -105,7 +107,8 @@ websockets==10.4
 # Auth
 python-ldap==3.4.0
 ldap3==2.9.1
-django-radius==1.5.0
+#django-radius==1.5.0
+git+https://github.com/robgolding/django-radius@develop#egg=django-radius
 jumpserver-django-oidc-rp==0.3.7.8
 django-cas-ng==4.0.1
 python-cas==1.5.0
@@ -118,7 +121,7 @@ kubernetes==21.7.0
 # DB requirements
 mysqlclient==2.1.0
 PyMySQL==1.0.2
-pymssql==2.2.5
+pymssql==2.2.7
 django-mysql==3.9.0
 django-redis==5.2.0
 python-redis-lock==3.7.0

From 1f25eaf4130055dc6e299ea004a7d90ff83d8722 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Fri, 21 Jul 2023 19:23:33 +0800
Subject: [PATCH 2/2] perf: update requirements.txt

---
 requirements/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 8f95d2d6c..839fccb11 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -119,7 +119,7 @@ botocore==1.27.12
 s3transfer==0.6.0
 kubernetes==21.7.0
 # DB requirements
-mysqlclient==2.1.0
+mysqlclient==2.2.0
 PyMySQL==1.0.2
 pymssql==2.2.7
 django-mysql==3.9.0