Skip to content

Commit

Permalink
Move to Python 3.10, fixes #2132
Browse files Browse the repository at this point in the history
  • Loading branch information
abhidg committed Oct 19, 2022
1 parent 48faf52 commit 0bcf3b3
Show file tree
Hide file tree
Showing 30 changed files with 103 additions and 99 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/aggregate-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
working-directory: data-serving/scripts/aggregate-covid19/aggregate
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: '3.10'
- name: Lint with flake8
run: |
pip install flake8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/api-python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
working-directory: api/python
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: '3.10'
- name: Install dependencies
run: |
pip install -r requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/completeness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: eu-central-1
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: '3.10'
- name: Install dependencies
run: pip install -r requirements-completeness.txt
- name: Upload completeness
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/freshness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: eu-central-1
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: '3.10'
- name: Install dependencies
run: pip install -r requirements.txt
- name: Upload freshness
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/geocoding-service-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
working-directory: geocoding/location-service
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'
- name: Lint with flake8
run: |
pip install flake8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ingestion-functions-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
working-directory: ingestion/functions
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'
- name: Lint with flake8
run: |
pip install flake8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/monitoring-notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: eu-central-1

- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'
- name: Install dependencies
run: pip install -r requirements.txt
- name: Run metrics script
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/monitoring-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
working-directory: ingestion/monitoring
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: '3.10'
- name: Install dependencies
run: |
pip install -r requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prune-uploads-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
working-directory: data-serving/scripts/prune-uploads
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: '3.10'
- name: Install dependencies
run: |
pip install -r requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-data-service-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: '3.10.5'
python-version: '3.10'
- name: Lint with flake8
run: |
pip install flake8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/suggest-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Python 3.8
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
26 changes: 10 additions & 16 deletions data-serving/scripts/aggregate-covid19/aggregate/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["Global.health <info@global.health>"]
license = "MIT"

[tool.poetry.dependencies]
python = "^3.9"
python = "^3.10"
boto3 = "1.16.60"
pymongo = "3.11.2"
dnspython = "2.1.0"
Expand Down
2 changes: 1 addition & 1 deletion dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# `python-base` sets up all our shared environment variables
FROM python:3.8-slim as python-base
FROM python:3.10-slim as python-base

ENV PYTHONUNBUFFERED=1 \
# prevents python creating .pyc files
Expand Down
4 changes: 2 additions & 2 deletions dev/Dockerfile-batch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8
FROM python:3.10-slim

# download https://github.com/docker/docker-credential-helpers/releases/download/v0.6.4/docker-credential-pass-v0.6.4-amd64.tar.gz
# extract it
Expand All @@ -7,4 +7,4 @@ FROM python:3.8

COPY ./batch.py ./

RUN [ "python", "./batch.py" ]
RUN [ "python", "./batch.py" ]
2 changes: 1 addition & 1 deletion dev/Dockerfile-ingestion
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# `python-base` sets up all our shared environment variables
FROM python:3.8-slim as python-base
FROM python:3.10-slim as python-base

ENV PYTHONUNBUFFERED=1 \
# prevents python creating .pyc files
Expand Down
4 changes: 2 additions & 2 deletions dev/Dockerfile-mock-source-data
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# `python-base` sets up all our shared environment variables
FROM python:3.8-slim as python-base
FROM python:3.10-slim as python-base

ENV PYTHONUNBUFFERED=1 \
# prevents python creating .pyc files
Expand Down Expand Up @@ -72,4 +72,4 @@ COPY poetry.lock pyproject.toml ./
# quicker install as runtime deps are already installed
RUN poetry install --no-dev

CMD [ "python", "./mock_source_data.py" ]
CMD [ "python", "./mock_source_data.py" ]
2 changes: 1 addition & 1 deletion dev/Dockerfile-test
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# `python-base` sets up all our shared environment variables
FROM python:3.9-slim as python-base
FROM python:3.10-slim as python-base

ENV PYTHONUNBUFFERED=1 \
# prevents python creating .pyc files
Expand Down
Loading

0 comments on commit 0bcf3b3

Please sign in to comment.