Skip to content

Commit a6db7e8

Browse files
authored
24 remove support for python36 and pypy3 and add support for python310 and 311 (#25)
* Remove support for old pythons, add support for new. * Remove parallel tox. * Limit the versions of pytest that are supported, since we get errors on python3.11 on the most recent version of pytest.
1 parent c8eadd4 commit a6db7e8

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM fedora:34 as base
22

33
RUN dnf -y update && dnf clean all
4-
RUN dnf -y install python3.6 python3.7 python3.8 python3.9 python3.10 pypy3 tox git && dnf clean all
4+
RUN dnf -y install python3.7 python3.8 python3.9 python3.10 python3.11 tox git && dnf clean all
55
RUN python3 -m pip install --upgrade build twine mkdocs && dnf clean all
66

77
FROM base as build
@@ -12,7 +12,7 @@ CMD ["tox"]
1212

1313
# Recipes to run tox
1414
FROM build as run
15-
RUN tox --parallel
15+
RUN tox
1616

1717
FROM scratch as results
1818
COPY --from=run /src/test-reports /

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ci: tox_docker
2929

3030
tox_docker: |$(BUILD_DIR)/
3131
rm -rf $(BUILD_DIR)/test-reports
32-
DOCKER_BUILDKIT=1 docker build . --target=results --output=type=local,dest=$(BUILD_DIR)/test-reports && \
32+
docker buildx build . --target=results --output=type=local,dest=$(BUILD_DIR)/test-reports && \
3333
touch $(BUILD_DIR)/test-reports/*.xml
3434

3535
mkdocs_docker: |$(BUILD_DIR)

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ package_dir=
3939
install_requires =
4040
pexpect >= 4.8.0
4141
pyeapi>=0.8.4
42-
pytest>=3.5.0
42+
pytest>=3.5.0,<7.3
4343
six>=1.15
4444
packaging>=22.0
4545

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# For more information about tox, see https://tox.readthedocs.io/en/latest/
22
[tox]
33
isolated_build = True
4-
envlist = py36,py37,py38,py39,pypy3,black,prospector,tmpblack
4+
envlist = py37,py38,py39,py310,py311,black,prospector,tmpblack
55

66
[testenv]
77
deps =
8-
pytest
8+
pytest < 7.3
99
pytest-mock
1010
commands = pytest -v --junit-xml=test-reports/{envname}.xml --junit-prefix={envname} tests
1111

0 commit comments

Comments
 (0)