From eef3c597e1f973cd77246318bd44b1847db17b08 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 7 Jul 2024 10:08:27 -0300 Subject: [PATCH 1/5] Drop support for Python 3.7 --- .github/workflows/test.yml | 11 ----------- CHANGELOG.rst | 1 + setup.cfg | 1 - tox.ini | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 273f07e..623f0e7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,14 +32,12 @@ jobs: fail-fast: false matrix: name: [ - "windows-py37", "windows-py38", "windows-py39", "windows-py310", "windows-py311", "windows-py312", - "ubuntu-py37", "ubuntu-py38", "ubuntu-py39", "ubuntu-py310", @@ -48,10 +46,6 @@ jobs: ] include: - - name: "windows-py37" - python: "3.7" - os: windows-latest - tox_env: "py37" - name: "windows-py38" python: "3.8" os: windows-latest @@ -73,11 +67,6 @@ jobs: os: windows-latest tox_env: "py312" - - - name: "ubuntu-py37" - python: "3.7" - os: ubuntu-latest - tox_env: "py37" - name: "ubuntu-py38" python: "3.8" os: ubuntu-latest diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0a58cf1..36fbb7f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,7 @@ CHANGELOG UNRELEASED ---------- +* Dropped support for EOL Python 3.7. * Support ``-x/--exitfirst`` (`#134`_). * Hide the traceback inside the ``SubTests.test()`` method (`#131`_). diff --git a/setup.cfg b/setup.cfg index 09f199a..3754249 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,7 +14,6 @@ classifiers = Topic :: Software Development :: Testing 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 diff --git a/tox.ini b/tox.ini index 0ecf9ce..a9a6ff8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37,py38,py39,py310,py311,py312 +envlist = py38,py39,py310,py311,py312 [testenv] passenv = From 79a6bc14d9479d9cda2b0fb9e9bb32da203bc033 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 7 Jul 2024 10:11:59 -0300 Subject: [PATCH 2/5] Simplify CI configuration Using tox environment 'py' means to use whatever Python it finds on PATH. --- .github/workflows/test.yml | 60 ++------------------------------------ 1 file changed, 3 insertions(+), 57 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 623f0e7..08a74e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,62 +31,8 @@ jobs: strategy: fail-fast: false matrix: - name: [ - "windows-py38", - "windows-py39", - "windows-py310", - "windows-py311", - "windows-py312", - - "ubuntu-py38", - "ubuntu-py39", - "ubuntu-py310", - "ubuntu-py311", - "ubuntu-py312", - ] - - include: - - name: "windows-py38" - python: "3.8" - os: windows-latest - tox_env: "py38" - - name: "windows-py39" - python: "3.9" - os: windows-latest - tox_env: "py39" - - name: "windows-py310" - python: "3.10" - os: windows-latest - tox_env: "py310" - - name: "windows-py311" - python: "3.11" - os: windows-latest - tox_env: "py311" - - name: "windows-py312" - python: "3.12" - os: windows-latest - tox_env: "py312" - - - name: "ubuntu-py38" - python: "3.8" - os: ubuntu-latest - tox_env: "py38" - - name: "ubuntu-py39" - python: "3.9" - os: ubuntu-latest - tox_env: "py39" - - name: "ubuntu-py310" - python: "3.10" - os: ubuntu-latest - tox_env: "py310" - - name: "ubuntu-py311" - python: "3.11" - os: ubuntu-latest - tox_env: "py311" - - name: "ubuntu-py312" - python: "3.12" - os: ubuntu-latest - tox_env: "py312" + os: ["ubuntu-latest", "windows-latest"] + python: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 @@ -110,4 +56,4 @@ jobs: - name: Test shell: bash run: | - tox run -e ${{ matrix.tox_env }} --installpkg `find dist/*.tar.gz` + tox run -e py --installpkg `find dist/*.tar.gz` From cb5a9229de26f115e2bd4f856a68267ca95bf1e4 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 7 Jul 2024 10:12:59 -0300 Subject: [PATCH 3/5] Update CHANGELOG --- CHANGELOG.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 36fbb7f..39601f5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,11 +1,11 @@ CHANGELOG ========= -UNRELEASED ----------- +0.13.0 (2024-07-07) +------------------- * Dropped support for EOL Python 3.7. -* Support ``-x/--exitfirst`` (`#134`_). +* Added support for ``-x/--exitfirst`` (`#134`_). * Hide the traceback inside the ``SubTests.test()`` method (`#131`_). .. _#131: https://github.com/pytest-dev/pytest-subtests/pull/131 From ed8f899e3e347d88c2bf12a29748aeb217c3218a Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 7 Jul 2024 10:21:17 -0300 Subject: [PATCH 4/5] Create a GH release during deploy --- .github/workflows/deploy.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 86d55d5..cdacc82 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,9 +41,8 @@ jobs: - name: Publish package to PyPI uses: pypa/gh-action-pypi-publish@v1.8.5 - - name: Push tag + - name: GitHub Release + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - git config user.name "pytest bot" - git config user.email "pytestbot@gmail.com" - git tag --annotate --message=v${{ github.event.inputs.version }} v${{ github.event.inputs.version }} ${{ github.sha }} - git push origin v${{ github.event.inputs.version }} + gh release create v${{ github.event.inputs.version }} --target=${{ github.ref_name }} --generate-notes From 3c6a72c0f7a579c887d8a74cd587359db83cfb24 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 7 Jul 2024 10:26:37 -0300 Subject: [PATCH 5/5] Automatically merge branch during deploy --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cdacc82..74b77ee 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -46,3 +46,4 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh release create v${{ github.event.inputs.version }} --target=${{ github.ref_name }} --generate-notes + gh merge --branch ${{ github.ref_name }}