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

⬆️ Maintenance: upgrade to python 3.9.12 #2973

Merged
merged 13 commits into from
Apr 11, 2022
Merged

⬆️ Maintenance: upgrade to python 3.9.12 #2973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
082db6f
move to python 3.9
sanderegg Apr 8, 2022
2417f56
upgraded packages to python 3.9.12
sanderegg Apr 8, 2022
aa6bbe6
upgraded services to python 3.9.12
sanderegg Apr 8, 2022
4b143d2
upgraded services to python 3.9.12
sanderegg Apr 8, 2022
fafaba3
upgraded to python 3.9.12
sanderegg Apr 8, 2022
6c5b9c8
fix definition of version as a string
sanderegg Apr 8, 2022
accf581
keep the same pennsieve agent
sanderegg Apr 8, 2022
07f0600
use python 3.9 importlib
sanderegg Apr 8, 2022
c4bd4aa
fix version of pennsieve-agent
sanderegg Apr 8, 2022
02fbf22
linter python 3.10
sanderegg Apr 8, 2022
98a53d2
distutils is deprecated in 3.10
sanderegg Apr 8, 2022
ed6d37f
skip director-v0
sanderegg Apr 8, 2022
cbf3ad6
@pcrespov review: no need to convert to string
sanderegg Apr 8, 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/ci-release.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: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-staging.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: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/ci-testing-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -269,7 +269,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -319,7 +319,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -375,7 +375,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -482,7 +482,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -538,7 +538,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -590,7 +590,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -640,7 +640,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -730,7 +730,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8, 3.9]
python: ["3.9", "3.10"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -767,7 +767,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -818,7 +818,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -868,7 +868,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -918,7 +918,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -968,7 +968,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1018,7 +1018,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1068,7 +1068,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1119,7 +1119,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1185,7 +1185,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1251,7 +1251,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1317,7 +1317,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1386,7 +1386,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1452,7 +1452,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1505,7 +1505,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1558,7 +1558,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
node: [14]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
Expand Down Expand Up @@ -1632,7 +1632,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down Expand Up @@ -1756,7 +1756,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.8]
python: ["3.9"]
os: [ubuntu-20.04]
docker_buildx: [v0.7.1]
docker_compose: [1.29.1]
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See https://pre-commit.com/hooks.html for more hooks
exclude: "^.venv$|^.cache$|^.pytest_cache$"
default_language_version:
python: python3.8
python: python3.9
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ pylint: ## Runs python linter framework's wide
-not -path "*generated_code*" \
-not -path "*build*" \
-not -path "*datcore.py" \
-not -path "*/director/*" \
-not -path "*web/server*"))"
# See exit codes and command line https://pylint.readthedocs.io/en/latest/user_guide/run.html#exit-codes

Expand Down
8 changes: 1 addition & 7 deletions api/tests/requirements.txt
View file
Open in desktop
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.9
# To update, run:
#
# pip-compile --output-file=requirements.txt requirements.in
Expand Down Expand Up @@ -33,10 +33,6 @@ frozenlist==1.3.0
# aiosignal
idna==3.3
# via yarl
importlib-resources==5.6.0 ; python_version < "3.9"
# via
# -c ../../requirements/constraints.txt
# jsonschema
iniconfig==1.1.1
# via pytest
isodate==0.6.1
Expand Down Expand Up @@ -111,8 +107,6 @@ werkzeug==2.0.3
# via openapi-core
yarl==1.7.2
# via aiohttp
zipp==3.7.0
# via importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# setuptools
12 changes: 6 additions & 6 deletions ci/helpers/requirements.txt
View file
Open in desktop
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.9
# To update, run:
#
# pip-compile --output-file=requirements.txt requirements.in
Expand All @@ -16,13 +16,13 @@ attrs==21.4.0
# via aiohttp
certifi==2021.10.8
# via requests
charset-normalizer==2.0.11
charset-normalizer==2.0.12
# via
# aiohttp
# requests
docker==5.0.3
# via -r requirements.in
fastapi==0.73.0
fastapi==0.75.1
# via -r requirements.in
frozenlist==1.3.0
# via
Expand All @@ -47,11 +47,11 @@ sniffio==1.2.0
# via anyio
starlette==0.17.1
# via fastapi
typing-extensions==4.0.1
typing-extensions==4.1.1
# via pydantic
urllib3==1.26.8
urllib3==1.26.9
# via requests
websocket-client==1.2.3
websocket-client==1.3.2
# via docker
yarl==1.7.2
# via aiohttp
2 changes: 1 addition & 1 deletion mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Global options:
[mypy]
python_version = 3.8
python_version = 3.9

warn_return_any = True
warn_unused_configs = True
Expand Down
Loading