Merge pull request #755 from softwaresaved/dev

Dev

.github/workflows/django.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9","3.10", "3.11"]
       fail-fast: false
 
     steps:

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.8-slim
 
-LABEL maintainer="James Graham <j.graham@software.ac.uk>"
+LABEL maintainer="Philippa Broadbent <p.k.broadbent@soton.ac.uk>"
 
 ENV PYTHONUNBUFFERED=1
 

lowfat/forms.py

@@ -878,7 +878,7 @@ def __init__(self, *args, **kwargs):
                                 </li>
                             </ul>
                         </li>
-                        <li>You MUST fill out the <a href='https://www.ed.ac.uk/sites/default/files/atoms/files/non_staff_expenses_claim_form_v3.docx'>University of Edinburgh Payment of Non-Staff Expenses form</a>.
+                        <li>You MUST fill out the University of Edinburgh Payment of Non-Staff Expenses form which can be downloaded from <a href='https://www.software.ac.uk/guide/guidelines-reimbursement-expenses-supported-software-sustainability-institute'>this page of the SSI website</a>.
                             <ul>
                                 <li>Fill out Sections 1-4 (pages 1-2) and page 6.</li>
                                 <li>Leave the visitor/student number blank.</li>

lowfat/test_urls.py

@@ -12,6 +12,9 @@
     testwrapper,
 )
 
+import PIL
+PIL.Image.ANTIALIAS = PIL.Image.LANCZOS
+
 
 class URLTest(TestCase):
     def setUp(self):

requirements.txt

@@ -1,135 +1,60 @@
-#
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
-#
-#    pip-compile requirements.in
-#
-asgiref==3.5.2
-    # via django
+asgiref==3.7.2
 certifi==2022.12.7
-    # via requests
 cffi==1.15.1
-    # via cryptography
 charset-normalizer==2.1.1
-    # via requests
 crispy-bootstrap5==0.7
 cryptography==38.0.3
-    # via social-auth-core
 defusedxml==0.7.1
-    # via
-    #   python3-openid
-    #   social-auth-core
+diff-match-patch==20230430
 dj-database-url==1.0.0
-    # via -r requirements.in
-django==3.2.16
-    # via
-    #   -r requirements.in
-    #   dj-database-url
-    #   django-appconf
-    #   django-bootstrap-datepicker-plus
-    #   django-datetime-widget
-    #   django-dbbackup
-    #   django-extensions
-    #   django-picklefield
-    #   django-settings-export
-    #   django-tagulous
+Django==4.2
 django-appconf==1.0.5
-    # via django-imagekit
 django-bootstrap-datepicker-plus==4.0.0
-    # via -r requirements.in
-django-constance[database]==2.9.1
-    # via -r requirements.in
+django-constance==2.9.1
 django-countries==7.3.2
-    # via -r requirements.in
 django-crispy-forms==1.14.0
-    # via -r requirements.in
 django-datetime-widget==0.9.3
-    # via -r requirements.in
 django-dbbackup==4.0.1
-    # via -r requirements.in
 django-extensions==3.2.0
-    # via -r requirements.in
 django-imagekit==4.1.0
-    # via -r requirements.in
 django-import-export==3.0.1
 django-pandas==0.6.6
-    # via -r requirements.in
 django-picklefield==3.1
-    # via
-    #   -r requirements.in
-    #   django-constance
 django-settings-export==1.2.1
-    # via -r requirements.in
 django-simple-history==3.1.1
-    # via -r requirements.in
 django-tagulous==1.3.3
-    # via -r requirements.in
+et-xmlfile==1.1.0
 geographiclib==1.52
-    # via geopy
 geopy==2.2.0
-    # via -r requirements.in
 html2text==2020.1.16
-    # via -r requirements.in
 idna==3.3
-    # via requests
-markdown==3.4.1
-    # via -r requirements.in
+Markdown==3.4.1
+MarkupPy==1.14
 numpy==1.23.2
-    # via pandas
 oauthlib==3.2.1
-    # via
-    #   requests-oauthlib
-    #   social-auth-core
+odfpy==1.4.1
+openpyxl==3.1.2
 pandas==1.4.3
-    # via
-    #   -r requirements.in
-    #   django-pandas
 pilkit==2.0
-    # via django-imagekit
-pillow==9.3.0
-    # via -r requirements.in
+Pillow==10.2.0
 pycparser==2.21
-    # via cffi
-pyjwt==2.4.0
-    # via social-auth-core
-pypdf2==2.10.3
-    # via -r requirements.in
+PyJWT==2.4.0
+PyPDF2==2.10.3
 python-dateutil==2.8.2
-    # via pandas
 python-decouple==3.6
-    # via -r requirements.in
 python-gnupg==0.5.0
-    # via -r requirements.in
 python-magic==0.4.27
-    # via -r requirements.in
 python3-openid==3.2.0
-    # via social-auth-core
 pytz==2022.2.1
-    # via
-    #   django
-    #   django-datetime-widget
-    #   django-dbbackup
-    #   pandas
+PyYAML==6.0.1
 requests==2.28.1
-    # via
-    #   requests-oauthlib
-    #   social-auth-core
 requests-oauthlib==1.3.1
-    # via social-auth-core
 six==1.16.0
-    # via
-    #   django-imagekit
-    #   django-pandas
-    #   python-dateutil
 social-auth-app-django==5.0.0
-    # via -r requirements.in
 social-auth-core==4.3.0
-    # via
-    #   -r requirements.in
-    #   social-auth-app-django
-sqlparse==0.4.2
-    # via django
-typing-extensions==4.3.0
-    # via django-countries
+sqlparse==0.4.4
+tablib==3.5.0
+typing_extensions==4.3.0
 urllib3==1.26.12
-    # via requests
+xlrd==2.0.1
+xlwt==1.3.0

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
     lint
-    py3-django{32,40,41}
+    py3-django{40,41,42}
 skipsdist = True
 
 [base]
@@ -22,9 +22,10 @@ setenv =
     SECRET_KEY=test_secret_key
 commands =
     # Reinstall Django here to override version in requirements.txt
-    django32: pip install django~=3.2.0
+    ; django32: pip install django~=3.2.0
     django40: pip install django~=4.0.0
     django41: pip install django~=4.1.0
+    django42: pip install django~=4.2.0
 
     coverage run --source=lowfat/ manage.py test
     coverage report --skip-covered