From ec2a28ce2ac42da7578b58df247a2e43c6b45a82 Mon Sep 17 00:00:00 2001 From: Nico Picchio Date: Thu, 21 Mar 2024 13:37:49 +0000 Subject: [PATCH 1/3] upgrade to python 3.10 --- .tool-versions | 2 +- docker/Dockerfile.dev | 2 +- poetry.lock | 6 +- pyproject.toml | 2 +- requirements.txt | 222 +++++++++++++++++++++--------------------- runtime.txt | 2 +- 6 files changed, 117 insertions(+), 119 deletions(-) diff --git a/.tool-versions b/.tool-versions index 120012983..48b0f2c40 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ nodejs 20.11.1 -python 3.9.18 +python 3.10.13 diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 20d6ccd59..75f70e090 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM python:3.9-buster +FROM python:3.10 ENV PYTHONUNBUFFERED=1 ENV PYTHONDONTWRITEBYTECODE=1 diff --git a/poetry.lock b/poetry.lock index 3744d9c07..c9d1c64c5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -186,7 +186,6 @@ mypy-extensions = ">=0.4.3" pathspec = ">=0.9.0" platformdirs = ">=2" tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} -typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""} [package.extras] colorama = ["colorama (>=0.4.3)"] @@ -1459,7 +1458,6 @@ files = [ [package.dependencies] amqp = ">=5.1.1,<6.0.0" -typing-extensions = {version = "*", markers = "python_version < \"3.10\""} vine = "*" [package.extras] @@ -2736,5 +2734,5 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" -python-versions = "^3.9" -content-hash = "e33a3191e593867bcd2e20fb01070e9ef7994f01a95a98949d8058e5abf9c4e2" +python-versions = "^3.10" +content-hash = "2b8f0ba585a03d172ccf1be8336f70b341ff1f7333343005e10693a1eb7bf33d" diff --git a/pyproject.toml b/pyproject.toml index bd59ae090..40ffcb757 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ readme = "README.md" package-mode = false [tool.poetry.dependencies] -python = "^3.9" +python = "^3.10" appnope = "0.1.0" atomicwrites = "1.2.1" celery = "^5.3.6" diff --git a/requirements.txt b/requirements.txt index ecfca82b3..bb203d05e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,111 +1,111 @@ -amqp==5.2.0 ; python_version >= "3.9" and python_version < "4.0" -appnope==0.1.0 ; python_version >= "3.9" and python_version < "4.0" -asgiref==3.7.2 ; python_version >= "3.9" and python_version < "4.0" -atomicwrites==1.2.1 ; python_version >= "3.9" and python_version < "4.0" -billiard==4.2.0 ; python_version >= "3.9" and python_version < "4.0" -boto3==1.17.89 ; python_version >= "3.9" and python_version < "4.0" -botocore==1.20.89 ; python_version >= "3.9" and python_version < "4.0" -celery==5.3.6 ; python_version >= "3.9" and python_version < "4.0" -certifi==2023.11.17 ; python_version >= "3.9" and python_version < "4.0" -cffi==1.16.0 ; platform_python_implementation == "CPython" and sys_platform == "win32" and python_version >= "3.9" and python_version < "4.0" -chardet==3.0.4 ; python_version >= "3.9" and python_version < "4.0" -charset-normalizer==3.3.2 ; python_version >= "3.9" and python_version < "4.0" -click-didyoumean==0.3.0 ; python_version >= "3.9" and python_version < "4.0" -click-plugins==1.1.1 ; python_version >= "3.9" and python_version < "4.0" -click-repl==0.2.0 ; python_version >= "3.9" and python_version < "4.0" -click==8.1.7 ; python_version >= "3.9" and python_version < "4.0" -colorama==0.4.3 ; python_version >= "3.9" and python_version < "4.0" and platform_system == "Windows" -decorator==4.2.1 ; python_version >= "3.9" and python_version < "4.0" -diff-match-patch==20121119 ; python_version >= "3.9" and python_version < "4.0" -dj-database-url==0.5.0 ; python_version >= "3.9" and python_version < "4.0" -django-admin-list-filter-dropdown==1.0.1 ; python_version >= "3.9" and python_version < "4.0" -django-appconf==1.0.4 ; python_version >= "3.9" and python_version < "4.0" -django-audit-log-middleware==0.0.4 ; python_version >= "3.9" and python_version < "4.0" -django-autocomplete-light==3.3.2 ; python_version >= "3.9" and python_version < "4.0" -django-axes==5.9.0 ; python_version >= "3.9" and python_version < "4.0" -django-chunk-upload-handlers==0.0.10 ; python_version >= "3.9" and python_version < "4.0" -django-environ==0.4.5 ; python_version >= "3.9" and python_version < "4.0" -django-extensions==3.2.3 ; python_version >= "3.9" and python_version < "4.0" -django-filter==2.4.0 ; python_version >= "3.9" and python_version < "4.0" -django-guardian==2.2.0 ; python_version >= "3.9" and python_version < "4.0" -django-import-export==2.4.0 ; python_version >= "3.9" and python_version < "4.0" -django-ipware==3.0.2 ; python_version >= "3.9" and python_version < "4.0" -django-log-formatter-ecs==0.0.3 ; python_version >= "3.9" and python_version < "4.0" -django-pivot==1.10.0 ; python_version >= "3.9" and python_version < "4.0" -django-redis==4.12.1 ; python_version >= "3.9" and python_version < "4.0" -django-reversion==5.0.12 ; python_version >= "3.9" and python_version < "4.0" -django-settings-export==1.2.1 ; python_version >= "3.9" and python_version < "4.0" -django-simple-history==3.0.0 ; python_version >= "3.9" and python_version < "4.0" -django-staff-sso-client==4.2.2 ; python_version >= "3.9" and python_version < "4.0" -django-storages==1.11.1 ; python_version >= "3.9" and python_version < "4.0" -django-tables2==2.4.0 ; python_version >= "3.9" and python_version < "4.0" -django-webpack-loader==0.7.0 ; python_version >= "3.9" and python_version < "4.0" -django==4.2.11 ; python_version >= "3.9" and python_version < "4.0" -djangorestframework==3.14.0 ; python_version >= "3.9" and python_version < "4.0" -docutils==0.14 ; python_version >= "3.9" and python_version < "4.0" -elastic-apm==6.2.2 ; python_version >= "3.9" and python_version < "4" -et-xmlfile==1.0.1 ; python_version >= "3.9" and python_version < "4.0" -flake8==3.8.4 ; python_version >= "3.9" and python_version < "4.0" -future==0.18.3 ; python_version >= "3.9" and python_version < "4.0" -gevent==23.9.1 ; python_version >= "3.9" and python_version < "4.0" -greenlet==3.0.3 ; platform_python_implementation == "CPython" and python_version < "4.0" and python_version >= "3.9" -gunicorn==19.9.0 ; python_version >= "3.9" and python_version < "4.0" -idna==2.7 ; python_version >= "3.9" and python_version < "4.0" -importlib-metadata==1.6.0 ; python_version >= "3.9" and python_version < "4.0" -jdcal==1.3 ; python_version >= "3.9" and python_version < "4.0" -jedi==0.11.1 ; python_version >= "3.9" and python_version < "4.0" -jmespath==0.9.3 ; python_version >= "3.9" and python_version < "4.0" -kombu==5.3.5 ; python_version >= "3.9" and python_version < "4.0" -kubi-ecs-logger==0.0.6 ; python_version >= "3.9" and python_version < "4" -markuppy==1.14 ; python_version >= "3.9" and python_version < "4.0" -marshmallow==2.19.2 ; python_version >= "3.9" and python_version < "4.0" -mccabe==0.6.1 ; python_version >= "3.9" and python_version < "4.0" -mohawk==1.1.0 ; python_version >= "3.9" and python_version < "4.0" -more-itertools==4.3.0 ; python_version >= "3.9" and python_version < "4.0" -oauthlib==2.1.0 ; python_version >= "3.9" and python_version < "4.0" -odfpy==1.3.6 ; python_version >= "3.9" and python_version < "4.0" -openpyxl==3.0.5 ; python_version >= "3.9" and python_version < "4.0" -parso==0.1.1 ; python_version >= "3.9" and python_version < "4.0" -pexpect==4.4.0 ; python_version >= "3.9" and python_version < "4.0" -pickleshare==0.7.4 ; python_version >= "3.9" and python_version < "4.0" -pluggy==0.13.1 ; python_version >= "3.9" and python_version < "4.0" -prompt-toolkit==1.0.15 ; python_version >= "3.9" and python_version < "4.0" -psycogreen==1.0.2 ; python_version >= "3.9" and python_version < "4.0" -psycopg2==2.8.6 ; python_version >= "3.9" and python_version < "4.0" -ptyprocess==0.5.2 ; python_version >= "3.9" and python_version < "4.0" -public==1.0.3 ; python_version >= "3.9" and python_version < "4.0" -pycodestyle==2.6.0 ; python_version >= "3.9" and python_version < "4.0" -pycparser==2.21 ; python_version >= "3.9" and platform_python_implementation == "CPython" and sys_platform == "win32" and python_version < "4.0" -pydot==1.2.4 ; python_version >= "3.9" and python_version < "4.0" -pyflakes==2.2.0 ; python_version >= "3.9" and python_version < "4.0" -pygments==2.15.0 ; python_version >= "3.9" and python_version < "4.0" -pyparsing==2.2.0 ; python_version >= "3.9" and python_version < "4.0" -python-dateutil==2.9.0.post0 ; python_version >= "3.9" and python_version < "4.0" -python-dotenv==0.9.1 ; python_version >= "3.9" and python_version < "4.0" -pytz==2021.3 ; python_version >= "3.9" and python_version < "4.0" -pyyaml==6.0.1 ; python_version >= "3.9" and python_version < "4.0" -query-string==1.0.2 ; python_version >= "3.9" and python_version < "4.0" -raven==6.9.0 ; python_version >= "3.9" and python_version < "4.0" -redis==3.5.3 ; python_version >= "3.9" and python_version < "4.0" -requests-oauthlib==1.0.0 ; python_version >= "3.9" and python_version < "4.0" -requests==2.31.0 ; python_version >= "3.9" and python_version < "4.0" -s3transfer==0.4.2 ; python_version >= "3.9" and python_version < "4.0" -sentry-sdk==1.25.1 ; python_version >= "3.9" and python_version < "4.0" -setuptools==69.2.0 ; python_version >= "3.9" and python_version < "4.0" -simplegeneric==0.8.1 ; python_version >= "3.9" and python_version < "4.0" -six==1.15.0 ; python_version >= "3.9" and python_version < "4.0" -sqlparse==0.4.4 ; python_version >= "3.9" and python_version < "4.0" -tablib[html,ods,xls,xlsx,yaml]==2.0.0 ; python_version >= "3.9" and python_version < "4.0" -text-unidecode==1.3 ; python_version >= "3.9" and python_version < "4.0" -typing-extensions==4.10.0 ; python_version >= "3.9" and python_version < "3.11" -tzdata==2024.1 ; python_version >= "3.9" and python_version < "4.0" -unicodecsv==0.14.1 ; python_version >= "3.9" and python_version < "4.0" -urllib3==1.26.18 ; python_version >= "3.9" and python_version < "4.0" -vine==5.1.0 ; python_version >= "3.9" and python_version < "4.0" -wcwidth==0.1.7 ; python_version >= "3.9" and python_version < "4.0" -whitenoise==6.6.0 ; python_version >= "3.9" and python_version < "4.0" -xlrd==1.1.0 ; python_version >= "3.9" and python_version < "4.0" -xlwt==1.3.0 ; python_version >= "3.9" and python_version < "4.0" -zipp==3.1.0 ; python_version >= "3.9" and python_version < "4.0" -zope-event==4.4 ; python_version >= "3.9" and python_version < "4.0" -zope-interface==5.1.0 ; python_version >= "3.9" and python_version < "4.0" +amqp==5.2.0 ; python_version >= "3.10" and python_version < "4.0" +appnope==0.1.0 ; python_version >= "3.10" and python_version < "4.0" +asgiref==3.7.2 ; python_version >= "3.10" and python_version < "4.0" +atomicwrites==1.2.1 ; python_version >= "3.10" and python_version < "4.0" +billiard==4.2.0 ; python_version >= "3.10" and python_version < "4.0" +boto3==1.17.89 ; python_version >= "3.10" and python_version < "4.0" +botocore==1.20.89 ; python_version >= "3.10" and python_version < "4.0" +celery==5.3.6 ; python_version >= "3.10" and python_version < "4.0" +certifi==2023.11.17 ; python_version >= "3.10" and python_version < "4.0" +cffi==1.16.0 ; platform_python_implementation == "CPython" and sys_platform == "win32" and python_version >= "3.10" and python_version < "4.0" +chardet==3.0.4 ; python_version >= "3.10" and python_version < "4.0" +charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "4.0" +click-didyoumean==0.3.0 ; python_version >= "3.10" and python_version < "4.0" +click-plugins==1.1.1 ; python_version >= "3.10" and python_version < "4.0" +click-repl==0.2.0 ; python_version >= "3.10" and python_version < "4.0" +click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" +colorama==0.4.3 ; python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows" +decorator==4.2.1 ; python_version >= "3.10" and python_version < "4.0" +diff-match-patch==20121119 ; python_version >= "3.10" and python_version < "4.0" +dj-database-url==0.5.0 ; python_version >= "3.10" and python_version < "4.0" +django-admin-list-filter-dropdown==1.0.1 ; python_version >= "3.10" and python_version < "4.0" +django-appconf==1.0.4 ; python_version >= "3.10" and python_version < "4.0" +django-audit-log-middleware==0.0.4 ; python_version >= "3.10" and python_version < "4.0" +django-autocomplete-light==3.3.2 ; python_version >= "3.10" and python_version < "4.0" +django-axes==5.9.0 ; python_version >= "3.10" and python_version < "4.0" +django-chunk-upload-handlers==0.0.10 ; python_version >= "3.10" and python_version < "4.0" +django-environ==0.4.5 ; python_version >= "3.10" and python_version < "4.0" +django-extensions==3.2.3 ; python_version >= "3.10" and python_version < "4.0" +django-filter==2.4.0 ; python_version >= "3.10" and python_version < "4.0" +django-guardian==2.2.0 ; python_version >= "3.10" and python_version < "4.0" +django-import-export==2.4.0 ; python_version >= "3.10" and python_version < "4.0" +django-ipware==3.0.2 ; python_version >= "3.10" and python_version < "4.0" +django-log-formatter-ecs==0.0.3 ; python_version >= "3.10" and python_version < "4.0" +django-pivot==1.10.0 ; python_version >= "3.10" and python_version < "4.0" +django-redis==4.12.1 ; python_version >= "3.10" and python_version < "4.0" +django-reversion==5.0.12 ; python_version >= "3.10" and python_version < "4.0" +django-settings-export==1.2.1 ; python_version >= "3.10" and python_version < "4.0" +django-simple-history==3.0.0 ; python_version >= "3.10" and python_version < "4.0" +django-staff-sso-client==4.2.2 ; python_version >= "3.10" and python_version < "4.0" +django-storages==1.11.1 ; python_version >= "3.10" and python_version < "4.0" +django-tables2==2.4.0 ; python_version >= "3.10" and python_version < "4.0" +django-webpack-loader==0.7.0 ; python_version >= "3.10" and python_version < "4.0" +django==4.2.11 ; python_version >= "3.10" and python_version < "4.0" +djangorestframework==3.14.0 ; python_version >= "3.10" and python_version < "4.0" +docutils==0.14 ; python_version >= "3.10" and python_version < "4.0" +elastic-apm==6.2.2 ; python_version >= "3.10" and python_version < "4" +et-xmlfile==1.0.1 ; python_version >= "3.10" and python_version < "4.0" +flake8==3.8.4 ; python_version >= "3.10" and python_version < "4.0" +future==0.18.3 ; python_version >= "3.10" and python_version < "4.0" +gevent==23.9.1 ; python_version >= "3.10" and python_version < "4.0" +greenlet==3.0.3 ; platform_python_implementation == "CPython" and python_version < "4.0" and python_version >= "3.10" +gunicorn==19.9.0 ; python_version >= "3.10" and python_version < "4.0" +idna==2.7 ; python_version >= "3.10" and python_version < "4.0" +importlib-metadata==1.6.0 ; python_version >= "3.10" and python_version < "4.0" +jdcal==1.3 ; python_version >= "3.10" and python_version < "4.0" +jedi==0.11.1 ; python_version >= "3.10" and python_version < "4.0" +jmespath==0.9.3 ; python_version >= "3.10" and python_version < "4.0" +kombu==5.3.5 ; python_version >= "3.10" and python_version < "4.0" +kubi-ecs-logger==0.0.6 ; python_version >= "3.10" and python_version < "4" +markuppy==1.14 ; python_version >= "3.10" and python_version < "4.0" +marshmallow==2.19.2 ; python_version >= "3.10" and python_version < "4.0" +mccabe==0.6.1 ; python_version >= "3.10" and python_version < "4.0" +mohawk==1.1.0 ; python_version >= "3.10" and python_version < "4.0" +more-itertools==4.3.0 ; python_version >= "3.10" and python_version < "4.0" +oauthlib==2.1.0 ; python_version >= "3.10" and python_version < "4.0" +odfpy==1.3.6 ; python_version >= "3.10" and python_version < "4.0" +openpyxl==3.0.5 ; python_version >= "3.10" and python_version < "4.0" +parso==0.1.1 ; python_version >= "3.10" and python_version < "4.0" +pexpect==4.4.0 ; python_version >= "3.10" and python_version < "4.0" +pickleshare==0.7.4 ; python_version >= "3.10" and python_version < "4.0" +pluggy==0.13.1 ; python_version >= "3.10" and python_version < "4.0" +prompt-toolkit==1.0.15 ; python_version >= "3.10" and python_version < "4.0" +psycogreen==1.0.2 ; python_version >= "3.10" and python_version < "4.0" +psycopg2==2.8.6 ; python_version >= "3.10" and python_version < "4.0" +ptyprocess==0.5.2 ; python_version >= "3.10" and python_version < "4.0" +public==1.0.3 ; python_version >= "3.10" and python_version < "4.0" +pycodestyle==2.6.0 ; python_version >= "3.10" and python_version < "4.0" +pycparser==2.21 ; python_version >= "3.10" and platform_python_implementation == "CPython" and sys_platform == "win32" and python_version < "4.0" +pydot==1.2.4 ; python_version >= "3.10" and python_version < "4.0" +pyflakes==2.2.0 ; python_version >= "3.10" and python_version < "4.0" +pygments==2.15.0 ; python_version >= "3.10" and python_version < "4.0" +pyparsing==2.2.0 ; python_version >= "3.10" and python_version < "4.0" +python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0" +python-dotenv==0.9.1 ; python_version >= "3.10" and python_version < "4.0" +pytz==2021.3 ; python_version >= "3.10" and python_version < "4.0" +pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "4.0" +query-string==1.0.2 ; python_version >= "3.10" and python_version < "4.0" +raven==6.9.0 ; python_version >= "3.10" and python_version < "4.0" +redis==3.5.3 ; python_version >= "3.10" and python_version < "4.0" +requests-oauthlib==1.0.0 ; python_version >= "3.10" and python_version < "4.0" +requests==2.31.0 ; python_version >= "3.10" and python_version < "4.0" +s3transfer==0.4.2 ; python_version >= "3.10" and python_version < "4.0" +sentry-sdk==1.25.1 ; python_version >= "3.10" and python_version < "4.0" +setuptools==69.2.0 ; python_version >= "3.10" and python_version < "4.0" +simplegeneric==0.8.1 ; python_version >= "3.10" and python_version < "4.0" +six==1.15.0 ; python_version >= "3.10" and python_version < "4.0" +sqlparse==0.4.4 ; python_version >= "3.10" and python_version < "4.0" +tablib[html,ods,xls,xlsx,yaml]==2.0.0 ; python_version >= "3.10" and python_version < "4.0" +text-unidecode==1.3 ; python_version >= "3.10" and python_version < "4.0" +typing-extensions==4.10.0 ; python_version >= "3.10" and python_version < "3.11" +tzdata==2024.1 ; python_version >= "3.10" and python_version < "4.0" +unicodecsv==0.14.1 ; python_version >= "3.10" and python_version < "4.0" +urllib3==1.26.18 ; python_version >= "3.10" and python_version < "4.0" +vine==5.1.0 ; python_version >= "3.10" and python_version < "4.0" +wcwidth==0.1.7 ; python_version >= "3.10" and python_version < "4.0" +whitenoise==6.6.0 ; python_version >= "3.10" and python_version < "4.0" +xlrd==1.1.0 ; python_version >= "3.10" and python_version < "4.0" +xlwt==1.3.0 ; python_version >= "3.10" and python_version < "4.0" +zipp==3.1.0 ; python_version >= "3.10" and python_version < "4.0" +zope-event==4.4 ; python_version >= "3.10" and python_version < "4.0" +zope-interface==5.1.0 ; python_version >= "3.10" and python_version < "4.0" diff --git a/runtime.txt b/runtime.txt index ab9b1dc34..02390d9cb 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1,2 +1,2 @@ -python-3.9.x +python-3.10.x From a432764687b58cd127a23cb478e975a402bef117 Mon Sep 17 00:00:00 2001 From: Nico Picchio Date: Fri, 22 Mar 2024 11:28:17 +0000 Subject: [PATCH 2/3] minor change to image in dockerfile --- docker/Dockerfile.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 75f70e090..c612a9f40 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM python:3.10 +FROM python:3.10-bookworm ENV PYTHONUNBUFFERED=1 ENV PYTHONDONTWRITEBYTECODE=1 From e338c8e3f055a4157488515a4ec9003550404e62 Mon Sep 17 00:00:00 2001 From: Sam Dudley Date: Wed, 27 Mar 2024 12:32:16 +0000 Subject: [PATCH 3/3] github action ci to py3.10 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0af6a4dbd..70aeaed57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.10" - uses: actions/setup-node@v4 with: