Skip to content

Commit 20b1eb1

Browse files
authored
Merge pull request #2186 from bsipocz/CI_adding_python310
Adding python 3.10 to CI
2 parents e500566 + 3667dac commit 20b1eb1

File tree

5 files changed

+42
-25
lines changed

5 files changed

+42
-25
lines changed

.github/workflows/ci_tests.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ jobs:
2727
python: 3.x
2828
toxenv: codestyle
2929

30-
- name: docs build
31-
os: ubuntu-latest
32-
python: 3.8
33-
toxenv: build_docs
34-
toxargs: -v
35-
3630
- name: oldest dependencies
3731
os: ubuntu-latest
3832
python: 3.7
@@ -41,20 +35,20 @@ jobs:
4135

4236
- name: astropy dev with all dependencies with coverage
4337
os: ubuntu-latest
44-
python: 3.9
45-
toxenv: py39-test-alldeps-devastropy-cov
38+
python: '3.10'
39+
toxenv: py310-test-alldeps-devastropy-cov
4640
toxargs: -v
4741

48-
- name: Python 3.7 with all optional dependencies (MacOS X)
42+
- name: Python 3.8 with all optional dependencies (MacOS X)
4943
os: macos-latest
50-
python: 3.7
51-
toxenv: py37-test-alldeps
44+
python: 3.8
45+
toxenv: py38-test-alldeps
5246
toxargs: -v
5347

54-
- name: Python 3.8 with mandatory dependencies (Windows)
48+
- name: Python 3.9 with mandatory dependencies (Windows)
5549
os: windows-latest
56-
python: 3.8
57-
toxenv: py38-test
50+
python: 3.9
51+
toxenv: py39-test
5852
toxargs: -v
5953

6054
steps:

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ python:
99
path: .
1010
extra_requirements:
1111
- docs
12-
- all_lt_39
12+
- all
1313

1414
sphinx:
1515
fail_on_warning: true

conftest.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Licensed under a 3-clause BSD style license - see LICENSE.rst
2+
3+
from pytest_astropy_header.display import (PYTEST_HEADER_MODULES,
4+
TESTED_VERSIONS)
5+
6+
7+
def pytest_configure(config):
8+
config.option.astropy_header = True
9+
10+
PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
11+
PYTEST_HEADER_MODULES['APLpy'] = 'aplpy'
12+
PYTEST_HEADER_MODULES['pyregion'] = 'pyregion'
13+
PYTEST_HEADER_MODULES['regions'] = 'regions'
14+
PYTEST_HEADER_MODULES['pyVO'] = 'pyvo'
15+
PYTEST_HEADER_MODULES['mocpy'] = 'mocpy'
16+
PYTEST_HEADER_MODULES['astropy-healpix'] = 'astropy_healpix'
17+
PYTEST_HEADER_MODULES['vamdclib'] = 'vamdclib'
18+
19+
# keyring doesn't provide __version__ any more
20+
# PYTEST_HEADER_MODULES['keyring'] = 'keyring'
21+
22+
# add '_testrun' to the version name so that the user-agent indicates that
23+
# it's being run in a test
24+
from astroquery import version
25+
version.version += '_testrun'
26+
27+
TESTED_VERSIONS['astroquery'] = version.version
28+
TESTED_VERSIONS['astropy_helpers'] = version.astropy_helpers_version

setup.cfg

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ filterwarnings =
5757
# Upstream, remove when fixed, PRs have been opened
5858
ignore::DeprecationWarning:pyvo
5959
ignore::DeprecationWarning:regions
60+
# Should ignore these for astropy<5.0
61+
ignore:getName|currentThread:DeprecationWarning:astropy
6062
# This should be cleared once we requre astropy>=4.1
6163
ignore:tostring\(\) is deprecated. Use tobytes:DeprecationWarning:astropy
6264
markers =
@@ -172,12 +174,5 @@ all=
172174
astropy-healpix
173175
boto3
174176
regions
175-
# aplpy is not py39 compatible (it requires shapely that doesn't compile
176-
# pyregion is not py39 compatible
177-
all_lt_39=
178-
mocpy>=0.5.2
179-
regions
180177
pyregion
181-
astropy-healpix
182178
aplpy
183-
boto3

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{37,38,39}-test{,-alldeps,-oldestdeps}{,-devastropy}{,-cov}
3+
py{37,38,39,310}-test{,-alldeps,-oldestdeps}{,-devastropy}{,-cov}
44
codestyle
55
build_docs
66
requires =
@@ -41,8 +41,8 @@ deps =
4141

4242
extras =
4343
test
44-
!py39-alldeps: all_lt_39
45-
py39-alldeps: all
44+
alldeps: all
45+
4646

4747
commands =
4848
pip freeze

0 commit comments

Comments
 (0)