Skip to content

Commit 3cdf684

Browse files
authored
Merge pull request #2102 from bsipocz/python3.6_drop
Drop python3.6
2 parents bbda889 + 9872f36 commit 3cdf684

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

.github/workflows/ci_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535

3636
- name: oldest dependencies
3737
os: ubuntu-latest
38-
python: 3.6
39-
toxenv: py36-test-oldestdeps
38+
python: 3.7
39+
toxenv: py37-test-oldestdeps
4040
toxargs: -v
4141

4242
- name: astropy dev with all dependencies with coverage

CHANGES.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ Infrastructure, Utility and Other Changes and Additions
6565

6666
- Fixed progressbar download to report the correct downloaded amount. [#2091]
6767

68+
- Dropping Python 3.6 support. [#2102]
6869

6970

7071
0.4.2 (2021-05-14)

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ website <http://simbad.u-strasbg.fr/simbad/>`_, use the ``simbad`` sub-package:
4242
Installation and Requirements
4343
-----------------------------
4444

45-
Astroquery works with Python 3.6 or later.
45+
Astroquery works with Python 3.7 or later.
4646
As an `astropy`_ affiliate, astroquery requires `astropy`_ version 3.1.2 or later.
4747

4848
astroquery uses the `requests <http://docs.python-requests.org/en/latest/>`_

docs/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ The development version can be obtained and installed from github:
6868
Requirements
6969
------------
7070

71-
Astroquery works with Python 3.6 or later.
71+
Astroquery works with Python 3.7 or later.
7272

7373
The following packages are required for astroquery installation & use:
7474

75-
* `numpy <http://www.numpy.org>`_ >= 1.14
75+
* `numpy <http://www.numpy.org>`_ >= 1.15
7676
* `astropy <http://www.astropy.org>`__ (>=3.1.2)
7777
* `pyVO`_ (>=1.1)
7878
* `requests <http://docs.python-requests.org/en/latest/>`_

tox.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{36,37,38,39}-test{,-alldeps,-oldestdeps}{,-devastropy}{,-cov}
3+
py{37,38,39}-test{,-alldeps,-oldestdeps}{,-devastropy}{,-cov}
44
codestyle
55
build_docs
66
requires =
@@ -31,10 +31,12 @@ deps =
3131

3232
# TODO: Add more versions to oldestdeps. numpy<1.15 could not be installed
3333
# in CI, a much newer version was pulled in instead, thus setting
34-
# minimum numpy to 1.15.
34+
# minimum numpy to 1.15. mpl while not a dependency, it's required for the
35+
# tests, and would pull up a newer numpy version if not pinned.
3536

3637
oldestdeps: astropy==3.1.2
3738
oldestdeps: numpy==1.15
39+
oldestdeps: matplotlib==3.3.*
3840
cov: codecov
3941

4042
extras =

0 commit comments

Comments
 (0)