Skip to content

Commit 84cb4b4

Browse files
authored
Merge pull request #3543 from neutrinoceros/add_CI_py310
MNT: add explicit support for Python 3.10 on UNIX
2 parents b57035a + fa0cc70 commit 84cb4b4

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

.github/workflows/build-test-pytest.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,20 @@ jobs:
2626
windows-latest,
2727
ubuntu-latest,
2828
]
29-
python-version: [3.9]
29+
python-version: ['3.10']
3030
dependencies: [full]
3131
tests-type: [unit]
3232
include:
3333
- os: ubuntu-latest
3434
python-version: 3.7
3535
dependencies: minimal
3636
tests-type: unit
37+
# temporary: Python 3.10 is not available on conda, so we pin this job to Python 3.9
38+
- os: windows-latest
39+
python-version: '3.9'
40+
exclude:
41+
- os: windows-latest
42+
python-version: '3.10'
3743

3844
runs-on: ${{ matrix.os }}
3945
steps:

.pre-commit-config.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ repos:
2020
rev: v1.20.0
2121
hooks:
2222
- id: setup-cfg-fmt
23-
args: [--max-py-version, '3.9']
2423
- repo: https://github.com/pre-commit/pre-commit-hooks
2524
rev: v4.0.1
2625
hooks:

setup.cfg

+15-14
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ classifiers =
2323
Programming Language :: Python :: 3.7
2424
Programming Language :: Python :: 3.8
2525
Programming Language :: Python :: 3.9
26+
Programming Language :: Python :: 3.10
2627
Topic :: Scientific/Engineering :: Astronomy
2728
Topic :: Scientific/Engineering :: Physics
2829
Topic :: Scientific/Engineering :: Visualization
@@ -71,25 +72,25 @@ doc =
7172
sphinx-bootstrap-theme
7273
sphinx-rtd-theme
7374
full =
74-
astropy>=4.0.1,<5.0.0
75+
astropy>=4.0.1,<6.0.0
7576
f90nml>=1.1.2
76-
fastcache~=1.0.2
77+
fastcache>=1.0.2
7778
firefly-vis>=2.0.4,<3.0.0
78-
glueviz~=0.13.3
7979
h5py>=3.1.0,<4.0.0
80-
libconf~=1.0.1
80+
libconf>=1.0.1
8181
miniballcpp>=0.2.1
82-
mpi4py~=3.0.3
83-
netCDF4~=1.5.3
84-
pandas~=1.1.2
82+
mpi4py>=3.0.3
83+
netCDF4>=1.5.3
84+
pandas>=1.1.2
8585
pooch>=0.7.0
86-
pyaml~=17.10.0
87-
pykdtree~=1.3.1
88-
pyqt5~=5.15.2
89-
pyx~=0.15
90-
requests~=2.20.0
91-
scipy~=1.5.0
92-
xarray~=0.16.1
86+
pyaml>=17.10.0
87+
pykdtree>=1.3.1
88+
pyqt5>=5.15.2
89+
pyx>=0.15
90+
requests>=2.20.0
91+
scipy>=1.5.0
92+
xarray>=0.16.1
93+
glueviz>=0.13.3;python_version < '3.10' # FUTURE: lift this limitation when glueviz has Python 3.10 compatibility
9394
mapserver =
9495
bottle
9596
minimal =

0 commit comments

Comments
 (0)