diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-28 17:30:48 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-28 17:30:48 +0000 |
| commit | 914f308898b2b7be53e50ccf64b631261cf2e9b3 (patch) | |
| tree | 81b7af0e85fd5da8b81aa38e0beacb93252dba66 | |
| parent | 52d788a1818c1ac0f7901673aa7cd674253cb55a (diff) | |
| parent | f16789cad754b58acd4a56a9f543551957d4dbc1 (diff) | |
| download | pint-trying.tar.gz | |
Try #727:trying
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | docs/pandas.rst | 3 | ||||
| -rw-r--r-- | pint/compat/__init__.py | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 1600785..09aec01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ branches: - trying.tmp env: -# - UNCERTAINTIES="N" PYTHON="3.6" NUMPY_VERSION=1.14 PANDAS=1 + - UNCERTAINTIES="N" PYTHON="3.6" NUMPY_VERSION=1.14 PANDAS=1 - UNCERTAINTIES="N" PYTHON="3.3" NUMPY_VERSION=1.9.2 PANDAS=0 - UNCERTAINTIES="N" PYTHON="3.4" NUMPY_VERSION=1.11.2 PANDAS=0 - UNCERTAINTIES="N" PYTHON="3.5" NUMPY_VERSION=1.11.2 PANDAS=0 @@ -50,7 +50,7 @@ install: - if [ $NUMPY_VERSION != '0' ]; then conda install --yes numpy==$NUMPY_VERSION; fi - if [[ $TRAVIS_PYTHON_VERSION == '3.5' && $NUMPY_VERSION == 1.11.2 && $UNCERTAINTIES == "Y" ]]; then pip install babel serialize pyyaml; fi # this is superslow but suck it up until updates to pandas are made - - if [[ $PANDAS == '1' ]]; then pip install numpy cython pytest pytest-cov nbval; pip install git+https://github.com/pandas-dev/pandas.git; fi + - if [[ $PANDAS == '1' ]]; then pip install numpy cython pytest pytest-cov nbval; pip install git+https://github.com/pandas-dev/pandas.git@bdb7a1603f1e0948ca0cab011987f616e7296167; fi - pip install coveralls script: diff --git a/docs/pandas.rst b/docs/pandas.rst index 745c53b..830eb11 100644 --- a/docs/pandas.rst +++ b/docs/pandas.rst @@ -5,7 +5,8 @@ Pandas support It is convenient to use the `Pandas package`_ when dealing with numerical data, so Pint provides `PintArray`. A `PintArray` is a `Pandas Extension Array`_, which allows Pandas to recognise the Quantity and store it in Pandas DataFrames and Series. -For this to work, we rely on `Pandas Extension Types`_ which are still experimental. As a result, we currently have to build the latest version of Pandas' master branch from source as documented in the `Pandas README`_. +For this to work, we rely on `Pandas Extension Types`_ which are still experimental. As a result, we are currently pinned to a specific commit, with version id ``0.24.0.dev0+625.gbdb7a16``, of Pandas. + Basic example ------------- diff --git a/pint/compat/__init__.py b/pint/compat/__init__.py index 4afdf75..657fcfe 100644 --- a/pint/compat/__init__.py +++ b/pint/compat/__init__.py @@ -127,10 +127,7 @@ if not HAS_PROPER_BABEL: try: import pandas as pd HAS_PANDAS = True - HAS_PROPER_PANDAS = ( - hasattr(pd.core, "arrays") - and hasattr(pd.core.arrays.base, "ExtensionOpsMixin") - ) + HAS_PROPER_PANDAS = pd.__version__ == "0.24.0.dev0+625.gbdb7a16" except ImportError: HAS_PROPER_PANDAS = HAS_PANDAS = False |