From a3e263e01ec69b991bbf718c371551de16e4ecc4 Mon Sep 17 00:00:00 2001
From: John Jakeman <jdjakem@users.noreply.github.com>
Date: Mon, 27 May 2024 17:04:05 -0600
Subject: [PATCH] python3.8 is near end of life so stop running CI using 3.8.

---
 .../continuous-integration-workflow-conda.yml         | 11 +----------
 .../continuous-integration-workflow-docs-pip.yml      |  7 +------
 .../continuous-integration-workflow-docs.yml          | 10 +---------
 .../workflows/continuous-integration-workflow-pip.yml |  2 +-
 setup.py                                              |  1 +
 5 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/continuous-integration-workflow-conda.yml b/.github/workflows/continuous-integration-workflow-conda.yml
index ce0098d2..7d8556a2 100644
--- a/.github/workflows/continuous-integration-workflow-conda.yml
+++ b/.github/workflows/continuous-integration-workflow-conda.yml
@@ -22,16 +22,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # os: [ubuntu-latest]
-        # pin to python-3.7.16 because github actions has a bug with _bz2 on
-        # ubunutu for 3.7.17
         # quotes needed around two-digit versions
-        python-version: [3.8, 3.9, '3.10', '3.11']
+        python-version: [3.9, '3.10', '3.11']
         os: [ubuntu-latest, macos-latest]
-        # python-version: [3.7, 3.8] #3.8 currently fails due to numpy error
-        # solely experienced when using github actions ValueError:
-        # numpy.ndarray size changed, may indicate binary incompatibility.
-        # Expected 96 from C header, got 88 from PyObject
 
     steps:
       - uses: actions/checkout@v4
@@ -40,11 +33,9 @@ jobs:
         with:
           activate-environment: pyapprox-base
           python-version: ${{ matrix.python-version }}
-          # channels: defaults,conda-forge
           channels: defaults
           environment-file: environment.yml
           auto-update-conda: true
-          # use-only-tar-bz2: true
           auto-activate-base: false
       - name: Conda list
         shell: bash -l {0}  # - l {0} is needed to activate created env
diff --git a/.github/workflows/continuous-integration-workflow-docs-pip.yml b/.github/workflows/continuous-integration-workflow-docs-pip.yml
index 2e4bd6b3..290e5cba 100644
--- a/.github/workflows/continuous-integration-workflow-docs-pip.yml
+++ b/.github/workflows/continuous-integration-workflow-docs-pip.yml
@@ -23,13 +23,8 @@ jobs:
       fail-fast: false
       matrix:
         # os: [ubuntu-latest]
-        python-version: [3.8, 3.9, '3.10', '3.11']
+        python-version: [3.9, '3.10', '3.11']
         os: [ubuntu-latest, macos-latest]
-        # python-version: [3.7, 3.8] #3.8 currently fails due to numpy error
-        # solely experienced when using github actions ValueError:
-        # numpy.ndarray size changed, may indicate binary incompatibility.
-        # Expected 96 from C header, got 88 from PyObject
-
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python ${{ matrix.python-version }} on ${{ matrix.os }}
diff --git a/.github/workflows/continuous-integration-workflow-docs.yml b/.github/workflows/continuous-integration-workflow-docs.yml
index bf3e8082..bbdf0ede 100644
--- a/.github/workflows/continuous-integration-workflow-docs.yml
+++ b/.github/workflows/continuous-integration-workflow-docs.yml
@@ -22,14 +22,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # os: [ubuntu-latest]
-        python-version: [3.8, 3.9, '3.10', '3.11']
+        python-version: [3.9, '3.10', '3.11']
         os: [ubuntu-latest, macos-latest]
-        # python-version: [3.7, 3.8] #3.8 currently fails due to numpy error
-        # solely experienced when using github actions ValueError:
-        # numpy.ndarray size changed, may indicate binary incompatibility.
-        # Expected 96 from C header, got 88 from PyObject
-
     steps:
       - uses: actions/checkout@v4
       - name: Setup Miniconda with Python ${{ matrix.python-version }} on ${{ matrix.os }}
@@ -37,10 +31,8 @@ jobs:
         with:
           activate-environment: pyapprox-base
           python-version: ${{ matrix.python-version }}
-          # channels: defaults,conda-forge
           channels: defaults
           environment-file: environment.yml
-          # use-only-tar-bz2: true
           auto-update-conda: true
           auto-activate-base: false
       - name: Conda list
diff --git a/.github/workflows/continuous-integration-workflow-pip.yml b/.github/workflows/continuous-integration-workflow-pip.yml
index 813f9012..4b4ee544 100644
--- a/.github/workflows/continuous-integration-workflow-pip.yml
+++ b/.github/workflows/continuous-integration-workflow-pip.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-latest]
-        python-version: [3.8, 3.9, '3.10', '3.11']
+        python-version: [3.9, '3.10', '3.11']
         # exclude:
         #  # stalls on github actions
         #  - os: ubuntu-latest
diff --git a/setup.py b/setup.py
index 6055cf70..7a0e09f8 100644
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,7 @@ def no_cythonize(extensions, **_ignore):
     include_dirs=[np.get_include()],
     setup_requires=['numpy >= 1.16.4', 'Cython', 'scipy >= 1.0.0'],
     install_requires=[
+        'setuptools',
         'numpy >= 1.16.4',
         'matplotlib',
         'scipy >= 1.0.0',