From eb7e8a467cda5bdf0d172d36805e892063792e6e Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 14 Jul 2021 12:05:01 -0700 Subject: [PATCH 01/11] Update sdist.yml --- .github/workflows/sdist.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index 64da432257fd1..2e890506073a8 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - 1.3.x pull_request: branches: - master From d348bd2819327333f94884d6a77ec20efd3ef360 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 14 Jul 2021 12:05:48 -0700 Subject: [PATCH 02/11] Update pre-commit.yml --- .github/workflows/pre-commit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 7280da66dc9b9..0609755678d78 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - 1.3.x jobs: pre-commit: From 0c50bc7d5f86c6334b743ee8dd63b799a31ff79f Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 14 Jul 2021 12:06:06 -0700 Subject: [PATCH 03/11] Update posix.yml --- .github/workflows/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 6c83035316481..6b5ac3cd17304 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - 1.3.x pull_request: branches: - master From c32aebf90734495ae08f1f585113506771658464 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 19 Jul 2021 09:50:59 -0700 Subject: [PATCH 04/11] Pin fastparquet --- ci/deps/actions-38-db.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-38-db.yaml b/ci/deps/actions-38-db.yaml index b4495fa6887f4..421eeb7a9c2d0 100644 --- a/ci/deps/actions-38-db.yaml +++ b/ci/deps/actions-38-db.yaml @@ -15,7 +15,7 @@ dependencies: - beautifulsoup4 - botocore>=1.11 - dask - - fastparquet>=0.4.0 + - fastparquet>=0.4.0, < 0.7.0 - fsspec>=0.7.4, <2021.6.0 - gcsfs>=0.6.0 - geopandas From 7e3ed0cbba328f04e3c8fab3caf1a6006562c031 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 19 Jul 2021 09:53:08 -0700 Subject: [PATCH 05/11] Pin more fastparquet --- ci/deps/azure-windows-38.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/azure-windows-38.yaml b/ci/deps/azure-windows-38.yaml index c56496bce7d6c..2863dc82ded32 100644 --- a/ci/deps/azure-windows-38.yaml +++ b/ci/deps/azure-windows-38.yaml @@ -15,7 +15,7 @@ dependencies: # pandas dependencies - blosc - bottleneck - - fastparquet>=0.4.0 + - fastparquet>=0.4.0, <0.7.0 - flask - fsspec>=0.8.0, <2021.6.0 - matplotlib=3.3.2 From d392b7bbf9eeaf4feb1da4e08cfcbcf772c14f74 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 19 Jul 2021 10:41:59 -0700 Subject: [PATCH 06/11] Pin in environment.yml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 9396210da3635..2ec63b2054c1c 100644 --- a/environment.yml +++ b/environment.yml @@ -99,7 +99,7 @@ dependencies: - xlwt - odfpy - - fastparquet>=0.4.0 # pandas.read_parquet, DataFrame.to_parquet + - fastparquet>=0.4.0, fastparquet<0.7.0 # pandas.read_parquet, DataFrame.to_parquet - pyarrow>=0.17.0 # pandas.read_parquet, DataFrame.to_parquet, pandas.read_feather, DataFrame.to_feather - python-snappy # required by pyarrow From a2aae5003d777ab84dd9419ef0bf685a2ad9fb2c Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 19 Jul 2021 10:42:38 -0700 Subject: [PATCH 07/11] Pin in requirements-dev --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3bf9084f55419..dc6fc837c0688 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -64,7 +64,7 @@ xlrd xlsxwriter xlwt odfpy -fastparquet>=0.4.0 +fastparquet>=0.4.0, <0.7.0 pyarrow>=0.17.0 python-snappy tables>=3.6.1 From 9b10292f212836a09cebeae0ae765d60da5bded9 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 19 Jul 2021 11:03:06 -0700 Subject: [PATCH 08/11] Update requirements-dev.txt --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index dc6fc837c0688..b4fceaff46bc3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -64,7 +64,7 @@ xlrd xlsxwriter xlwt odfpy -fastparquet>=0.4.0, <0.7.0 +fastparquet>=0.4.0, fastparquet<0.7.0 pyarrow>=0.17.0 python-snappy tables>=3.6.1 From 3014aa4930e8291da6d2948bad409eea8aed7990 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 19 Jul 2021 11:16:15 -0700 Subject: [PATCH 09/11] Update requirements-dev.txt --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b4fceaff46bc3..dc6fc837c0688 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -64,7 +64,7 @@ xlrd xlsxwriter xlwt odfpy -fastparquet>=0.4.0, fastparquet<0.7.0 +fastparquet>=0.4.0, <0.7.0 pyarrow>=0.17.0 python-snappy tables>=3.6.1 From 51e555cc0980c9f40aecb9565cfc98b20ab8410c Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 20 Jul 2021 08:17:38 -0700 Subject: [PATCH 10/11] Update requirements-dev.txt --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index dc6fc837c0688..b4fceaff46bc3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -64,7 +64,7 @@ xlrd xlsxwriter xlwt odfpy -fastparquet>=0.4.0, <0.7.0 +fastparquet>=0.4.0, fastparquet<0.7.0 pyarrow>=0.17.0 python-snappy tables>=3.6.1 From 7e5b8c4633557221b677cabc9695e3f6df2d25b6 Mon Sep 17 00:00:00 2001 From: Thomas Li Date: Tue, 20 Jul 2021 08:48:00 -0700 Subject: [PATCH 11/11] Actually fix --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 2ec63b2054c1c..cfcb14d2cf7a9 100644 --- a/environment.yml +++ b/environment.yml @@ -99,7 +99,7 @@ dependencies: - xlwt - odfpy - - fastparquet>=0.4.0, fastparquet<0.7.0 # pandas.read_parquet, DataFrame.to_parquet + - fastparquet>=0.4.0, <0.7.0 # pandas.read_parquet, DataFrame.to_parquet - pyarrow>=0.17.0 # pandas.read_parquet, DataFrame.to_parquet, pandas.read_feather, DataFrame.to_feather - python-snappy # required by pyarrow diff --git a/requirements-dev.txt b/requirements-dev.txt index b4fceaff46bc3..dc6fc837c0688 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -64,7 +64,7 @@ xlrd xlsxwriter xlwt odfpy -fastparquet>=0.4.0, fastparquet<0.7.0 +fastparquet>=0.4.0, <0.7.0 pyarrow>=0.17.0 python-snappy tables>=3.6.1