Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Python version to 3.10 #811

Merged
merged 6 commits into from
Apr 28, 2022
Merged

Upgrade Python version to 3.10 #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca20ef8
Update PIP dependencies
noliveleger Apr 25, 2022
58140c8
Use Python 3.10 base image and add apt dependencies…
noliveleger Apr 25, 2022
035dfaf
Make the code Python 3.10 compliant
noliveleger Apr 25, 2022
6614ab0
Update GitHub Actions to use python 3.10
noliveleger Apr 25, 2022
a127f60
Remove not used apt_requirements.txt
noliveleger Apr 26, 2022
8b541b8
Apply requested changes for PR#811
noliveleger Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ['3.8']
python-version: ['3.10']
services:
postgres:
image: postgis/postgis:9.5-2.5
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:

test:
stage: build_test
image: python:3.8
image: python:3.10
variables:
DJANGO_SECRET_KEY: abcdef
TEST_DATABASE_URL: postgis://kobo:kobo@postgres:5432/kobocat_test
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8 as build-python
FROM python:3.10 as build-python

ENV VIRTUAL_ENV=/opt/venv \
KOBOCAT_SRC_DIR=/srv/src/kobocat \
Expand All @@ -12,7 +12,7 @@ RUN pip install --quiet --upgrade pip && \
COPY ./dependencies/pip/prod.txt "${TMP_DIR}/pip_dependencies.txt"
RUN pip-sync "${TMP_DIR}/pip_dependencies.txt" 1>/dev/null

FROM python:3.8-slim
FROM python:3.10-slim

# Declare environment variables
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -57,6 +57,7 @@ RUN apt-get -qq update && \
git \
gosu \
less \
libpq5 \
libproj-dev \
libsqlite3-mod-spatialite \
locales \
Expand Down
2 changes: 0 additions & 2 deletions apt_requirements.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dependencies/pip/dev.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ pytest-env
mongomock
mock
httmock
django-nose
Loading