Upgrade to Django 2.2.x Python 3.9.x plus trivial changes (#1337)

Author: fpierfed

.github/workflows/ci_pipeline.yml

@@ -16,12 +16,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.6
+    - name: Set up Python 3.9
       uses: actions/setup-python@v1
       with:
-        python-version: 3.6
+        python-version: 3.9
     - name: Install dependencies
       run: |
+        sudo apt-get install -y libxml2-dev libxslt1-dev
         python -m pip install -U pip
         pip install -r requirements.txt
         pip install -r requirements-dev.txt

.gitignore

@@ -45,3 +45,8 @@ htmlcov/
 coverage.xml
 prof/
 .vagrant
+
+# virtualenvwrapper/zsh
+.venv
+.env
+env

Dockerfile

@@ -1,5 +1,5 @@
 # Base image
-FROM python:3.6
+FROM python:3.9
 
 # Update system
 RUN apt-get update && \

conference/migrations/0026_auto_20201204_1130.py

@@ -0,0 +1,34 @@
+# Generated by Django 2.2.17 on 2020-12-04 10:30
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('conference', '0025_add_poster_45_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='conferencetag',
+            name='name',
+            field=models.CharField(max_length=100, unique=True, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='conferencetag',
+            name='slug',
+            field=models.SlugField(max_length=100, unique=True, verbose_name='slug'),
+        ),
+        migrations.AlterField(
+            model_name='conferencetaggeditem',
+            name='content_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='conference_conferencetaggeditem_tagged_items', to='contenttypes.ContentType', verbose_name='content type'),
+        ),
+        migrations.AlterField(
+            model_name='conferencetaggeditem',
+            name='object_id',
+            field=models.IntegerField(db_index=True, verbose_name='object ID'),
+        ),
+    ]

conference/migrations/0027_auto_20201204_1539.py

@@ -0,0 +1,34 @@
+# Generated by Django 2.2.17 on 2020-12-04 14:39
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('conference', '0026_auto_20201204_1130'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='conferencetag',
+            name='name',
+            field=models.CharField(max_length=100, unique=True, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='conferencetag',
+            name='slug',
+            field=models.SlugField(max_length=100, unique=True, verbose_name='Slug'),
+        ),
+        migrations.AlterField(
+            model_name='conferencetaggeditem',
+            name='content_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='conference_conferencetaggeditem_tagged_items', to='contenttypes.ContentType', verbose_name='Content type'),
+        ),
+        migrations.AlterField(
+            model_name='conferencetaggeditem',
+            name='object_id',
+            field=models.IntegerField(db_index=True, verbose_name='Object id'),
+        ),
+    ]

conference/templatetags/conference.py

@@ -27,7 +27,7 @@ def _request_cache(request, key):
     return request._conf_cache[key]
 
 # Current conference object
-@register.assignment_tag()
+@register.simple_tag()
 def current_conference():
     return models.Conference.objects.current()
 

pycon/settings.py

@@ -212,7 +212,6 @@ def _(x):
 
 MIDDLEWARE = (
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',

requirements-dev.in

@@ -6,7 +6,8 @@ pytest-xdist
 
 freezegun
 responses
-factory_boy
+# factory_boy
+git+https://github.com/FactoryBoy/factory_boy.git#factory_boy
 
 flake8
 black

requirements-dev.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements-dev.txt requirements-dev.in
+#    pip-compile requirements-dev.in
 #
 apipkg==1.5               # via execnet
 appdirs==1.4.3            # via black
@@ -15,13 +15,12 @@ coverage==5.0.4           # via pytest-cov
 django-pdb==0.6.2         # via -r requirements-dev.in
 entrypoints==0.3          # via flake8
 execnet==1.7.1            # via pytest-xdist
-factory-boy==2.12.0       # via -r requirements-dev.in
+git+https://github.com/FactoryBoy/factory_boy.git#factory_boy  # via -r requirements-dev.in
 faker==4.0.2              # via factory-boy
 fancycompleter==0.9.1     # via pdbpp
 flake8==3.7.9             # via -r requirements-dev.in
 freezegun==0.3.15         # via -r requirements-dev.in
 idna==2.9                 # via requests
-importlib-metadata==1.5.0  # via pluggy, pytest
 mccabe==0.6.1             # via flake8
 more-itertools==8.2.0     # via pytest
 packaging==20.3           # via pytest
@@ -53,4 +52,3 @@ typed-ast==1.4.1          # via black
 urllib3==1.25.8           # via requests
 wcwidth==0.1.9            # via pytest
 wmctrl==0.3               # via pdbpp
-zipp==3.1.0               # via importlib-metadata

requirements.in

@@ -1,4 +1,4 @@
-Django~=1.11
+Django~=2.2
 
 requests
 requests-oauthlib
@@ -9,26 +9,26 @@ django_extensions
 django-model-utils<4.0
 django-crispy-forms
 
-django-taggit~=1.2
-git+https://github.com/bennylope/django-taggit-labels@c4006980d133f4c392b9f37e386bd7da43a8d4ce#egg=django-taggit-labels
+django-taggit
+git+https://github.com/bennylope/django-taggit-labels#egg=django-taggit-labels
 
 python3-openid
-python-social-auth==0.3.6
+python-social-auth
 social-auth-app-django
 # Fixes https://github.com/python-social-auth/social-app-django/issues/178
 social-auth-core[openidconnect]
 
-markdown2>=2.3.9
+markdown2
 
 # 3.7 DjangoCMS LTS release
-django-cms>=3.7,<3.8
+django-cms
 djangocms-admin-style
 djangocms-text-ckeditor
-django-filer<1.6
-git+https://github.com/pawelmarkowski/cmsplugin-filer@2.0.2#egg=cmsplugin-filer
+django-filer
+git+https://github.com/pawelmarkowski/cmsplugin-filer#egg=cmsplugin-filer
 
-django-filebrowser-no-grappelli~=3.8
-django-markitup~=3.5
+django-filebrowser-no-grappelli
+django-markitup
 
 # django settings enhancements
 python-decouple
@@ -42,15 +42,14 @@ phonenumbers
 stripe
 
 WeasyPrint
-unicodecsv==0.14.1
+unicodecsv
 
-openpyxl==2.4.8
+openpyxl
 ipython
 decorator
 
 lxml  # for currencies
-dataclasses
 
-gunicorn<20.0
+gunicorn
 
-anglicize
+anglicize