From 02b2879887ec59823127bc4b1a38e0c2ffe3459f Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 19 Apr 2018 15:01:46 -0500 Subject: [PATCH 01/40] CI: compat --- ci/requirements-2.7_COMPAT.build | 5 ----- ci/requirements-2.7_COMPAT.pip | 4 ---- ci/requirements-2.7_COMPAT.run | 14 -------------- ci/travis-27-compat.yaml | 28 ++++++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 23 deletions(-) delete mode 100644 ci/requirements-2.7_COMPAT.build delete mode 100644 ci/requirements-2.7_COMPAT.pip delete mode 100644 ci/requirements-2.7_COMPAT.run create mode 100644 ci/travis-27-compat.yaml diff --git a/ci/requirements-2.7_COMPAT.build b/ci/requirements-2.7_COMPAT.build deleted file mode 100644 index 0a83a7346e8b5..0000000000000 --- a/ci/requirements-2.7_COMPAT.build +++ /dev/null @@ -1,5 +0,0 @@ -python=2.7* -numpy=1.9.2 -cython=0.24 -python-dateutil=2.5.0 -pytz=2013b diff --git a/ci/requirements-2.7_COMPAT.pip b/ci/requirements-2.7_COMPAT.pip deleted file mode 100644 index 0e154dbc07525..0000000000000 --- a/ci/requirements-2.7_COMPAT.pip +++ /dev/null @@ -1,4 +0,0 @@ -html5lib==1.0b2 -beautifulsoup4==4.2.1 -openpyxl -argparse diff --git a/ci/requirements-2.7_COMPAT.run b/ci/requirements-2.7_COMPAT.run deleted file mode 100644 index c3daed6e6e1da..0000000000000 --- a/ci/requirements-2.7_COMPAT.run +++ /dev/null @@ -1,14 +0,0 @@ -numpy=1.9.2 -python-dateutil=2.5.0 -pytz=2013b -scipy=0.14.0 -xlwt=0.7.5 -xlrd=0.9.2 -bottleneck=1.0.0 -numexpr=2.4.4 # we test that we correctly don't use an unsupported numexpr -pytables=3.2.2 -psycopg2 -pymysql=0.6.0 -sqlalchemy=0.7.8 -xlsxwriter=0.5.2 -jinja2=2.8 diff --git a/ci/travis-27-compat.yaml b/ci/travis-27-compat.yaml new file mode 100644 index 0000000000000..df62494377ba8 --- /dev/null +++ b/ci/travis-27-compat.yaml @@ -0,0 +1,28 @@ +name: pandas +dependencies: + - bottleneck=1.0.0 + - cython=0.24 + - jinja2=2.8 + - numexpr=2.4.4 + - numpy=1.9.2 + - psycopg2 + - python-dateutil=2.5.0 + - python=2.7.* + - pytz=2013b + - scipy=0.14.0 + - sqlalchemy=0.7.8 + - xlrd=0.9.2 + - xlsxwriter=0.5.2 + - xlwt=0.7.5 + # universal + - pytest + - pytest-xdist + - pytest-cov + - moto + - pip: + - argparse + - beautifulsoup4==4.2.1 + - html5lib==1.0b2 + - openpyxl + - pymysql==0.6.0 # Older version only available on PyPI + - tables==3.2.2 # Older version only available on PyPI From 586132d8c16e6990e95bc91c1b5418b899fa43a3 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 19 Apr 2018 15:07:12 -0500 Subject: [PATCH 02/40] CI: 27-locale --- ci/requirements-2.7_LOCALE.build | 5 ----- ci/requirements-2.7_LOCALE.pip | 3 --- ci/requirements-2.7_LOCALE.run | 12 ------------ ci/travis-27-locale.yaml | 26 ++++++++++++++++++++++++++ 4 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 ci/requirements-2.7_LOCALE.build delete mode 100644 ci/requirements-2.7_LOCALE.pip delete mode 100644 ci/requirements-2.7_LOCALE.run create mode 100644 ci/travis-27-locale.yaml diff --git a/ci/requirements-2.7_LOCALE.build b/ci/requirements-2.7_LOCALE.build deleted file mode 100644 index a6f2e25387910..0000000000000 --- a/ci/requirements-2.7_LOCALE.build +++ /dev/null @@ -1,5 +0,0 @@ -python=2.7* -python-dateutil -pytz=2013b -numpy=1.9.2 -cython=0.24 diff --git a/ci/requirements-2.7_LOCALE.pip b/ci/requirements-2.7_LOCALE.pip deleted file mode 100644 index 1b825bbf492ca..0000000000000 --- a/ci/requirements-2.7_LOCALE.pip +++ /dev/null @@ -1,3 +0,0 @@ -html5lib==1.0b2 -beautifulsoup4==4.2.1 -blosc diff --git a/ci/requirements-2.7_LOCALE.run b/ci/requirements-2.7_LOCALE.run deleted file mode 100644 index 0a809a7dd6e5d..0000000000000 --- a/ci/requirements-2.7_LOCALE.run +++ /dev/null @@ -1,12 +0,0 @@ -python-dateutil -pytz -numpy=1.9.2 -xlwt=0.7.5 -openpyxl=2.4.0 -xlsxwriter=0.5.2 -xlrd=0.9.2 -bottleneck=1.0.0 -matplotlib=1.4.3 -sqlalchemy=0.8.1 -lxml -scipy diff --git a/ci/travis-27-locale.yaml b/ci/travis-27-locale.yaml new file mode 100644 index 0000000000000..1bff99a9ce122 --- /dev/null +++ b/ci/travis-27-locale.yaml @@ -0,0 +1,26 @@ +name: pandas +dependencies: + - bottleneck=1.0.0 + - cython=0.24 + - lxml + - matplotlib=1.4.3 + - numpy=1.9.2 + - openpyxl=2.4.0 + - python-dateutil + - python-blosc # XXX: moved from pip + - python=2.7 + - pytz + - pytz=2013b + - scipy + - sqlalchemy=0.8.1 + - xlrd=0.9.2 + - xlsxwriter=0.5.2 + - xlwt=0.7.5 + # universal + - pytest + - pytest-xdist + - pytest-cov + - moto + - pip: + - html5lib==1.0b2 + - beautifulsoup4==4.2.1 From 5bcee037ddb32832d09fd5e8d706ebb284e8acbc Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 19 Apr 2018 15:24:58 -0500 Subject: [PATCH 03/40] CI: 27 --- ci/requirements-2.7.build | 6 ------ ci/requirements-2.7.pip | 10 --------- ci/requirements-2.7.run | 20 ------------------ ci/requirements-2.7.sh | 7 ------- ci/travis-27.yaml | 44 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 43 deletions(-) delete mode 100644 ci/requirements-2.7.build delete mode 100644 ci/requirements-2.7.pip delete mode 100644 ci/requirements-2.7.run delete mode 100644 ci/requirements-2.7.sh create mode 100644 ci/travis-27.yaml diff --git a/ci/requirements-2.7.build b/ci/requirements-2.7.build deleted file mode 100644 index 17d34f3895c64..0000000000000 --- a/ci/requirements-2.7.build +++ /dev/null @@ -1,6 +0,0 @@ -python=2.7* -python-dateutil=2.5.0 -pytz=2013b -nomkl -numpy=1.13* -cython=0.24 diff --git a/ci/requirements-2.7.pip b/ci/requirements-2.7.pip deleted file mode 100644 index 876d9e978fa84..0000000000000 --- a/ci/requirements-2.7.pip +++ /dev/null @@ -1,10 +0,0 @@ -blosc -pandas-gbq -html5lib -beautifulsoup4 -pathlib -backports.lzma -py -PyCrypto -mock -ipython diff --git a/ci/requirements-2.7.run b/ci/requirements-2.7.run deleted file mode 100644 index 7c10b98fb6e14..0000000000000 --- a/ci/requirements-2.7.run +++ /dev/null @@ -1,20 +0,0 @@ -python-dateutil=2.5.0 -pytz=2013b -numpy -xlwt=0.7.5 -numexpr -pytables -matplotlib -openpyxl=2.4.0 -xlrd=0.9.2 -sqlalchemy=0.9.6 -lxml -scipy -xlsxwriter=0.5.2 -s3fs -bottleneck -psycopg2 -patsy -pymysql=0.6.3 -jinja2=2.8 -xarray=0.8.0 diff --git a/ci/requirements-2.7.sh b/ci/requirements-2.7.sh deleted file mode 100644 index 95169e5dcce57..0000000000000 --- a/ci/requirements-2.7.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -source activate pandas - -echo "install 27" - -conda install -n pandas -c conda-forge feather-format pyarrow=0.4.1 jemalloc=4.5.0.post fastparquet diff --git a/ci/travis-27.yaml b/ci/travis-27.yaml new file mode 100644 index 0000000000000..dfd98e8153ccf --- /dev/null +++ b/ci/travis-27.yaml @@ -0,0 +1,44 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - beautifulsoup4 # XXX: pip -> conda + - bottleneck + - cython=0.24 + - html5lib # XXX: pip -> conda + - ipython # XXX: pip -> conda + - jinja2=2.8 + - lxml + - matplotlib + - mock # XXX: pip -> conda + - nomkl + - numexpr + - numpy=1.13* + - openpyxl=2.4.0 + - patsy + - psycopg2 + - py # XXX: pip -> conda + - PyCrypto # XXX: pip -> conda + - pymysql=0.6.3 + - pytables + - python-blosc # XXX: pip -> conda + - python-dateutil=2.5.0 + - python=2.7* + - pytz=2013b + - s3fs + - scipy + - sqlalchemy=0.9.6 + - xarray=0.8.0 + - xlrd=0.9.2 + - xlsxwriter=0.5.2 + - xlwt=0.7.5 + # universal + - pytest + - pytest-xdist + - pytest-cov + - moto + - pip: + - backports.lzma + - pandas-gbq + - pathlib From 8f27bc1bc7a87eb88c3bfc1f4d90ba4e73c9695e Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 07:20:59 -0500 Subject: [PATCH 04/40] CI: 3.5 --- ci/requirements-3.5.build | 6 ------ ci/requirements-3.5.pip | 2 -- ci/requirements-3.5.run | 20 -------------------- ci/requirements-3.5.sh | 11 ----------- ci/travis-35.yaml | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 ci/requirements-3.5.build delete mode 100644 ci/requirements-3.5.pip delete mode 100644 ci/requirements-3.5.run delete mode 100644 ci/requirements-3.5.sh create mode 100644 ci/travis-35.yaml diff --git a/ci/requirements-3.5.build b/ci/requirements-3.5.build deleted file mode 100644 index f7befe3b31865..0000000000000 --- a/ci/requirements-3.5.build +++ /dev/null @@ -1,6 +0,0 @@ -python=3.5* -python-dateutil -pytz -nomkl -numpy -cython diff --git a/ci/requirements-3.5.pip b/ci/requirements-3.5.pip deleted file mode 100644 index c9565f2173070..0000000000000 --- a/ci/requirements-3.5.pip +++ /dev/null @@ -1,2 +0,0 @@ -xarray==0.9.1 -pandas_gbq diff --git a/ci/requirements-3.5.run b/ci/requirements-3.5.run deleted file mode 100644 index 669cf437f2164..0000000000000 --- a/ci/requirements-3.5.run +++ /dev/null @@ -1,20 +0,0 @@ -pytz -numpy -openpyxl -xlsxwriter -xlrd -xlwt -scipy -numexpr -pytables -html5lib -lxml -matplotlib -jinja2 -bottleneck -sqlalchemy -pymysql -psycopg2 -s3fs -beautifulsoup4 -ipython diff --git a/ci/requirements-3.5.sh b/ci/requirements-3.5.sh deleted file mode 100644 index 529e1e8742722..0000000000000 --- a/ci/requirements-3.5.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -source activate pandas - -echo "install 35" - -# pip install python-dateutil to get latest -conda remove -n pandas python-dateutil --force -pip install python-dateutil - -conda install -n pandas -c conda-forge feather-format pyarrow=0.7.1 diff --git a/ci/travis-35.yaml b/ci/travis-35.yaml new file mode 100644 index 0000000000000..be748e6e54f4d --- /dev/null +++ b/ci/travis-35.yaml @@ -0,0 +1,39 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - beautifulsoup4 + - bottleneck + - cython + - feather-format + - html5lib + - ipython + - jinja2 + - lxml + - matplotlib + - nomkl + - numexpr + - numpy + - openpyxl + - psycopg2 + - pyarrow=0.7.1 + - pymysql + - pytables + - python-dateutil # XXX: We used to reinstall with pip. Why? + - python=3.5* + - pytz + - s3fs + - scipy + - sqlalchemy + - xarray=0.9.1 + - xlrd + - xlsxwriter + - xlwt + # universal + - pytest + - pytest-xdist + - pytest-cov + - moto + - pip: + - pandas_gbq From 8d64136de495752a4a7bd6a32959d805eed23fd9 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 07:32:04 -0500 Subject: [PATCH 05/40] CI: OSX --- ci/requirements-3.5_OSX.build | 4 ---- ci/requirements-3.5_OSX.pip | 1 - ci/requirements-3.5_OSX.run | 16 ---------------- ci/requirements-3.5_OSX.sh | 7 ------- ci/travis-35-osx.yaml | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 33 insertions(+), 28 deletions(-) delete mode 100644 ci/requirements-3.5_OSX.build delete mode 100644 ci/requirements-3.5_OSX.pip delete mode 100644 ci/requirements-3.5_OSX.run delete mode 100644 ci/requirements-3.5_OSX.sh create mode 100644 ci/travis-35-osx.yaml diff --git a/ci/requirements-3.5_OSX.build b/ci/requirements-3.5_OSX.build deleted file mode 100644 index f5bc01b67a20a..0000000000000 --- a/ci/requirements-3.5_OSX.build +++ /dev/null @@ -1,4 +0,0 @@ -python=3.5* -nomkl -numpy=1.10.4 -cython diff --git a/ci/requirements-3.5_OSX.pip b/ci/requirements-3.5_OSX.pip deleted file mode 100644 index d1fc1fe24a079..0000000000000 --- a/ci/requirements-3.5_OSX.pip +++ /dev/null @@ -1 +0,0 @@ -python-dateutil==2.5.3 diff --git a/ci/requirements-3.5_OSX.run b/ci/requirements-3.5_OSX.run deleted file mode 100644 index 1d83474d10f2f..0000000000000 --- a/ci/requirements-3.5_OSX.run +++ /dev/null @@ -1,16 +0,0 @@ -pytz -numpy=1.10.4 -openpyxl -xlsxwriter -xlrd -xlwt -numexpr -pytables -html5lib -lxml -matplotlib -jinja2 -bottleneck -xarray -s3fs -beautifulsoup4 diff --git a/ci/requirements-3.5_OSX.sh b/ci/requirements-3.5_OSX.sh deleted file mode 100644 index c2978b175968c..0000000000000 --- a/ci/requirements-3.5_OSX.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -source activate pandas - -echo "install 35_OSX" - -conda install -n pandas -c conda-forge feather-format==0.3.1 fastparquet diff --git a/ci/travis-35-osx.yaml b/ci/travis-35-osx.yaml new file mode 100644 index 0000000000000..087a6b206ee00 --- /dev/null +++ b/ci/travis-35-osx.yaml @@ -0,0 +1,33 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - beautifulsoup4 + - bottleneck + - cython + - fastparquet + - feather-format=0.3.1 + - html5lib + - jinja2 + - lxml + - matplotlib + - nomkl + - numexpr + - numpy=1.10.4 + - openpyxl + - pytables + - python=3.5* + - pytz + - s3fs + - xarray + - xlrd + - xlsxwriter + - xlwt + # universal + - pytest + - pytest-xdist + - pytest-cov + - moto + - pip: + - python-dateutil==2.5.3 From 5f985ad5a101340e3cc447126058f3b0fd274cdd Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 07:35:39 -0500 Subject: [PATCH 06/40] CI: 3.6 slow --- ci/requirements-3.6_SLOW.build | 5 ----- ci/requirements-3.6_SLOW.pip | 0 ci/requirements-3.6_SLOW.run | 19 ------------------- ci/travis-36-slow.yaml | 31 +++++++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 24 deletions(-) delete mode 100644 ci/requirements-3.6_SLOW.build delete mode 100644 ci/requirements-3.6_SLOW.pip delete mode 100644 ci/requirements-3.6_SLOW.run create mode 100644 ci/travis-36-slow.yaml diff --git a/ci/requirements-3.6_SLOW.build b/ci/requirements-3.6_SLOW.build deleted file mode 100644 index bdcfe28105866..0000000000000 --- a/ci/requirements-3.6_SLOW.build +++ /dev/null @@ -1,5 +0,0 @@ -python=3.6* -python-dateutil -pytz -numpy -cython diff --git a/ci/requirements-3.6_SLOW.pip b/ci/requirements-3.6_SLOW.pip deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/ci/requirements-3.6_SLOW.run b/ci/requirements-3.6_SLOW.run deleted file mode 100644 index ab5253ad99e51..0000000000000 --- a/ci/requirements-3.6_SLOW.run +++ /dev/null @@ -1,19 +0,0 @@ -python-dateutil -pytz -numpy -matplotlib -scipy -patsy -xlwt -openpyxl -xlsxwriter -xlrd -numexpr -pytables -sqlalchemy -lxml -s3fs -psycopg2 -pymysql -html5lib -beautifulsoup4 diff --git a/ci/travis-36-slow.yaml b/ci/travis-36-slow.yaml new file mode 100644 index 0000000000000..06e344270e8d1 --- /dev/null +++ b/ci/travis-36-slow.yaml @@ -0,0 +1,31 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - beautifulsoup4 + - cython + - html5lib + - lxml + - matplotlib + - numexpr + - numpy + - openpyxl + - patsy + - psycopg2 + - pymysql + - pytables + - python-dateutil + - python=3.6* + - pytz + - s3fs + - scipy + - sqlalchemy + - xlrd + - xlsxwriter + - xlwt + # universal + - pytest + - pytest-xdist + - pytest-cov + - moto From 57eef01076c7f0f34ef55dab81baa5c4b5c1eb7c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 08:57:50 -0500 Subject: [PATCH 07/40] CI: 3.6 NumPy Dev --- ci/requirements-3.6_NUMPY_DEV.build | 2 -- ci/requirements-3.6_NUMPY_DEV.build.sh | 20 -------------------- ci/requirements-3.6_NUMPY_DEV.pip | 0 ci/requirements-3.6_NUMPY_DEV.run | 1 - ci/travis-36-numpydev.yaml | 19 +++++++++++++++++++ 5 files changed, 19 insertions(+), 23 deletions(-) delete mode 100644 ci/requirements-3.6_NUMPY_DEV.build delete mode 100644 ci/requirements-3.6_NUMPY_DEV.build.sh delete mode 100644 ci/requirements-3.6_NUMPY_DEV.pip delete mode 100644 ci/requirements-3.6_NUMPY_DEV.run create mode 100644 ci/travis-36-numpydev.yaml diff --git a/ci/requirements-3.6_NUMPY_DEV.build b/ci/requirements-3.6_NUMPY_DEV.build deleted file mode 100644 index 336fbe86b57d8..0000000000000 --- a/ci/requirements-3.6_NUMPY_DEV.build +++ /dev/null @@ -1,2 +0,0 @@ -python=3.6* -pytz diff --git a/ci/requirements-3.6_NUMPY_DEV.build.sh b/ci/requirements-3.6_NUMPY_DEV.build.sh deleted file mode 100644 index fd79142c5cebb..0000000000000 --- a/ci/requirements-3.6_NUMPY_DEV.build.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -source activate pandas - -echo "install numpy master wheel" - -# remove the system installed numpy -pip uninstall numpy -y - -# install numpy wheel from master -PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" -pip install --pre --upgrade --timeout=60 -f $PRE_WHEELS numpy scipy - -# install dateutil from master -pip install -U git+git://github.com/dateutil/dateutil.git - -# cython via pip -pip install cython - -true diff --git a/ci/requirements-3.6_NUMPY_DEV.pip b/ci/requirements-3.6_NUMPY_DEV.pip deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/ci/requirements-3.6_NUMPY_DEV.run b/ci/requirements-3.6_NUMPY_DEV.run deleted file mode 100644 index af44f198c687e..0000000000000 --- a/ci/requirements-3.6_NUMPY_DEV.run +++ /dev/null @@ -1 +0,0 @@ -pytz diff --git a/ci/travis-36-numpydev.yaml b/ci/travis-36-numpydev.yaml new file mode 100644 index 0000000000000..d2560619aee42 --- /dev/null +++ b/ci/travis-36-numpydev.yaml @@ -0,0 +1,19 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - python=3.6* + - pytz + - Cython + # universal + - pytest + - pytest-xdist + - pytest-cov + - moto + - pip: + - "git+git://github.com/dateutil/dateutil.git" + - "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" + - "--pre" + - "numpy" + - "scipy" From 5e9b6aa5bb60d1dfc751cee8011d7565b763240a Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 08:59:03 -0500 Subject: [PATCH 08/40] DEBUG: show whole environment --- ci/install_travis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 9ccb4baf25505..1119f20f49350 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -156,8 +156,8 @@ echo "[running setup.py develop]" python setup.py develop || exit 1 echo -echo "[show pandas]" -conda list pandas +echo "[show environment]" +conda list echo echo "[done]" From f0401019f48c91bb5b6591bdd57e691c85d93f7d Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 09:02:42 -0500 Subject: [PATCH 09/40] CI: 3.6 DOC --- ci/requirements-3.6_DOC.build | 5 ---- ci/requirements-3.6_DOC.run | 25 ------------------- ci/requirements-3.6_DOC.sh | 11 -------- ci/travis-36-doc.yaml | 47 +++++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 41 deletions(-) delete mode 100644 ci/requirements-3.6_DOC.build delete mode 100644 ci/requirements-3.6_DOC.run delete mode 100644 ci/requirements-3.6_DOC.sh create mode 100644 ci/travis-36-doc.yaml diff --git a/ci/requirements-3.6_DOC.build b/ci/requirements-3.6_DOC.build deleted file mode 100644 index bc72eed2a0d4e..0000000000000 --- a/ci/requirements-3.6_DOC.build +++ /dev/null @@ -1,5 +0,0 @@ -python=3.6* -python-dateutil -pytz -numpy=1.13* -cython diff --git a/ci/requirements-3.6_DOC.run b/ci/requirements-3.6_DOC.run deleted file mode 100644 index 084f38ce17eb2..0000000000000 --- a/ci/requirements-3.6_DOC.run +++ /dev/null @@ -1,25 +0,0 @@ -ipython -ipykernel -ipywidgets -sphinx -nbconvert -nbformat -notebook -matplotlib -seaborn -scipy -lxml -beautifulsoup4 -html5lib -pytables -python-snappy -openpyxl -xlrd -xlwt -xlsxwriter -sqlalchemy -numexpr -bottleneck -statsmodels -xarray -pyqt diff --git a/ci/requirements-3.6_DOC.sh b/ci/requirements-3.6_DOC.sh deleted file mode 100644 index aec0f62148622..0000000000000 --- a/ci/requirements-3.6_DOC.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -source activate pandas - -echo "[install DOC_BUILD deps]" - -pip install pandas-gbq - -conda install -n pandas -c conda-forge feather-format pyarrow nbsphinx pandoc fastparquet - -conda install -n pandas -c r r rpy2 --yes diff --git a/ci/travis-36-doc.yaml b/ci/travis-36-doc.yaml new file mode 100644 index 0000000000000..c4f8f1215bb77 --- /dev/null +++ b/ci/travis-36-doc.yaml @@ -0,0 +1,47 @@ +name: pandas +channels: + - defaults + - conda-forge + - r +dependencies: + - beautifulsoup4 + - bottleneck + - cython + - fastparquet + - feather-format + - html5lib + - ipykernel + - ipython + - ipywidgets + - lxml + - matplotlib + - nbconvert + - nbformat + - nbsphinx + - notebook + - numexpr + - numpy=1.13* + - openpyxl + - pandoc + - pyqt + - pytables + - python-dateutil + - python-snappy + - python=3.6* + - pytz + - r + - rpy2 + - scipy + - seaborn + - sphinx + - sqlalchemy + - statsmodels + - xarray + - xlrd + - xlsxwriter + - xlwt + # universal + - pytest + - pytest-xdist + - pytest-cov + - moto From d08da8f03550a152ee520da94f3975e9a6c2731c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 09:27:16 -0500 Subject: [PATCH 10/40] CI: 3.6 --- ci/requirements-3.6.build | 6 ----- ci/requirements-3.6.pip | 1 - ci/requirements-3.6.run | 25 --------------------- ci/requirements-3.6.sh | 7 ------ ci/travis-36.yaml | 46 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 46 insertions(+), 39 deletions(-) delete mode 100644 ci/requirements-3.6.build delete mode 100644 ci/requirements-3.6.pip delete mode 100644 ci/requirements-3.6.run delete mode 100644 ci/requirements-3.6.sh create mode 100644 ci/travis-36.yaml diff --git a/ci/requirements-3.6.build b/ci/requirements-3.6.build deleted file mode 100644 index 1c4b46aea3865..0000000000000 --- a/ci/requirements-3.6.build +++ /dev/null @@ -1,6 +0,0 @@ -python=3.6* -python-dateutil -pytz -nomkl -numpy -cython diff --git a/ci/requirements-3.6.pip b/ci/requirements-3.6.pip deleted file mode 100644 index 753a60d6c119a..0000000000000 --- a/ci/requirements-3.6.pip +++ /dev/null @@ -1 +0,0 @@ -brotlipy diff --git a/ci/requirements-3.6.run b/ci/requirements-3.6.run deleted file mode 100644 index 822144a80bc9a..0000000000000 --- a/ci/requirements-3.6.run +++ /dev/null @@ -1,25 +0,0 @@ -python-dateutil -pytz -numpy -scipy -openpyxl -xlsxwriter -xlrd -xlwt -numexpr -pytables -matplotlib -lxml -html5lib -jinja2 -sqlalchemy -pymysql -feather-format -pyarrow -psycopg2 -python-snappy -fastparquet -beautifulsoup4 -s3fs -xarray -ipython diff --git a/ci/requirements-3.6.sh b/ci/requirements-3.6.sh deleted file mode 100644 index f5c3dbf59a29d..0000000000000 --- a/ci/requirements-3.6.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -source activate pandas - -echo "[install 3.6 downstream deps]" - -conda install -n pandas -c conda-forge pandas-datareader xarray geopandas seaborn statsmodels scikit-learn dask diff --git a/ci/travis-36.yaml b/ci/travis-36.yaml new file mode 100644 index 0000000000000..fd8958dbec91e --- /dev/null +++ b/ci/travis-36.yaml @@ -0,0 +1,46 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - beautifulsoup4 + - cython + - dask + - fastparquet + - feather-format + - geopandas + - html5lib + - ipython + - jinja2 + - lxml + - matplotlib + - nomkl + - numexpr + - numpy + - openpyxl + - pandas-datareader + - psycopg2 + - pyarrow + - pymysql + - pytables + - python-dateutil + - python-snappy + - python=3.6* + - pytz + - s3fs + - scikit-learn + - scipy + - seaborn + - sqlalchemy + - statsmodels + - xarray + - xlrd + - xlsxwriter + - xlwt + # universal + - pytest + - pytest-xdist + - pytest-cov + - moto + - pip: + - brotlipy From c9b4c68bbaf9117de6dd65774911da58ba3948d6 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 09:28:40 -0500 Subject: [PATCH 11/40] Revert 2.7-compat --- ci/requirements-2.7_COMPAT.build | 5 +++++ ci/requirements-2.7_COMPAT.pip | 4 ++++ ci/requirements-2.7_COMPAT.run | 14 ++++++++++++++ ci/travis-27-compat.yaml | 28 ---------------------------- 4 files changed, 23 insertions(+), 28 deletions(-) create mode 100644 ci/requirements-2.7_COMPAT.build create mode 100644 ci/requirements-2.7_COMPAT.pip create mode 100644 ci/requirements-2.7_COMPAT.run delete mode 100644 ci/travis-27-compat.yaml diff --git a/ci/requirements-2.7_COMPAT.build b/ci/requirements-2.7_COMPAT.build new file mode 100644 index 0000000000000..0a83a7346e8b5 --- /dev/null +++ b/ci/requirements-2.7_COMPAT.build @@ -0,0 +1,5 @@ +python=2.7* +numpy=1.9.2 +cython=0.24 +python-dateutil=2.5.0 +pytz=2013b diff --git a/ci/requirements-2.7_COMPAT.pip b/ci/requirements-2.7_COMPAT.pip new file mode 100644 index 0000000000000..0e154dbc07525 --- /dev/null +++ b/ci/requirements-2.7_COMPAT.pip @@ -0,0 +1,4 @@ +html5lib==1.0b2 +beautifulsoup4==4.2.1 +openpyxl +argparse diff --git a/ci/requirements-2.7_COMPAT.run b/ci/requirements-2.7_COMPAT.run new file mode 100644 index 0000000000000..c3daed6e6e1da --- /dev/null +++ b/ci/requirements-2.7_COMPAT.run @@ -0,0 +1,14 @@ +numpy=1.9.2 +python-dateutil=2.5.0 +pytz=2013b +scipy=0.14.0 +xlwt=0.7.5 +xlrd=0.9.2 +bottleneck=1.0.0 +numexpr=2.4.4 # we test that we correctly don't use an unsupported numexpr +pytables=3.2.2 +psycopg2 +pymysql=0.6.0 +sqlalchemy=0.7.8 +xlsxwriter=0.5.2 +jinja2=2.8 diff --git a/ci/travis-27-compat.yaml b/ci/travis-27-compat.yaml deleted file mode 100644 index df62494377ba8..0000000000000 --- a/ci/travis-27-compat.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: pandas -dependencies: - - bottleneck=1.0.0 - - cython=0.24 - - jinja2=2.8 - - numexpr=2.4.4 - - numpy=1.9.2 - - psycopg2 - - python-dateutil=2.5.0 - - python=2.7.* - - pytz=2013b - - scipy=0.14.0 - - sqlalchemy=0.7.8 - - xlrd=0.9.2 - - xlsxwriter=0.5.2 - - xlwt=0.7.5 - # universal - - pytest - - pytest-xdist - - pytest-cov - - moto - - pip: - - argparse - - beautifulsoup4==4.2.1 - - html5lib==1.0b2 - - openpyxl - - pymysql==0.6.0 # Older version only available on PyPI - - tables==3.2.2 # Older version only available on PyPI From c86eba5908d9b0c705cac7123b0f49ec76c9b3e0 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 09:30:38 -0500 Subject: [PATCH 12/40] CI: Revert 3.5 --- ci/requirements-3.5.build | 6 ++++++ ci/requirements-3.5.pip | 2 ++ ci/requirements-3.5.run | 20 ++++++++++++++++++++ ci/requirements-3.5.sh | 11 +++++++++++ ci/travis-35.yaml | 39 --------------------------------------- 5 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 ci/requirements-3.5.build create mode 100644 ci/requirements-3.5.pip create mode 100644 ci/requirements-3.5.run create mode 100644 ci/requirements-3.5.sh delete mode 100644 ci/travis-35.yaml diff --git a/ci/requirements-3.5.build b/ci/requirements-3.5.build new file mode 100644 index 0000000000000..f7befe3b31865 --- /dev/null +++ b/ci/requirements-3.5.build @@ -0,0 +1,6 @@ +python=3.5* +python-dateutil +pytz +nomkl +numpy +cython diff --git a/ci/requirements-3.5.pip b/ci/requirements-3.5.pip new file mode 100644 index 0000000000000..c9565f2173070 --- /dev/null +++ b/ci/requirements-3.5.pip @@ -0,0 +1,2 @@ +xarray==0.9.1 +pandas_gbq diff --git a/ci/requirements-3.5.run b/ci/requirements-3.5.run new file mode 100644 index 0000000000000..669cf437f2164 --- /dev/null +++ b/ci/requirements-3.5.run @@ -0,0 +1,20 @@ +pytz +numpy +openpyxl +xlsxwriter +xlrd +xlwt +scipy +numexpr +pytables +html5lib +lxml +matplotlib +jinja2 +bottleneck +sqlalchemy +pymysql +psycopg2 +s3fs +beautifulsoup4 +ipython diff --git a/ci/requirements-3.5.sh b/ci/requirements-3.5.sh new file mode 100644 index 0000000000000..529e1e8742722 --- /dev/null +++ b/ci/requirements-3.5.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +source activate pandas + +echo "install 35" + +# pip install python-dateutil to get latest +conda remove -n pandas python-dateutil --force +pip install python-dateutil + +conda install -n pandas -c conda-forge feather-format pyarrow=0.7.1 diff --git a/ci/travis-35.yaml b/ci/travis-35.yaml deleted file mode 100644 index be748e6e54f4d..0000000000000 --- a/ci/travis-35.yaml +++ /dev/null @@ -1,39 +0,0 @@ -name: pandas -channels: - - defaults - - conda-forge -dependencies: - - beautifulsoup4 - - bottleneck - - cython - - feather-format - - html5lib - - ipython - - jinja2 - - lxml - - matplotlib - - nomkl - - numexpr - - numpy - - openpyxl - - psycopg2 - - pyarrow=0.7.1 - - pymysql - - pytables - - python-dateutil # XXX: We used to reinstall with pip. Why? - - python=3.5* - - pytz - - s3fs - - scipy - - sqlalchemy - - xarray=0.9.1 - - xlrd - - xlsxwriter - - xlwt - # universal - - pytest - - pytest-xdist - - pytest-cov - - moto - - pip: - - pandas_gbq From 5d19822f06e4f50f0fb4dd84772808a9e663a283 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 09:44:04 -0500 Subject: [PATCH 13/40] Updated travis install Limit coverage installs --- .travis.yml | 21 +++++++-------- ci/install_travis.sh | 53 +------------------------------------- ci/travis-27-locale.yaml | 1 - ci/travis-27.yaml | 3 ++- ci/travis-35-osx.yaml | 1 - ci/travis-36-doc.yaml | 1 - ci/travis-36-numpydev.yaml | 1 - ci/travis-36-slow.yaml | 1 - ci/travis-36.yaml | 1 + 9 files changed, 14 insertions(+), 69 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4dab4eb53afb..8ad49986764a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,33 +34,32 @@ matrix: - os: osx language: generic env: - - JOB="3.5_OSX" TEST_ARGS="--skip-slow --skip-network" + - JOB="3.5_OSX" ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network" - dist: trusty env: - - JOB="2.7_LOCALE" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true + - JOB="2.7_LOCALE" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true addons: apt: packages: - language-pack-zh-hans - dist: trusty env: - - JOB="2.7" TEST_ARGS="--skip-slow" LINT=true + - JOB="2.7" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true addons: apt: packages: - python-gtk2 - # In allow_failures - dist: trusty env: - - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true COVERAGE=true + - JOB="3.6" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true # In allow_failures - dist: trusty env: - - JOB="3.6_SLOW" SLOW=true + - JOB="3.6_SLOW" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true # In allow_failures - dist: trusty env: - - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" + - JOB="3.6_NUMPY_DEV" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" addons: apt: packages: @@ -68,21 +67,21 @@ matrix: # In allow_failures - dist: trusty env: - - JOB="3.6_DOC" DOC=true + - JOB="3.6_DOC" ENV_FILE="ci/travis-36-doc.yaml" DOC=true allow_failures: - dist: trusty env: - - JOB="3.6_SLOW" SLOW=true + - JOB="3.6_SLOW" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true - dist: trusty env: - - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" + - JOB="3.6_NUMPY_DEV" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" addons: apt: packages: - xsel - dist: trusty env: - - JOB="3.6_DOC" DOC=true + - JOB="3.6_DOC" ENV_FILE="ci/travis-36-doc.yaml" DOC=true before_install: - echo "before_install" diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 1119f20f49350..650833133a692 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -50,16 +50,6 @@ 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 -echo -echo "[add channels]" -conda config --remove channels defaults || exit 1 -conda config --add channels defaults || exit 1 - -if [ "$CONDA_FORGE" ]; then - # add conda-forge channel as priority - conda config --add channels conda-forge || exit 1 -fi - # Useful for debugging any issues with conda conda info -a || exit 1 @@ -90,55 +80,14 @@ echo echo "[create env]" # create our environment -REQ="ci/requirements-${JOB}.build" -time conda create -n pandas --file=${REQ} || exit 1 +time conda env create -n pandas --file="${ENV_FILE}" || exit 1 source activate pandas -# may have addtl installation instructions for this build -echo -echo "[build addtl installs]" -REQ="ci/requirements-${JOB}.build.sh" -if [ -e ${REQ} ]; then - time bash $REQ || exit 1 -fi - -time conda install -n pandas pytest>=3.1.0 -time pip install -q pytest-xdist moto - -if [ "$LINT" ]; then - conda install flake8=3.4.1 - pip install cpplint -fi - if [ "$COVERAGE" ]; then pip install coverage pytest-cov fi -# we may have run installations -echo -echo "[conda installs]" -REQ="ci/requirements-${JOB}.run" -if [ -e ${REQ} ]; then - time conda install -n pandas --file=${REQ} || exit 1 -fi - -# we may have additional pip installs -echo -echo "[pip installs]" -REQ="ci/requirements-${JOB}.pip" -if [ -e ${REQ} ]; then - pip install -r $REQ -fi - -# may have addtl installation instructions for this build -echo -echo "[addtl installs]" -REQ="ci/requirements-${JOB}.sh" -if [ -e ${REQ} ]; then - time bash $REQ || exit 1 -fi - # remove any installed pandas package # w/o removing anything else echo diff --git a/ci/travis-27-locale.yaml b/ci/travis-27-locale.yaml index 1bff99a9ce122..a3f25830e08ad 100644 --- a/ci/travis-27-locale.yaml +++ b/ci/travis-27-locale.yaml @@ -19,7 +19,6 @@ dependencies: # universal - pytest - pytest-xdist - - pytest-cov - moto - pip: - html5lib==1.0b2 diff --git a/ci/travis-27.yaml b/ci/travis-27.yaml index dfd98e8153ccf..51e12f2d01616 100644 --- a/ci/travis-27.yaml +++ b/ci/travis-27.yaml @@ -6,6 +6,7 @@ dependencies: - beautifulsoup4 # XXX: pip -> conda - bottleneck - cython=0.24 + - flake8=3.4.1 - html5lib # XXX: pip -> conda - ipython # XXX: pip -> conda - jinja2=2.8 @@ -36,9 +37,9 @@ dependencies: # universal - pytest - pytest-xdist - - pytest-cov - moto - pip: - backports.lzma + - cpplint - pandas-gbq - pathlib diff --git a/ci/travis-35-osx.yaml b/ci/travis-35-osx.yaml index 087a6b206ee00..98129eb095f88 100644 --- a/ci/travis-35-osx.yaml +++ b/ci/travis-35-osx.yaml @@ -27,7 +27,6 @@ dependencies: # universal - pytest - pytest-xdist - - pytest-cov - moto - pip: - python-dateutil==2.5.3 diff --git a/ci/travis-36-doc.yaml b/ci/travis-36-doc.yaml index c4f8f1215bb77..f5a867d1d616a 100644 --- a/ci/travis-36-doc.yaml +++ b/ci/travis-36-doc.yaml @@ -43,5 +43,4 @@ dependencies: # universal - pytest - pytest-xdist - - pytest-cov - moto diff --git a/ci/travis-36-numpydev.yaml b/ci/travis-36-numpydev.yaml index d2560619aee42..5516a57ee8cdc 100644 --- a/ci/travis-36-numpydev.yaml +++ b/ci/travis-36-numpydev.yaml @@ -9,7 +9,6 @@ dependencies: # universal - pytest - pytest-xdist - - pytest-cov - moto - pip: - "git+git://github.com/dateutil/dateutil.git" diff --git a/ci/travis-36-slow.yaml b/ci/travis-36-slow.yaml index 06e344270e8d1..6c475dc48723c 100644 --- a/ci/travis-36-slow.yaml +++ b/ci/travis-36-slow.yaml @@ -27,5 +27,4 @@ dependencies: # universal - pytest - pytest-xdist - - pytest-cov - moto diff --git a/ci/travis-36.yaml b/ci/travis-36.yaml index fd8958dbec91e..fe057e714761e 100644 --- a/ci/travis-36.yaml +++ b/ci/travis-36.yaml @@ -44,3 +44,4 @@ dependencies: - moto - pip: - brotlipy + - coverage From 132e1d835b03a91e745f18e3be663ba95f6d2bbe Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 09:48:44 -0500 Subject: [PATCH 14/40] Include conda-forge for 2.7 --- ci/travis-27-locale.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/travis-27-locale.yaml b/ci/travis-27-locale.yaml index a3f25830e08ad..8cf92ca0043ac 100644 --- a/ci/travis-27-locale.yaml +++ b/ci/travis-27-locale.yaml @@ -1,4 +1,7 @@ name: pandas +channels: + - defaults + - conda-forge dependencies: - bottleneck=1.0.0 - cython=0.24 From 8071359ceb856183d7907f9dca965c38fff00811 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 10:13:32 -0500 Subject: [PATCH 15/40] Removed markers --- ci/travis-27-locale.yaml | 2 +- ci/travis-27.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/travis-27-locale.yaml b/ci/travis-27-locale.yaml index 8cf92ca0043ac..6992d9c8034fc 100644 --- a/ci/travis-27-locale.yaml +++ b/ci/travis-27-locale.yaml @@ -10,7 +10,7 @@ dependencies: - numpy=1.9.2 - openpyxl=2.4.0 - python-dateutil - - python-blosc # XXX: moved from pip + - python-blosc - python=2.7 - pytz - pytz=2013b diff --git a/ci/travis-27.yaml b/ci/travis-27.yaml index 51e12f2d01616..8b96688453ced 100644 --- a/ci/travis-27.yaml +++ b/ci/travis-27.yaml @@ -3,27 +3,27 @@ channels: - defaults - conda-forge dependencies: - - beautifulsoup4 # XXX: pip -> conda + - beautifulsoup4 - bottleneck - cython=0.24 - flake8=3.4.1 - - html5lib # XXX: pip -> conda - - ipython # XXX: pip -> conda + - html5lib + - ipython - jinja2=2.8 - lxml - matplotlib - - mock # XXX: pip -> conda + - mock - nomkl - numexpr - numpy=1.13* - openpyxl=2.4.0 - patsy - psycopg2 - - py # XXX: pip -> conda - - PyCrypto # XXX: pip -> conda + - py + - PyCrypto - pymysql=0.6.3 - pytables - - python-blosc # XXX: pip -> conda + - python-blosc - python-dateutil=2.5.0 - python=2.7* - pytz=2013b From 828b08b68282d41eea80dc8055288ff28141af30 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 10:29:21 -0500 Subject: [PATCH 16/40] Added quiet to the install --- ci/install_travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 650833133a692..3ce58a15fe37d 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -80,7 +80,7 @@ echo echo "[create env]" # create our environment -time conda env create -n pandas --file="${ENV_FILE}" || exit 1 +time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1 source activate pandas From 65e874a369da3e38528f0b7b3cea073efd6f7d7d Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 11:10:42 -0500 Subject: [PATCH 17/40] CI: Removed fastparquet from OSX That's pinned to numpy 1.10.4, which forces fastparquet 0.1.3, which is not compatible with thrift & pandas master. --- ci/travis-35-osx.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/travis-35-osx.yaml b/ci/travis-35-osx.yaml index 98129eb095f88..87c35805b6de7 100644 --- a/ci/travis-35-osx.yaml +++ b/ci/travis-35-osx.yaml @@ -6,7 +6,6 @@ dependencies: - beautifulsoup4 - bottleneck - cython - - fastparquet - feather-format=0.3.1 - html5lib - jinja2 From dce87b581410f41d26706ac5ba3f767a276ff765 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 12:25:06 -0500 Subject: [PATCH 18/40] CI: Circle 27 compat --- ci/circle-27-compat.yaml | 29 +++++++++++++++++++++++++++++ ci/requirements-2.7_COMPAT.build | 5 ----- ci/requirements-2.7_COMPAT.pip | 4 ---- ci/requirements-2.7_COMPAT.run | 14 -------------- 4 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 ci/circle-27-compat.yaml delete mode 100644 ci/requirements-2.7_COMPAT.build delete mode 100644 ci/requirements-2.7_COMPAT.pip delete mode 100644 ci/requirements-2.7_COMPAT.run diff --git a/ci/circle-27-compat.yaml b/ci/circle-27-compat.yaml new file mode 100644 index 0000000000000..fce106eb7b114 --- /dev/null +++ b/ci/circle-27-compat.yaml @@ -0,0 +1,29 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - bottleneck=1.0.0 + - cython=0.24 + - jinja2=2.8 + - numexpr=2.4.4 # we test that we correctly don't use an unsupported numexpr + - numpy=1.9.2 + - openpyxl + - psycopg2 + - pytables=3.2.2 + - python-dateutil=2.5.0 + - python=2.7* + - pytz=2013b + - scipy=0.14.0 + - sqlalchemy=0.7.8 + - xlrd=0.9.2 + - xlsxwriter=0.5.2 + - xlwt=0.7.5 + # universal + - pytest + - pytest-xdist + - moto + - pip: + - html5lib==1.0b2 + - beautifulsoup4==4.2.1 + - pymysql==0.6.0 diff --git a/ci/requirements-2.7_COMPAT.build b/ci/requirements-2.7_COMPAT.build deleted file mode 100644 index 0a83a7346e8b5..0000000000000 --- a/ci/requirements-2.7_COMPAT.build +++ /dev/null @@ -1,5 +0,0 @@ -python=2.7* -numpy=1.9.2 -cython=0.24 -python-dateutil=2.5.0 -pytz=2013b diff --git a/ci/requirements-2.7_COMPAT.pip b/ci/requirements-2.7_COMPAT.pip deleted file mode 100644 index 0e154dbc07525..0000000000000 --- a/ci/requirements-2.7_COMPAT.pip +++ /dev/null @@ -1,4 +0,0 @@ -html5lib==1.0b2 -beautifulsoup4==4.2.1 -openpyxl -argparse diff --git a/ci/requirements-2.7_COMPAT.run b/ci/requirements-2.7_COMPAT.run deleted file mode 100644 index c3daed6e6e1da..0000000000000 --- a/ci/requirements-2.7_COMPAT.run +++ /dev/null @@ -1,14 +0,0 @@ -numpy=1.9.2 -python-dateutil=2.5.0 -pytz=2013b -scipy=0.14.0 -xlwt=0.7.5 -xlrd=0.9.2 -bottleneck=1.0.0 -numexpr=2.4.4 # we test that we correctly don't use an unsupported numexpr -pytables=3.2.2 -psycopg2 -pymysql=0.6.0 -sqlalchemy=0.7.8 -xlsxwriter=0.5.2 -jinja2=2.8 From 3116c97481f6a29fcc41713c1a321b4848f813f1 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 12:34:02 -0500 Subject: [PATCH 19/40] CI: circle-36-locale --- ci/circle-36-locale.yaml | 33 ++++++++++++++++++++++++++++++++ ci/requirements-3.6_LOCALE.build | 6 ------ ci/requirements-3.6_LOCALE.pip | 0 ci/requirements-3.6_LOCALE.run | 22 --------------------- 4 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 ci/circle-36-locale.yaml delete mode 100644 ci/requirements-3.6_LOCALE.build delete mode 100644 ci/requirements-3.6_LOCALE.pip delete mode 100644 ci/requirements-3.6_LOCALE.run diff --git a/ci/circle-36-locale.yaml b/ci/circle-36-locale.yaml new file mode 100644 index 0000000000000..cc852c1e2aeeb --- /dev/null +++ b/ci/circle-36-locale.yaml @@ -0,0 +1,33 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - beautifulsoup4 + - cython + - html5lib + - ipython + - jinja2 + - lxml + - matplotlib + - nomkl + - numexpr + - numpy + - openpyxl + - psycopg2 + - pymysql + - pytables + - python-dateutil + - python=3.6* + - pytz + - s3fs + - scipy + - sqlalchemy + - xarray + - xlrd + - xlsxwriter + - xlwt + # universal + - pytest + - pytest-xdist + - moto diff --git a/ci/requirements-3.6_LOCALE.build b/ci/requirements-3.6_LOCALE.build deleted file mode 100644 index 1c4b46aea3865..0000000000000 --- a/ci/requirements-3.6_LOCALE.build +++ /dev/null @@ -1,6 +0,0 @@ -python=3.6* -python-dateutil -pytz -nomkl -numpy -cython diff --git a/ci/requirements-3.6_LOCALE.pip b/ci/requirements-3.6_LOCALE.pip deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/ci/requirements-3.6_LOCALE.run b/ci/requirements-3.6_LOCALE.run deleted file mode 100644 index ad54284c6f7e3..0000000000000 --- a/ci/requirements-3.6_LOCALE.run +++ /dev/null @@ -1,22 +0,0 @@ -python-dateutil -pytz -numpy -scipy -openpyxl -xlsxwriter -xlrd -xlwt -numexpr -pytables -matplotlib -lxml -html5lib -jinja2 -sqlalchemy -pymysql -# feather-format (not available on defaults ATM) -psycopg2 -beautifulsoup4 -s3fs -xarray -ipython From 0d4ae517557556afc2f11b51851f8deba1c36c53 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 12:36:39 -0500 Subject: [PATCH 20/40] CI: circle-36-locale_slow --- ci/circle-36-locale_slow.yaml | 33 +++++++++++++++++++++++++++ ci/requirements-3.6_LOCALE_SLOW.build | 6 ----- ci/requirements-3.6_LOCALE_SLOW.pip | 0 ci/requirements-3.6_LOCALE_SLOW.run | 22 ------------------ 4 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 ci/circle-36-locale_slow.yaml delete mode 100644 ci/requirements-3.6_LOCALE_SLOW.build delete mode 100644 ci/requirements-3.6_LOCALE_SLOW.pip delete mode 100644 ci/requirements-3.6_LOCALE_SLOW.run diff --git a/ci/circle-36-locale_slow.yaml b/ci/circle-36-locale_slow.yaml new file mode 100644 index 0000000000000..cc852c1e2aeeb --- /dev/null +++ b/ci/circle-36-locale_slow.yaml @@ -0,0 +1,33 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - beautifulsoup4 + - cython + - html5lib + - ipython + - jinja2 + - lxml + - matplotlib + - nomkl + - numexpr + - numpy + - openpyxl + - psycopg2 + - pymysql + - pytables + - python-dateutil + - python=3.6* + - pytz + - s3fs + - scipy + - sqlalchemy + - xarray + - xlrd + - xlsxwriter + - xlwt + # universal + - pytest + - pytest-xdist + - moto diff --git a/ci/requirements-3.6_LOCALE_SLOW.build b/ci/requirements-3.6_LOCALE_SLOW.build deleted file mode 100644 index 1c4b46aea3865..0000000000000 --- a/ci/requirements-3.6_LOCALE_SLOW.build +++ /dev/null @@ -1,6 +0,0 @@ -python=3.6* -python-dateutil -pytz -nomkl -numpy -cython diff --git a/ci/requirements-3.6_LOCALE_SLOW.pip b/ci/requirements-3.6_LOCALE_SLOW.pip deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/ci/requirements-3.6_LOCALE_SLOW.run b/ci/requirements-3.6_LOCALE_SLOW.run deleted file mode 100644 index ad54284c6f7e3..0000000000000 --- a/ci/requirements-3.6_LOCALE_SLOW.run +++ /dev/null @@ -1,22 +0,0 @@ -python-dateutil -pytz -numpy -scipy -openpyxl -xlsxwriter -xlrd -xlwt -numexpr -pytables -matplotlib -lxml -html5lib -jinja2 -sqlalchemy -pymysql -# feather-format (not available on defaults ATM) -psycopg2 -beautifulsoup4 -s3fs -xarray -ipython From 480686b45b8f019703997d36cffc13dcc7f1ef36 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 12:38:42 -0500 Subject: [PATCH 21/40] CI: 3.5-ascii --- ci/circle-35-ascii.yaml | 15 +++++++++++++++ ci/requirements-3.5_ASCII.build | 6 ------ ci/requirements-3.5_ASCII.run | 3 --- 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 ci/circle-35-ascii.yaml delete mode 100644 ci/requirements-3.5_ASCII.build delete mode 100644 ci/requirements-3.5_ASCII.run diff --git a/ci/circle-35-ascii.yaml b/ci/circle-35-ascii.yaml new file mode 100644 index 0000000000000..2b02f0951e416 --- /dev/null +++ b/ci/circle-35-ascii.yaml @@ -0,0 +1,15 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - cython + - nomkl + - numpy + - python-dateutil + - python=3.5* + - pytz + # universal + - pytest + - pytest-xdist + - moto diff --git a/ci/requirements-3.5_ASCII.build b/ci/requirements-3.5_ASCII.build deleted file mode 100644 index f7befe3b31865..0000000000000 --- a/ci/requirements-3.5_ASCII.build +++ /dev/null @@ -1,6 +0,0 @@ -python=3.5* -python-dateutil -pytz -nomkl -numpy -cython diff --git a/ci/requirements-3.5_ASCII.run b/ci/requirements-3.5_ASCII.run deleted file mode 100644 index b9d543f557d06..0000000000000 --- a/ci/requirements-3.5_ASCII.run +++ /dev/null @@ -1,3 +0,0 @@ -python-dateutil -pytz -numpy From 692cc27e6a0500ca3e013e05930be9ce739bd702 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 12:44:47 -0500 Subject: [PATCH 22/40] CI: Remove redundant coverage install --- ci/install_travis.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 3ce58a15fe37d..fd4a36f86db6c 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -84,10 +84,6 @@ time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1 source activate pandas -if [ "$COVERAGE" ]; then - pip install coverage pytest-cov -fi - # remove any installed pandas package # w/o removing anything else echo From 2ead1bee823b60361b577c2da18c955dfaf14aa2 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 12:45:33 -0500 Subject: [PATCH 23/40] CI: updated circle --- ci/install_circle.sh | 30 ++++++++++++------------------ circle.yml | 8 ++++---- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/ci/install_circle.sh b/ci/install_circle.sh index fd79f907625e9..5ffff84c88488 100755 --- a/ci/install_circle.sh +++ b/ci/install_circle.sh @@ -46,10 +46,6 @@ echo "[environmental variable file]" cat $ENVS_FILE source $ENVS_FILE -export REQ_BUILD=ci/requirements-${JOB}.build -export REQ_RUN=ci/requirements-${JOB}.run -export REQ_PIP=ci/requirements-${JOB}.pip - # edit the locale override if needed if [ -n "$LOCALE_OVERRIDE" ]; then echo "[Adding locale to the first line of pandas/__init__.py]" @@ -62,25 +58,23 @@ if [ -n "$LOCALE_OVERRIDE" ]; then fi # create envbuild deps -echo "[create env: ${REQ_BUILD}]" -time conda create -n pandas -q --file=${REQ_BUILD} || exit 1 -time conda install -n pandas pytest>=3.1.0 || exit 1 +echo "[create env]" +time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1 source activate pandas -time pip install moto || exit 1 + +# remove any installed pandas package +# w/o removing anything else +echo +echo "[removing installed pandas]" +conda remove pandas -y --force +pip uninstall -y pandas # build but don't install echo "[build em]" time python setup.py build_ext --inplace || exit 1 -# we may have run installations -echo "[conda installs: ${REQ_RUN}]" -if [ -e ${REQ_RUN} ]; then - time conda install -q --file=${REQ_RUN} || exit 1 -fi +echo +echo "[show environment]" -# we may have additional pip installs -echo "[pip installs: ${REQ_PIP}]" -if [ -e ${REQ_PIP} ]; then - pip install -r $REQ_PIP -fi +conda list diff --git a/circle.yml b/circle.yml index 9d49145af54e3..66415defba6fe 100644 --- a/circle.yml +++ b/circle.yml @@ -21,13 +21,13 @@ dependencies: - > case $CIRCLE_NODE_INDEX in 0) - sudo apt-get install language-pack-it && ./ci/install_circle.sh JOB="2.7_COMPAT" LOCALE_OVERRIDE="it_IT.UTF-8" ;; + sudo apt-get install language-pack-it && ./ci/install_circle.sh JOB="2.7_COMPAT" ENV_FILE="ci/circle-27-compat.yaml" LOCALE_OVERRIDE="it_IT.UTF-8" ;; 1) - sudo apt-get install language-pack-zh-hans && ./ci/install_circle.sh JOB="3.6_LOCALE" LOCALE_OVERRIDE="zh_CN.UTF-8" ;; + sudo apt-get install language-pack-zh-hans && ./ci/install_circle.sh JOB="3.6_LOCALE" ENV_FILE="ci/circle-36-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" ;; 2) - sudo apt-get install language-pack-zh-hans && ./ci/install_circle.sh JOB="3.6_LOCALE_SLOW" LOCALE_OVERRIDE="zh_CN.UTF-8" ;; + sudo apt-get install language-pack-zh-hans && ./ci/install_circle.sh JOB="3.6_LOCALE_SLOW" ENV_FILE="ci/circle-36-locale_slow.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" ;; 3) - ./ci/install_circle.sh JOB="3.5_ASCII" LOCALE_OVERRIDE="C" ;; + ./ci/install_circle.sh JOB="3.5_ASCII" ENV_FILE="ci/circle-35-ascii.yaml" LOCALE_OVERRIDE="C" ;; esac - ./ci/show_circle.sh From 3d29fcc43312a1a1448f83ac61ded1486766ff8d Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 12:49:15 -0500 Subject: [PATCH 24/40] CI: Appveyor 27 --- ci/appveyor-27.yaml | 27 +++++++++++++++++++++++++++ ci/requirements-2.7_WIN.pip | 0 ci/requirements-2.7_WIN.run | 18 ------------------ 3 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 ci/appveyor-27.yaml delete mode 100644 ci/requirements-2.7_WIN.pip delete mode 100644 ci/requirements-2.7_WIN.run diff --git a/ci/appveyor-27.yaml b/ci/appveyor-27.yaml new file mode 100644 index 0000000000000..491b452648442 --- /dev/null +++ b/ci/appveyor-27.yaml @@ -0,0 +1,27 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - beautifulsoup4 + - bottleneck + - dateutil + - html5lib + - jinja2=2.8 + - lxml + - matplotlib + - numexpr + - numpy=1.10* + - openpyxl + - pytables==3.2.2 + - pytz + - s3fs + - scipy + - sqlalchemy + - xlrd + - xlsxwriter + - xlwt + # universal + - pytest + - pytest-xdist + - moto diff --git a/ci/requirements-2.7_WIN.pip b/ci/requirements-2.7_WIN.pip deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/ci/requirements-2.7_WIN.run b/ci/requirements-2.7_WIN.run deleted file mode 100644 index c4ca7fc736bb1..0000000000000 --- a/ci/requirements-2.7_WIN.run +++ /dev/null @@ -1,18 +0,0 @@ -dateutil -pytz -numpy=1.10* -xlwt -numexpr -pytables==3.2.2 -matplotlib -openpyxl -xlrd -sqlalchemy -lxml -scipy -xlsxwriter -s3fs -bottleneck -html5lib -beautifulsoup4 -jinja2=2.8 From 7dbd646965a6ad8319ae498d3d1dc96ae083d9ce Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 12:51:27 -0500 Subject: [PATCH 25/40] CI: appveyor-3.6 --- ci/appveyor-36.yaml | 26 ++++++++++++++++++++++++++ ci/requirements-3.6_WIN.pip | 0 ci/requirements-3.6_WIN.run | 17 ----------------- 3 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 ci/appveyor-36.yaml delete mode 100644 ci/requirements-3.6_WIN.pip delete mode 100644 ci/requirements-3.6_WIN.run diff --git a/ci/appveyor-36.yaml b/ci/appveyor-36.yaml new file mode 100644 index 0000000000000..cf4fbe51240e8 --- /dev/null +++ b/ci/appveyor-36.yaml @@ -0,0 +1,26 @@ +name: pandas +channels: + - defaults + - conda-forge +dependencies: + - blosc + - bottleneck + - fastparquet + - feather-format + - matplotlib + - numexpr + - numpy=1.13* + - openpyxl + - pyarrow + - pytables + - python-dateutil + - pytz + - scipy + - thrift=0.10* + - xlrd + - xlsxwriter + - xlwt + # universal + - pytest + - pytest-xdist + - moto diff --git a/ci/requirements-3.6_WIN.pip b/ci/requirements-3.6_WIN.pip deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/ci/requirements-3.6_WIN.run b/ci/requirements-3.6_WIN.run deleted file mode 100644 index 3042888763863..0000000000000 --- a/ci/requirements-3.6_WIN.run +++ /dev/null @@ -1,17 +0,0 @@ -python-dateutil -pytz -numpy=1.13* -bottleneck -openpyxl -xlsxwriter -xlrd -xlwt -scipy -feather-format -numexpr -pytables -matplotlib -blosc -thrift=0.10* -fastparquet -pyarrow From 5cf612d3901f6343f4d5cd5d2ca210d0b670288e Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 12:56:22 -0500 Subject: [PATCH 26/40] CI: Updated appveyor --- appveyor.yml | 15 ++++----------- ci/appveyor-27.yaml | 2 ++ ci/appveyor-36.yaml | 2 ++ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ba001208864a8..fae2e1fef4495 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -73,19 +73,12 @@ install: - cmd: conda info -a # create our env - - cmd: conda create -n pandas python=%PYTHON_VERSION% cython pytest>=3.1.0 pytest-xdist + - cmd: conda env create -q -n pandas --file=ci\appveyor-%PYTHON_VERSION%.yaml - cmd: activate pandas - - cmd: pip install moto - - SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.run - - cmd: echo "installing requirements from %REQ%" - - cmd: conda install -n pandas --file=%REQ% - cmd: conda list -n pandas - - cmd: echo "installing requirements from %REQ% - done" - - # add some pip only reqs to the env - - SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.pip - - cmd: echo "installing requirements from %REQ%" - - cmd: pip install -Ur %REQ% + # uninstall pandas if nescessary + - cmd: conda remove pandas -y --force + - cmd: pip uninstall -y pandas # build em using the local source checkout in the correct windows env - cmd: '%CMD_IN_ENV% python setup.py build_ext --inplace' diff --git a/ci/appveyor-27.yaml b/ci/appveyor-27.yaml index 491b452648442..84107c605b14f 100644 --- a/ci/appveyor-27.yaml +++ b/ci/appveyor-27.yaml @@ -14,6 +14,7 @@ dependencies: - numpy=1.10* - openpyxl - pytables==3.2.2 + - python=2.7.* - pytz - s3fs - scipy @@ -22,6 +23,7 @@ dependencies: - xlsxwriter - xlwt # universal + - cython - pytest - pytest-xdist - moto diff --git a/ci/appveyor-36.yaml b/ci/appveyor-36.yaml index cf4fbe51240e8..736c525013a8e 100644 --- a/ci/appveyor-36.yaml +++ b/ci/appveyor-36.yaml @@ -14,6 +14,7 @@ dependencies: - pyarrow - pytables - python-dateutil + - python=3.6.* - pytz - scipy - thrift=0.10* @@ -21,6 +22,7 @@ dependencies: - xlsxwriter - xlwt # universal + - cython - pytest - pytest-xdist - moto From 444992b07ffe0a7fa7ee5d0bfd3a7ebd319d4e1b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 13:30:59 -0500 Subject: [PATCH 27/40] CI: use absolute path to environment file --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fae2e1fef4495..22d7cdbc94ab3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -73,7 +73,7 @@ install: - cmd: conda info -a # create our env - - cmd: conda env create -q -n pandas --file=ci\appveyor-%PYTHON_VERSION%.yaml + - cmd: conda env create -q -n pandas --file=%clone_folder%\ci\appveyor-%PYTHON_VERSION%.yaml - cmd: activate pandas - cmd: conda list -n pandas # uninstall pandas if nescessary From 1706d238aba058ed5a37559c7ca64b1aa5aacb76 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 14:24:17 -0500 Subject: [PATCH 28/40] Fix filename --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 22d7cdbc94ab3..63ca6dc452db3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -73,7 +73,7 @@ install: - cmd: conda info -a # create our env - - cmd: conda env create -q -n pandas --file=%clone_folder%\ci\appveyor-%PYTHON_VERSION%.yaml + - cmd: conda env create -q -n pandas --file=ci\appveyor-%CONDA_PY%.yaml - cmd: activate pandas - cmd: conda list -n pandas # uninstall pandas if nescessary From 2de5402f66f706c9832410855eae476f16677338 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 15:30:39 -0500 Subject: [PATCH 29/40] no pip uninstall --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 63ca6dc452db3..71d8388888e3c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -78,7 +78,7 @@ install: - cmd: conda list -n pandas # uninstall pandas if nescessary - cmd: conda remove pandas -y --force - - cmd: pip uninstall -y pandas + # TODO(pip10): this current exits with 1; in pip 10 it's fine. - cmd: pip uninstall -y pandas # build em using the local source checkout in the correct windows env - cmd: '%CMD_IN_ENV% python setup.py build_ext --inplace' From 0f7f0f170647d706a609d66eabb082653da1ab33 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 16:19:50 -0500 Subject: [PATCH 30/40] Try setting the exit manually --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 71d8388888e3c..f70fc829ec971 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -76,9 +76,9 @@ install: - cmd: conda env create -q -n pandas --file=ci\appveyor-%CONDA_PY%.yaml - cmd: activate pandas - cmd: conda list -n pandas - # uninstall pandas if nescessary - - cmd: conda remove pandas -y --force - # TODO(pip10): this current exits with 1; in pip 10 it's fine. - cmd: pip uninstall -y pandas + # uninstall pandas if it's present + - cmd: conda remove pandas -y --force & exit 0 + - cmd: pip uninstall -y pandas & exit 0 # build em using the local source checkout in the correct windows env - cmd: '%CMD_IN_ENV% python setup.py build_ext --inplace' From c4771df7b7b33e7942ff00dd7d9f3e57642e318f Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 20 Apr 2018 17:05:15 -0500 Subject: [PATCH 31/40] Re-add parquet deps to 2.7 --- ci/travis-27.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/travis-27.yaml b/ci/travis-27.yaml index 8b96688453ced..22b993a2da886 100644 --- a/ci/travis-27.yaml +++ b/ci/travis-27.yaml @@ -6,9 +6,12 @@ dependencies: - beautifulsoup4 - bottleneck - cython=0.24 + - fastparquet + - feather-format - flake8=3.4.1 - html5lib - ipython + - jemalloc=4.5.0.post - jinja2=2.8 - lxml - matplotlib @@ -20,6 +23,7 @@ dependencies: - patsy - psycopg2 - py + - pyarrow=0.4.1 - PyCrypto - pymysql=0.6.3 - pytables From 06edc661fdd121a305940aaa5a2e78284e5058f7 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Sat, 21 Apr 2018 13:31:13 -0500 Subject: [PATCH 32/40] Remove unused motos --- ci/appveyor-36.yaml | 1 - ci/circle-27-compat.yaml | 1 - ci/circle-35-ascii.yaml | 2 -- ci/travis-27-locale.yaml | 1 - ci/travis-36-doc.yaml | 1 - ci/travis-36-numpydev.yaml | 2 -- 6 files changed, 8 deletions(-) diff --git a/ci/appveyor-36.yaml b/ci/appveyor-36.yaml index 736c525013a8e..5e370de39958a 100644 --- a/ci/appveyor-36.yaml +++ b/ci/appveyor-36.yaml @@ -25,4 +25,3 @@ dependencies: - cython - pytest - pytest-xdist - - moto diff --git a/ci/circle-27-compat.yaml b/ci/circle-27-compat.yaml index fce106eb7b114..81a48d4edf11c 100644 --- a/ci/circle-27-compat.yaml +++ b/ci/circle-27-compat.yaml @@ -22,7 +22,6 @@ dependencies: # universal - pytest - pytest-xdist - - moto - pip: - html5lib==1.0b2 - beautifulsoup4==4.2.1 diff --git a/ci/circle-35-ascii.yaml b/ci/circle-35-ascii.yaml index 2b02f0951e416..602c414b49bb2 100644 --- a/ci/circle-35-ascii.yaml +++ b/ci/circle-35-ascii.yaml @@ -1,7 +1,6 @@ name: pandas channels: - defaults - - conda-forge dependencies: - cython - nomkl @@ -12,4 +11,3 @@ dependencies: # universal - pytest - pytest-xdist - - moto diff --git a/ci/travis-27-locale.yaml b/ci/travis-27-locale.yaml index 6992d9c8034fc..1312c1296d46a 100644 --- a/ci/travis-27-locale.yaml +++ b/ci/travis-27-locale.yaml @@ -22,7 +22,6 @@ dependencies: # universal - pytest - pytest-xdist - - moto - pip: - html5lib==1.0b2 - beautifulsoup4==4.2.1 diff --git a/ci/travis-36-doc.yaml b/ci/travis-36-doc.yaml index f5a867d1d616a..c22dddbe0ba3f 100644 --- a/ci/travis-36-doc.yaml +++ b/ci/travis-36-doc.yaml @@ -43,4 +43,3 @@ dependencies: # universal - pytest - pytest-xdist - - moto diff --git a/ci/travis-36-numpydev.yaml b/ci/travis-36-numpydev.yaml index 5516a57ee8cdc..455d65feb4242 100644 --- a/ci/travis-36-numpydev.yaml +++ b/ci/travis-36-numpydev.yaml @@ -1,7 +1,6 @@ name: pandas channels: - defaults - - conda-forge dependencies: - python=3.6* - pytz @@ -9,7 +8,6 @@ dependencies: # universal - pytest - pytest-xdist - - moto - pip: - "git+git://github.com/dateutil/dateutil.git" - "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" From 4161d65128a01286dda6037a1c57cc9bb6d7363c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 23 Apr 2018 06:06:28 -0500 Subject: [PATCH 33/40] CI: Remove conda-forge from 3.5 --- ci/travis-35-osx.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/travis-35-osx.yaml b/ci/travis-35-osx.yaml index 87c35805b6de7..e74abac4c9775 100644 --- a/ci/travis-35-osx.yaml +++ b/ci/travis-35-osx.yaml @@ -1,12 +1,10 @@ name: pandas channels: - defaults - - conda-forge dependencies: - beautifulsoup4 - bottleneck - cython - - feather-format=0.3.1 - html5lib - jinja2 - lxml @@ -18,7 +16,6 @@ dependencies: - pytables - python=3.5* - pytz - - s3fs - xarray - xlrd - xlsxwriter @@ -26,6 +23,5 @@ dependencies: # universal - pytest - pytest-xdist - - moto - pip: - python-dateutil==2.5.3 From f70a6dc6a3e50e90c2518207a6546eb14c290f5a Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 23 Apr 2018 06:08:22 -0500 Subject: [PATCH 34/40] remove JOB --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ad49986764a9..eb7a391e0ab66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,32 +34,32 @@ matrix: - os: osx language: generic env: - - JOB="3.5_OSX" ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network" + - ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network" - dist: trusty env: - - JOB="2.7_LOCALE" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true + - ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true addons: apt: packages: - language-pack-zh-hans - dist: trusty env: - - JOB="2.7" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true + - ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true addons: apt: packages: - python-gtk2 - dist: trusty env: - - JOB="3.6" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true + - ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true # In allow_failures - dist: trusty env: - - JOB="3.6_SLOW" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true + - ENV_FILE="ci/travis-36-slow.yaml" SLOW=true # In allow_failures - dist: trusty env: - - JOB="3.6_NUMPY_DEV" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" + - ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" addons: apt: packages: @@ -67,21 +67,21 @@ matrix: # In allow_failures - dist: trusty env: - - JOB="3.6_DOC" ENV_FILE="ci/travis-36-doc.yaml" DOC=true + - ENV_FILE="ci/travis-36-doc.yaml" DOC=true allow_failures: - dist: trusty env: - - JOB="3.6_SLOW" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true + - ENV_FILE="ci/travis-36-slow.yaml" SLOW=true - dist: trusty env: - - JOB="3.6_NUMPY_DEV" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" + - ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" addons: apt: packages: - xsel - dist: trusty env: - - JOB="3.6_DOC" ENV_FILE="ci/travis-36-doc.yaml" DOC=true + - ENV_FILE="ci/travis-36-doc.yaml" DOC=true before_install: - echo "before_install" From bf60ba245d429bf44525aa8c51b0dcabf6a03bad Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 23 Apr 2018 07:45:15 -0500 Subject: [PATCH 35/40] Removed xfails --- pandas/tests/io/parser/test_network.py | 1 - pandas/tests/io/test_parquet.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/pandas/tests/io/parser/test_network.py b/pandas/tests/io/parser/test_network.py index 416535aac3a4c..fdf45f307e953 100644 --- a/pandas/tests/io/parser/test_network.py +++ b/pandas/tests/io/parser/test_network.py @@ -183,7 +183,6 @@ def test_read_csv_handles_boto_s3_object(self, expected = read_csv(tips_file) tm.assert_frame_equal(result, expected) - @pytest.mark.xfail(reason="buggy s3 / moto interaction on CI: gh-20720") def test_read_csv_chunked_download(self, s3_resource, caplog): # 8 MB, S3FS usees 5MB chunks df = DataFrame(np.random.randn(100000, 4), columns=list('abcd')) diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py index 41a1db57c954b..11cbea8ce6331 100644 --- a/pandas/tests/io/test_parquet.py +++ b/pandas/tests/io/test_parquet.py @@ -432,7 +432,6 @@ def test_categorical_unsupported(self, pa_lt_070): df = pd.DataFrame({'a': pd.Categorical(list('abc'))}) self.check_error_on_write(df, pa, NotImplementedError) - @pytest.mark.xfail(reason="buggy s3 / moto interaction on CI: gh-20720") def test_s3_roundtrip(self, df_compat, s3_resource, pa): # GH #19134 check_round_trip(df_compat, pa, @@ -499,7 +498,6 @@ def test_filter_row_groups(self, fp): result = read_parquet(path, fp, filters=[('a', '==', 0)]) assert len(result) == 1 - @pytest.mark.xfail(reason="buggy s3 / moto interaction on CI: gh-20720") def test_s3_roundtrip(self, df_compat, s3_resource, fp): # GH #19134 check_round_trip(df_compat, fp, From d8aa12fd58eb71f739358f185e9627a1b30b5ca8 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 23 Apr 2018 08:10:59 -0500 Subject: [PATCH 36/40] Revert "remove JOB" This reverts commit f70a6dc6a3e50e90c2518207a6546eb14c290f5a. --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb7a391e0ab66..8ad49986764a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,32 +34,32 @@ matrix: - os: osx language: generic env: - - ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network" + - JOB="3.5_OSX" ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network" - dist: trusty env: - - ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true + - JOB="2.7_LOCALE" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true addons: apt: packages: - language-pack-zh-hans - dist: trusty env: - - ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true + - JOB="2.7" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true addons: apt: packages: - python-gtk2 - dist: trusty env: - - ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true + - JOB="3.6" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true # In allow_failures - dist: trusty env: - - ENV_FILE="ci/travis-36-slow.yaml" SLOW=true + - JOB="3.6_SLOW" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true # In allow_failures - dist: trusty env: - - ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" + - JOB="3.6_NUMPY_DEV" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" addons: apt: packages: @@ -67,21 +67,21 @@ matrix: # In allow_failures - dist: trusty env: - - ENV_FILE="ci/travis-36-doc.yaml" DOC=true + - JOB="3.6_DOC" ENV_FILE="ci/travis-36-doc.yaml" DOC=true allow_failures: - dist: trusty env: - - ENV_FILE="ci/travis-36-slow.yaml" SLOW=true + - JOB="3.6_SLOW" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true - dist: trusty env: - - ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" + - JOB="3.6_NUMPY_DEV" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" addons: apt: packages: - xsel - dist: trusty env: - - ENV_FILE="ci/travis-36-doc.yaml" DOC=true + - JOB="3.6_DOC" ENV_FILE="ci/travis-36-doc.yaml" DOC=true before_install: - echo "before_install" From b2e1a5f1c9cde088f7497bfc4949077916f538cd Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 23 Apr 2018 09:30:10 -0500 Subject: [PATCH 37/40] Removed unused environment --- ci/requirements-3.5.build | 6 ------ ci/requirements-3.5.pip | 2 -- ci/requirements-3.5.run | 20 -------------------- ci/requirements-3.5.sh | 11 ----------- 4 files changed, 39 deletions(-) delete mode 100644 ci/requirements-3.5.build delete mode 100644 ci/requirements-3.5.pip delete mode 100644 ci/requirements-3.5.run delete mode 100644 ci/requirements-3.5.sh diff --git a/ci/requirements-3.5.build b/ci/requirements-3.5.build deleted file mode 100644 index f7befe3b31865..0000000000000 --- a/ci/requirements-3.5.build +++ /dev/null @@ -1,6 +0,0 @@ -python=3.5* -python-dateutil -pytz -nomkl -numpy -cython diff --git a/ci/requirements-3.5.pip b/ci/requirements-3.5.pip deleted file mode 100644 index c9565f2173070..0000000000000 --- a/ci/requirements-3.5.pip +++ /dev/null @@ -1,2 +0,0 @@ -xarray==0.9.1 -pandas_gbq diff --git a/ci/requirements-3.5.run b/ci/requirements-3.5.run deleted file mode 100644 index 669cf437f2164..0000000000000 --- a/ci/requirements-3.5.run +++ /dev/null @@ -1,20 +0,0 @@ -pytz -numpy -openpyxl -xlsxwriter -xlrd -xlwt -scipy -numexpr -pytables -html5lib -lxml -matplotlib -jinja2 -bottleneck -sqlalchemy -pymysql -psycopg2 -s3fs -beautifulsoup4 -ipython diff --git a/ci/requirements-3.5.sh b/ci/requirements-3.5.sh deleted file mode 100644 index 529e1e8742722..0000000000000 --- a/ci/requirements-3.5.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -source activate pandas - -echo "install 35" - -# pip install python-dateutil to get latest -conda remove -n pandas python-dateutil --force -pip install python-dateutil - -conda install -n pandas -c conda-forge feather-format pyarrow=0.7.1 From be43dd74ab3fd41de9832b7dd84abfc0b6c8c628 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 23 Apr 2018 13:01:18 -0500 Subject: [PATCH 38/40] Informative JOB tags --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ad49986764a9..4e25380a7d941 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,32 +34,32 @@ matrix: - os: osx language: generic env: - - JOB="3.5_OSX" ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network" + - JOB="3.5, OSX" ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network" - dist: trusty env: - - JOB="2.7_LOCALE" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true + - JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true addons: apt: packages: - language-pack-zh-hans - dist: trusty env: - - JOB="2.7" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true + - JOB="2.7, lint" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true addons: apt: packages: - python-gtk2 - dist: trusty env: - - JOB="3.6" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true + - JOB="3.6, coverage" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true # In allow_failures - dist: trusty env: - - JOB="3.6_SLOW" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true + - JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true # In allow_failures - dist: trusty env: - - JOB="3.6_NUMPY_DEV" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" + - JOB="3.6, NumPy dev" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" addons: apt: packages: @@ -67,21 +67,21 @@ matrix: # In allow_failures - dist: trusty env: - - JOB="3.6_DOC" ENV_FILE="ci/travis-36-doc.yaml" DOC=true + - JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true allow_failures: - dist: trusty env: - - JOB="3.6_SLOW" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true + - JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true - dist: trusty env: - - JOB="3.6_NUMPY_DEV" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" + - JOB="3.6, NumPy dev" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" addons: apt: packages: - xsel - dist: trusty env: - - JOB="3.6_DOC" ENV_FILE="ci/travis-36-doc.yaml" DOC=true + - JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true before_install: - echo "before_install" From cd50adbaa9f92c5f478e2dc52417129dd93b0d04 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 23 Apr 2018 13:46:02 -0500 Subject: [PATCH 39/40] BUG: Fixed NDFrame.transform('abs') Closes https://github.com/pandas-dev/pandas/issues/19760 --- pandas/core/apply.py | 4 +++- pandas/tests/frame/test_apply.py | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pandas/core/apply.py b/pandas/core/apply.py index 8fb74e2e87174..c14e335955c2d 100644 --- a/pandas/core/apply.py +++ b/pandas/core/apply.py @@ -111,7 +111,9 @@ def get_result(self): # string dispatch if isinstance(self.f, compat.string_types): - self.kwds['axis'] = self.axis + if self.f not in {'abs'}: + # Not all transform functions take an axis keyword. + self.kwds['axis'] = self.axis return getattr(self.obj, self.f)(*self.args, **self.kwds) # ufunc diff --git a/pandas/tests/frame/test_apply.py b/pandas/tests/frame/test_apply.py index a057ca0879cac..938f3122c3658 100644 --- a/pandas/tests/frame/test_apply.py +++ b/pandas/tests/frame/test_apply.py @@ -880,6 +880,13 @@ def f(): with np.errstate(all='ignore'): df.agg({'A': ['abs', 'sum'], 'B': ['mean', 'max']}) + def test_transform_abs_name(self): + # https://github.com/pandas-dev/pandas/issues/19760 + df = pd.DataFrame({"A": [-1, 2]}) + result = df.transform('abs') + expected = pd.DataFrame({"A": [1, 2]}) + tm.assert_frame_equal(result, expected) + def test_demo(self): # demonstration tests df = pd.DataFrame({'A': range(5), 'B': 5}) From 8b0e2771ff29255c4e069911a599b9f9b59349d0 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 23 Apr 2018 13:47:27 -0500 Subject: [PATCH 40/40] Revert "BUG: Fixed NDFrame.transform('abs')" This reverts commit cd50adbaa9f92c5f478e2dc52417129dd93b0d04. --- pandas/core/apply.py | 4 +--- pandas/tests/frame/test_apply.py | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pandas/core/apply.py b/pandas/core/apply.py index c14e335955c2d..8fb74e2e87174 100644 --- a/pandas/core/apply.py +++ b/pandas/core/apply.py @@ -111,9 +111,7 @@ def get_result(self): # string dispatch if isinstance(self.f, compat.string_types): - if self.f not in {'abs'}: - # Not all transform functions take an axis keyword. - self.kwds['axis'] = self.axis + self.kwds['axis'] = self.axis return getattr(self.obj, self.f)(*self.args, **self.kwds) # ufunc diff --git a/pandas/tests/frame/test_apply.py b/pandas/tests/frame/test_apply.py index 938f3122c3658..a057ca0879cac 100644 --- a/pandas/tests/frame/test_apply.py +++ b/pandas/tests/frame/test_apply.py @@ -880,13 +880,6 @@ def f(): with np.errstate(all='ignore'): df.agg({'A': ['abs', 'sum'], 'B': ['mean', 'max']}) - def test_transform_abs_name(self): - # https://github.com/pandas-dev/pandas/issues/19760 - df = pd.DataFrame({"A": [-1, 2]}) - result = df.transform('abs') - expected = pd.DataFrame({"A": [1, 2]}) - tm.assert_frame_equal(result, expected) - def test_demo(self): # demonstration tests df = pd.DataFrame({'A': range(5), 'B': 5})