Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEPS: Bump numpy to 1.13.3 #25554

Merged
merged 25 commits into from
Mar 28, 2019
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bcaf944
DEPS: bump numpy minimum to 1.13.3
h-vetinari Mar 25, 2019
ca28cdb
Fixes
h-vetinari Mar 25, 2019
4830f49
Enforce higher bottleneck version
h-vetinari Mar 25, 2019
49e8a06
Shift mpl pin away from coverage job
h-vetinari Mar 25, 2019
01e2b06
Clean up scipy cruft
h-vetinari Mar 25, 2019
a3e09c2
Reshuffle mpl pins
h-vetinari Mar 26, 2019
27bf206
More numpy cruft
h-vetinari Mar 26, 2019
64fc701
Fix order and pin in azure compat job
h-vetinari Mar 26, 2019
327ef30
Reformulate version bump in whatsnew, add lowest version pins where m…
h-vetinari Mar 26, 2019
f3f7d2b
clean some old sqlalchemy code
h-vetinari Mar 26, 2019
5f2e19b
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 26, 2019
e3d9f6e
Review (jreback)
h-vetinari Mar 26, 2019
182d67c
Fixes
h-vetinari Mar 26, 2019
d0bb930
Lint
h-vetinari Mar 26, 2019
3ea9cd8
Update whatsnew issues references
h-vetinari Mar 26, 2019
ffd86ff
split table in whatsnew (review jreback)
h-vetinari Mar 27, 2019
fb449ea
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 27, 2019
a7d7190
Remove left-over comment
h-vetinari Mar 27, 2019
aad68c6
Remove cython from deps in whatsnew
h-vetinari Mar 27, 2019
fa674e3
Fix wording
h-vetinari Mar 27, 2019
8005679
Reinstate better regexes
h-vetinari Mar 27, 2019
b4288e9
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 27, 2019
e0f8a6d
Review (jreback)
h-vetinari Mar 27, 2019
445a9a2
Simplify regex
h-vetinari Mar 28, 2019
20ad5a5
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 28, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ matrix:

- dist: trusty
env:
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
jreback marked this conversation as resolved.
Show resolved Hide resolved

