From 576b6b1f5f40c6173068500e00c20c0aa7be89bf Mon Sep 17 00:00:00 2001
From: "P. L. Lim" <2090236+pllim@users.noreply.github.com>
Date: Tue, 1 Oct 2024 20:31:51 -0400
Subject: [PATCH] MNT: Drop Python 3.8 and 3.9, and add support for Python 3.13
 (#21)

* MNT: Drop Python 3.8 and 3.9 and add support for Python 3.13

* Bump min pytest to 6.2

* Relax 6.2 bugfix pin because 6.2.0 fails
---
 .github/workflows/publish.yml      |  2 +-
 .github/workflows/python-tests.yml | 35 ++++++------------------------
 CHANGES.rst                        |  3 +++
 LICENSE.rst                        |  2 +-
 setup.cfg                          |  9 ++++----
 tox.ini                            | 11 ++--------
 6 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 90b3326..fe6b1a4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -18,7 +18,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3  # v5.2.0
       with:
-        python-version: 3.8
+        python-version: '3.10'
 
     - name: Install python-build and twine
       run: python -m pip install pip build "twine>=3.3" -U
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 7feecf8..3d2c2d4 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -19,39 +19,18 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            python-version: 3.8
-            toxenv: py38-test-pytestoldest
-          - os: windows-latest
-            python-version: 3.8
-            toxenv: py38-test-pytest50
+            python-version: '3.10'
+            toxenv: py310-test-pytestoldest
           - os: macos-12
-            python-version: 3.8
-            toxenv: py38-test-pytest51
-          - os: ubuntu-latest
-            python-version: 3.8
-            toxenv: py38-test-pytest52
-          - os: windows-latest
-            python-version: 3.8
-            toxenv: py38-test-pytest53
-          - os: ubuntu-latest
-            python-version: 3.8
-            toxenv: py38-test-pytest60
-          - os: ubuntu-latest
-            python-version: 3.9
-            toxenv: py39-test-pytest61
-          - os: ubuntu-latest
-            python-version: 3.9
-            toxenv: py39-test-pytest62
-          - os: ubuntu-latest
             python-version: '3.10'
             toxenv: py310-test-pytest70
-          - os: ubuntu-latest
+          - os: windows-latest
             python-version: '3.10'
             toxenv: py310-test-pytest71
           - os: windows-latest
             python-version: '3.11'
             toxenv: py311-test-pytest72
-          - os: ubuntu-latest
+          - os: macos-12
             python-version: '3.11'
             toxenv: py311-test-pytest73
           - os: ubuntu-latest
@@ -70,11 +49,11 @@ jobs:
             python-version: '3.11'
             toxenv: py311-test-pytestdev
           - os: windows-latest
-            python-version: '3.11'
-            toxenv: py311-test-pytestdev
-          - os: ubuntu-latest
             python-version: '3.12'
             toxenv: py312-test-pytestdev
+          - os: ubuntu-latest
+            python-version: '3.13-dev'
+            toxenv: py313-test-pytestdev
 
     steps:
     - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
diff --git a/CHANGES.rst b/CHANGES.rst
index c280c44..dc7563f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,9 @@
 0.3.0 (unreleased)
 ==================
 
+- Dropped Python 3.8 and 3.9 support. Added support for Python 3.13.
+  Minimum supported pytest is now 6.2. [#21]
+
 0.2.0 (2024-03-04)
 ==================
 
diff --git a/LICENSE.rst b/LICENSE.rst
index e12b62b..210f76a 100644
--- a/LICENSE.rst
+++ b/LICENSE.rst
@@ -1,4 +1,4 @@
-Copyright (c) 2019, Astropy Developers
+Copyright (c) 2019-2024, Astropy Developers
 
 All rights reserved.
 
diff --git a/setup.cfg b/setup.cfg
index 619dc56..9e944aa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,11 +11,10 @@ classifiers =
 	Operating System :: OS Independent
 	Programming Language :: Python
 	Programming Language :: Python :: 3
-	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 :: 3.13
 	Topic :: Software Development :: Testing
 	Topic :: Utilities
 license = BSD
@@ -27,9 +26,9 @@ keywords = pytest, py.test
 [options]
 zip_safe = False
 packages = find:
-python_requires = >=3.8
+python_requires = >=3.10
 install_requires =
-	pytest>=4.6
+	pytest>=6.2
 	packaging
 
 [options.entry_points]
@@ -43,7 +42,7 @@ test =
     pytest-cov
 
 [tool:pytest]
-minversion = 4.6
+minversion = 6.2
 testpaths = tests pytest_filter_subpackage
 xfail_strict = true
 filterwarnings =
diff --git a/tox.ini b/tox.ini
index fdf1a78..d05628a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{38,39,310,311,312}-test
+    py{310,311,312,313}-test
     codestyle
 requires =
     setuptools >= 30.3.0
@@ -11,14 +11,7 @@ isolated_build = true
 changedir = .tmp/{envname}
 description = run tests with pytest
 deps =
-    pytestoldest: pytest==4.6.0
-    pytest50: pytest==5.0.*
-    pytest51: pytest==5.1.*
-    pytest52: pytest==5.2.*
-    pytest53: pytest==5.3.*
-    pytest60: pytest==6.0.*
-    pytest61: pytest==6.1.*
-    pytest62: pytest==6.2.*
+    pytestoldest: pytest==6.2.*
     pytest70: pytest==7.0.*
     pytest71: pytest==7.1.*
     pytest72: pytest==7.2.*