From e0f639f769f9632d2780e6541911e6799bae9be4 Mon Sep 17 00:00:00 2001
From: "Pey Lian Lim (Github)" <2090236+pllim@users.noreply.github.com>
Date: Fri, 4 Mar 2022 10:05:35 -0500
Subject: [PATCH] MNT: Drop Python 3.7 support to be consistent with upstream
 (astropy, regions, etc).

TST: Clean up cron job workflow; it is unnecessarily complicated.

TST: We cannot use Python 3.10 with stable Glue because its
compatibility patch is not yet released.
---
 .github/workflows/ci_cron_weekly.yml | 33 ++++++++--------------------
 .github/workflows/ci_workflows.yml   | 11 +++-------
 CHANGES.rst                          |  4 +++-
 docs/known_bugs.rst                  | 10 ---------
 setup.cfg                            |  2 +-
 5 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/ci_cron_weekly.yml b/.github/workflows/ci_cron_weekly.yml
index 487cc6eda4..56bb488c70 100644
--- a/.github/workflows/ci_cron_weekly.yml
+++ b/.github/workflows/ci_cron_weekly.yml
@@ -1,5 +1,4 @@
 # GitHub Actions workflow that runs on a cron schedule.
-
 name: Cron Scheduled CI Tests
 
 on:
@@ -19,44 +18,30 @@ jobs:
     - name: Set up Python to build docs with sphinx
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Install base dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install tox
     - name: Check links in docs using tox
-      run: |
-        tox -e linkcheck
-  # everything except the matrix is copied-and-pasted from ci_workflows.yml ... not ideal, maybe there's some way to do this by reference?
-  ci_cron_tests:
-    name: ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - name: Python 3.8 latest developer version of key dependencies
-            os: ubuntu-latest
-            python: 3.8
-            toxenv: py38-test-devdeps
-
-          - name: Python 3.9 with latest dev versions of key dependencies
-            os: ubuntu-latest
-            python: 3.9
-            toxenv: py39-test-devdeps
+      run: tox -e linkcheck
 
+  ci_cron_tests:
+    name: Python 3.9 with latest dev versions of key dependencies
+    runs-on: ubuntu-latest
+    if: github.repository == 'spacetelescope/jdaviz'
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Set up python ${{ matrix.python }} on ${{ matrix.os }}
+    - name: Set up python
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python }}
+        python-version: 3.9
     - name: Install base dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install tox
     - name: Test with tox
-      run: |
-        tox -e ${{ matrix.toxenv }}
+      run: tox -e py39-test-devdeps
diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
index 0eea333447..c0f946705f 100644
--- a/.github/workflows/ci_workflows.yml
+++ b/.github/workflows/ci_workflows.yml
@@ -2,12 +2,7 @@ name: CI
 
 on:
   push:
-  #  branches:  #uncomment to run only on main
-  #  - main
-  #  tags: # run CI if specific tags are pushed
   pull_request:
-  #  branches: # only build on PRs against 'main' if you need to further limit when CI is run.
-  #  - main
 
 jobs:
   # Github Actions supports ubuntu, windows, and macos virtual environments:
@@ -44,10 +39,10 @@ jobs:
             toxposargs: --remote-data
             allow_failure: false
 
-          - name: OS X - Python 3.7
+          - name: OS X - Python 3.9
             os: macos-latest
-            python: 3.7
-            toxenv: py37-test
+            python: 3.9
+            toxenv: py39-test
             allow_failure: false
 
           - name: Windows - Python 3.8
diff --git a/CHANGES.rst b/CHANGES.rst
index d05bbb01ba..144546e1a8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -51,7 +51,9 @@ Specviz
 Other Changes and Additions
 ---------------------------
 
-- Viewer toolbars are now nested and consolidated, with viewer and layer options 
+- Jdaviz now requires Python 3.8 or later. [#1145]
+
+- Viewer toolbars are now nested and consolidated, with viewer and layer options
   moved to the sidebar. [#1140]
 
 2.3 (2022-03-01)
diff --git a/docs/known_bugs.rst b/docs/known_bugs.rst
index c1e4d425bb..6ddbc1923f 100644
--- a/docs/known_bugs.rst
+++ b/docs/known_bugs.rst
@@ -61,16 +61,6 @@ in bottleneck trying to build numpy from source and crash, stalling the
 installation altogether. When this happens, exit the installation, install
 bottleneck with conda, and try to install jdaviz again.
 
-In Python 3.7.1, install fails due to terminado
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In Python 3.7.1, installing jdaviz might produce this error::
-
-    ERROR: Cannot uninstall 'terminado'. It is a distutils installed project...
-
-The solution is to upgrade your Python version to at least the latest bug-fix
-version of 3.7.
-
 .. _known_issues_cubeviz:
 
 Cubeviz
diff --git a/setup.cfg b/setup.cfg
index 6aac3bec6b..5b630a643c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,7 @@ github_project = spacetelescope/jdaviz
 zip_safe = False
 packages = find:
 include_package_data = True
-python_requires = >=3.7
+python_requires = >=3.8
 setup_requires = setuptools_scm
 install_requires =
     astropy>=4.3