Merge pull request #376 from ImageMarkup/upgrade-py312

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.12"
       - name: Install tox
         run: |
           pip install --upgrade pip

README.md

@@ -29,7 +29,7 @@ but allows developers to run Python code on their native system.
 
 ### Initial Setup
 1. Run `docker-compose -f ./docker-compose.yml up -d`
-2. Install Python 3.10
+2. Install Python 3.12
 3. Install
    [`psycopg2` build prerequisites](https://www.psycopg.org/docs/install.html#build-prerequisites)
 4. Create and activate a new Python virtualenv

dev/django.Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.12-slim
 # Install system librarires for Python packages:
 # * psycopg2
 RUN apt-get update && \

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.black]
 line-length = 100
 skip-string-normalization = true
-target-version = ["py310"]
+target-version = ["py312"]
 exclude='\.eggs|\.git|\.mypy_cache|\.tox|\.venv|_build|buck-out|build|dist'
 
 [tool.isort]

runtime.txt

@@ -1 +1 @@
-python-3.10.7
+python-3.12.0

setup.py

@@ -29,10 +29,10 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.12',
         'Programming Language :: Python',
     ],
-    python_requires='>=3.10',
+    python_requires='>=3.12',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
@@ -53,10 +53,12 @@
         'isic-challenge-scoring>=5.6',
         'requests',
         'rules',
+        # See https://github.com/axnsan12/drf-yasg/issues/874
+        'setuptools',
         'uritemplate',
         # Production-only
         'django-composed-configuration[prod]>=0.20.1',
-        'django-s3-file-field[boto3]',
+        'django-s3-file-field[s3]>=1',
         'gunicorn',
     ],
     extras_require={

stade/core/forms.py

@@ -147,11 +147,11 @@ def clean(self):
 
     def get_invites(self):
         for field in range(3):
-            if self.cleaned_data[f'initial_invite_{field+1}']:
+            if self.cleaned_data[f'initial_invite_{field + 1}']:
                 yield TeamInvitation(
                     sender=self.request.user,
                     team=self.instance,
-                    recipient=self.cleaned_data[f'initial_invite_{field+1}'].lower(),
+                    recipient=self.cleaned_data[f'initial_invite_{field + 1}'].lower(),
                 )
 
 

stade/core/tasks.py

@@ -146,9 +146,10 @@ def _score_submission(submission):
         prediction_file: FieldFile = submission.test_prediction_file
 
         if submission.approach.task.type == Task.Type.SEGMENTATION:
-            with field_file_to_local_path(truth_file) as truth_file_path, field_file_to_local_path(
-                prediction_file
-            ) as prediction_file_path:
+            with (
+                field_file_to_local_path(truth_file) as truth_file_path,
+                field_file_to_local_path(prediction_file) as prediction_file_path,
+            ):
                 score = SegmentationScore.from_zip_file(
                     truth_file_path,
                     prediction_file_path,