From bec8c95a1e79285422ca9a993a66b954e381e589 Mon Sep 17 00:00:00 2001
From: Austin Macdonald <austin@dartmouth.edu>
Date: Thu, 2 May 2024 08:54:21 -0500
Subject: [PATCH] Add python version matrix

---
 .github/workflows/test.yaml    | 16 +++++++++-------
 setup.cfg                      |  5 ++++-
 run-tests.sh => smoke-tests.sh |  1 +
 tox.ini                        | 15 ++++++++-------
 4 files changed, 22 insertions(+), 15 deletions(-)
 rename run-tests.sh => smoke-tests.sh (94%)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 6873089..437e7da 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -30,15 +30,14 @@ jobs:
           # - windows-latest
           - ubuntu-latest
         python-version:
-          # - '3.7'
-          # - '3.8'
-          # - '3.9'
-          # - '3.10'
+          - '3.8'
+          - '3.9'
+          - '3.10'
           - '3.11'
           - '3.12'
-          # - 'pypy-3.8'
-          # - 'pypy-3.9'
-          # - 'pypy-3.10'
+          - 'pypy-3.8'
+          - 'pypy-3.9'
+          - 'pypy-3.10'
         # exclude:
         #   # No older Pythons on arm64 macos-latest
         #   - python-version: '3.7'
@@ -77,4 +76,7 @@ jobs:
 
       - name: Run tests
         run: tox -e py
+
+      - name: Run smoke tests
+        run: ./smoke-tests.sh
 # vim:set et sts=2:
diff --git a/setup.cfg b/setup.cfg
index 7538883..923f181 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,6 +26,9 @@ classifiers =
     # Development Status :: 5 - Production/Stable
     Programming Language :: Python :: 3 :: Only
     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 :: Implementation :: CPython
@@ -47,7 +50,7 @@ py_modules = duct
 package_dir =
     =src
 include_package_data = True
-python_requires = >= 3.11
+python_requires = >= 3.8
 
 [options.entry_points]
 console_scripts =
diff --git a/run-tests.sh b/smoke-tests.sh
similarity index 94%
rename from run-tests.sh
rename to smoke-tests.sh
index eb20db3..e7c3986 100755
--- a/run-tests.sh
+++ b/smoke-tests.sh
@@ -1,3 +1,4 @@
+# Smoketests
 rm -rf .duct/*
 duct --report-interval 2 --sample-interval 0.5 ./test_script.py -- --duration 6 --cpu-load 50000 --memory-size 500
 find .duct/ -name '*.json' -exec sh -c 'echo "File: $1)"; cat "$1" | jq' _ {} \;
diff --git a/tox.ini b/tox.ini
index cf09ef9..8f96fb7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = lint,typing,py37,py38,py39,py310,py311,py312,pypy3
+# envlist = lint,typing,py37,py38,py39,py310,py311,py312,pypy3
+envlist = lint,py37,py38,py39,py310,py311,py312,pypy3
 skip_missing_interpreters = True
 isolated_build = True
 minversion = 3.3.0
@@ -25,12 +26,12 @@ deps =
 commands =
     flake8 src test
 
-[testenv:typing]
-deps =
-    mypy
-    {[testenv]deps}
-commands =
-    mypy src test
+# [testenv:typing]
+# deps =
+#     mypy
+#    {[testenv]deps}
+# commands =
+#     mypy src test
 
 [pytest]
 # addopts = --cov=datalad_installer --no-cov-on-fail