Merge pull request #13 from psipred/django3

Django3
psipred · Jul 30, 2021 · 2173787 · 2173787
2 parents a040099 + 78698ae
commit 2173787
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 29 deletions.
diff --git a/blast_cache/settings/base.py b/blast_cache/settings/base.py
@@ -56,7 +56,7 @@ def get_secret(setting, secrets):
 # Application definition
 
 INSTALLED_APPS = (
-    'django_admin_bootstrapped',
+    'bootstrap_admin',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -136,3 +136,5 @@ def get_secret(setting, secrets):
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
 STATIC_URL = '/static/'
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
diff --git a/blast_cache_app/model_factories.py b/blast_cache_app/model_factories.py
@@ -40,7 +40,7 @@ def produce_settings_hash(data):
     return(m.hexdigest())
 
 
-class CacheEntryFactory(factory.DjangoModelFactory):
+class CacheEntryFactory(factory.django.DjangoModelFactory):
     name = random_string(length=20)
     md5 = produce_sequence_hash()
     accessed_count = random.randint(0, 100)

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,30 +1,37 @@
-appdirs==1.4.3
-biopython==1.69
-bugsnag==3.1.0
-certifi==2019.3.9
-chardet==3.0.4
-Django==2.2
-django-admin-bootstrapped==2.5.6
-django-bootstrap3==8.2.3
-django-debug-toolbar==1.8
+appdirs==1.4.4
+asgiref==3.4.1
+biopython==1.79
+bootstrap-admin==0.4.4
+bugsnag==4.1.0
+certifi==2021.5.30
+chardet==4.0.0
+charset-normalizer==2.0.3
+Django==3.2.5
+django-bootstrap3==15.0.0
+django-debug-toolbar==3.2.1
 django-hstore==1.4.2
-djangorestframework==3.9.2
+django-utils-six==2.0
+djangorestframework==3.12.4
 djangorestframework-hstore==1.3
-factory-boy==2.8.1
-Faker==0.7.12
-idna==2.8
-mod-wsgi==4.5.15
-mod-wsgi-httpd==2.4.23.2
-numpy==1.12.1
-packaging==16.8
-psycopg2==2.7.3.2
-pyparsing==2.2.0
-python-dateutil==2.6.0
-pytz==2017.2
-requests==2.21.0
-six==1.10.0
-sortedcontainers==1.5.7
-sqlparse==0.2.3
+factory-boy==3.2.0
+Faker==8.10.3
+idna==3.2
+importlib-metadata==2.1.1
+mod-wsgi==4.8.0
+mod-wsgi-httpd==2.4.46.1
+numpy==1.19.5
+packaging==21.0
+psycopg2==2.9.1
+pyparsing==2.4.7
+python-dateutil==2.8.2
+pytz==2021.1
+requests==2.26.0
+six==1.16.0
+sortedcontainers==2.4.0
+sqlparse==0.4.1
+text-unidecode==1.3
+typing-extensions==3.10.0.0
 Unipath==1.1
-urllib3==1.24.1
-WebOb==1.7.2
+urllib3==1.26.6
+WebOb==1.8.7
+zipp==3.5.0