Merge pull request #42 from BeyondEvil/beyondevil/update-python-versions

Drop support for python 3.7

Author: BeyondEvil

.github/workflows/publish.yml

@@ -11,16 +11,16 @@ jobs:
     if: github.repository == 'pytest-dev/pytest-base-url'
     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

.github/workflows/test.yml

@@ -16,43 +16,33 @@ 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: |
           python -m pip install --upgrade pip
           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 }}

README.rst

@@ -25,7 +25,7 @@ Requirements
 
 You will need the following prerequisites in order to use pytest-base-url:
 
-- Python 3.7+ or PyPy3
+- Python 3.8+ or PyPy3
 
 Installation
 ------------

pyproject.toml

@@ -10,7 +10,7 @@ name = "pytest-base-url"
 description = "pytest plugin for URL based testing"
 readme = "README.rst"
 license = "MPL-2.0"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 keywords = [
     "pytest",
     "base",
@@ -26,16 +26,16 @@ classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Framework :: Pytest",
   "Intended Audience :: Developers",
-  "License :: OSI Approved :: MIT License",
+  "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
   "Natural Language :: English",
   "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",

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]