From 0390a31d4fa3223eb02a60cdc7a8d47ff67318e0 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 31 May 2019 09:44:14 -0500 Subject: [PATCH 01/12] try conda canary --- ci/azure/windows.yml | 2 +- ci/setup_env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index eeb03a0b28130..55e593c3cd290 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -19,7 +19,7 @@ jobs: steps: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" displayName: Add conda to PATH - - script: conda update -q -n base conda + - script: conda install -c conda-canary conda displayName: Update conda - script: conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml displayName: Create anaconda environment diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 8f73bb228e2bd..e967205c22a71 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -51,7 +51,7 @@ echo echo "update conda" conda config --set ssl_verify false conda config --set quiet true --set always_yes true --set changeps1 false -conda update -n base conda +conda install -c conda-canary conda echo "conda info -a" conda info -a From be4d0afc7cce5c0bb7f4584dfecd445d676edac6 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 31 May 2019 10:01:15 -0500 Subject: [PATCH 02/12] (test) try adding back free for compat --- ci/deps/azure-35-compat.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index d0a48bd3f8b27..ed400174bc60f 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -2,6 +2,7 @@ name: pandas-dev channels: - defaults - conda-forge + - free dependencies: - beautifulsoup4=4.4.1 - bottleneck=1.2.1 From 418351d2e96855daaaa73dd73971ba0829a74c96 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 31 May 2019 10:48:30 -0500 Subject: [PATCH 03/12] call activate --- ci/azure/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 55e593c3cd290..b4bdf065fa203 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -21,7 +21,9 @@ jobs: displayName: Add conda to PATH - script: conda install -c conda-canary conda displayName: Update conda - - script: conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml + - script: | + call activate + conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml displayName: Create anaconda environment - script: | call activate pandas-dev From ef73b53c3b2302ed360c3d3d9471f220fd997879 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 13 Jun 2019 15:01:11 -0500 Subject: [PATCH 04/12] remove free --- ci/deps/azure-35-compat.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index 47d559de8bfc0..c783670e78d52 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -2,7 +2,6 @@ name: pandas-dev channels: - defaults - conda-forge - - free dependencies: - beautifulsoup4=4.6.0 - bottleneck=1.2.1 From 6b548c3f2aaeb0473c1ba3f7d9615495ad2e2523 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 13 Jun 2019 15:01:59 -0500 Subject: [PATCH 05/12] activate --- ci/azure/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index ed55b38e52baa..ddf0c6de8e224 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -21,7 +21,9 @@ jobs: displayName: 'Add conda to PATH' - script: conda install -c conda-canary conda displayName: Update conda - - script: conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml + - script: | + call activate + conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml displayName: 'Create anaconda environment' - script: | call activate pandas-dev From 5a13d14d9b47e58df5c173a7b3d61ca3a8cdc95c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 13 Jun 2019 16:38:55 -0500 Subject: [PATCH 06/12] Bump pymysql --- ci/deps/travis-36-locale.yaml | 2 +- doc/source/install.rst | 2 +- doc/source/whatsnew/v0.25.0.rst | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index badf4e6932da8..bb38a6e09b5e6 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -20,7 +20,7 @@ dependencies: - openpyxl - pandas-gbq=0.8.0 - psycopg2=2.6.2 - - pymysql=0.7.9 + - pymysql=0.7.11 - pytables - python-dateutil # cannot go past python=3.6.6 for matplotlib=3.0.0 due to diff --git a/doc/source/install.rst b/doc/source/install.rst index db31d75e3013e..58f2623b8ec11 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -284,7 +284,7 @@ openpyxl 2.4.8 Reading / writing for xlsx files pandas-gbq 0.8.0 Google Big Query access psycopg2 PostgreSQL engine for sqlalchemy pyarrow 0.9.0 Parquet and feather reading / writing -pymysql MySQL engine for sqlalchemy +pymysql 0.7.11 MySQL engine for sqlalchemy qtpy Clipboard I/O s3fs 0.0.8 Amazon S3 access xarray 0.8.2 pandas-like API for N-dimensional data diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst index c1d4797af9145..ece72a4656c57 100644 --- a/doc/source/whatsnew/v0.25.0.rst +++ b/doc/source/whatsnew/v0.25.0.rst @@ -427,6 +427,8 @@ Optional libraries below the lowest tested version may still work, but are not c +-----------------+-----------------+ | pyarrow | 0.9.0 | +-----------------+-----------------+ +| pymysql | 0.7.1 | ++-----------------+-----------------+ | pytables | 3.4.2 | +-----------------+-----------------+ | scipy | 0.19.0 | From 1ac03a45499b3b23c8f9dfb7040a0f54ab9cacfb Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 14 Jun 2019 06:28:19 -0500 Subject: [PATCH 07/12] Python and MPL --- ci/deps/travis-36-locale.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index bb38a6e09b5e6..f9a994e5144ff 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -13,7 +13,7 @@ dependencies: - ipython - jinja2 - lxml=3.7.0 - - matplotlib=3.0.0 + - matplotlib=3.0.2 - nomkl - numexpr - numpy @@ -25,7 +25,7 @@ dependencies: - python-dateutil # 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 + - python=3.6.* - pytz - s3fs=0.0.8 - scipy From deea532ed03357e140a2370a6648ed1ead6a1398 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 17 Jun 2019 14:21:51 -0500 Subject: [PATCH 08/12] Bump lxml --- ci/deps/travis-36-locale.yaml | 4 ++-- doc/source/install.rst | 2 +- doc/source/whatsnew/v0.25.0.rst | 2 ++ pandas/compat/_optional.py | 1 + pandas/io/html.py | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index f9a994e5144ff..1d758e1024879 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -12,8 +12,8 @@ dependencies: - html5lib - ipython - jinja2 - - lxml=3.7.0 - - matplotlib=3.0.2 + - lxml=3.8.0 + - matplotlib=3.0.* - nomkl - numexpr - numpy diff --git a/doc/source/install.rst b/doc/source/install.rst index 0c64ee1805735..5b07240632707 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -278,7 +278,7 @@ blosc Compression for msgpack fastparquet 0.2.1 Parquet reading / writing gcsfs 0.1.0 Google Cloud Storage access html5lib HTML parser for read_html (see :ref:`note `) -lxml HTML parser for read_html (see :ref:`note `) +lxml 3.8.0 HTML parser for read_html (see :ref:`note `) matplotlib 2.2.2 Visualization openpyxl 2.4.8 Reading / writing for xlsx files pandas-gbq 0.8.0 Google Big Query access diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst index 74561e2e4309c..9b9c9291c482b 100644 --- a/doc/source/whatsnew/v0.25.0.rst +++ b/doc/source/whatsnew/v0.25.0.rst @@ -422,6 +422,8 @@ Optional libraries below the lowest tested version may still work, but are not c +-----------------+-----------------+ | fastparquet | 0.2.1 | +-----------------+-----------------+ +| lxml | 3.8.0 | ++-----------------+-----------------+ | matplotlib | 2.2.2 | +-----------------+-----------------+ | openpyxl | 2.4.8 | diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index 4a7b8c4e88649..04c1d884c951e 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -10,6 +10,7 @@ "bottleneck": "1.2.1", "fastparquet": "0.2.1", "gcsfs": "0.1.0", + "lxml.etree": "3.8.0", "matplotlib": "2.2.2", "numexpr": "2.6.2", "openpyxl": "2.4.8", diff --git a/pandas/io/html.py b/pandas/io/html.py index 2e2327a35f2c7..15b9d25f6be6c 100644 --- a/pandas/io/html.py +++ b/pandas/io/html.py @@ -40,7 +40,7 @@ def _importers(): on_version="ignore") _HAS_BS4 = bs4 is not None - lxml = import_optional_dependency("lxml", raise_on_missing=False, + lxml = import_optional_dependency("lxml.etree", raise_on_missing=False, on_version="ignore") _HAS_LXML = lxml is not None From e5a8312144b0738a2f00337a81ea19957b7abc66 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 24 Jun 2019 11:22:10 -0500 Subject: [PATCH 09/12] bump gcsfs --- ci/deps/travis-36-locale.yaml | 2 +- doc/source/install.rst | 2 +- pandas/compat/_optional.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 1d758e1024879..2bf7736dc930a 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -8,7 +8,7 @@ dependencies: - python-blosc - cython>=0.28.2 - fastparquet=0.2.1 - - gcsfs=0.1.0 + - gcsfs=0.2.2 - html5lib - ipython - jinja2 diff --git a/doc/source/install.rst b/doc/source/install.rst index c415982dde62a..013a27c980e97 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -276,7 +276,7 @@ SciPy 0.19.0 Miscellaneous statistical functions XLsxWriter 0.9.8 Excel writing blosc Compression for msgpack fastparquet 0.2.1 Parquet reading / writing -gcsfs 0.1.0 Google Cloud Storage access +gcsfs 0.2.2 Google Cloud Storage access html5lib HTML parser for read_html (see :ref:`note `) lxml 3.8.0 HTML parser for read_html (see :ref:`note `) matplotlib 2.2.2 Visualization diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index a5004801edd2e..31746dc3d6c16 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -9,7 +9,7 @@ "bs4": "4.6.0", "bottleneck": "1.2.1", "fastparquet": "0.2.1", - "gcsfs": "0.1.0", + "gcsfs": "0.2.2", "lxml.etree": "3.8.0", "matplotlib": "2.2.2", "numexpr": "2.6.2", From c758704da0bb2cd098b28d26d5b8529beb46bacb Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 24 Jun 2019 13:47:03 -0500 Subject: [PATCH 10/12] cleanup --- ci/deps/travis-36-locale.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 2bf7736dc930a..75e3348adab7c 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -23,8 +23,6 @@ dependencies: - pymysql=0.7.11 - pytables - python-dateutil - # cannot go past python=3.6.6 for matplotlib=3.0.0 due to - # https://github.com/matplotlib/matplotlib/issues/12626 - python=3.6.* - pytz - s3fs=0.0.8 From ccade79ce8248f89ad45e4065c4266f5be708269 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 24 Jun 2019 13:47:48 -0500 Subject: [PATCH 11/12] debug --- ci/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index e967205c22a71..f586f5b0d8e8f 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -92,7 +92,7 @@ conda remove --all -q -y -n pandas-dev echo echo "conda env create -q --file=${ENV_FILE}" -time conda env create -q --file="${ENV_FILE}" +time conda env create -v --file="${ENV_FILE}" echo "activate pandas-dev" source activate pandas-dev From 869dab6aaa8770773c9698a49c3014f9812425d3 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 25 Jun 2019 11:36:00 -0500 Subject: [PATCH 12/12] update gcsfs; remove canary --- ci/azure/windows.yml | 2 +- ci/setup_env.sh | 4 ++-- doc/source/whatsnew/v0.25.0.rst | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index ddf0c6de8e224..20cad1bb4af96 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -19,7 +19,7 @@ jobs: steps: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" displayName: 'Add conda to PATH' - - script: conda install -c conda-canary conda + - script: conda update -q -n base conda displayName: Update conda - script: | call activate diff --git a/ci/setup_env.sh b/ci/setup_env.sh index f586f5b0d8e8f..8f73bb228e2bd 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -51,7 +51,7 @@ echo echo "update conda" conda config --set ssl_verify false conda config --set quiet true --set always_yes true --set changeps1 false -conda install -c conda-canary conda +conda update -n base conda echo "conda info -a" conda info -a @@ -92,7 +92,7 @@ conda remove --all -q -y -n pandas-dev echo echo "conda env create -q --file=${ENV_FILE}" -time conda env create -v --file="${ENV_FILE}" +time conda env create -q --file="${ENV_FILE}" echo "activate pandas-dev" source activate pandas-dev diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst index a93627496111a..18a3785867714 100644 --- a/doc/source/whatsnew/v0.25.0.rst +++ b/doc/source/whatsnew/v0.25.0.rst @@ -455,6 +455,8 @@ Optional libraries below the lowest tested version may still work, but are not c +-----------------+-----------------+ | fastparquet | 0.2.1 | +-----------------+-----------------+ +| gcsfs | 0.2.2 | ++-----------------+-----------------+ | lxml | 3.8.0 | +-----------------+-----------------+ | matplotlib | 2.2.2 |