From 008e5d4b414a493fcf904af7100ca9d497141118 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Fri, 26 Oct 2018 14:54:22 +0100 Subject: [PATCH 1/3] unpin openpyxl --- ci/azure-36-locale_slow.yaml | 2 +- ci/azure-37-locale.yaml | 2 +- ci/azure-macos-35.yaml | 2 +- ci/azure-windows-36.yaml | 2 +- ci/circle-36-locale.yaml | 2 +- ci/requirements-optional-conda.txt | 2 +- ci/requirements-optional-pip.txt | 2 +- ci/travis-36-doc.yaml | 2 +- ci/travis-36-slow.yaml | 2 +- ci/travis-36.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/azure-36-locale_slow.yaml b/ci/azure-36-locale_slow.yaml index 14b23dd6f3e4c..7e40bd1a9979e 100644 --- a/ci/azure-36-locale_slow.yaml +++ b/ci/azure-36-locale_slow.yaml @@ -14,7 +14,7 @@ dependencies: - nomkl - numexpr - numpy - - openpyxl=2.5.5 + - openpyxl - psycopg2 - pymysql - pytables diff --git a/ci/azure-37-locale.yaml b/ci/azure-37-locale.yaml index ef97b85406709..59c8818eaef1e 100644 --- a/ci/azure-37-locale.yaml +++ b/ci/azure-37-locale.yaml @@ -13,7 +13,7 @@ dependencies: - nomkl - numexpr - numpy - - openpyxl=2.5.5 + - openpyxl - psycopg2 - pymysql - pytables diff --git a/ci/azure-macos-35.yaml b/ci/azure-macos-35.yaml index 6ccdc79d11b27..065deb914dae6 100644 --- a/ci/azure-macos-35.yaml +++ b/ci/azure-macos-35.yaml @@ -12,7 +12,7 @@ dependencies: - nomkl - numexpr - numpy=1.12.0 - - openpyxl=2.5.5 + - openpyxl - pytables - python=3.5* - pytz diff --git a/ci/azure-windows-36.yaml b/ci/azure-windows-36.yaml index d03a6cbbd662c..979443661f99b 100644 --- a/ci/azure-windows-36.yaml +++ b/ci/azure-windows-36.yaml @@ -11,7 +11,7 @@ dependencies: - matplotlib - numexpr - numpy=1.14* - - openpyxl=2.5.5 + - openpyxl - parquet-cpp - pyarrow - pytables diff --git a/ci/circle-36-locale.yaml b/ci/circle-36-locale.yaml index ef97b85406709..59c8818eaef1e 100644 --- a/ci/circle-36-locale.yaml +++ b/ci/circle-36-locale.yaml @@ -13,7 +13,7 @@ dependencies: - nomkl - numexpr - numpy - - openpyxl=2.5.5 + - openpyxl - psycopg2 - pymysql - pytables diff --git a/ci/requirements-optional-conda.txt b/ci/requirements-optional-conda.txt index e9afd7a551b6e..04abfede67163 100644 --- a/ci/requirements-optional-conda.txt +++ b/ci/requirements-optional-conda.txt @@ -12,7 +12,7 @@ lxml matplotlib>=2.0.0 nbsphinx numexpr>=2.6.1 -openpyxl=2.5.5 +openpyxl pyarrow pymysql pytables>=3.4.2 diff --git a/ci/requirements-optional-pip.txt b/ci/requirements-optional-pip.txt index ebe0c4ca88ee6..0153bdb6edf04 100644 --- a/ci/requirements-optional-pip.txt +++ b/ci/requirements-optional-pip.txt @@ -14,7 +14,7 @@ lxml matplotlib>=2.0.0 nbsphinx numexpr>=2.6.1 -openpyxl==2.5.5 +openpyxl pyarrow pymysql tables diff --git a/ci/travis-36-doc.yaml b/ci/travis-36-doc.yaml index 8353659e7b9a9..f1f64546374af 100644 --- a/ci/travis-36-doc.yaml +++ b/ci/travis-36-doc.yaml @@ -22,7 +22,7 @@ dependencies: - notebook - numexpr - numpy=1.13* - - openpyxl=2.5.5 + - openpyxl - pandoc - pyqt - pytables diff --git a/ci/travis-36-slow.yaml b/ci/travis-36-slow.yaml index 1a7bc53e1b74b..3157ecac3a902 100644 --- a/ci/travis-36-slow.yaml +++ b/ci/travis-36-slow.yaml @@ -10,7 +10,7 @@ dependencies: - matplotlib - numexpr - numpy - - openpyxl=2.5.5 + - openpyxl - patsy - psycopg2 - pymysql diff --git a/ci/travis-36.yaml b/ci/travis-36.yaml index 7aa27beacf976..257f830ec6c48 100644 --- a/ci/travis-36.yaml +++ b/ci/travis-36.yaml @@ -21,7 +21,7 @@ dependencies: - nomkl - numexpr - numpy - - openpyxl=2.5.5 + - openpyxl - psycopg2 - pyarrow - pymysql From 435bfeec9a4549695a21abe9d0e800d08a1e6eb3 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Fri, 26 Oct 2018 14:58:09 +0100 Subject: [PATCH 2/3] unpin openpyxl python2.7 builds --- ci/azure-27-compat.yaml | 2 +- ci/azure-windows-27.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure-27-compat.yaml b/ci/azure-27-compat.yaml index 5b726304cf414..4f5ace0c15fc8 100644 --- a/ci/azure-27-compat.yaml +++ b/ci/azure-27-compat.yaml @@ -8,7 +8,7 @@ dependencies: - jinja2=2.8 - numexpr=2.6.1 - numpy=1.12.0 - - openpyxl=2.5.5 + - openpyxl - psycopg2 - pytables=3.4.2 - python-dateutil=2.5.0 diff --git a/ci/azure-windows-27.yaml b/ci/azure-windows-27.yaml index d48a9ba986a93..dc68129a5e6d3 100644 --- a/ci/azure-windows-27.yaml +++ b/ci/azure-windows-27.yaml @@ -13,7 +13,7 @@ dependencies: - matplotlib=2.0.1 - numexpr - numpy=1.12* - - openpyxl=2.5.5 + - openpyxl - pytables - python=2.7.* - pytz From bb0e9ce893fc4af5bd99f9f0adf7b317385360c8 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Sun, 28 Oct 2018 17:44:37 +0000 Subject: [PATCH 3/3] leave 27 azure openpyxl pin --- ci/azure-27-compat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure-27-compat.yaml b/ci/azure-27-compat.yaml index 4f5ace0c15fc8..5b726304cf414 100644 --- a/ci/azure-27-compat.yaml +++ b/ci/azure-27-compat.yaml @@ -8,7 +8,7 @@ dependencies: - jinja2=2.8 - numexpr=2.6.1 - numpy=1.12.0 - - openpyxl + - openpyxl=2.5.5 - psycopg2 - pytables=3.4.2 - python-dateutil=2.5.0