Skip to content

Commit 6c07930

Browse files
committed
Python 3.8 is EOL, remove it from most places in the build pipelines and
tox config. Instead of using Python 3.8 for various tox targets, use 3.9 instead.
1 parent 9c0fb20 commit 6c07930

File tree

6 files changed

+23
-43
lines changed

6 files changed

+23
-43
lines changed

.github/workflows/install_test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
- "3.10"
2929
- "3.11"
3030
- "pypy-3.7"
31+
- "pypy-3.8"
32+
- "pypy-3.9"
3133
include:
3234
# python 3.6 is not supported with ubuntu-latest anymore so we need to
3335
# use ubuntu 20.04

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
strategy:
3434
matrix:
35-
python_version: [3.8]
35+
python_version: [3.9]
3636

3737
steps:
3838
- uses: actions/checkout@master

.github/workflows/main.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
python_version:
35-
- 3.8
36-
- 3.9
35+
- "3.9"
3736
- "3.10"
3837
- "3.11"
3938
- "3.12"
4039
# cryptography is not compatible with older PyPy versions
41-
- "pypy-3.8"
40+
- "pypy-3.9"
4241
os:
4342
- ubuntu-latest
4443

@@ -74,8 +73,7 @@ jobs:
7473
tox -e py${{ matrix.python_version }}
7574
7675
- name: Run dist install checks tox target
77-
# NOTE: 3.12 will be failing until we migrate away from setup.py
78-
if: ${{ matrix.python_version != 'pypy-3.7' && matrix.python_version != 'pypy-3.8' && matrix.python_version != '3.12-dev' }}
76+
if: ${{ matrix.python_version != 'pypy-3.7' && matrix.python_version != 'pypy-3.9' && matrix.python_version != '3.12-dev' }}
7977
run: |
8078
tox -e py${{ matrix.python_version }}-dist,py${{ matrix.python_version }}-dist-wheel
8179
@@ -85,7 +83,7 @@ jobs:
8583

8684
strategy:
8785
matrix:
88-
python_version: [3.8]
86+
python_version: [3.9]
8987

9088
steps:
9189
- uses: actions/checkout@master
@@ -133,7 +131,7 @@ jobs:
133131

134132
strategy:
135133
matrix:
136-
python_version: [3.8]
134+
python_version: [3.9]
137135

138136
steps:
139137
- uses: actions/checkout@master
@@ -176,7 +174,7 @@ jobs:
176174

177175
strategy:
178176
matrix:
179-
python_version: [3.8]
177+
python_version: [3.9]
180178

181179
steps:
182180
- uses: actions/checkout@master
@@ -200,7 +198,7 @@ jobs:
200198

201199
strategy:
202200
matrix:
203-
python_version: [3.8]
201+
python_version: [3.9]
204202

205203
steps:
206204
- uses: actions/checkout@master
@@ -268,7 +266,7 @@ jobs:
268266

269267
strategy:
270268
matrix:
271-
python_version: [3.8]
269+
python_version: [3.9]
272270

273271
steps:
274272
- uses: actions/checkout@master
@@ -307,7 +305,7 @@ jobs:
307305

308306
strategy:
309307
matrix:
310-
python_version: [3.8]
308+
python_version: [3.9]
311309

312310
steps:
313311
- name: Print Environment Info

.github/workflows/publish_dev_artifact.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Use Python ${{ matrix.python_version }}
3636
uses: actions/setup-python@v5
3737
with:
38-
python-version: 3.8
38+
python-version: 3.9
3939

4040
- name: Install Dependencies
4141
run: |

.github/workflows/publish_pricing_to_s3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
python_version: [3.8]
20+
python_version: [3.9]
2121

2222
steps:
2323
- name: Print Environment Info