# In allow_failures
- dist: trusty
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ pip install pandas
```

## Dependencies
- [NumPy](https://www.numpy.org): 1.12.0 or higher
- [NumPy](https://www.numpy.org): 1.13.3 or higher
- [python-dateutil](https://labix.org/python-dateutil): 2.5.0 or higher
- [pytz](https://pythonhosted.org/pytz): 2015.4 or higher

Expand Down
2 changes: 1 addition & 1 deletion ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
py36_np14:
py36_np15:
ENV_FILE: ci/deps/azure-windows-36.yaml
CONDA_PY: "36"

Expand Down
16 changes: 8 additions & 8 deletions ci/deps/azure-35-compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ channels:
- defaults
- conda-forge
dependencies:
- beautifulsoup4==4.4.1
jreback marked this conversation as resolved.
Show resolved Hide resolved
- bottleneck=1.2.0
- cython=0.28.2
- hypothesis>=3.58.0
jreback marked this conversation as resolved.
Show resolved Hide resolved
- beautifulsoup4=4.4.1
- bottleneck=1.2.1
- jinja2=2.8
- numexpr=2.6.1
- numpy=1.12.0
- numexpr=2.6.2
- numpy=1.13.3
- openpyxl=2.4.0
- pytables=3.4.2
- python-dateutil=2.5.0
- python=3.5*
- python=3.5.*
h-vetinari marked this conversation as resolved.
Show resolved Hide resolved
- pytz=2015.4
- scipy=0.18.1
- scipy=0.19.0
- xlrd=1.0.0
- xlsxwriter=0.7.7
- xlwt=1.0.0
# universal
- cython=0.28.2
- hypothesis>=3.58.0
- pytest-xdist
- pytest-mock
- isort
Expand Down
8 changes: 4 additions & 4 deletions ci/deps/azure-36-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ channels:
- conda-forge
dependencies:
- beautifulsoup4==4.5.1
- bottleneck=1.2.0
- bottleneck=1.2.*
- cython=0.28.2
- lxml
- matplotlib=2.0.0
- numpy=1.12.0
- matplotlib=2.2.2
- numpy=1.14.*
- openpyxl=2.4.0
- python-dateutil
- python-blosc
- python=3.6
- python=3.6.*
- pytz=2016.10
- scipy
- sqlalchemy=1.1.4
Expand Down
6 changes: 3 additions & 3 deletions ci/deps/azure-36-locale_slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ dependencies:
- ipython
- jinja2
- lxml
- matplotlib
- matplotlib=3.0.*
- nomkl
- numexpr
- numpy
- numpy=1.15.*
TomAugspurger marked this conversation as resolved.
Show resolved Hide resolved
- openpyxl
- pytables
- python-dateutil
- python=3.6*
- python=3.6.*
- pytz
- s3fs
- scipy
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- openpyxl
- pytables
- python-dateutil
- python=3.7*
- python=3.7.*
- pytz
- s3fs
- scipy
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-numpydev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: pandas-dev
channels:
- defaults
dependencies:
- python=3.7*
- python=3.7.*
- pytz
- Cython>=0.28.2
# universal
Expand Down
6 changes: 3 additions & 3 deletions ci/deps/azure-macos-35.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ dependencies:
- html5lib
- jinja2
- lxml
- matplotlib=2.2.0
- matplotlib=2.2.3
- nomkl
- numexpr
- numpy=1.12.0
- numpy=1.13.3
- openpyxl
- pyarrow
- pytables
- python=3.5*
- python=3.5.*
- pytz
- xarray
- xlrd
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/azure-windows-36.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ dependencies:
- bottleneck
- boost-cpp<1.67
- fastparquet>=0.2.1
- matplotlib
- matplotlib=3.0.2
- numexpr
- numpy=1.14*
- numpy=1.15.*
- openpyxl
- parquet-cpp
- pyarrow
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- html5lib
- jinja2
- lxml
- matplotlib=3.0.1
- matplotlib=2.2.*
- numexpr
- numpy=1.14.*
- openpyxl
Expand Down
5 changes: 3 additions & 2 deletions ci/deps/travis-36.yaml → ci/deps/travis-36-cov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ dependencies:
- matplotlib
- nomkl
- numexpr
- numpy
- numpy=1.15.*
- openpyxl
- pandas-gbq
jreback marked this conversation as resolved.
Show resolved Hide resolved
- psycopg2
- pyarrow=0.9.0
- pymysql
- pytables
- python-snappy
- python=3.6.6
- python=3.6.*
- pytz
- s3fs
- scikit-learn
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies:
- pytables
- python-dateutil
- python-snappy
- python=3.6*
- python=3.6.*
- pytz
- scipy
- seaborn
Expand Down
21 changes: 14 additions & 7 deletions ci/deps/travis-36-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,33 @@ channels:
- conda-forge
dependencies:
- beautifulsoup4
- blosc=1.14.3
- python-blosc
- cython>=0.28.2
- fastparquet=0.2.1
- gcsfs=0.1.0
- html5lib
- ipython
- jinja2
- lxml
- matplotlib
- lxml=3.7.0
- matplotlib=3.0.0
- nomkl
- numexpr
- numpy
- openpyxl
- psycopg2
- pandas-gbq=0.8.0
- psycopg2=2.6.2
- pymysql=0.7.9
- pytables
- python-dateutil
- python=3.6*
# cannot go past python=3.6.6 for matplotlib=3.0.0 due to
# https://github.com/matplotlib/matplotlib/issues/12626
- python=3.6.6
jreback marked this conversation as resolved.
Show resolved Hide resolved
- pytz
- s3fs
- s3fs=0.0.8
- scipy
- sqlalchemy
- xarray
- sqlalchemy=1.1.4
- xarray=0.8.2
h-vetinari marked this conversation as resolved.
Show resolved Hide resolved
- xlrd
- xlsxwriter
- xlwt
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- pymysql
- pytables
- python-dateutil
- python=3.6*
- python=3.6.*
- pytz
- s3fs
- scipy
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
- c3i_test
dependencies:
- python=3.7
- python=3.7.*
- botocore>=1.11
- cython>=0.28.2
- numpy
Expand Down
20 changes: 9 additions & 11 deletions doc/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ Dependencies
------------

* `setuptools <https://setuptools.readthedocs.io/en/latest/>`__: 24.2.0 or higher
* `NumPy <http://www.numpy.org>`__: 1.12.0 or higher
* `NumPy <http://www.numpy.org>`__: 1.13.3 or higher
* `python-dateutil <https://dateutil.readthedocs.io/en/stable/>`__: 2.5.0 or higher
* `pytz <http://pytz.sourceforge.net/>`__: 2015.4 or higher

