diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 54c4184..02f011e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,16 +11,16 @@ jobs: if: github.repository == 'pytest-dev/pytest-metadata' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 persist-credentials: false - name: Build and Check Package - uses: hynek/build-and-inspect-python-package@v1 + uses: hynek/build-and-inspect-python-package@v2 - name: Download Package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: Packages path: dist diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0d18917..557e727 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,25 +16,20 @@ concurrency: jobs: test: - name: ${{ matrix.python-version }} + name: ${{ matrix.tox-env }} runs-on: ubuntu-latest strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] - include: - - python-version: pypy3.9 - tox-env: py3.9 - - python-version: 3.11-dev - tox-env: devel + tox-env: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.10", "devel"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: ${{ matrix.python-version }} + python-version: ${{ matrix.tox-env == 'devel' && 3.12 || matrix.tox-env }} # default is for devel - name: Install tox run: | @@ -42,17 +37,12 @@ jobs: pip install tox - name: Cache tox environments - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: .tox - key: tox-ubuntu-latest-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }} + key: ubuntu-latest-tox-${{ matrix.tox-env }}-${{ hashFiles('pyproject.toml', 'tox.ini') }} restore-keys: | - tox-ubuntu-latest-${{ matrix.python-version }}- + ubuntu-latest-tox-${{ matrix.tox-env }}- - name: Run tests - if: ${{ ! matrix.tox-env }} - run: tox -e py${{ matrix.python-version }} - - - name: Run tests - if: ${{ matrix.tox-env }} run: tox -e ${{ matrix.tox-env }} diff --git a/README.rst b/README.rst index 8ce91de..ec10bdc 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,7 @@ Requirements You will need the following in order to use pytest-metadata: -- Python 3.7+ or PyPy3 +- Python 3.8+ or PyPy3 Installation ------------ diff --git a/pyproject.toml b/pyproject.toml index f5ef8f3..019ea01 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ name = "pytest-metadata" description = "pytest plugin for test session metadata" readme = "README.rst" license = "MPL-2.0" -requires-python = ">=3.7" +requires-python = ">=3.8" keywords = [ "pytest", "metadata", @@ -28,11 +28,11 @@ classifiers = [ "Operating System :: POSIX", "Operating System :: Microsoft :: Windows", "Operating System :: MacOS :: MacOS X", - "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", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Quality Assurance", diff --git a/tox.ini b/tox.ini index d12f71c..032f74a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{3.7, 3.8, 3.9, 3.10, py3.9}, linting +envlist = py{3.8, 3.9, 3.10, 3.11, 3.12, py3.10}, linting isolated_build = True [testenv]