Skip to content

Commit

Permalink
Remove py27 CI jobs (#24942)
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari authored and jreback committed Mar 17, 2019
1 parent 65c0441 commit 707c720
Show file tree
Hide file tree
Showing 16 changed files with 28 additions and 270 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
sudo: false
language: python
# Default Python version is usually 2.7
python: 3.5

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

- dist: trusty
env:
- JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="(not slow or (single and db))"
addons:
apt:
packages:
- python-gtk2

- dist: trusty
env:
- 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"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ pip install pandas
## Dependencies
- [NumPy](https://www.numpy.org): 1.12.0 or higher
- [python-dateutil](https://labix.org/python-dateutil): 2.5.0 or higher
- [pytz](https://pythonhosted.org/pytz): 2011k or higher
- [pytz](https://pythonhosted.org/pytz): 2015.4 or higher

See the [full installation instructions](https://pandas.pydata.org/pandas-docs/stable/install.html#dependencies)
for recommended and optional dependencies.
Expand Down
1 change: 0 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
name: Linux
vmImage: ubuntu-16.04

# Windows Python 2.7 needs VC 9.0 installed, handled in the template
- template: ci/azure/windows.yml
parameters:
name: Windows
Expand Down
14 changes: 1 addition & 13 deletions ci/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,12 @@ jobs:
strategy:
matrix:
${{ if eq(parameters.name, 'macOS') }}:
py35_np_120:
py35_macos:
ENV_FILE: ci/deps/azure-macos-35.yaml
CONDA_PY: "35"
PATTERN: "not slow and not network"

${{ if eq(parameters.name, 'Linux') }}:
py27_np_120:
ENV_FILE: ci/deps/azure-27-compat.yaml
CONDA_PY: "27"
PATTERN: "not slow and not network"

py27_locale_slow_old_np:
ENV_FILE: ci/deps/azure-27-locale.yaml
CONDA_PY: "27"
PATTERN: "slow"
LOCALE_OVERRIDE: "zh_CN.UTF-8"
EXTRA_APT: "language-pack-zh-hans"

py36_locale_slow:
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
CONDA_PY: "36"
Expand Down
11 changes: 0 additions & 11 deletions ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,12 @@ jobs:
ENV_FILE: ci/deps/azure-windows-36.yaml
CONDA_PY: "36"

py27_np121:
ENV_FILE: ci/deps/azure-windows-27.yaml
CONDA_PY: "27"

steps:
- task: CondaEnvironment@1
inputs:
updateConda: no
packageSpecs: ''

- powershell: |
$wc = New-Object net.webclient
$wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi")
Start-Process "VCForPython27.msi" /qn -Wait
displayName: 'Install VC 9.0 only for Python 2.7'
condition: eq(variables.CONDA_PY, '27')
- script: |
ci\\incremental\\setup_conda_environment.cmd
displayName: 'Before Install'
Expand Down
28 changes: 0 additions & 28 deletions ci/deps/azure-27-compat.yaml

This file was deleted.

30 changes: 0 additions & 30 deletions ci/deps/azure-27-locale.yaml

This file was deleted.

33 changes: 0 additions & 33 deletions ci/deps/azure-windows-27.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion ci/deps/azure-windows-36.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- pyarrow
- pytables
- python-dateutil
- python=3.6.6
- python=3.6.*
- pytz
- scipy
- xlrd
Expand Down
51 changes: 0 additions & 51 deletions ci/deps/travis-27.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions ci/deps/travis-36-doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ dependencies:
- ipywidgets
- lxml
- matplotlib
- nbconvert
- nbconvert>=5.4.1
- nbformat
- nbsphinx
- notebook
- notebook>=5.7.5
- numexpr
- numpy=1.13*
- numpy
- numpydoc
- openpyxl
- pandoc
Expand Down
4 changes: 2 additions & 2 deletions ci/run_with_env.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:: EXPECTED ENV VARS: PYTHON_ARCH (either x86 or x64)
:: CONDA_PY (either 27, 33, 35 etc. - only major version is extracted)
:: CONDA_PY (either 35, 36 etc. - only major version is extracted)
::
::
:: To build extensions for 64 bit Python 3, we need to configure environment
Expand Down Expand Up @@ -45,7 +45,7 @@ SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
SET MAJOR_PYTHON_VERSION=%CONDA_PY:~0,1%

IF "%CONDA_PY:~2,1%" == "" (
:: CONDA_PY style, such as 27, 34 etc.
:: CONDA_PY style, such as 36, 37 etc.
SET MINOR_PYTHON_VERSION=%CONDA_PY:~1,1%
) ELSE (
IF "%CONDA_PY:~3,1%" == "." (
Expand Down
6 changes: 3 additions & 3 deletions doc/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ Dependencies
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`__: 24.2.0 or higher
* `NumPy <http://www.numpy.org>`__: 1.12.0 or higher
* `python-dateutil <https://dateutil.readthedocs.io/en/stable/>`__: 2.5.0 or higher
* `pytz <http://pytz.sourceforge.net/>`__
* `pytz <http://pytz.sourceforge.net/>`__: 2015.4 or higher

.. _install.recommended_dependencies:

Expand Down Expand Up @@ -259,7 +259,7 @@ Optional Dependencies
* `PyTables <http://www.pytables.org>`__: necessary for HDF5-based storage, Version 3.4.2 or higher
* `pyarrow <http://arrow.apache.org/docs/python/>`__ (>= 0.9.0): necessary for feather-based storage.
* `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.
* `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:
* `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:

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

.. note::

If using BeautifulSoup4 a minimum version of 4.2.1 is required
If using BeautifulSoup4 a minimum version of 4.4.1 is required

* `BeautifulSoup4`_ and `html5lib`_ (Any recent version of `html5lib`_ is
okay.)
Expand Down
17 changes: 16 additions & 1 deletion doc/source/whatsnew/v0.25.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,27 @@ is respected in indexing. (:issue:`24076`, :issue:`16785`)
Increased minimum versions for dependencies
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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

+-----------------+-----------------+----------+
| Package | Minimum Version | Required |
+=================+=================+==========+
| beautifulsoup4 | 4.4.1 | |
+-----------------+-----------------+----------+
| openpyxl | 2.2.6 | |
+-----------------+-----------------+----------+
| pymysql | 0.6.6 | |
+-----------------+-----------------+----------+
| pytz | 2015.4 | |
+-----------------+-----------------+----------+
| sqlalchemy | 1.0.8 | |
+-----------------+-----------------+----------+
| xlsxwriter | 0.7.7 | |
+-----------------+-----------------+----------+
| xlwt | 1.0.0 | |
+-----------------+-----------------+----------+
| pytest (dev) | 4.0.2 | |
+-----------------+-----------------+----------+

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def is_platform_mac():
setuptools_kwargs = {
'install_requires': [
'python-dateutil >= 2.5.0',
'pytz >= 2011k',
'pytz >= 2015.4',
'numpy >= {numpy_ver}'.format(numpy_ver=min_numpy_ver),
],
'setup_requires': ['numpy >= {numpy_ver}'.format(numpy_ver=min_numpy_ver)],
Expand Down
Loading

0 comments on commit 707c720

Please sign in to comment.