Skip to content

Commit b9beb5c

Browse files
committed
CI: Fix python3.6 runs using still-maintained Leap 15.6 based image
1 parent 4a0be2c commit b9beb5c

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

.github/workflows/tox.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [pull_request]
55

66
jobs:
77
build:
8-
runs-on: ${{ matrix.os }}
8+
runs-on: ubuntu-latest
99
strategy:
1010
max-parallel: 4
1111
fail-fast: false
@@ -18,22 +18,33 @@ jobs:
1818
- "3.11"
1919
- "3.12"
2020
- "3.13"
21-
include:
22-
- os: "ubuntu-latest"
23-
- os: "ubuntu-20.04"
24-
python-version: "3.6"
25-
21+
container: ${{ contains(matrix.python-version, '3.6') && 'registry.opensuse.org/home/okurz/container/leap15/containers/leap:openQA-python-client-ci' || '' }}
2622
steps:
2723
- uses: actions/checkout@v5
2824
with:
2925
fetch-depth: 0
3026
- name: Set up Python ${{ matrix.python-version }}
27+
if: matrix.python-version != '3.6'
3128
uses: actions/[email protected]
3229
with:
3330
python-version: ${{ matrix.python-version }}
31+
- name: Adjust 3.6 image
32+
if: matrix.python-version == '3.6'
33+
run: |
34+
ln -s /usr/bin/python3 /usr/local/bin/python
35+
whoami
36+
ls -l /
37+
ls -la /github/home/
38+
mkdir -p /github/home/.cache/
39+
ls -la /github/home/
3440
- name: Install dependencies
3541
run: |
3642
python -m pip install --upgrade pip
3743
pip install tox tox-gh-actions
3844
- name: Test with tox
39-
run: tox
45+
run: |
46+
pwd
47+
ls -la
48+
tox list
49+
tox config
50+
tox

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
packages=["openqa_client"],
3737
package_data={"openqa_client": ["py.typed"]},
3838
package_dir={"": "src"},
39-
install_requires=open('install.requires').read().splitlines(),
39+
install_requires=open(os.path.join(HERE, 'install.requires')).read().splitlines(),
4040
python_requires="!=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4",
4141
long_description=LONGDESC,
4242
long_description_content_type='text/markdown',

tox.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
envlist = py36,py38,py39,py310,py311,py312,py313,ci
33
skip_missing_interpreters = true
44
isolated_build = true
5+
# https://tox.wiki/en/4.11.3/faq.html#testing-end-of-life-python-versions
6+
# for python3.6
7+
requires = virtualenv<20.22.0
8+
59

610
[gh-actions]
711
python =

0 commit comments

Comments
 (0)