Skip to content

Commit 707c720

Browse files
h-vetinarijreback
authored andcommitted
Remove py27 CI jobs (#24942)
1 parent 65c0441 commit 707c720

16 files changed

+28
-270
lines changed

.travis.yml

-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
sudo: false
22
language: python
3-
# Default Python version is usually 2.7
43
python: 3.5
54

65
# To turn off cached cython files and compiler cache
@@ -36,14 +35,6 @@ matrix:
3635
env:
3736
- JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="(not slow and not network)"
3837

39-
- dist: trusty
40-
env:
41-
- JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="(not slow or (single and db))"
42-
addons:
43-
apt:
44-
packages:
45-
- python-gtk2
46-
4738
- dist: trusty
4839
env:
4940
- JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8"

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ pip install pandas
166166
## Dependencies
167167
- [NumPy](https://www.numpy.org): 1.12.0 or higher
168168
- [python-dateutil](https://labix.org/python-dateutil): 2.5.0 or higher
169-
- [pytz](https://pythonhosted.org/pytz): 2011k or higher
169+
- [pytz](https://pythonhosted.org/pytz): 2015.4 or higher
170170

171171
See the [full installation instructions](https://pandas.pydata.org/pandas-docs/stable/install.html#dependencies)
172172
for recommended and optional dependencies.

azure-pipelines.yml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
name: Linux
1111
vmImage: ubuntu-16.04
1212

13-
# Windows Python 2.7 needs VC 9.0 installed, handled in the template
1413
- template: ci/azure/windows.yml
1514
parameters:
1615
name: Windows

ci/azure/posix.yml

+1-13
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,12 @@ jobs:
99
strategy:
1010
matrix:
1111
${{ if eq(parameters.name, 'macOS') }}:
12-
py35_np_120:
12+
py35_macos:
1313
ENV_FILE: ci/deps/azure-macos-35.yaml
1414
CONDA_PY: "35"
1515
PATTERN: "not slow and not network"
1616

1717
${{ if eq(parameters.name, 'Linux') }}:
18-
py27_np_120:
19-
ENV_FILE: ci/deps/azure-27-compat.yaml
20-
CONDA_PY: "27"
21-
PATTERN: "not slow and not network"
22-
23-
py27_locale_slow_old_np:
24-
ENV_FILE: ci/deps/azure-27-locale.yaml
25-
CONDA_PY: "27"
26-
PATTERN: "slow"
27-
LOCALE_OVERRIDE: "zh_CN.UTF-8"
28-
EXTRA_APT: "language-pack-zh-hans"
29-
3018
py36_locale_slow:
3119
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
3220
CONDA_PY: "36"

ci/azure/windows.yml

-11
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,12 @@ jobs:
1212
ENV_FILE: ci/deps/azure-windows-36.yaml
1313
CONDA_PY: "36"
1414

15-
py27_np121:
16-
ENV_FILE: ci/deps/azure-windows-27.yaml
17-
CONDA_PY: "27"
18-
1915
steps:
2016
- task: CondaEnvironment@1
2117
inputs:
2218
updateConda: no
2319
packageSpecs: ''
2420

25-
- powershell: |
26-
$wc = New-Object net.webclient
27-
$wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi")
28-
Start-Process "VCForPython27.msi" /qn -Wait
29-
displayName: 'Install VC 9.0 only for Python 2.7'
30-
condition: eq(variables.CONDA_PY, '27')
31-
3221
- script: |
3322
ci\\incremental\\setup_conda_environment.cmd
3423
displayName: 'Before Install'

ci/deps/azure-27-compat.yaml

-28
This file was deleted.

ci/deps/azure-27-locale.yaml

-30
This file was deleted.

ci/deps/azure-windows-27.yaml

-33
This file was deleted.

ci/deps/azure-windows-36.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- pyarrow
1616
- pytables
1717
- python-dateutil
18-
- python=3.6.6
18+
- python=3.6.*
1919
- pytz
2020
- scipy
2121
- xlrd

ci/deps/travis-27.yaml

-51
This file was deleted.

ci/deps/travis-36-doc.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ dependencies:
1515
- ipywidgets
1616
- lxml
1717
- matplotlib
18-
- nbconvert
18+
- nbconvert>=5.4.1
1919
- nbformat
2020
- nbsphinx
21-
- notebook
21+
- notebook>=5.7.5
2222
- numexpr
23-
- numpy=1.13*
23+
- numpy
2424
- numpydoc
2525
- openpyxl
2626
- pandoc

ci/run_with_env.cmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:: EXPECTED ENV VARS: PYTHON_ARCH (either x86 or x64)
2-
:: CONDA_PY (either 27, 33, 35 etc. - only major version is extracted)
2+
:: CONDA_PY (either 35, 36 etc. - only major version is extracted)
33
::
44
::
55
:: To build extensions for 64 bit Python 3, we need to configure environment
@@ -45,7 +45,7 @@ SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
4545
SET MAJOR_PYTHON_VERSION=%CONDA_PY:~0,1%
4646

4747
IF "%CONDA_PY:~2,1%" == "" (
48-
:: CONDA_PY style, such as 27, 34 etc.
48+
:: CONDA_PY style, such as 36, 37 etc.
4949
SET MINOR_PYTHON_VERSION=%CONDA_PY:~1,1%
5050
) ELSE (
5151
IF "%CONDA_PY:~3,1%" == "." (

doc/source/install.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Dependencies
226226
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`__: 24.2.0 or higher
227227
* `NumPy <http://www.numpy.org>`__: 1.12.0 or higher
228228
* `python-dateutil <https://dateutil.readthedocs.io/en/stable/>`__: 2.5.0 or higher
229-
* `pytz <http://pytz.sourceforge.net/>`__
229+
* `pytz <http://pytz.sourceforge.net/>`__: 2015.4 or higher
230230

231231
.. _install.recommended_dependencies:
232232

@@ -259,7 +259,7 @@ Optional Dependencies
259259
* `PyTables <http://www.pytables.org>`__: necessary for HDF5-based storage, Version 3.4.2 or higher
260260
* `pyarrow <http://arrow.apache.org/docs/python/>`__ (>= 0.9.0): necessary for feather-based storage.
261261
* `Apache Parquet <https://parquet.apache.org/>`__, either `pyarrow <http://arrow.apache.org/docs/python/>`__ (>= 0.7.0) or `fastparquet <https://fastparquet.readthedocs.io/en/latest>`__ (>= 0.2.1) for parquet-based storage. The `snappy <https://pypi.org/project/python-snappy>`__ and `brotli <https://pypi.org/project/brotlipy>`__ are available for compression support.
262-
* `SQLAlchemy <http://www.sqlalchemy.org>`__: for SQL database support. Version 0.8.1 or higher recommended. Besides SQLAlchemy, you also need a database specific driver. You can find an overview of supported drivers for each SQL dialect in the `SQLAlchemy docs <http://docs.sqlalchemy.org/en/latest/dialects/index.html>`__. Some common drivers are:
262+
* `SQLAlchemy <http://www.sqlalchemy.org>`__: for SQL database support. Version 1.0.8 or higher recommended. Besides SQLAlchemy, you also need a database specific driver. You can find an overview of supported drivers for each SQL dialect in the `SQLAlchemy docs <http://docs.sqlalchemy.org/en/latest/dialects/index.html>`__. Some common drivers are:
263263

264264
* `psycopg2 <http://initd.org/psycopg/>`__: for PostgreSQL
265265
* `pymysql <https://github.com/PyMySQL/PyMySQL>`__: for MySQL.
@@ -298,7 +298,7 @@ Optional Dependencies
298298

299299
.. note::
300300

301-
If using BeautifulSoup4 a minimum version of 4.2.1 is required
301+
If using BeautifulSoup4 a minimum version of 4.4.1 is required
302302

303303
* `BeautifulSoup4`_ and `html5lib`_ (Any recent version of `html5lib`_ is
304304
okay.)

doc/source/whatsnew/v0.25.0.rst

+16-1
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,27 @@ is respected in indexing. (:issue:`24076`, :issue:`16785`)
7070
Increased minimum versions for dependencies
7171
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7272

73-
We have updated our minimum supported versions of dependencies (:issue:`23519`).
73+
Due to dropping support for Python 2.7, a number of optional dependencies have updated minimum versions.
74+
Independently, some minimum supported versions of dependencies were updated (:issue:`23519`, :issue:`24942`).
7475
If installed, we now require:
7576

7677
+-----------------+-----------------+----------+
7778
| Package | Minimum Version | Required |
7879
+=================+=================+==========+
80+
| beautifulsoup4 | 4.4.1 | |
81+
+-----------------+-----------------+----------+
82+
| openpyxl | 2.2.6 | |
83+
+-----------------+-----------------+----------+
84+
| pymysql | 0.6.6 | |
85+
+-----------------+-----------------+----------+
86+
| pytz | 2015.4 | |
87+
+-----------------+-----------------+----------+
88+
| sqlalchemy | 1.0.8 | |
89+
+-----------------+-----------------+----------+
90+
| xlsxwriter | 0.7.7 | |
91+
+-----------------+-----------------+----------+
92+
| xlwt | 1.0.0 | |
93+
+-----------------+-----------------+----------+
7994
| pytest (dev) | 4.0.2 | |
8095
+-----------------+-----------------+----------+
8196

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def is_platform_mac():
3434
setuptools_kwargs = {
3535
'install_requires': [
3636
'python-dateutil >= 2.5.0',
37-
'pytz >= 2011k',
37+
'pytz >= 2015.4',
3838
'numpy >= {numpy_ver}'.format(numpy_ver=min_numpy_ver),
3939
],
4040
'setup_requires': ['numpy >= {numpy_ver}'.format(numpy_ver=min_numpy_ver)],

0 commit comments

Comments
 (0)