From ce4773c4e2702052c86eec06853673b80e38c5d5 Mon Sep 17 00:00:00 2001
From: Greg Lindahl <lindahl@pbm.com>
Date: Fri, 23 Aug 2024 07:15:56 +0000
Subject: [PATCH] chore: finish py3.12 (#176)

---
 .github/workflows/ci.yaml |  4 ++--
 setup.py                  | 19 +++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d866110b..cf9f7659 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,8 +19,8 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install setuptools on python 3.12
-        if: ${{ matrix.python-version == '3.12' }}
+      - name: Install setuptools on python 3.12+
+        if: ${{ matrix.python-version >= '3.12' }}
         run: |
           pip install setuptools
 
diff --git a/setup.py b/setup.py
index 0328ade1..db123e85 100755
--- a/setup.py
+++ b/setup.py
@@ -2,18 +2,10 @@
 # vim: set sw=4 et:
 
 from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
-import glob
 
 __version__ = '1.7.4'
 
 
-class PyTest(TestCommand):
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        # should work with setuptools <18, 18 18.5
-        self.test_suite = ' '
-
 setup(
     name='warcio',
     version=__version__,
@@ -35,7 +27,6 @@ def finalize_options(self):
         [console_scripts]
         warcio = warcio.cli:main
     """,
-    cmdclass={'test': PyTest},
     test_suite='',
     extras_require={
         'testing': [
@@ -52,13 +43,13 @@ def finalize_options(self):
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         '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',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Utilities',
     ]