Skip to content

Commit e7b29b8

Browse files
committed
⬆️ Upgrade to python 3.9
1 parent 7c1e2b3 commit e7b29b8

File tree

9 files changed

+161
-199
lines changed

9 files changed

+161
-199
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v2
3232
- uses: actions/setup-python@v2
3333
with:
34-
python-version: '3.7'
34+
python-version: '3.9'
3535
- uses: actions/setup-node@v2-beta
3636
with:
3737
node-version: '12'

.github/workflows/code-quality.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v2
1212
- uses: actions/setup-python@v2
1313
with:
14-
python-version: '3.7'
14+
python-version: '3.9'
1515
- uses: isort/isort-action@v0.1.0
1616
with:
1717
requirementsFiles: requirements/dev.txt
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/checkout@v2
2727
- uses: actions/setup-python@v2
2828
with:
29-
python-version: '3.7'
29+
python-version: '3.9'
3030
- name: Install dependencies
3131
run: |
3232
pip install -r requirements/dev.txt

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1 - Compile needed python dependencies
2-
FROM python:3.7-buster AS build
2+
FROM python:3.9-buster AS build
33

44
RUN apt-get update && apt-get install -y --no-install-recommends \
55
libpq-dev \
@@ -29,7 +29,7 @@ RUN npm run build
2929

3030

3131
# Stage 3 - Build docker image suitable for execution and deployment
32-
FROM python:3.7-buster AS production
32+
FROM python:3.9-buster AS production
3333

