From 1a43df91e1c9f9c767a4a4340ed5fd92da18900f Mon Sep 17 00:00:00 2001
From: Simon Hawkins <simonjayhawkins@gmail.com>
Date: Thu, 1 Oct 2020 13:06:12 +0100
Subject: [PATCH 1/4] CI: troubleshoot travis ci on 1.1.x

---
 ci/deps/travis-36-cov.yaml    | 2 --
 ci/deps/travis-36-locale.yaml | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml
index c380423c55f19..6071d4dd3b5e5 100644
--- a/ci/deps/travis-36-cov.yaml
+++ b/ci/deps/travis-36-cov.yaml
@@ -1,6 +1,5 @@
 name: pandas-dev
 channels:
-  - defaults
   - conda-forge
 dependencies:
   - python=3.6.*
@@ -15,7 +14,6 @@ dependencies:
   # pandas dependencies
   - beautifulsoup4
   - botocore>=1.11
-  - cython>=0.29.16
   - dask
   - fastparquet>=0.3.2
   - fsspec>=0.7.4
diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml
index 21176054ae0d7..31281ce0aa243 100644
--- a/ci/deps/travis-36-locale.yaml
+++ b/ci/deps/travis-36-locale.yaml
@@ -27,6 +27,7 @@ dependencies:
   - numpy
   - openpyxl
   - pandas-gbq=0.12.0
+  - google-cloud-bigquery==1.21.0
   - psycopg2=2.6.2
   - pyarrow>=0.13.0 # GH #35813
   - pymysql=0.7.11

From 14bfbb91b96d1e4bb0edb1821931e80c650e02b1 Mon Sep 17 00:00:00 2001
From: Simon Hawkins <simonjayhawkins@gmail.com>
Date: Thu, 1 Oct 2020 13:39:20 +0100
Subject: [PATCH 2/4] move python-dateutil from pip section

---
 ci/deps/travis-36-cov.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml
index 6071d4dd3b5e5..d890de7f42619 100644
--- a/ci/deps/travis-36-cov.yaml
+++ b/ci/deps/travis-36-cov.yaml
@@ -32,6 +32,7 @@ dependencies:
   - pyarrow>=0.13.0
   - pymysql
   - pytables
+  - python-dateutil
   - python-snappy
   - pytz
   - s3fs>=0.4.0
@@ -48,5 +49,4 @@ dependencies:
     - brotlipy
     - coverage
     - pandas-datareader
-    - python-dateutil
     - pyxlsb

From 7cc04ca0ce52f8f1ef50bd4962b9982d165cb07b Mon Sep 17 00:00:00 2001
From: Simon Hawkins <simonjayhawkins@gmail.com>
Date: Thu, 1 Oct 2020 14:13:55 +0100
Subject: [PATCH 3/4] revert changes to 36-cov

---
 ci/deps/travis-36-cov.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml
index d890de7f42619..8c8db106af05c 100644
--- a/ci/deps/travis-36-cov.yaml
+++ b/ci/deps/travis-36-cov.yaml
@@ -1,5 +1,6 @@
 name: pandas-dev
 channels:
+  - defaults
   - conda-forge
 dependencies:
   - python=3.6.*
@@ -32,7 +33,6 @@ dependencies:
   - pyarrow>=0.13.0
   - pymysql
   - pytables
-  - python-dateutil
   - python-snappy
   - pytz
   - s3fs>=0.4.0
@@ -49,4 +49,5 @@ dependencies:
     - brotlipy
     - coverage
     - pandas-datareader
+    - python-dateutil
     - pyxlsb

From 3c8a0b241c90b7e31a615d0819aae2e58a510b9b Mon Sep 17 00:00:00 2001
From: Simon Hawkins <simonjayhawkins@gmail.com>
Date: Thu, 1 Oct 2020 17:43:54 +0100
Subject: [PATCH 4/4] CI: troubleshoot UnsatisfiableError in travis-36-cov on
 1.1.x

---
 ci/deps/travis-36-cov.yaml    | 80 +++++++++++++++++------------------
 ci/deps/travis-36-locale.yaml |  1 -
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml
index 8c8db106af05c..296d9c39b5250 100644
--- a/ci/deps/travis-36-cov.yaml
+++ b/ci/deps/travis-36-cov.yaml
@@ -6,48 +6,48 @@ dependencies:
   - python=3.6.*
 
   # tools
-  - cython>=0.29.21
-  - pytest>=5.0.1
-  - pytest-xdist>=1.21
-  - hypothesis>=3.58.0
-  - pytest-cov>=2.10.1  # this is only needed in the coverage build, ref: GH 35737
+  # - cython>=0.29.21
+  # - pytest>=5.0.1
+  # - pytest-xdist>=1.21
+  # - hypothesis>=3.58.0
+  # - pytest-cov>=2.10.1  # this is only needed in the coverage build, ref: GH 35737
 
   # pandas dependencies
-  - beautifulsoup4
-  - botocore>=1.11
-  - dask
-  - fastparquet>=0.3.2
-  - fsspec>=0.7.4
-  - gcsfs>=0.6.0
-  - geopandas
-  - html5lib
-  - matplotlib
-  - moto
+  # - beautifulsoup4
+  # - botocore>=1.11
+  # - dask
+  # - fastparquet>=0.3.2
+  # - fsspec>=0.7.4
+  # - gcsfs>=0.6.0
+  # - geopandas
+  # - html5lib
+  # - matplotlib
+  # - moto
   - nomkl
-  - numexpr
+  # - numexpr
   - numpy=1.15.*
-  - odfpy
-  - openpyxl
-  - pandas-gbq
-  - psycopg2
-  - pyarrow>=0.13.0
-  - pymysql
-  - pytables
-  - python-snappy
-  - pytz
-  - s3fs>=0.4.0
+  # - odfpy
+  # - openpyxl
+  # - pandas-gbq
+  # - psycopg2
+  # - pyarrow>=0.13.0
+  # - pymysql
+  # - pytables
+  # - python-snappy
+  # - pytz
+  # - s3fs>=0.4.0
   - scikit-learn
-  - scipy
-  - sqlalchemy
-  - statsmodels
-  - xarray
-  - xlrd
-  - xlsxwriter
-  - xlwt
-  - pip
-  - pip:
-    - brotlipy
-    - coverage
-    - pandas-datareader
-    - python-dateutil
-    - pyxlsb
+  # - scipy
+  # - sqlalchemy
+  # - statsmodels
+  # - xarray
+  # - xlrd
+  # - xlsxwriter
+  # - xlwt
+  # - pip
+  # - pip:
+  #   - brotlipy
+  #   - coverage
+  #   - pandas-datareader
+  #   - python-dateutil
+  #   - pyxlsb
diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml
index 31281ce0aa243..21176054ae0d7 100644
--- a/ci/deps/travis-36-locale.yaml
+++ b/ci/deps/travis-36-locale.yaml
@@ -27,7 +27,6 @@ dependencies:
   - numpy
   - openpyxl
   - pandas-gbq=0.12.0
-  - google-cloud-bigquery==1.21.0
   - psycopg2=2.6.2
   - pyarrow>=0.13.0 # GH #35813
   - pymysql=0.7.11