Skip to content

Commit

Permalink
Upgrade Ubuntu to 22.04 and Python to 3.10 in Dockerfile
Browse files Browse the repository at this point in the history
This upgrade to the latest LTS version of Ubuntu also includes the
upgrade to Python 3.10.
  • Loading branch information
japauliina committed Nov 8, 2023
1 parent a92e55a commit a63ac17
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [ "3.8" ,"3.9", "3.10" , "3.11" ]
python: [ "3.10" , "3.11" ]
env:
DATABASE_URL: postgis://postgres:postgres@localhost/smbackend
SECRET_KEY: test-secret
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Using Ubuntu base for access to GDAL PPA
FROM ubuntu:20.04
FROM ubuntu:22.04
WORKDIR /smbackend

# tzdata installation requires settings frontend
RUN apt-get update && \
TZ="Europe/Helsinki" DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip gdal-bin uwsgi uwsgi-plugin-python3 libgdal26 postgresql-client netcat gettext git-core libpq-dev voikko-fi libvoikko-dev && \
TZ="Europe/Helsinki" DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip gdal-bin uwsgi uwsgi-plugin-python3 postgresql-client netcat gettext git-core libpq-dev voikko-fi libvoikko-dev && \
ln -s /usr/bin/pip3 /usr/local/bin/pip && \
ln -s /usr/bin/python3 /usr/local/bin/python

Expand Down
12 changes: 4 additions & 8 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile requirements-dev.in
#
asttokens==2.4.1
# via stack-data
backcall==0.2.0
# via ipython
decorator==5.1.1
# via ipython
exceptiongroup==1.1.3
# via ipython
executing==2.0.1
# via stack-data
ipython==8.12.3
ipython==8.17.2
# via -r requirements-dev.in
jedi==0.19.1
# via ipython
Expand All @@ -22,8 +22,6 @@ parso==0.8.3
# via jedi
pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
prompt-toolkit==3.0.39
# via ipython
ptyprocess==0.7.0
Expand All @@ -40,7 +38,5 @@ traitlets==5.13.0
# via
# ipython
# matplotlib-inline
typing-extensions==4.8.0
# via ipython
wcwidth==0.2.9
# via prompt-toolkit
1 change: 1 addition & 0 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ libvoikko
bmi-arcgis-restapi
geopy
backports.zoneinfo;python_version<"3.9"
tzdata
14 changes: 4 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile requirements.in
Expand All @@ -10,10 +10,6 @@ attrs==23.1.0
# via
# cattrs
# requests-cache
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements.in
# django
black==23.11.0
# via -r requirements.in
bmi-arcgis-restapi==2.4.5
Expand Down Expand Up @@ -61,7 +57,7 @@ django-modeltranslation==0.18.11
# via
# -r requirements.in
# django-munigeo
django-mptt==0.14.0
django-mptt==0.15.0
# via
# -r requirements.in
# django-munigeo
Expand All @@ -87,8 +83,6 @@ geopy==2.4.0
# via -r requirements.in
idna==3.4
# via requests
importlib-metadata==6.8.0
# via build
iniconfig==2.0.0
# via pytest
isort==5.12.0
Expand Down Expand Up @@ -187,6 +181,8 @@ typing-extensions==4.8.0
# black
# cattrs
# django-modeltranslation
tzdata==2023.3
# via -r requirements.in
url-normalize==1.4.3
# via requests-cache
urllib3==2.0.7
Expand All @@ -199,8 +195,6 @@ wheel==0.41.3
# via pip-tools
whitenoise==6.6.0
# via -r requirements.in
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down

0 comments on commit a63ac17

Please sign in to comment.