Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 3 additions & 27 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -41,7 +41,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -55,30 +55,6 @@ jobs:
inv mkdir build/coverage-data
inv tox -e "py-*"

test-py36:
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 4
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.6"]

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install pip==21.3.1
python -m pip install invoke tox
- name: Run tox
env:
TOX_PARALLEL_NO_SPINNER: "1"
run: |
inv mkdir build/coverage-data
inv tox -e "py36-*"

lint:
runs-on: ubuntu-latest
Expand All @@ -90,7 +66,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ classifiers = [
"Operating System :: Microsoft :: Windows",
"Operating System :: OS Independent",
"Operating System :: POSIX",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand All @@ -33,7 +32,7 @@ requires = [
"pytest>=6,<8",
"mypy",
]
requires-python = ">=3.6"
requires-python = ">=3.7"

[tool.flit.entrypoints.pytest11]
mypy-testing = "pytest_mypy_testing.plugin"
Expand Down
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
[tox]
isolated_build = True
envlist =
{py36}-pytest{60,61,62,70}-mypy{0910,0931,0971}
{py37,py38,py39}-pytest{62,70,71}-mypy{0910,0931,0971}
{py310}-pytest{62,71}-mypy{0910,0931,0971}
py-pytest{62,70,71}-mypy{0910,0931,0971}
Expand All @@ -12,7 +11,6 @@ envlist =
[testenv]
deps =
coverage[toml]
dataclasses;python_version<"3.7"
pytest53: pytest~=5.3.5
pytest54: pytest~=5.4.1
pytest60: pytest~=6.0.2
Expand All @@ -34,7 +32,7 @@ deps =
setenv =
COVERAGE_FILE={toxinidir}/build/{envname}/coverage
commands =
coverage run --context "{envname}" -m pytest \
python -m coverage run --context "{envname}" -m pytest \
{posargs} \
--html={toxinidir}/build/{envname}/pytest-report.html \
--junitxml={toxinidir}/build/{envname}/junit.xml
Expand Down