Merge branch 'dev'

guohongze · May 14, 2020 · 71f2dd7 · 71f2dd7
2 parents 1757170 + f2afff1
commit 71f2dd7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/install/server/auto_install.sh b/install/server/auto_install.sh
@@ -82,6 +82,7 @@ pip install kombu==4.2.1
 pip install celery==4.2.1
 pip install billiard==3.5.0.3
 pip install pytz==2017.3
+pip install setuptools==39.2.0
 cd $adminset_dir/vendor/django-celery-results-master
 python setup.py build
 python setup.py install

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-django==1.11.20
+django==1.11.28
 tornado==5.1.1
 ansible==2.7.8
 sh==1.12.9