Expand All @@ -235,11 +235,11 @@ Recommended Dependencies

* `numexpr <https://github.com/pydata/numexpr>`__: for accelerating certain numerical operations.
``numexpr`` uses multiple cores as well as smart chunking and caching to achieve large speedups.
If installed, must be Version 2.6.1 or higher.
If installed, must be Version 2.6.2 or higher.

* `bottleneck <https://github.com/kwgoodman/bottleneck>`__: for accelerating certain types of ``nan``
evaluations. ``bottleneck`` uses specialized cython routines to achieve large speedups. If installed,
must be Version 1.2.0 or higher.
must be Version 1.2.1 or higher.

.. note::

Expand All @@ -254,27 +254,27 @@ Optional Dependencies

* `Cython <http://www.cython.org>`__: Only necessary to build development
version. Version 0.28.2 or higher.
* `SciPy <http://www.scipy.org>`__: miscellaneous statistical functions, Version 0.18.1 or higher
* `xarray <http://xarray.pydata.org>`__: pandas like handling for > 2 dims. Version 0.7.0 or higher is recommended.
* `SciPy <http://www.scipy.org>`__: miscellaneous statistical functions, Version 0.19.0 or higher
* `xarray <http://xarray.pydata.org>`__: pandas like handling for > 2 dims. Version 0.8.2 or higher is recommended.
* `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.
* `Apache Parquet <https://parquet.apache.org/>`__, either `pyarrow <http://arrow.apache.org/docs/python/>`__ (>= 0.9.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 1.1.4 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.
* `SQLite <https://docs.python.org/3/library/sqlite3.html>`__: for SQLite, this is included in Python's standard library by default.

* `matplotlib <http://matplotlib.org/>`__: for plotting, Version 2.0.0 or higher.
* `matplotlib <http://matplotlib.org/>`__: for plotting, Version 2.2.2 or higher.
* For Excel I/O:

* `xlrd/xlwt <http://www.python-excel.org/>`__: Excel reading (xlrd), version 1.0.0 or higher required, and writing (xlwt)
* `openpyxl <https://openpyxl.readthedocs.io/en/stable/>`__: openpyxl version 2.4.0
for writing .xlsx files (xlrd >= 0.9.0)
for writing .xlsx files (xlrd >= 1.0.0)
* `XlsxWriter <https://pypi.org/project/XlsxWriter>`__: Alternative Excel writer

* `Jinja2 <http://jinja.pocoo.org/>`__: Template engine for conditional HTML formatting.
* `s3fs <http://s3fs.readthedocs.io/>`__: necessary for Amazon S3 access (s3fs >= 0.0.7).
* `s3fs <http://s3fs.readthedocs.io/>`__: necessary for Amazon S3 access (s3fs >= 0.0.8).
* `blosc <https://pypi.org/project/blosc>`__: for msgpack compression using ``blosc``
* `gcsfs <http://gcsfs.readthedocs.io/>`__: necessary for Google Cloud Storage access (gcsfs >= 0.1.0).
* One of
Expand All @@ -289,8 +289,6 @@ Optional Dependencies
<https://pandas-gbq.readthedocs.io/en/latest/install.html#dependencies>`__:
for Google BigQuery I/O. (pandas-gbq >= 0.8.0)


* `Backports.lzma <https://pypi.org/project/backports.lzma/>`__: Only for Python 2, for writing to and/or reading from an xz compressed DataFrame in CSV; Python 3 support is built into the standard library.
* One of the following combinations of libraries is needed to use the
top-level :func:`~pandas.read_html` function:

