From 25c30171317aa3e246b5ebd23718ba9870f73e69 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Mon, 1 Jul 2024 13:54:23 -0700 Subject: [PATCH 1/6] Fix newsfragment location --- src/incremental/{ => newsfragments}/86.removal | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/incremental/{ => newsfragments}/86.removal (100%) diff --git a/src/incremental/86.removal b/src/incremental/newsfragments/86.removal similarity index 100% rename from src/incremental/86.removal rename to src/incremental/newsfragments/86.removal From 06992a4b83095b61874bf7a9ae7066b10e08b587 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Mon, 1 Jul 2024 19:00:04 -0700 Subject: [PATCH 2/6] Bump some GitHub actions --- .github/workflows/tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index b3f5d915..3c9bd00d 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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 }} From 98c7776182a5e454d0a8541708b477cbf6c01040 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Mon, 1 Jul 2024 19:19:46 -0700 Subject: [PATCH 3/6] Bump some more actions --- .github/workflows/tests.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3c9bd00d..1cc634c3 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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') @@ -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: @@ -104,7 +104,7 @@ jobs: needs: - testing # Wait for test jobs. steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -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 From c5a642c32598de93a408a42eba0f129aea10230a Mon Sep 17 00:00:00 2001 From: Tom Most Date: Mon, 1 Jul 2024 19:28:15 -0700 Subject: [PATCH 4/6] Drop Python 3.5 support The Python 3.5 build is failing because it can't talk to PyPI (certificate validation failure). I guess it's time to drop it, as it has been EoL for 3 years. --- .github/workflows/tests.yaml | 2 +- pyproject.toml | 3 +-- setup.cfg | 3 --- src/incremental/newsfragments/92.removal | 2 ++ 4 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 src/incremental/newsfragments/92.removal diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 1cc634c3..1bba4d0a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12'] tox-env: ['tests'] include: diff --git a/pyproject.toml b/pyproject.toml index c16a88ba..8783b9d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" diff --git a/setup.cfg b/setup.cfg index b0de040e..6e3aef38 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,8 +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 @@ -22,7 +20,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: diff --git a/src/incremental/newsfragments/92.removal b/src/incremental/newsfragments/92.removal new file mode 100644 index 00000000..d55c6da9 --- /dev/null +++ b/src/incremental/newsfragments/92.removal @@ -0,0 +1,2 @@ +Support for Python 3.5 has been dropped for lack of test infrastructure. + From ab3bfcbc0457a5a24bc55ca966bb9c286e932e1e Mon Sep 17 00:00:00 2001 From: Tom Most Date: Mon, 1 Jul 2024 21:07:53 -0700 Subject: [PATCH 5/6] Bump GHA runner to ubuntu-24.04 --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 1bba4d0a..82981e96 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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 }} From 0813891da020aeaa35a03ff07e2b8720ad83bc98 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Tue, 2 Jul 2024 15:41:01 -0700 Subject: [PATCH 6/6] Drop EoL Python 3.6 and 3.7 --- .github/workflows/tests.yaml | 2 +- setup.cfg | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 82981e96..91a5a5ea 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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.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: diff --git a/setup.cfg b/setup.cfg index 6e3aef38..8695240f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,8 +8,6 @@ classifiers = Intended Audience :: Developers License :: OSI Approved :: MIT License 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