tox.ini

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{pypy3,3.8,3.9,3.10,3.11,pyjion},checks,lint,pylint,pyupgrade,isort,black,mypy,docs,coverage,integration-storage
2+
envlist = py{pypy3,3.9,3.10,3.11,pyjion},checks,lint,pylint,pyupgrade,isort,black,mypy,docs,coverage,integration-storage
33
skipsdist = true
44
requires =
55
wheel
@@ -23,11 +23,10 @@ allowlist_externals =
2323
basepython =
2424
py3.12-dev: python3.12
2525
pypypy3: pypy3
26-
pypypy-3.8: pypy3.8
26+
pypypy-3.9: pypy3.9
2727
pypyjion: pyjion
28-
{docs,checks,black,black-check,lint,pylint,bandit,mypy,micro-benchmarks,coverage,import-timings,isort,isort-check,pyupgrade}: python3.8
29-
{py3.8,py3.8-windows,integration-storage,py3.8-dist,py3.8-dist-wheel}: python3.8
30-
{py3.9,py3.9-dist,py3.9-dist-wheel}: python3.9
28+
{docs,checks,black,black-check,lint,pylint,bandit,mypy,micro-benchmarks,coverage,import-timings,isort,isort-check,pyupgrade}: python3.9
29+
{py3.9,py3.9-dist,py3.9-dist-wheel,py3.9-windows,integration-storage}: python3.9
3130
{py3.10,py3.10-dist,py3.10-dist-wheel}: python3.10
3231
{py3.11,py3.11-dist,py3.11-dist-wheel}: python3.11
3332
{py3.12-dev,py3.12-dev-dist,py3.12-dev-dist-wheel}: python3.12
@@ -43,25 +42,6 @@ commands = cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
4342
pytest --color=yes -rsx -vvv --capture=tee-sys -o log_cli=True --durations=10 --timeout=15 -n auto --dist loadfile --ignore libcloud/test/benchmarks/ --ignore-glob "*test_list_objects_filtering_performance*" -m "not serial"
4443
pytest --color=yes -rsx -vvv --capture=tee-sys -o log_cli=True --durations=10 --timeout=15 --ignore libcloud/test/benchmarks/ --ignore-glob "*test_list_objects_filtering_performance*" -m "serial"
4544

46-
[testenv:py3.8-dist]
47-
# Verify library installs without any dependencies when using python setup.py
48-
# install
49-
skipdist = True
50-
recreate = True
51-
# NOTE: We intentionally set empty deps to ensure it works on a clean
52-
# environment without any dependencies
53-
deps =
54-
commands = bash -c "./scripts/dist_install_check.sh"
55-
56-
[testenv:py3.8-dist-wheel]
57-
# Verify library installs without any dependencies when using built wheel
58-
skipdist = True
59-
recreate = True
60-
# NOTE: We intentionally set empty deps to ensure it works on a clean
61-
# environment without any dependencies
62-
deps =
63-
commands = bash -c "./scripts/dist_wheel_install_check.sh"
64-
6545
[testenv:py3.9-dist]
6646
# Verify library installs without any dependencies when using python setup.py
6747
# install
@@ -150,11 +130,11 @@ commands = rstcheck --report-level warning ../README.rst
150130
sphinx-build -j auto -b html -d {envtmpdir}/doctrees . _build/html
151131

152132
[testenv:provider-tables]
153-
basepython: python3.8
133+
basepython: python3.9
154134
commands = python ./contrib/generate_provider_feature_matrix_table.py
155135

156136
[testenv:scrape-and-publish-provider-prices]
157-
basepython: python3.8
137+
basepython: python3.9
158138
# Needed to avoid urllib3 errors related to old openssl version
159139
# https://github.com/urllib3/urllib3/issues/2168
160140
deps = urllib3==1.26.6
@@ -188,7 +168,7 @@ commands =
188168
echo "https://libcloud-pricing-data.s3.amazonaws.com/pricing.json.sha512"
189169

190170
[testenv:scrape-provider-prices]
191-
basepython: python3.8
171+
basepython: python3.9
192172
# Needed to avoid urllib3 errors related to old openssl version
193173
# https://github.com/urllib3/urllib3/issues/2168
194174
deps = urllib3==1.26.6
@@ -211,7 +191,7 @@ commands =
211191
bash -c "(cd libcloud/data/ ; sha512sum pricing.json > {toxinidir}/libcloud/data/pricing.json.sha512)"
212192

213193
[testenv:scrape-ec2-prices]
214-
basepython: python3.8
194+
basepython: python3.9
215195
# Needed to avoid urllib3 errors related to old openssl version
216196
# https://github.com/urllib3/urllib3/issues/2168
217197
deps = urllib3==1.26.6
@@ -222,7 +202,7 @@ deps = urllib3==1.26.6
222202
commands = python contrib/scrape-ec2-prices.py
223203

224204
[testenv:scrape-ec2-sizes]
225-
basepython: python3.8
205+
basepython: python3.9
226206
# Needed to avoid urllib3 errors related to old openssl version
227207
# https://github.com/urllib3/urllib3/issues/2168
228208
deps = urllib3==1.26.6

0 commit comments

Comments
 (0)