Skip to content

Commit fca9945

Browse files
authored
Merge pull request #1560 from bsipocz/python2_remove_testing
Removing python2 testing and it's mention in the install docs and readme
2 parents a733169 + c37b5ff commit fca9945

File tree

3 files changed

+5
-28
lines changed

3 files changed

+5
-28
lines changed

.travis.yml

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ env:
5252
- secure: "al9u/QSQfrwNljdu8gYUaT9z4BxEL1FlE4ntsn6eqtN2Y0rurqll+gq46quYjtE6zgcpb0uYtGIubusJkp7ceE6IBGhQdsel4UY16VIqeEuQ3GpVDb4RiJgU51SAjbmXYV1dMAJnOm4Ra41WzxokStKRDdoRraAsae9zK3H6AnI="
5353

5454
matrix:
55-
- PYTHON_VERSION=2.7 SETUP_CMD='egg_info'
5655
- PYTHON_VERSION=3.7 SETUP_CMD='egg_info'
5756

5857
matrix:
@@ -70,12 +69,6 @@ matrix:
7069
env: EVENT_TYPE='push cron' DEBUG=True ASTROPY_VERSION=dev
7170
SETUP_CMD='test -R -V -a "--durations=50"'
7271
CONDA_DEPENDENCIES=$CONDA_DEPENDENCIES_REMOTE
73-
- os: linux
74-
stage: Remote data tests
75-
env: EVENT_TYPE='push cron' PYTHON_VERSION=2.7
76-
SETUP_CMD='test --remote-data -V -a "--durations=50"'
77-
CONDA_DEPENDENCIES=$CONDA_DEPENDENCIES_REMOTE
78-
KEYRING_VERSION='<12.0' PYTEST_VERSION='<3.7'
7972

8073
# No need to run it from cron
8174
# Try MacOS X
@@ -101,13 +94,7 @@ matrix:
10194
# Test the oldest astropy version without optional dependencies.
10295
- os: linux
10396
stage: Tests with other Python/Numpy versions
104-
env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.12 KEYRING_VERSION='<12.0'
105-
CONDA_DEPENDENCIES="keyring requests beautifulsoup4 html5lib secretstorage pyvo"
106-
SECRETSTORAGE_VERSION='<3.0.1'
107-
ASTROPY_VERSION=2 PYTEST_VERSION='<3.7'
108-
- os: linux
109-
stage: Tests with other Python/Numpy versions
110-
env: PYTHON_VERSION=3.5.5 NUMPY_VERSION=1.14 KEYRING_VERSION='<12.0'
97+
env: PYTHON_VERSION=3.6 NUMPY_VERSION=1.14 KEYRING_VERSION='<12.0'
11198
ASTROPY_VERSION=3.0 APLPY_VERSION='<2.0'
11299

113100
- os: linux
@@ -119,11 +106,6 @@ matrix:
119106
env: ASTROPY_VERSION=development EVENT_TYPE='pull_request'
120107

121108
# Try with optional dependencies disabled
122-
- os: linux
123-
stage: Test docs, astropy dev, and without optional dependencies
124-
env: PYTHON_VERSION=2.7 KEYRING_VERSION='<12.0' PYTEST_VERSION='<3.7'
125-
CONDA_DEPENDENCIES='requests beautifulsoup4 html5lib keyring'
126-
ASTROPY_VERSION=lts NUMPY_VERSION=1.13
127109
- os: linux
128110
stage: Test docs, astropy dev, and without optional dependencies
129111
env: CONDA_DEPENDENCIES='requests beautifulsoup4 html5lib keyring'
@@ -159,12 +141,7 @@ matrix:
159141
env: EVENT_TYPE='push cron' DEBUG=True ASTROPY_VERSION=dev
160142
SETUP_CMD='test -R -V -a "--durations=50"'
161143
CONDA_DEPENDENCIES=$CONDA_DEPENDENCIES_REMOTE
162-
- os: linux
163-
stage: Remote data tests
164-
env: EVENT_TYPE='push cron' PYTHON_VERSION=2.7
165-
SETUP_CMD='test --remote-data -V -a "--durations=50"'
166-
CONDA_DEPENDENCIES=$CONDA_DEPENDENCIES_REMOTE
167-
KEYRING_VERSION='<12.0' PYTEST_VERSION='<3.7'
144+
168145

169146
install:
170147
- git clone git://github.com/astropy/ci-helpers.git

README.rst

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

41-
Astroquery works with Python 2.7 and 3.5 or later.
41+
Astroquery works with Python 3.6 or later.
4242
As an `astropy`_ affiliate, astroquery requires `astropy`_ version 2.0 or later.
4343

4444
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
@@ -64,11 +64,11 @@ The development version can be obtained and installed from github:
6464
Requirements
6565
------------
6666

67-
Astroquery works with Python 2.7 and 3.5 or later.
67+
Astroquery works with Python 3.6 or later.
6868

6969
The following packages are required for astroquery installation & use:
7070

71-
* `numpy <http://www.numpy.org>`_ >= 1.12
71+
* `numpy <http://www.numpy.org>`_ >= 1.14
7272
* `astropy <http://www.astropy.org>`__ (>=2.0)
7373
* `requests <http://docs.python-requests.org/en/latest/>`_
7474
* `keyring <https://pypi.python.org/pypi/keyring>`_

0 commit comments

Comments
 (0)