Skip to content

Commit

Permalink
Drop EOL Python 3.6 and 3.7
Browse files Browse the repository at this point in the history
Also execute pyupgrade --py38-plus
  • Loading branch information
nicoddemus committed Aug 31, 2023
1 parent c7f11cb commit 66c02f6
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
13 changes: 4 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,9 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ["3.7", "3.8", "3.9", "3.10"]
python: ["3.8", "3.9", "3.10", "3.11"]
os: [ubuntu-latest, windows-latest]
include:
# non-matrix listed runs (python 3.6 is not supported with ubuntu-latest).
- python: 3.6
os: ubuntu-20.04
tox_env: "py36"
- python: 3.6
os: windows-latest
tox_env: "py36"
- python: "3.7"
tox_env: "py37"
- python: "3.8"
Expand All @@ -28,6 +21,8 @@ jobs:
tox_env: "py39"
- python: "3.10"
tox_env: "py310,pytest6"
- python: "3.11"
tox_env: "py311
exclude:
- python: "3.6"
os: windows-latest
Expand Down Expand Up @@ -59,7 +54,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: "3.7"
python-version: "3.11"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2.5.0 (2023-08-31)
------------------

* Dropped support for EOL Python 3.6 and Python 3.7.
* Added support for Python 3.11.

2.4.3 (2023-08-30)
------------------

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ def read(fname: str) -> str:
"Intended Audience :: Developers",
"Topic :: Software Development :: Testing",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: Implementation :: CPython",
"Operating System :: OS Independent",
"License :: OSI Approved :: MIT License",
Expand Down
2 changes: 1 addition & 1 deletion src/pytest_regressions/ndarrays_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def _load_fn(self, filename: Path) -> Dict[str, Any]:
with open(filename, "rb") as f:
result = dict(np.load(f))
except (zipfile.BadZipFile, ValueError) as e:
raise IOError(
raise OSError(
f"NPZ file {filename} could not be loaded. Corrupt file?"
) from e
return result
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py36,py37,py38,py39,py310,pytest6, docs,linting
envlist = py38,py39,py310,py311,pytest6

[testenv]
download = true
Expand Down

0 comments on commit 66c02f6

Please sign in to comment.