From 451aa9226d6de594a960d699236236c7885b1042 Mon Sep 17 00:00:00 2001 From: Antony Milne Date: Thu, 27 Jan 2022 11:20:14 +0000 Subject: [PATCH 1/3] Pin upper pandas version requirement Signed-off-by: Antony Milne --- features/windows_reqs.txt | 2 +- setup.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/features/windows_reqs.txt b/features/windows_reqs.txt index 587d9ff03c..7adcdf1951 100644 --- a/features/windows_reqs.txt +++ b/features/windows_reqs.txt @@ -2,7 +2,7 @@ # e2e tests on Windows are slow but we don't need to install # everything, so just this subset will be enough for CI behave==1.2.6 -pandas>=0.24.0, <1.0.4 +pandas>=0.24, <1.4 psutil==5.6.7 requests~=2.20 toml~=0.10.1 diff --git a/setup.py b/setup.py index 6eb737b09d..6cafa78331 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ here = path.abspath(path.dirname(__file__)) -PANDAS = "pandas>=0.24" +PANDAS = "pandas>=0.24, <1.4" SPARK = "pyspark>=2.2, <4.0" HDFS = "hdfs>=2.5.8, <3.0" S3FS = "s3fs>=0.3.0, <0.5" @@ -77,8 +77,11 @@ def _collect_requirements(requires): "pandas.FeatherDataSet": [PANDAS], "pandas.GBQTableDataSet": [PANDAS, "pandas-gbq>=0.12.0, <1.0"], "pandas.GBQQueryDataSet": [PANDAS, "pandas-gbq>=0.12.0, <1.0"], - "pandas.HDFDataSet": [PANDAS, "tables~=3.6.0; platform_system == 'Windows'", - "tables~=3.6; platform_system != 'Windows'"], + "pandas.HDFDataSet": [ + PANDAS, + "tables~=3.6.0; platform_system == 'Windows'", + "tables~=3.6; platform_system != 'Windows'", + ], "pandas.JSONDataSet": [PANDAS], "pandas.ParquetDataSet": [PANDAS, "pyarrow>=1.0, <7.0"], "pandas.SQLTableDataSet": [PANDAS, "SQLAlchemy~=1.2"], From 3d321937aa4a9801b13bb704ce93cd593d962302 Mon Sep 17 00:00:00 2001 From: Antony Milne Date: Thu, 27 Jan 2022 11:40:28 +0000 Subject: [PATCH 2/3] Alter test requirements Signed-off-by: Antony Milne --- RELEASE.md | 5 +++-- test_requirements.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 669176a2a1..5915bcf74e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -4,8 +4,9 @@ * `pipeline` now accepts `tags` and a collection of `Node`s and/or `Pipeline`s rather than just a single `Pipeline` object. `pipeline` should be used in preference to `Pipeline` when creating a Kedro pipeline. ## Bug fixes and other changes -* Added tutorial documentation for experiment tracking in Kedro docs (`03_tutorial/07_set_up_experiment_tracking.md`). -* Added Plotly documentation in Kedro docs (`03_tutorial/06_visualise_pipeline.md`). +* Added tutorial documentation for experiment tracking (`03_tutorial/07_set_up_experiment_tracking.md`). +* Added Plotly dataset documentation (`03_tutorial/06_visualise_pipeline.md`). +* Added the upper limit `pandas<1.4` to maintain compatibility with `xlrd~=1.0`. ## Minor breaking changes to the API diff --git a/test_requirements.txt b/test_requirements.txt index 8c7337789a..bccb45f75e 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -27,7 +27,7 @@ nbformat~=4.4 networkx~=2.4 openpyxl>=3.0.3, <4.0 pandas-gbq>=0.12.0, <1.0 -pandas>=0.24.0 # Needs to be at least 0.24.0 to make use of `pandas.DataFrame.to_numpy` (recommended alternative to `pandas.DataFrame.values`) +pandas>=0.24, <1.4 # Needs to be at least 0.24.0 to make use of `pandas.DataFrame.to_numpy` (recommended alternative to `pandas.DataFrame.values`); needs to be less than 1.4 for compatiblity with xlrd~=1.0. Pillow~=8.0 plotly>=4.8.0, <6.0 pre-commit~=1.17 From cbf211e2cbe99087e64006207215451982eb4e16 Mon Sep 17 00:00:00 2001 From: Antony Milne Date: Thu, 27 Jan 2022 15:24:22 +0000 Subject: [PATCH 3/3] Change windows orb Signed-off-by: Antony Milne --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 501020b0de..0a2b683807 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ parameters: default: false orbs: - win: circleci/windows@2.2.0 + win: circleci/windows@2.4.1 # No windows executor is listed here since windows builds use win/default and modify # the Python version through the conda environment.