⬆️ Upgrade to python 3.9

maykinmedia · Jan 26, 2024 · e7b29b8 · e7b29b8
1 parent 7c1e2b3
commit e7b29b8
Show file tree

Hide file tree

Showing 9 changed files with 161 additions and 199 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.9'
       - uses: actions/setup-node@v2-beta
         with:
           node-version: '12'

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.9'
       - uses: isort/[email protected]
         with:
           requirementsFiles: requirements/dev.txt
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.9'
       - name: Install dependencies
         run: |
           pip install -r requirements/dev.txt

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1 - Compile needed python dependencies
-FROM python:3.7-buster AS build
+FROM python:3.9-buster AS build
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         libpq-dev \
@@ -29,7 +29,7 @@ RUN npm run build
 
 
 # Stage 3 - Build docker image suitable for execution and deployment
-FROM python:3.7-buster AS production
+FROM python:3.9-buster AS production
 
 # Stage 3.1 - Set up the needed production dependencies
 # install all the dependencies for GeoDjango
@@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         libproj13 \
     && rm -rf /var/lib/apt/lists/*
 
-COPY --from=build /usr/local/lib/python3.7 /usr/local/lib/python3.7
+COPY --from=build /usr/local/lib/python3.9 /usr/local/lib/python3.9
 COPY --from=build /usr/local/bin/uwsgi /usr/local/bin/uwsgi
 
 # Stage 3.2 - Copy source code

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -18,7 +18,7 @@ Prerequisites
 
 You need the following libraries and/or programs:
 
-* `Python`_ 3.7 or above
+* `Python`_ 3.9 or above
 * Python `Virtualenv`_ and `Pip`_
 * `PostgreSQL`_ 12 or above with PostGIS extension
 * `Node.js`_

diff --git a/README.NL.rst b/README.NL.rst
@@ -140,7 +140,7 @@ Licensed under the EUPL_
     :alt: Docker image
     :target: https://hub.docker.com/r/maykinmedia/objects-api
 
-.. |python-versions| image:: https://img.shields.io/badge/python-3.7%2B-blue.svg
+.. |python-versions| image:: https://img.shields.io/badge/python-3.9%2B-blue.svg
     :alt: Supported Python version
 
 .. |lint-oas| image:: https://github.com/maykinmedia/objects-api/workflows/lint-oas/badge.svg

diff --git a/README.rst b/README.rst
@@ -138,7 +138,7 @@ Licensed under the EUPL_
     :alt: Docker image
     :target: https://hub.docker.com/r/maykinmedia/objects-api
 
-.. |python-versions| image:: https://img.shields.io/badge/python-3.7%2B-blue.svg
+.. |python-versions| image:: https://img.shields.io/badge/python-3.9%2B-blue.svg
     :alt: Supported Python version
 
 .. |lint-oas| image:: https://github.com/maykinmedia/objects-api/workflows/lint-oas/badge.svg

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    pip-compile --no-emit-index-url requirements/base.in
 #
@@ -32,6 +32,31 @@ cryptography==3.4.8
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
+django==2.2.28
+    # via
+    #   -r requirements/base.in
+    #   django-axes
+    #   django-choices
+    #   django-filter
+    #   django-formtools
+    #   django-hijack
+    #   django-markup
+    #   django-otp
+    #   django-phonenumber-field
+    #   django-redis
+    #   django-relativedelta
+    #   django-rest-framework-condition
+    #   django-rosetta
+    #   django-sniplates
+    #   djangorestframework
+    #   drf-nested-routers
+    #   drf-spectacular
+    #   drf-yasg
+    #   maykin-django-two-factor-auth
+    #   mozilla-django-oidc
+    #   mozilla-django-oidc-db
+    #   vng-api-common
+    #   zgw-consumers
 django-admin-index==1.5.0
     # via -r requirements/base.in
 django-axes==5.14.0
@@ -51,12 +76,12 @@ django-filter==2.4.0
     #   vng-api-common
 django-formtools==2.3
     # via maykin-django-two-factor-auth
-django-hijack-admin==2.1.10
-    # via -r requirements/base.in
 django-hijack==2.3.0
     # via
     #   -r requirements/base.in
     #   django-hijack-admin
+django-hijack-admin==2.1.10
+    # via -r requirements/base.in
 django-ipware==3.0.2
     # via django-axes
 django-markup==1.3
@@ -82,43 +107,18 @@ django-solo==1.1.5
     #   mozilla-django-oidc-db
     #   vng-api-common
     #   zgw-consumers
-django==2.2.28
+djangorestframework==3.12.4
     # via
     #   -r requirements/base.in
-    #   django-axes
-    #   django-choices
-    #   django-filter
-    #   django-formtools
-    #   django-hijack
-    #   django-markup
-    #   django-otp
-    #   django-phonenumber-field
-    #   django-redis
-    #   django-relativedelta
-    #   django-rest-framework-condition
-    #   django-rosetta
-    #   django-sniplates
-    #   djangorestframework
+    #   djangorestframework-gis
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-yasg
-    #   maykin-django-two-factor-auth
-    #   mozilla-django-oidc
-    #   mozilla-django-oidc-db
     #   vng-api-common
-    #   zgw-consumers
 djangorestframework-camel-case==1.2.0
     # via vng-api-common
 djangorestframework-gis==0.17
     # via -r requirements/base.in
-djangorestframework==3.12.4
-    # via
-    #   -r requirements/base.in
-    #   djangorestframework-gis
-    #   drf-nested-routers
-    #   drf-spectacular
-    #   drf-yasg
-    #   vng-api-common
 drf-nested-routers==0.93.3
     # via vng-api-common
 drf-spectacular==0.16.0
@@ -139,10 +139,6 @@ glom==20.11.0
     # via -r requirements/base.in
 idna==2.10
     # via requests
-importlib-metadata==4.8.1
-    # via
-    #   jsonschema
-    #   markdown
 inflection==0.5.1
     # via
     #   drf-spectacular
@@ -167,10 +163,10 @@ markupsafe==1.1.1
     # via jinja2
 maykin-django-two-factor-auth[phonenumbers]==2.0.3
     # via -r requirements/base.in
-mozilla-django-oidc-db==0.7.2
-    # via -r requirements/base.in
 mozilla-django-oidc==1.2.4
     # via mozilla-django-oidc-db
+mozilla-django-oidc-db==0.7.2
+    # via -r requirements/base.in
 oyaml==1.0
     # via vng-api-common
 packaging==23.2
@@ -217,8 +213,6 @@ qrcode==6.1
     # via maykin-django-two-factor-auth
 redis==3.5.3
     # via django-redis
-requests-mock==1.8.0
-    # via zgw-consumers
 requests==2.25.1
     # via
     #   coreapi
@@ -228,10 +222,12 @@ requests==2.25.1
     #   requests-mock
     #   vng-api-common
     #   zgw-consumers
-ruamel.yaml.clib==0.2.7
-    # via ruamel.yaml
-ruamel.yaml==0.17.4
+requests-mock==1.8.0
+    # via zgw-consumers
+ruamel-yaml==0.17.4
     # via drf-yasg
+ruamel-yaml-clib==0.2.7
+    # via ruamel-yaml
 sentry-sdk==1.0.0
     # via -r requirements/base.in
 six==1.15.0
@@ -251,8 +247,6 @@ sqlparse==0.4.2
     # via django
 text-unidecode==1.3
     # via faker
-typing-extensions==4.7.1
-    # via importlib-metadata
 unidecode==1.2.0
     # via vng-api-common
 uritemplate==3.0.1
@@ -267,12 +261,12 @@ urllib3==1.26.6
     #   sentry-sdk
 uwsgi==2.0.21
     # via -r requirements/base.in
-vng-api-common[markdown_docs]==1.6.4
-    # via -r requirements/base.in
+vng-api-common[markdown-docs]==1.6.4
+    # via
+    #   -r requirements/base.in
+    #   vng-api-common
 zgw-consumers==0.15.2
     # via -r requirements/base.in
-zipp==3.5.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools