diff --git a/ci/deps/azure-27-compat.yaml b/ci/deps/azure-27-compat.yaml index c68b51fbd6644..aec57c05e87b8 100644 --- a/ci/deps/azure-27-compat.yaml +++ b/ci/deps/azure-27-compat.yaml @@ -9,7 +9,7 @@ dependencies: - numexpr=2.6.1 - numpy=1.12.0 - openpyxl=2.5.5 - - pytables=3.4.2 + - pytables>=3.5.2 - python-dateutil=2.5.0 - python=2.7* - pytz=2013b diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index c104d78591384..2b1f6b5bd2f15 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -12,6 +12,8 @@ call deactivate conda list @rem Clean up any left-over from a previous build conda remove --all -q -y -n pandas-dev +@rem free channel needed for older packages +conda config --set restore_free_channel true @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index f174c17a614d8..43690d427ac70 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -15,6 +15,9 @@ conda list # `conda env remove` issue) conda remove --all -q -y -n pandas-dev +# free channel needed for older packages +conda config --set restore_free_channel true + echo echo "[create env]" time conda env create -q --file="${ENV_FILE}" || exit 1 diff --git a/ci/install_travis.sh b/ci/install_travis.sh index d1a940f119228..730d726b534f9 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -50,6 +50,9 @@ conda config --set ssl_verify false || exit 1 conda config --set quiet true --set always_yes true --set changeps1 false || exit 1 conda update -q conda +# free channel needed for older packages +conda config --set restore_free_channel true + # Useful for debugging any issues with conda conda info -a || exit 1 diff --git a/doc/source/install.rst b/doc/source/install.rst index 92364fcc9ebd2..9e61afea2ec60 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -256,7 +256,7 @@ Optional Dependencies version. Version 0.28.2 or higher. * `SciPy `__: miscellaneous statistical functions, Version 0.18.1 or higher * `xarray `__: pandas like handling for > 2 dims, needed for converting Panels to xarray objects. Version 0.7.0 or higher is recommended. -* `PyTables `__: necessary for HDF5-based storage, Version 3.4.2 or higher +* `PyTables `__: necessary for HDF5-based storage, Version 3.5.2 or higher * `pyarrow `__ (>= 0.9.0): necessary for feather-based storage. * `Apache Parquet `__, either `pyarrow `__ (>= 0.7.0) or `fastparquet `__ (>= 0.2.1) for parquet-based storage. The `snappy `__ and `brotli `__ are available for compression support. * `SQLAlchemy `__: 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 `__. Some common drivers are: diff --git a/doc/source/whatsnew/v0.24.0.rst b/doc/source/whatsnew/v0.24.0.rst index a49ea2cf493a6..97ef8fbb1d1c2 100644 --- a/doc/source/whatsnew/v0.24.0.rst +++ b/doc/source/whatsnew/v0.24.0.rst @@ -460,7 +460,7 @@ If installed, we now require: +-----------------+-----------------+----------+ | pyarrow | 0.9.0 | | +-----------------+-----------------+----------+ -| pytables | 3.4.2 | | +| pytables | 3.5.2 | | +-----------------+-----------------+----------+ | scipy | 0.18.1 | | +-----------------+-----------------+----------+ diff --git a/environment.yml b/environment.yml index ff7c5d56052d2..39f5680f4316c 100644 --- a/environment.yml +++ b/environment.yml @@ -42,7 +42,7 @@ dependencies: - numexpr>=2.6.8 - openpyxl - pyarrow>=0.9.0 - - pytables>=3.4.2 + - pytables>=3.5.2 - pytest-cov - pytest-xdist - s3fs diff --git a/pandas/core/frame.py b/pandas/core/frame.py index fb40c08aeb28a..842bf8da56dd8 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -2522,7 +2522,7 @@ def memory_usage(self, index=True, deep=False): ---------- index : bool, default True Specifies whether to include the memory usage of the DataFrame's - index in returned Series. If ``index=True``, the memory usage of + index in returned Series. If ``index=True``, the memory usage of the index is the first item in the output. deep : bool, default False If True, introspect the data deeply by interrogating diff --git a/requirements-dev.txt b/requirements-dev.txt index 02d8b0a70aab6..e9ec4e1a55d0e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -31,7 +31,7 @@ nbsphinx numexpr>=2.6.8 openpyxl pyarrow>=0.9.0 -tables>=3.4.2 +tables>=3.5.2 pytest-cov pytest-xdist s3fs diff --git a/setup.py b/setup.py index 2a67b21414f63..6bcf28fae676c 100755 --- a/setup.py +++ b/setup.py @@ -31,13 +31,22 @@ def is_platform_mac(): min_numpy_ver = '1.12.0' +max_numpy_ver = '' + +if (sys.version_info < (3, 0)): + max_numpy_ver = '1.17' + +numpy_install_rule = 'numpy >= {numpy_ver}'.format(numpy_ver=min_numpy_ver) +if max_numpy_ver: + numpy_install_rule += ', < {numpy_ver}'.format(numpy_ver=max_numpy_ver) + setuptools_kwargs = { 'install_requires': [ 'python-dateutil >= 2.5.0', 'pytz >= 2011k', - 'numpy >= {numpy_ver}'.format(numpy_ver=min_numpy_ver), + numpy_install_rule, ], - 'setup_requires': ['numpy >= {numpy_ver}'.format(numpy_ver=min_numpy_ver)], + 'setup_requires': [numpy_install_rule], 'zip_safe': False, }