Skip to content

Commit

Permalink
Merge pull request astropy#290 from Cadair/python310
Browse files Browse the repository at this point in the history
Add CI jobs for Python 3.10 and Drop Python 3.7
  • Loading branch information
Cadair authored May 18, 2022
2 parents 4f5e943 + 4f11ad4 commit 3cfc7a8
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 46 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ jobs:
with:
envs: |
- linux: codestyle
- macos: py37-test-oldestdeps-cov
- macos: py38-test-cov
- macos: py39-test-cov
- linux: py37-test-oldestdeps-cov
- linux: py38-test-cov
- linux: py39-test-cov
- windows: py37-test-oldestdeps-cov
- windows: py38-test-cov
- windows: py39-test-cov
- macos: py38-test-oldestdeps
- macos: py39-test
- macos: py310-test
- linux: py38-test-oldestdeps
- linux: py38-test
- linux: py39-test
- linux: py310-test
- windows: py38-test-oldestdeps
- windows: py39-test
- windows: py310-test
coverage: 'codecov'

publish:
if: github.event_name != 'pull_request'
needs: tests
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@v1
with:
test_extras: test
test_command: pytest -p no:warnings --pyargs reproject
secrets:
pypi_token: ${{ secrets.pypi_token }}
pypi_token: ${{ secrets.pypi_token }}
19 changes: 19 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: 2
build:
os: ubuntu-20.04
tools:
python: "3.9"
apt_packages:
- graphviz

sphinx:
builder: html
configuration: docs/conf.py
fail_on_warning: true

python:
install:
- method: pip
extra_requirements:
- docs
path: .
4 changes: 1 addition & 3 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
0.9 (unreleased)
----------------

0.8.1 (unreleased)
------------------

- Drop support for Python 3.7.
- Infrastructure and packaging updates.

0.8 (2021-08-11)
Expand Down
15 changes: 0 additions & 15 deletions readthedocs.yml

This file was deleted.

8 changes: 4 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ github_project = astropy/reproject
[options]
zip_safe = False
packages = find:
python_requires = >=3.7
python_requires = >=3.8
setup_requires = setuptools_scm
install_requires =
numpy>=1.14
astropy>=3.2
numpy>=1.17
astropy>=4.0
astropy-healpix>=0.6
scipy>=1.1
scipy>=1.3

[options.extras_require]
test =
Expand Down
26 changes: 13 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[tox]
envlist =
py{37,38,39,310}-{test}{-oldestdeps,-numpy121}{-cov}
py{37,38,39,310}-{test}{-oldestdeps,-numpy121}
build_docs
codestyle
isolated_build = True
indexserver =
NIGHTLY = https://pypi.anaconda.org/scipy-wheels-nightly/simple
ASTROPY = https://pkgs.dev.azure.com/astropy-project/astropy/_packaging/nightly/pypi/simple/

[testenv]
whitelist_externals =
Expand All @@ -15,6 +16,7 @@ passenv =
setenv =
HOME = {envtmpdir}
MPLBACKEND = Agg
PYTEST_COMMAND = pytest --arraydiff --arraydiff-default-format=fits --pyargs reproject --cov reproject --cov-config={toxinidir}/setup.cfg {toxinidir}/docs
changedir =
.tmp/{envname}
deps =
Expand All @@ -23,29 +25,27 @@ deps =

numpy121: numpy==1.21.*

# FIXME: https://github.com/astropy/reproject/issues/269
oldestdeps: numpy==1.14.5
oldestdeps: astropy==3.2.*
oldestdeps: numpy==1.17.3
oldestdeps: astropy==4.0.*
oldestdeps: astropy-healpix==0.6
oldestdeps: scipy==1.1.*
# Not strictly a reproject test dependency but gets included
# as a dependency of other dependencies and we have to limit
# the version for compatibility with Numpy.
oldestdeps: matplotlib==3.0.*
oldestdeps: scipy==1.3.2

devdeps: :NIGHTLY:numpy
devdeps: git+https://github.com/astropy/astropy.git#egg=astropy
devdeps: :NIGHTLY:scipy
devdeps: :ASTROPY:astropy
devdeps: git+https://github.com/asdf-format/asdf.git#egg=asdf
devdeps: git+https://github.com/astropy/asdf-astropy.git
devdeps: git+https://github.com/spacetelescope/gwcs.git#egg=gwcs
devdeps: git+https://github.com/sunpy/sunpy.git#egg=sunpy
extras =
test
testall
# Don't run the more complex tests on oldestdeps because it pulls in a nest
# web of dependencies much newer than our mins
!oldestdeps: testall
commands =
pip freeze
!cov: pytest --arraydiff --arraydiff-default-format=fits --pyargs reproject {toxinidir}/docs {posargs}
cov: pytest --arraydiff --arraydiff-default-format=fits --pyargs reproject {toxinidir}/docs --cov reproject --cov-config={toxinidir}/setup.cfg {posargs}
!oldestdeps: {env:PYTEST_COMMAND} {posargs}
oldestdeps: {env:PYTEST_COMMAND} -W ignore::RuntimeWarning {posargs}
# Clear the download cache from the .tox directory - this is done to
# avoid issues in the continuous integration when uploading results
python -c 'from astropy.utils.data import clear_download_cache; clear_download_cache()'
Expand Down

0 comments on commit 3cfc7a8

Please sign in to comment.