Expand Down
68 changes: 47 additions & 21 deletions doc/source/whatsnew/v0.25.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,29 +159,55 @@ cause a ``SparseSeries`` or ``SparseDataFrame`` to be returned, as before.
Increased minimum versions for dependencies
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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`).
Due to dropping support for Python 2.7, a number of optional dependencies have updated minimum versions (issue:`25725`, :issue:`24942`, :issue:`25752`).
Independently, some minimum supported versions of dependencies were updated (:issue:`23519`, :issue:`25554`).
If installed, we now require:

+-----------------+-----------------+----------+
| Package | Minimum Version | Required |
+=================+=================+==========+
| beautifulsoup4 | 4.4.1 | |
+-----------------+-----------------+----------+
| openpyxl | 2.4.0 | |
+-----------------+-----------------+----------+
| pymysql | 0.7.9 | |
+-----------------+-----------------+----------+
| pytz | 2015.4 | |
+-----------------+-----------------+----------+
| sqlalchemy | 1.1.4 | |
+-----------------+-----------------+----------+
| xlsxwriter | 0.7.7 | |
+-----------------+-----------------+----------+
| xlwt | 1.0.0 | |
+-----------------+-----------------+----------+
| pytest (dev) | 4.0.2 | |
+-----------------+-----------------+----------+
+-----------------+-----------------+-----------------------+
| Package | Minimum Version | Comment |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is too verbose. pls separate into 2 tables, the basic deps (numpy, pytz, bottleneck, numexpr); make the table like we had it exactly

you can make a table for other things, but i am going to limit that list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kept pytest due to #23519.

I kept the structure of the table because the distinction between the kind of requirement (hard requirement vs. requirement if installed) is clearer like this, and fits with the other table.

+=================+=================+=======================+
| numpy | 1.13.3 | Required |
+-----------------+-----------------+-----------------------+
| pytz | 2015.4 | Required |
+-----------------+-----------------+-----------------------+
| bottleneck | 1.2.1 | Required if installed |
+-----------------+-----------------+-----------------------+
| numexpr | 2.6.2 | Required if installed |
+-----------------+-----------------+-----------------------+
| cython | 0.28.2 | Development-only req. |
+-----------------+-----------------+-----------------------+
| pytest | 4.0.2 | Development-only req. |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a misleading comment for pytest. its required if you run tests

Require if installed is very misleading, remove it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reverted it. That being said, pytest is not necessary to run pandas, so it is "as required" as, say openpyxl to write excel files.

+-----------------+-----------------+-----------------------+

For `optional libraries <https://pandas-docs.github.io/pandas-docs-travis/install.html#dependencies>`_ the general recommendation is to use the latest version.
The following table lists the lowest version per library that is being tested throughout the development of pandas.
Optional libraries below the lowest tested version may still work, but are not considered supported.

+-----------------+-----------------+-----------------------+
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the comment column.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

| Package | Minimum Version | Comment |
+=================+=================+=======================+
| fastparquet | 0.2.1 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| matplotlib | 2.2.2 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| openpyxl | 2.4.0 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| pyarrow | 0.9.0 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| pytables | 3.4.2 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| scipy | 0.19.0 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| sqlalchemy | 1.1.4 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| xarray | 0.8.2 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| xlrd | 1.0.0 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| xlsxwriter | 0.7.7 | Lowest tested version |
+-----------------+-----------------+-----------------------+
| xlwt | 1.0.0 | Lowest tested version |
+-----------------+-----------------+-----------------------+

.. _whatsnew_0250.api.other:

Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ dependencies:
- blosc
- botocore>=1.11
- boto3
- bottleneck>=1.2.0
- bottleneck>=1.2.1
- fastparquet>=0.2.1
- html5lib
- ipython>=5.6.0
- ipykernel
- jinja2
- lxml
- matplotlib>=2.0.0
- matplotlib>=2.2.2
- nbsphinx
- numexpr>=2.6.8
jreback marked this conversation as resolved.
Show resolved Hide resolved
- openpyxl
Expand Down
Loading