From b0db493e43021295f73da18b73b72e70b296d296 Mon Sep 17 00:00:00 2001 From: phofl Date: Sun, 22 Aug 2021 20:20:03 +0200 Subject: [PATCH 1/4] Pin botocore to get ci passing --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index ff833be999fcb..28b55332a42ee 100644 --- a/environment.yml +++ b/environment.yml @@ -54,7 +54,7 @@ dependencies: # testing - boto3 - - botocore>=1.11 + - botocore>=1.11, <1.14.0 - hypothesis>=5.5.3 - moto # mock S3 - flask diff --git a/requirements-dev.txt b/requirements-dev.txt index 86f04ed77c985..9106faddfdac1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -32,7 +32,7 @@ feedparser pyyaml requests boto3 -botocore>=1.11 +botocore>=1.11, <1.14.0 hypothesis>=5.5.3 moto flask From f50619bf0f10db25ace28261267a9d41cd71b1fa Mon Sep 17 00:00:00 2001 From: phofl Date: Sun, 22 Aug 2021 21:15:01 +0200 Subject: [PATCH 2/4] Pin aiobotocore to get ci passing --- environment.yml | 3 ++- requirements-dev.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 28b55332a42ee..7c95428fb0572 100644 --- a/environment.yml +++ b/environment.yml @@ -54,7 +54,7 @@ dependencies: # testing - boto3 - - botocore>=1.11, <1.14.0 + - botocore>=1.11 - hypothesis>=5.5.3 - moto # mock S3 - flask @@ -105,6 +105,7 @@ dependencies: - pytables>=3.6.1 # pandas.read_hdf, DataFrame.to_hdf - s3fs>=0.4.0 # file IO when using 's3://...' path + - aiobotocore<1.4.0 # Remove when s3fs is at 2021.08.0 - fsspec>=0.7.4, <2021.6.0 # for generic remote file operations - gcsfs>=0.6.0 # file IO when using 'gcs://...' path - sqlalchemy # pandas.read_sql, DataFrame.to_sql diff --git a/requirements-dev.txt b/requirements-dev.txt index 9106faddfdac1..acb37f919358a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -32,7 +32,7 @@ feedparser pyyaml requests boto3 -botocore>=1.11, <1.14.0 +botocore>=1.11 hypothesis>=5.5.3 moto flask @@ -69,6 +69,7 @@ pyarrow>=0.17.0 python-snappy tables>=3.6.1 s3fs>=0.4.0 +aiobotocore<1.4.0 fsspec>=0.7.4, <2021.6.0 gcsfs>=0.6.0 sqlalchemy From 97496e178d09b5f52459ead3966891a8abba09cf Mon Sep 17 00:00:00 2001 From: phofl Date: Sun, 22 Aug 2021 22:08:13 +0200 Subject: [PATCH 3/4] Use leq --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 7c95428fb0572..004580435655f 100644 --- a/environment.yml +++ b/environment.yml @@ -105,7 +105,7 @@ dependencies: - pytables>=3.6.1 # pandas.read_hdf, DataFrame.to_hdf - s3fs>=0.4.0 # file IO when using 's3://...' path - - aiobotocore<1.4.0 # Remove when s3fs is at 2021.08.0 + - aiobotocore<=1.3.3 # Remove when s3fs is at 2021.08.0 - fsspec>=0.7.4, <2021.6.0 # for generic remote file operations - gcsfs>=0.6.0 # file IO when using 'gcs://...' path - sqlalchemy # pandas.read_sql, DataFrame.to_sql diff --git a/requirements-dev.txt b/requirements-dev.txt index acb37f919358a..afeb9eed6c02b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -69,7 +69,7 @@ pyarrow>=0.17.0 python-snappy tables>=3.6.1 s3fs>=0.4.0 -aiobotocore<1.4.0 +aiobotocore<=1.3.3 fsspec>=0.7.4, <2021.6.0 gcsfs>=0.6.0 sqlalchemy From c729b0d57b1071a6a19ba94f6476ed827c5f7495 Mon Sep 17 00:00:00 2001 From: phofl Date: Sun, 22 Aug 2021 22:22:56 +0200 Subject: [PATCH 4/4] Pin env files too --- ci/deps/actions-39.yaml | 1 + ci/deps/azure-windows-38.yaml | 1 + ci/deps/azure-windows-39.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index a78fb30019b53..530e095895b77 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -31,6 +31,7 @@ dependencies: - python-dateutil - pytz - s3fs>=0.4.2 + - aiobotocore<=1.3.3 - scipy - sqlalchemy - xlrd diff --git a/ci/deps/azure-windows-38.yaml b/ci/deps/azure-windows-38.yaml index c56496bce7d6c..92ff3ef7675e5 100644 --- a/ci/deps/azure-windows-38.yaml +++ b/ci/deps/azure-windows-38.yaml @@ -30,6 +30,7 @@ dependencies: - python-dateutil - pytz - s3fs>=0.4.0 + - aiobotocore<=1.3.3 - scipy - xlrd - xlsxwriter diff --git a/ci/deps/azure-windows-39.yaml b/ci/deps/azure-windows-39.yaml index c4d376fd2a909..1e0f62e99f0c8 100644 --- a/ci/deps/azure-windows-39.yaml +++ b/ci/deps/azure-windows-39.yaml @@ -32,6 +32,7 @@ dependencies: - python-dateutil - pytz - s3fs>=0.4.2 + - aiobotocore<=1.3.3 - scipy - sqlalchemy - xlrd