From c8c52c61c8a26c6491f321bc1cd3924e0767eda7 Mon Sep 17 00:00:00 2001 From: Thomas Denewiler Date: Fri, 30 Jun 2023 08:02:14 -0700 Subject: [PATCH] Cleanup supported versions. (#60) - Drop support for Python 3.7 due to end-of-life on 27 June 2023. - Run deployment actions on ubuntu-latest. - Make setup.py and tox.ini consistent with supported versions. - Use latest tagged releases for GitHub Actions. --- .github/workflows/publish.yaml | 18 +++++++++--------- .github/workflows/tests.yaml | 2 +- setup.py | 1 - tox.ini | 3 +-- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 1f5a9ef..851dd32 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,17 +9,17 @@ on: # NOLINT jobs: build-n-publish: name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Set up Python + uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.11' - - uses: actions/cache@v1 + - uses: actions/cache@v3 if: startsWith(runner.os, 'Linux') with: path: ~/.cache/pip @@ -27,7 +27,7 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - - uses: actions/cache@v1 + - uses: actions/cache@v3 if: startsWith(runner.os, 'macOS') with: path: ~/Library/Caches/pip @@ -35,7 +35,7 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - - uses: actions/cache@v1 + - uses: actions/cache@v3 if: startsWith(runner.os, 'Windows') with: path: ~\AppData\Local\pip\Cache @@ -53,12 +53,12 @@ jobs: python setup.py sdist bdist_wheel - name: Publish distribution 📦 to Test PyPI - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_TEST_TOKEN }} repository_url: https://test.pypi.org/legacy/ - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_TOKEN }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c66121d..b965857 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-20.04, ubuntu-22.04, windows-latest] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v3 diff --git a/setup.py b/setup.py index e523637..449066f 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,6 @@ url="https://github.com/sscpac/statick-web", classifiers=[ "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", - "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 49786eb..aa1c4c7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37, py38, py39, py310, py311 +envlist = py38, py39, py310, py311 skip_missing_interpreters = true [pytest] @@ -24,7 +24,6 @@ line_length = 88 [gh-actions] python = - 3.7: py37 3.8: py38 3.9: py39 3.10: py310