Skip to content

Commit

Permalink
Merge pull request #92 from twisted/bump-gha
Browse files Browse the repository at this point in the history
Drop Python 3.5, 3.6, and 3.7; bump GHA
  • Loading branch information
twm authored Jul 2, 2024
2 parents 5752c86 + 0813891 commit 2c2b716
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 17 deletions.
21 changes: 11 additions & 10 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ defaults:

jobs:
testing:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
env:
TOXENV: "${{ matrix.tox-env }}"
name: ${{ matrix.python-version }}-${{ matrix.tox-env }}
Expand All @@ -37,7 +37,7 @@ jobs:
# When updating the minimum Python version here, also update the
# `python_requires` from `setup.cfg`.
# Run on latest minor release of each major python version.
python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
tox-env: ['tests']

include:
Expand All @@ -47,10 +47,10 @@ jobs:
skip-coverage: true

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -62,7 +62,7 @@ jobs:
- name: Run job via tox
run: |
# GitHub Actions VM have 2 CPUs.
tox --parallel 2
TOX_PARALLEL_NO_SPINNER=1 tox --parallel 2
- name: Prepare GitHub Pages
if: contains(matrix['tox-env'], 'apidocs')
Expand Down Expand Up @@ -90,9 +90,9 @@ jobs:
- name: Store coverage file
if: ${{ !cancelled() && !matrix.skip-coverage }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage
name: coverage-${{ matrix.python-version }}-${{ matrix.job-name }}
path: .coverage-job-*

coverage-report:
Expand All @@ -104,7 +104,7 @@ jobs:
needs:
- testing # Wait for test jobs.
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -114,9 +114,10 @@ jobs:
python -m pip install --upgrade coverage[toml] diff_cover
- name: Download coverage reports
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: coverage
pattern: coverage-*
merge-multiple: true
path: .

- name: Prepare coverage
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
requires = [
"setuptools >= 44.1.1",
"wheel >= 0.36.2",
"typing >= 3.7.4.3; python_version < '3.5'",
]
build-backend = "setuptools.build_meta"

[tool.black]
target-version = ['py27', 'py36', 'py37', 'py38']
target-version = ['py36', 'py37', 'py38']

[tool.towncrier]
filename = "NEWS.rst"
Expand Down
5 changes: 0 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ classifiers =
Intended Audience :: Developers
License :: OSI Approved :: MIT License
Programming Language :: Python :: 3
Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
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
Expand All @@ -22,7 +18,6 @@ description = "A small library that versions your Python projects."
long_description = file: README.rst
install_requires =
setuptools
typing >= 3.7.4.3; python_version < '3.5'

[options]
packages = find:
Expand Down
File renamed without changes.
2 changes: 2 additions & 0 deletions src/incremental/newsfragments/92.removal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Support for Python 3.5 has been dropped for lack of test infrastructure.

0 comments on commit 2c2b716

Please sign in to comment.