Skip to content

Commit

Permalink
Merge branch 'master' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
bdraco committed Sep 9, 2024
2 parents 2e93a11 + 438113f commit 76e10b7
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 13 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ jobs:
*-macosx_universal2
*-musllinux_*
*-win32
*_arm64
pp*'
|| ''
}}
Expand All @@ -153,7 +152,6 @@ jobs:
pyver:
- 3.13-dev
- 3.12
- 3.7
- 3.11
- >-
3.10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
.tox/.tmp/.mypy/python-3.13/cobertura.xml,
.tox/.tmp/.mypy/python-3.11/cobertura.xml,
.tox/.tmp/.mypy/python-3.9/cobertura.xml,
.tox/.tmp/.mypy/python-3.7/cobertura.xml
.tox/.tmp/.mypy/python-3.8/cobertura.xml
flags: >-
CI-GHA,
MyPy
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,18 @@ repos:
- --html-report=.tox/.tmp/.mypy/python-3.9
pass_filenames: false
- id: mypy
alias: mypy-py37
name: MyPy, for Python 3.7
alias: mypy-py38
name: MyPy, for Python 3.8
additional_dependencies:
- types-docutils
- lxml # dep of `--txt-report`, `--cobertura-xml-report` & `--html-report`
- pytest < 8
- Sphinx >= 5.3.0, < 6
args:
- --python-version=3.7
- --txt-report=.tox/.tmp/.mypy/python-3.7
- --cobertura-xml-report=.tox/.tmp/.mypy/python-3.7
- --html-report=.tox/.tmp/.mypy/python-3.7
- --python-version=3.8
- --txt-report=.tox/.tmp/.mypy/python-3.8
- --cobertura-xml-report=.tox/.tmp/.mypy/python-3.8
- --html-report=.tox/.tmp/.mypy/python-3.8
pass_filenames: false

...
1 change: 1 addition & 0 deletions CHANGES/997.breaking.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove Python 3.7 support -- by :user:`bdraco`.
1 change: 1 addition & 0 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-r towncrier.txt
sphinx==7.3.7
pyenchant==3.2.2
sphinxcontrib-spelling==8.0.0
Expand Down
3 changes: 1 addition & 2 deletions requirements/pytest.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
pytest==7.4.4; python_version < "3.8"
pytest==8.1.1; python_version >= "3.8"
pytest==8.3.2; python_version >= "3.8"
pytest-cov==4.1.0
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,14 @@ classifiers =

Programming Language :: Python
Programming Language :: Python :: 3
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 :: 3.12

[options]
python_requires = >= 3.7
python_requires = >= 3.8
install_requires =
typing-extensions >= 4.1.0; python_version < '3.11'
packages =
Expand Down

0 comments on commit 76e10b7

Please sign in to comment.