Skip to content

Commit

Permalink
Fix devdeps and clean up matrix
Browse files Browse the repository at this point in the history
and stuff
  • Loading branch information
pllim committed Nov 22, 2023
1 parent fd48630 commit ea65b1b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 34 deletions.
32 changes: 11 additions & 21 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ jobs:
toxargs: -v
toxposargs: --remote-data=astropy

- name: Python 3.11 (Windows)
- name: Python 3.12 (Windows)
os: windows-latest
python: 3.11
toxenv: py311-test
python: '3.12'
toxenv: py312-test

- name: Python 3.11 (MacOS X)
- name: Python 3.12 (MacOS X)
os: macos-latest
python: 3.11
toxenv: py311-test
python: '3.12'
toxenv: py312-test

- name: Python 3.10
os: ubuntu-latest
Expand All @@ -59,20 +59,15 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Install language-pack-de and tzdata
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install language-pack-de tzdata graphviz
- name: Install Python dependencies
run: python -m pip install --upgrade tox codecov
run: python -m pip install --upgrade tox
- name: Run tests
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
# TODO: Do we need --gcov-glob "*cextern*" ?
Expand All @@ -91,25 +86,20 @@ jobs:
include:
- name: (Allowed Failure) Python 3.12 with remote data and dev version of key dependencies
os: ubuntu-latest
python: '3.12-dev'
python: '3.12'
toxenv: py312-test-devdeps
toxposargs: --remote-data=any

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Install language-pack-de and tzdata
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install language-pack-de tzdata
- name: Install Python dependencies
run: python -m pip install --upgrade tox codecov
run: python -m pip install --upgrade tox
- name: Run tests
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
5 changes: 1 addition & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
[build-system]

requires = ["setuptools",
"setuptools_scm",
"wheel"]

"setuptools_scm"]
build-backend = 'setuptools.build_meta'
5 changes: 0 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ github_project = astropy/specutils
zip_safe = False
packages = find:
python_requires = >=3.8
setup_requires = setuptools_scm
install_requires =
numpy>=1.19
scipy>=1.3
Expand All @@ -28,11 +27,7 @@ install_requires =
[options.extras_require]
test =
pytest-astropy
pytest-cov
tox
matplotlib
graphviz
coverage
spectral-cube
jwst =
stdatamodels>=1.1.0
Expand Down
7 changes: 3 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ envlist =
py{38,39,310,311,312}-test{,-devdeps,-oldestdeps,-predeps}{,-cov,-external}
linkcheck
codestyle
requires =
setuptools >= 30.3.0
pip >= 19.3.1
isolated_build = true

[testenv]
# Suppress display of matplotlib plots generated during docs build
setenv =
MPLBACKEND=agg
devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/liberfa/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple

# Pass through the following environment variables which may be needed for the CI
passenv = HOME,WINDIR,LC_ALL,LC_CTYPE,CC,CI
Expand All @@ -38,6 +35,7 @@ description =

# The following provides some specific pinnings for key packages
deps =
cov: pytest-cov

oldestdeps: numpy==1.19.*
oldestdeps: scipy==1.3.*
Expand All @@ -55,6 +53,7 @@ deps =
devdeps: numpy>=0.0.dev0
devdeps: scipy>=0.0.dev0
devdeps: matplotlib>=0.0.dev0
devdeps: pyerfa>=0.0.dev0
devdeps: astropy>=0.0.dev0
devdeps: git+https://github.com/spacetelescope/gwcs.git
devdeps: git+https://github.com/asdf-format/asdf.git
Expand Down

0 comments on commit ea65b1b

Please sign in to comment.