3434
# Stage 3.1 - Set up the needed production dependencies
3535
# install all the dependencies for GeoDjango
@@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
4040
libproj13 \
4141
&& rm -rf /var/lib/apt/lists/*
4242

43-
COPY --from=build /usr/local/lib/python3.7 /usr/local/lib/python3.7
43+
COPY --from=build /usr/local/lib/python3.9 /usr/local/lib/python3.9
4444
COPY --from=build /usr/local/bin/uwsgi /usr/local/bin/uwsgi
4545

4646
# Stage 3.2 - Copy source code

INSTALL.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Prerequisites
1818

1919
You need the following libraries and/or programs:
2020

21-
* `Python`_ 3.7 or above
21+
* `Python`_ 3.9 or above
2222
* Python `Virtualenv`_ and `Pip`_
2323
* `PostgreSQL`_ 12 or above with PostGIS extension
2424
* `Node.js`_

README.NL.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Licensed under the EUPL_
140140
:alt: Docker image
141141
:target: https://hub.docker.com/r/maykinmedia/objects-api
142142

143-
.. |python-versions| image:: https://img.shields.io/badge/python-3.7%2B-blue.svg
143+
.. |python-versions| image:: https://img.shields.io/badge/python-3.9%2B-blue.svg
144144
:alt: Supported Python version
145145

146146
.. |lint-oas| image:: https://github.com/maykinmedia/objects-api/workflows/lint-oas/badge.svg

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Licensed under the EUPL_
138138
:alt: Docker image
139139
:target: https://hub.docker.com/r/maykinmedia/objects-api
140140

141-
.. |python-versions| image:: https://img.shields.io/badge/python-3.7%2B-blue.svg
141+
.. |python-versions| image:: https://img.shields.io/badge/python-3.9%2B-blue.svg
142142
:alt: Supported Python version
143143

144144
.. |lint-oas| image:: https://github.com/maykinmedia/objects-api/workflows/lint-oas/badge.svg

requirements/base.txt

+42-48
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# This file is autogenerated by pip-compile
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
44
#
55
# pip-compile --no-emit-index-url requirements/base.in
66
#
@@ -32,6 +32,31 @@ cryptography==3.4.8
3232
# josepy
3333
# mozilla-django-oidc
3434
# pyopenssl
35+
django==2.2.28
36+
# via
37+
# -r requirements/base.in
38+
# django-axes
39+
# django-choices
40+
# django-filter
41+
# django-formtools
42+
# django-hijack
43+
# django-markup
44+
# django-otp
45+
# django-phonenumber-field
46+
# django-redis
47+
# django-relativedelta
48+
# django-rest-framework-condition
49+
# django-rosetta
50+
# django-sniplates
51+
# djangorestframework
52+
# drf-nested-routers
53+
# drf-spectacular
54+
# drf-yasg
55+
# maykin-django-two-factor-auth
56+
# mozilla-django-oidc
57+
# mozilla-django-oidc-db
58+
# vng-api-common
59+
# zgw-consumers
3560
django-admin-index==1.5.0
3661
# via -r requirements/base.in
3762
django-axes==5.14.0
@@ -51,12 +76,12 @@ django-filter==2.4.0
5176
# vng-api-common
5277
django-formtools==2.3
5378
# via maykin-django-two-factor-auth
54-
django-hijack-admin==2.1.10
55-
# via -r requirements/base.in
5679
django-hijack==2.3.0
5780
# via
5881
# -r requirements/base.in
5982
# django-hijack-admin
83+
django-hijack-admin==2.1.10
84+
# via -r requirements/base.in
6085
django-ipware==3.0.2
6186
# via django-axes
6287
django-markup==1.3
@@ -82,43 +107,18 @@ django-solo==1.1.5
82107
# mozilla-django-oidc-db
83108
# vng-api-common
84109
# zgw-consumers
85-
django==2.2.28
110+
djangorestframework==3.12.4
86111
# via
87112
# -r requirements/base.in
88-
# django-axes
89-
# django-choices
90-
# django-filter
91-
# django-formtools
92-
# django-hijack
93-
# django-markup
94-
# django-otp
95-
# django-phonenumber-field
96-
# django-redis
97-
# django-relativedelta
98-
# django-rest-framework-condition
99-
# django-rosetta
100-
# django-sniplates
101-
# djangorestframework
113+
# djangorestframework-gis
102114
# drf-nested-routers
103115
# drf-spectacular
104116
# drf-yasg
105-
# maykin-django-two-factor-auth
106-
# mozilla-django-oidc
107-
# mozilla-django-oidc-db
108117
# vng-api-common
109-
# zgw-consumers
110118
djangorestframework-camel-case==1.2.0
111119
# via vng-api-common
112120
djangorestframework-gis==0.17
113121
# via -r requirements/base.in
114-
djangorestframework==3.12.4
115-
# via
116-
# -r requirements/base.in
117-
# djangorestframework-gis
118-
# drf-nested-routers
119-
# drf-spectacular
120-
# drf-yasg
121-
# vng-api-common
122122
drf-nested-routers==0.93.3
123123
# via vng-api-common
124124
drf-spectacular==0.16.0
@@ -139,10 +139,6 @@ glom==20.11.0
139139
# via -r requirements/base.in
140140
idna==2.10
141141
# via requests
142-
importlib-metadata==4.8.1
143-
# via
144-
# jsonschema
145-
# markdown
146142
inflection==0.5.1
147143
# via
148144
# drf-spectacular
@@ -167,10 +163,10 @@ markupsafe==1.1.1
167163
# via jinja2
168164
maykin-django-two-factor-auth[phonenumbers]==2.0.3
169165
# via -r requirements/base.in
170-
mozilla-django-oidc-db==0.7.2
171-
# via -r requirements/base.in
172166
mozilla-django-oidc==1.2.4
173167
# via mozilla-django-oidc-db
168+
mozilla-django-oidc-db==0.7.2
169+
# via -r requirements/base.in
174170
oyaml==1.0
175171
# via vng-api-common
176172
packaging==23.2
@@ -217,8 +213,6 @@ qrcode==6.1
217213
# via maykin-django-two-factor-auth
218214
redis==3.5.3
219215
# via django-redis
220-
requests-mock==1.8.0
221-
# via zgw-consumers
222216
requests==2.25.1
223217
# via
224218
# coreapi
@@ -228,10 +222,12 @@ requests==2.25.1
228222
# requests-mock
229223
# vng-api-common
230224
# zgw-consumers
231-
ruamel.yaml.clib==0.2.7
232-
# via ruamel.yaml
233-
ruamel.yaml==0.17.4
225+
requests-mock==1.8.0
226+
# via zgw-consumers
227+
ruamel-yaml==0.17.4
234228
# via drf-yasg
229+
ruamel-yaml-clib==0.2.7
230+
# via ruamel-yaml
235231
sentry-sdk==1.0.0
236232
# via -r requirements/base.in
237233
six==1.15.0
@@ -251,8 +247,6 @@ sqlparse==0.4.2
251247
# via django
252248
text-unidecode==1.3
253249
# via faker
254-
typing-extensions==4.7.1
255-
# via importlib-metadata
256250
unidecode==1.2.0
257251
# via vng-api-common
258252
uritemplate==3.0.1
@@ -267,12 +261,12 @@ urllib3==1.26.6
267261
# sentry-sdk
268262
uwsgi==2.0.21
269263
# via -r requirements/base.in
270-
vng-api-common[markdown_docs]==1.6.4
271-
# via -r requirements/base.in
264+
vng-api-common[markdown-docs]==1.6.4
265+
# via
266+
# -r requirements/base.in
267+
# vng-api-common
272268
zgw-consumers==0.15.2
273269
# via -r requirements/base.in
274-
zipp==3.5.0
275-
# via importlib-metadata
276270

277271
# The following packages are considered to be unsafe in a requirements file:
278272
# setuptools

0 commit comments

Comments
 (0)