Skip to content

Commit

Permalink
MNT: Drop Python 3.7 support
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pllim committed Mar 8, 2022
1 parent b2e6c8d commit e0f639f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 44 deletions.
33 changes: 9 additions & 24 deletions .github/workflows/ci_cron_weekly.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# GitHub Actions workflow that runs on a cron schedule.

name: Cron Scheduled CI Tests

on:
Expand All @@ -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
11 changes: 3 additions & 8 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 0 additions & 10 deletions docs/known_bugs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e0f639f

Please sign in to comment.