Merge pull request #257 from UW-GAC/deploy/stage

Deploy to production

config/settings/base.py

@@ -242,7 +242,7 @@
 # Django Admin URL.
 ADMIN_URL = "admin/"
 # https://docs.djangoproject.com/en/dev/ref/settings/#admins
-ADMINS = [("""Jonas Carson""", "jcarson@uw.edu")]
+ADMINS = [("""Gregor Admins""", "gregorweb@uw.edu")]
 # https://docs.djangoproject.com/en/dev/ref/settings/#managers
 MANAGERS = ADMINS
 

gregor_django/users/migrations/0005_user_blank_research_center_or_partner_group.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.16 on 2023-05-26 21:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gregor_anvil', '0009_unique_full_names'),
+        ('users', '0004_user_partner_groups'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='partner_groups',
+            field=models.ManyToManyField(blank=True, to='gregor_anvil.PartnerGroup'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='research_centers',
+            field=models.ManyToManyField(blank=True, to='gregor_anvil.ResearchCenter'),
+        ),
+    ]

gregor_django/users/models.py

@@ -13,8 +13,8 @@ class User(AbstractUser):
     name = CharField(_("Name of User"), blank=True, max_length=255)
     first_name = None  # type: ignore
     last_name = None  # type: ignore
-    research_centers = ManyToManyField(ResearchCenter)
-    partner_groups = ManyToManyField(PartnerGroup)
+    research_centers = ManyToManyField(ResearchCenter, blank=True)
+    partner_groups = ManyToManyField(PartnerGroup, blank=True)
 
     def get_absolute_url(self):
         """Get url for user's detail view.

requirements/base.txt

@@ -1,27 +1,28 @@
 pytz==2022.1  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
-Pillow==9.2.0  # https://github.com/python-pillow/Pillow
+Pillow==9.3.0  # https://github.com/python-pillow/Pillow
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 whitenoise==6.0.0  # https://github.com/evansd/whitenoise
-redis==4.2.2  # https://github.com/andymccurdy/redis-py
+redis==4.5.4  # https://github.com/andymccurdy/redis-py
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 oauthlib==3.2.1  # https://github.com/oauthlib/oauthlib
+setuptools==65.5.1  # https://github.com/pypa/setuptools
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.16  # pyup: < 3.3  # https://www.djangoproject.com/
+django==3.2.19  # pyup: < 3.3  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-maintenance-mode==0.16.3 # https://github.com/fabiocaccamo/django-maintenance-mode
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.54.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 django-redis==5.2.0  # https://github.com/jazzband/django-redis
 django-login-required-middleware==0.8.0 # https://github.com/CleitonDeLima/django-login-required-middleware
 django-dbbackup==4.0.1 # https://github.com/jazzband/django-dbbackup
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
 
 # anvil_consortium_manager
-git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.15
+git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.16.1
 
 # Simple history - model history tracking
 django-simple-history==3.1.1  # For tracking history

requirements/local.txt

@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug==2.1.1 # https://github.com/pallets/werkzeug
+Werkzeug==2.2.3 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 
 # Testing
@@ -26,6 +26,10 @@ black==22.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 pre-commit==2.18.1  # https://github.com/pre-commit/pre-commit
 
+# Security
+# ------------------------------------------------------------------------------
+safety==2.3.5  # https://github.com/pyupio/safety
+
 # Django
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy