Skip to content

Commit d1bec00

Browse files
authored
Merge pull request #3504 from bsipocz/MAINT_dropping_py39
MAINT: dropping python 3.9 support
2 parents c26a457 + 9fb78d2 commit d1bec00

6 files changed

Lines changed: 31 additions & 43 deletions

File tree

.github/workflows/ci_devtests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Python 3.13
4040
os: ubuntu-latest
41-
python: '3.13-dev'
41+
python: '3.13'
4242
toxenv: py313-test
4343
toxargs: -v
4444

.github/workflows/ci_tests.yml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ jobs:
3838

3939
- name: oldest version for all dependencies
4040
os: ubuntu-latest
41-
python: "3.9"
42-
toxenv: py39-test-oldestdeps-alldeps
41+
python: "3.10"
42+
toxenv: py310-test-oldestdeps-alldeps
4343
toxargs: -v
4444

45-
- name: OSX, py310, all optional dependencies
45+
- name: OSX, py312, all optional dependencies
4646
os: macos-latest
47-
python: "3.10"
48-
toxenv: py310-test-alldeps
47+
python: "3.12"
48+
toxenv: py312-test-alldeps
4949
toxargs: -v
5050

5151
- name: Windows, py311, mandatory dependencies only
@@ -79,18 +79,3 @@ jobs:
7979
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
8080
with:
8181
file: ./coverage.xml
82-
83-
egg_info:
84-
name: egg_info with Python 3.9
85-
runs-on: ubuntu-latest
86-
steps:
87-
- name: Checkout code
88-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
89-
with:
90-
fetch-depth: 0
91-
- name: Set up Python
92-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
93-
with:
94-
python-version: "3.9"
95-
- name: Run egg_info
96-
run: python setup.py egg_info

CHANGES.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ xmatch
9797
Infrastructure, Utility and Other Changes and Additions
9898
-------------------------------------------------------
9999

100+
- Versions of Python <3.10 are no longer supported. [#3504]
101+
102+
- Versions of numpy <1.22 are no longer supported. [#3504]
103+
104+
100105
utils.tap
101106
^^^^^^^^^
102107

docs/index.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ building the documentation, in editable mode:
9595
Requirements
9696
------------
9797

98-
Astroquery works with Python 3.9 or later.
98+
Astroquery works with Python 3.10 or later.
9999

100100
The following packages are required for astroquery installation & use:
101101

102-
* `numpy <https://numpy.org>`_ >= 1.20
102+
* `numpy <https://numpy.org>`_ >= 1.22
103103
* `astropy <https://www.astropy.org>`__ (>=5.0)
104104
* `pyVO`_ (>=1.5)
105105
* `requests <https://requests.readthedocs.io/en/latest/>`_
@@ -116,9 +116,9 @@ and for running the tests:
116116
The following packages are optional dependencies and are required for the
117117
full functionality of the `~astroquery.mocserver`, `~astroquery.alma`, and `~astroquery.xmatch` modules:
118118

119-
* `astropy-healpix <https://astropy-healpix.readthedocs.io/en/latest/>`_
120-
* `regions <https://astropy-regions.readthedocs.io/en/latest/>`_
121-
* `mocpy <https://cds-astro.github.io/mocpy/>`_ >= 0.9
119+
* `astropy-healpix <https://astropy-healpix.readthedocs.io/en/latest/>`_ >= 0.7
120+
* `regions <https://astropy-regions.readthedocs.io/en/latest/>`_ >= 0.5
121+
* `mocpy <https://cds-astro.github.io/mocpy/>`_ >= 0.12
122122

123123
For the `~astroquery.vamdc` module:
124124

@@ -129,6 +129,7 @@ The following packages are optional dependencies and are required for the
129129
full functionality of the `~astroquery.mast` and `~astroquery.heasarc` modules:
130130

131131
* `boto3 <https://boto3.amazonaws.com/v1/documentation/api/latest/index.html>`_
132+
* ``botocore``
132133

133134
Using astroquery
134135
----------------

setup.cfg

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ filterwarnings =
9797
# CoverageWarnings triggered by one of the other plugins(?). Either case, explicitely
9898
# ignore it here to have passing test for pytest 8.4.
9999
ignore:Module astroquery was previously imported, but not measured:coverage.exceptions.CoverageWarning
100-
# Python 3.9 warning for the newest boto releases
101-
ignore:Boto3 will no longer support Python 3.9:boto3.exceptions.PythonDeprecationWarning
102100

103101
markers =
104102
bigdata: marks tests that are expected to trigger a large download (deselect with '-m "not bigdata"')
@@ -142,15 +140,15 @@ omit =
142140

143141
[options]
144142

145-
python_requires = >=3.9
143+
python_requires = >=3.10
146144

147145
install_requires=
148-
numpy>=1.20
146+
numpy>=1.22
149147
astropy>=5.0
150-
requests>=2.19
151-
beautifulsoup4>=4.8
148+
requests>=2.26
149+
beautifulsoup4>=4.10
152150
html5lib>=0.999
153-
keyring>=15.0
151+
keyring>=23.0
154152
pyvo>=1.5
155153

156154
[options.extras_require]
@@ -176,4 +174,5 @@ all=
176174
mocpy>=0.12
177175
astropy-healpix
178176
boto3
177+
botocore
179178
regions>=0.5

tox.ini

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{39,310,311,312,313}-test{,-alldeps,-oldestdeps,-devdeps,-predeps}{,-online}{,-cov}
3+
py{310,311,312,313}-test{,-alldeps,-oldestdeps,-devdeps,-predeps}{,-online}{,-cov}
44
codestyle
55
linkcheck
66
build_docs
@@ -37,24 +37,22 @@ deps =
3737
devdeps: pyerfa>=0.0.dev0
3838
devdeps: git+https://github.com/astropy/pyvo.git#egg=pyvo
3939

40-
# astropy doesn't yet have a 3.13 compatible release
41-
py313: astropy>0.0dev0
42-
4340
# mpl while not a dependency, it's required for the tests, and would pull up a newer numpy version if not pinned.
4441
# And pillow should be pinned as well, otherwise a too new version is pulled that is not compatible with old np.
4542

4643
oldestdeps: astropy==5.0.0
47-
oldestdeps: numpy==1.20
48-
oldestdeps: matplotlib==3.4.*
44+
oldestdeps: numpy==1.22
45+
oldestdeps: matplotlib==3.5.0
4946
oldestdeps: pillow==10.0.0
5047
oldestdeps: pyvo==1.5
51-
oldestdeps: pytest-doctestplus==0.13
52-
oldestdeps: requests==2.25
53-
oldestdeps: keyring==15.0
48+
oldestdeps: pytest-doctestplus==1.4
49+
oldestdeps: requests==2.26
50+
oldestdeps: keyring==23.0
5451
oldestdeps: pytest==7.4
55-
oldestdeps: beautifulsoup4==4.9
52+
oldestdeps: beautifulsoup4==4.10
5653
oldestdeps-alldeps: mocpy==0.12
5754
oldestdeps-alldeps: regions==0.5
55+
oldestdeps-alldeps: astropy-healpix==0.7
5856

5957
online: pytest-custom_exit_code
6058

0 commit comments

Comments
 (0)