Skip to content

Commit 32f6501

Browse files
pcrespovpcrespov
authored
🏗️ Upgrades repository to python 3.8.10 (#2079)
- Upgrades all python code in repository, i.e. all packages, tests and services [except director whose development is frozen], to python 3.8.10. See what is new - Repository's version in requirements/PYTHON_VERSION ( repo checked using tests/environment-setup/test_used_python.py) - CI runs in 3.8.10 except for python-linting that is run in both 3.8 and 3.9
1 parent e19f6c1 commit 32f6501

File tree

151 files changed

+870
-1746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+870
-1746
lines changed

‎.github/workflows/ci-testing-deploy.yml

+35-34
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ${{ matrix.os }}
4040
strategy:
4141
matrix:
42-
python: [3.6]
42+
python: [3.8]
4343
os: [ubuntu-20.04]
4444
fail-fast: false
4545
steps:
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: ${{ matrix.os }}
7474
strategy:
7575
matrix:
76-
python: [3.6]
76+
python: [3.8]
7777
os: [ubuntu-20.04]
7878
fail-fast: false
7979
steps:
@@ -120,7 +120,7 @@ jobs:
120120
runs-on: ${{ matrix.os }}
121121
strategy:
122122
matrix:
123-
python: [3.6]
123+
python: [3.8]
124124
os: [ubuntu-20.04]
125125
fail-fast: false
126126
steps:
@@ -173,6 +173,7 @@ jobs:
173173
runs-on: ${{ matrix.os }}
174174
strategy:
175175
matrix:
176+
# KEEP 3.6 Development of this service is frozen
176177
python: [3.6]
177178
os: [ubuntu-20.04]
178179
fail-fast: false
@@ -220,7 +221,7 @@ jobs:
220221
runs-on: ${{ matrix.os }}
221222
strategy:
222223
matrix:
223-
python: [3.6]
224+
python: [3.8]
224225
os: [ubuntu-20.04]
225226
fail-fast: false
226227
steps:
@@ -271,7 +272,7 @@ jobs:
271272
runs-on: ${{ matrix.os }}
272273
strategy:
273274
matrix:
274-
python: [3.6]
275+
python: [3.8]
275276
os: [ubuntu-20.04]
276277
fail-fast: false
277278
steps:
@@ -318,7 +319,7 @@ jobs:
318319
runs-on: ${{ matrix.os }}
319320
strategy:
320321
matrix:
321-
python: [3.6]
322+
python: [3.8]
322323
os: [ubuntu-20.04]
323324
fail-fast: false
324325
steps:
@@ -395,7 +396,7 @@ jobs:
395396
runs-on: ${{ matrix.os }}
396397
strategy:
397398
matrix:
398-
python: [3.6]
399+
python: [3.8, 3.9]
399400
os: [ubuntu-20.04]
400401
fail-fast: false
401402
steps:
@@ -429,7 +430,7 @@ jobs:
429430
runs-on: ${{ matrix.os }}
430431
strategy:
431432
matrix:
432-
python: [3.6]
433+
python: [3.8]
433434
os: [ubuntu-20.04]
434435
fail-fast: false
435436
steps:
@@ -477,7 +478,7 @@ jobs:
477478
runs-on: ${{ matrix.os }}
478479
strategy:
479480
matrix:
480-
python: [3.6]
481+
python: [3.8]
481482
os: [ubuntu-20.04]
482483
fail-fast: false
483484
steps:
@@ -524,7 +525,7 @@ jobs:
524525
runs-on: ${{ matrix.os }}
525526
strategy:
526527
matrix:
527-
python: [3.6]
528+
python: [3.8]
528529
os: [ubuntu-20.04]
529530
fail-fast: false
530531
steps:
@@ -571,7 +572,7 @@ jobs:
571572
runs-on: ${{ matrix.os }}
572573
strategy:
573574
matrix:
574-
python: [3.6]
575+
python: [3.8]
575576
os: [ubuntu-20.04]
576577
fail-fast: false
577578
steps:
@@ -618,7 +619,7 @@ jobs:
618619
runs-on: ${{ matrix.os }}
619620
strategy:
620621
matrix:
621-
python: [3.6]
622+
python: [3.8]
622623
os: [ubuntu-20.04]
623624
fail-fast: false
624625
steps:
@@ -665,7 +666,7 @@ jobs:
665666
runs-on: ${{ matrix.os }}
666667
strategy:
667668
matrix:
668-
python: [3.6]
669+
python: [3.8]
669670
os: [ubuntu-20.04]
670671
fail-fast: false
671672
steps:
@@ -712,7 +713,7 @@ jobs:
712713
runs-on: ${{ matrix.os }}
713714
strategy:
714715
matrix:
715-
python: [3.6]
716+
python: [3.8]
716717
os: [ubuntu-20.04]
717718
fail-fast: false
718719
steps:
@@ -760,7 +761,7 @@ jobs:
760761
runs-on: ${{ matrix.os }}
761762
strategy:
762763
matrix:
763-
python: [3.6]
764+
python: [3.8]
764765
os: [ubuntu-20.04]
765766
fail-fast: false
766767
steps:
@@ -808,7 +809,7 @@ jobs:
808809
runs-on: ${{ matrix.os }}
809810
strategy:
810811
matrix:
811-
python: [3.6]
812+
python: [3.8]
812813
os: [ubuntu-20.04]
813814
fail-fast: false
814815
steps:
@@ -856,7 +857,7 @@ jobs:
856857
runs-on: ${{ matrix.os }}
857858
strategy:
858859
matrix:
859-
python: [3.6]
860+
python: [3.8]
860861
os: [ubuntu-20.04]
861862
fail-fast: false
862863
steps:
@@ -904,7 +905,7 @@ jobs:
904905
runs-on: ${{ matrix.os }}
905906
strategy:
906907
matrix:
907-
python: [3.6]
908+
python: [3.8]
908909
os: [ubuntu-20.04]
909910
fail-fast: false
910911
steps:
@@ -947,12 +948,12 @@ jobs:
947948
path: codeclimate.${{ github.job }}_coverage.json
948949

949950
unit-test-webserver-05:
950-
timeout-minutes: 15 # if this timeout gets too small, then split the tests
951+
timeout-minutes: 14 # if this timeout gets too small, then split the tests
951952
name: "[unit] webserver 05"
952953
runs-on: ${{ matrix.os }}
953954
strategy:
954955
matrix:
955-
python: [3.6]
956+
python: [3.8]
956957
os: [ubuntu-20.04]
957958
fail-fast: false
958959
steps:
@@ -1000,7 +1001,7 @@ jobs:
10001001
runs-on: ${{ matrix.os }}
10011002
strategy:
10021003
matrix:
1003-
python: [3.6]
1004+
python: [3.8]
10041005
os: [ubuntu-20.04]
10051006
fail-fast: false
10061007
steps:
@@ -1048,7 +1049,7 @@ jobs:
10481049
runs-on: ${{ matrix.os }}
10491050
strategy:
10501051
matrix:
1051-
python: [3.6]
1052+
python: [3.8]
10521053
os: [ubuntu-20.04]
10531054
fail-fast: false
10541055
steps:
@@ -1096,7 +1097,7 @@ jobs:
10961097
runs-on: ${{ matrix.os }}
10971098
strategy:
10981099
matrix:
1099-
python: [3.6]
1100+
python: [3.8]
11001101
os: [ubuntu-20.04]
11011102
fail-fast: false
11021103
steps:
@@ -1144,7 +1145,7 @@ jobs:
11441145
runs-on: ${{ matrix.os }}
11451146
strategy:
11461147
matrix:
1147-
python: [3.6]
1148+
python: [3.8]
11481149
os: [ubuntu-20.04]
11491150
fail-fast: false
11501151
steps:
@@ -1192,7 +1193,7 @@ jobs:
11921193
runs-on: ${{ matrix.os }}
11931194
strategy:
11941195
matrix:
1195-
python: [3.6]
1196+
python: [3.8]
11961197
os: [ubuntu-20.04]
11971198
fail-fast: false
11981199
steps:
@@ -1269,7 +1270,7 @@ jobs:
12691270
runs-on: ${{ matrix.os }}
12701271
strategy:
12711272
matrix:
1272-
python: [3.6]
1273+
python: [3.8]
12731274
os: [ubuntu-20.04]
12741275
fail-fast: false
12751276
steps:
@@ -1333,7 +1334,7 @@ jobs:
13331334
runs-on: ${{ matrix.os }}
13341335
strategy:
13351336
matrix:
1336-
python: [3.6]
1337+
python: [3.8]
13371338
os: [ubuntu-20.04]
13381339
fail-fast: false
13391340
steps:
@@ -1397,7 +1398,7 @@ jobs:
13971398
runs-on: ${{ matrix.os }}
13981399
strategy:
13991400
matrix:
1400-
python: [3.6]
1401+
python: [3.8]
14011402
os: [ubuntu-20.04]
14021403
fail-fast: false
14031404
steps:
@@ -1461,7 +1462,7 @@ jobs:
14611462
runs-on: ${{ matrix.os }}
14621463
strategy:
14631464
matrix:
1464-
python: [3.6]
1465+
python: [3.8]
14651466
os: [ubuntu-20.04]
14661467
fail-fast: false
14671468
steps:
@@ -1525,7 +1526,7 @@ jobs:
15251526
runs-on: ${{ matrix.os }}
15261527
strategy:
15271528
matrix:
1528-
python: [3.6]
1529+
python: [3.8]
15291530
os: [ubuntu-20.04]
15301531
fail-fast: false
15311532
steps:
@@ -1589,7 +1590,7 @@ jobs:
15891590
runs-on: ${{ matrix.os }}
15901591
strategy:
15911592
matrix:
1592-
python: [3.6]
1593+
python: [3.8]
15931594
os: [ubuntu-20.04]
15941595
fail-fast: false
15951596
steps:
@@ -1634,7 +1635,7 @@ jobs:
16341635
runs-on: ${{ matrix.os }}
16351636
strategy:
16361637
matrix:
1637-
python: [3.6]
1638+
python: [3.8]
16381639
os: [ubuntu-20.04]
16391640
fail-fast: false
16401641
steps:
@@ -1679,7 +1680,7 @@ jobs:
16791680
runs-on: ${{ matrix.os }}
16801681
strategy:
16811682
matrix:
1682-
python: [3.6]
1683+
python: [3.8]
16831684
node: [14]
16841685
os: [ubuntu-20.04]
16851686
fail-fast: false
@@ -1756,7 +1757,7 @@ jobs:
17561757
runs-on: ${{ matrix.os }}
17571758
strategy:
17581759
matrix:
1759-
python: [3.6]
1760+
python: [3.8]
17601761
os: [ubuntu-20.04]
17611762
fail-fast: false
17621763
steps:

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
exclude: "^.venv$|^.cache$|^.pytest_cache$"
44
default_language_version:
5-
python: python3.6
5+
python: python3.8
66
repos:
77
- repo: https://github.com/pre-commit/pre-commit-hooks
88
rev: v3.3.0

‎api/tests/requirements.txt

+2-18
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,10 @@ coverage==5.5
2222
# via
2323
# -r requirements.in
2424
# pytest-cov
25-
dataclasses==0.8
26-
# via werkzeug
2725
dictpath==0.1.3
2826
# via openapi-core
29-
idna-ssl==1.1.0
30-
# via aiohttp
3127
idna==3.1
32-
# via
33-
# idna-ssl
34-
# yarl
35-
importlib-metadata==4.0.1
36-
# via
37-
# jsonschema
38-
# pluggy
39-
# pytest
28+
# via yarl
4029
iniconfig==1.1.1
4130
# via pytest
4231
isodate==0.6.0
@@ -108,16 +97,11 @@ termcolor==1.1.0
10897
toml==0.10.2
10998
# via pytest
11099
typing-extensions==3.10.0.0
111-
# via
112-
# aiohttp
113-
# importlib-metadata
114-
# yarl
100+
# via aiohttp
115101
werkzeug==2.0.0
116102
# via openapi-core
117103
yarl==1.6.3
118104
# via aiohttp
119-
zipp==3.4.1
120-
# via importlib-metadata
121105

122106
# The following packages are considered to be unsafe in a requirements file:
123107
# setuptools

‎api/tests/test_repo_data.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ def test_project_against_schema(data_path, project_schema, this_repo_root_dir):
9090
}
9191
data = prj
9292

93-
assert any(isinstance(data, _type) for _type in [List, Dict])
94-
if isinstance(data, Dict):
93+
assert any(isinstance(data, _type) for _type in [list, dict])
94+
if isinstance(data, dict):
9595
data = [
9696
data,
9797
]

‎mypy.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Global options:
22
[mypy]
3-
python_version = 3.6
3+
python_version = 3.8
44

55
warn_return_any = True
66
warn_unused_configs = True

‎packages/models-library/requirements/_base.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#
55
# pip-compile --output-file=requirements/_base.txt requirements/_base.in
66
#
7-
dataclasses==0.8
8-
# via pydantic
97
dnspython==2.1.0
108
# via email-validator
119
email-validator==1.1.2
@@ -15,6 +13,8 @@ idna==2.10
1513
# -r requirements/_base.in
1614
# email-validator
1715
pydantic[email]==1.8.2
18-
# via -r requirements/_base.in
16+
# via
17+
# -c requirements/../../../requirements/constraints.txt
18+
# -r requirements/_base.in
1919
typing-extensions==3.10.0.0
2020
# via pydantic

0 commit comments

Comments
 (0)