From 6576f9ba51e216e4976bc2de4f3f8c493fa563a4 Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Mon, 29 Jul 2019 21:18:23 +0200 Subject: [PATCH 01/11] Add mapping for pyqt --- scripts/generate_pip_deps_from_conda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index ac73859b22598..6ae10c2cb07d2 100755 --- a/scripts/generate_pip_deps_from_conda.py +++ b/scripts/generate_pip_deps_from_conda.py @@ -20,7 +20,7 @@ EXCLUDE = {"python=3"} -RENAME = {"pytables": "tables"} +RENAME = {"pytables": "tables", "pyqt": "pyqt5"} def conda_package_to_pip(package): From c49823c87065ac33944998f5cdf53bb38d43a793 Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Mon, 29 Jul 2019 21:46:16 +0200 Subject: [PATCH 02/11] Add whatsnew in 0.25.1 --- doc/source/whatsnew/v0.25.1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v0.25.1.rst b/doc/source/whatsnew/v0.25.1.rst index eb60272246ebb..87b345241bf67 100644 --- a/doc/source/whatsnew/v0.25.1.rst +++ b/doc/source/whatsnew/v0.25.1.rst @@ -157,7 +157,7 @@ ExtensionArray Other ^^^^^ -- +- Add pyqt in mapping dictionary in `generate_pip_deps_from_conda.py` to fix installation failure of pandas (:issue:`26838`) - - From bbeb533605bb7b57cfacfefeba95375e56f8988c Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Mon, 29 Jul 2019 21:47:04 +0200 Subject: [PATCH 03/11] change to rename --- doc/source/whatsnew/v0.25.1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v0.25.1.rst b/doc/source/whatsnew/v0.25.1.rst index 87b345241bf67..34131698d3237 100644 --- a/doc/source/whatsnew/v0.25.1.rst +++ b/doc/source/whatsnew/v0.25.1.rst @@ -157,7 +157,7 @@ ExtensionArray Other ^^^^^ -- Add pyqt in mapping dictionary in `generate_pip_deps_from_conda.py` to fix installation failure of pandas (:issue:`26838`) +- Add pyqt in RENAME dictionary in `generate_pip_deps_from_conda.py` to fix installation failure of pandas (:issue:`26838`) - - From 92a9938a75e62147749cda978ef2bf44d88bde1a Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Tue, 30 Jul 2019 21:08:28 +0200 Subject: [PATCH 04/11] add versiona and run again --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 93e8302b498a0..8a12142467bdc 100644 --- a/environment.yml +++ b/environment.yml @@ -71,7 +71,7 @@ dependencies: - lxml # pandas.read_html - openpyxl # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile - pyarrow>=0.9.0 # pandas.read_paquet, DataFrame.to_parquet, pandas.read_feather, DataFrame.to_feather - - pyqt # pandas.read_clipbobard + - pyqt>=5.13.0 # pandas.read_clipbobard - pytables>=3.4.2 # pandas.read_hdf, DataFrame.to_hdf - python-snappy # required by pyarrow - s3fs # pandas.read_csv... when using 's3://...' path diff --git a/requirements-dev.txt b/requirements-dev.txt index e49ad10bfc99d..efe904037b21e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -45,7 +45,7 @@ html5lib lxml openpyxl pyarrow>=0.9.0 -pyqt +pyqt5>=5.13.0 tables>=3.4.2 python-snappy s3fs From 59d1317a3841bac6e6f7510b3691adfd0a761dbe Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Tue, 30 Jul 2019 21:10:26 +0200 Subject: [PATCH 05/11] Move whatsnew note --- doc/source/whatsnew/v0.25.1.rst | 2 +- doc/source/whatsnew/v1.0.0.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v0.25.1.rst b/doc/source/whatsnew/v0.25.1.rst index 34131698d3237..eb60272246ebb 100644 --- a/doc/source/whatsnew/v0.25.1.rst +++ b/doc/source/whatsnew/v0.25.1.rst @@ -157,7 +157,7 @@ ExtensionArray Other ^^^^^ -- Add pyqt in RENAME dictionary in `generate_pip_deps_from_conda.py` to fix installation failure of pandas (:issue:`26838`) +- - - diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index cc4bab8b9a923..049ea3b9d2c45 100644 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -182,6 +182,7 @@ Sparse Build Changes ^^^^^^^^^^^^^ +- Fixed pyqt development dependency (:issue:`26838`) ExtensionArray From af7868230fff0c4ff9267e00ef29898d990d47ff Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Tue, 30 Jul 2019 21:32:30 +0200 Subject: [PATCH 06/11] Change name in env.yaml --- environment.yml | 2 +- scripts/generate_pip_deps_from_conda.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 8a12142467bdc..f6a9319b36f8a 100644 --- a/environment.yml +++ b/environment.yml @@ -71,7 +71,7 @@ dependencies: - lxml # pandas.read_html - openpyxl # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile - pyarrow>=0.9.0 # pandas.read_paquet, DataFrame.to_parquet, pandas.read_feather, DataFrame.to_feather - - pyqt>=5.13.0 # pandas.read_clipbobard + - pyqt5>=5.13.0 # pandas.read_clipbobard - pytables>=3.4.2 # pandas.read_hdf, DataFrame.to_hdf - python-snappy # required by pyarrow - s3fs # pandas.read_csv... when using 's3://...' path diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index 6ae10c2cb07d2..ac73859b22598 100755 --- a/scripts/generate_pip_deps_from_conda.py +++ b/scripts/generate_pip_deps_from_conda.py @@ -20,7 +20,7 @@ EXCLUDE = {"python=3"} -RENAME = {"pytables": "tables", "pyqt": "pyqt5"} +RENAME = {"pytables": "tables"} def conda_package_to_pip(package): From dab50e7b175f4bb441a2d7480a23bdd963d6b95c Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Tue, 30 Jul 2019 22:03:42 +0200 Subject: [PATCH 07/11] Change env.yaml --- environment.yml | 2 +- requirements-dev.txt | 2 +- scripts/generate_pip_deps_from_conda.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index f6a9319b36f8a..db5054209b6d8 100644 --- a/environment.yml +++ b/environment.yml @@ -71,7 +71,7 @@ dependencies: - lxml # pandas.read_html - openpyxl # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile - pyarrow>=0.9.0 # pandas.read_paquet, DataFrame.to_parquet, pandas.read_feather, DataFrame.to_feather - - pyqt5>=5.13.0 # pandas.read_clipbobard + - pyqt>=5.9.2 # pandas.read_clipbobard - pytables>=3.4.2 # pandas.read_hdf, DataFrame.to_hdf - python-snappy # required by pyarrow - s3fs # pandas.read_csv... when using 's3://...' path diff --git a/requirements-dev.txt b/requirements-dev.txt index efe904037b21e..cf11a3ee28258 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -45,7 +45,7 @@ html5lib lxml openpyxl pyarrow>=0.9.0 -pyqt5>=5.13.0 +pyqt5>=5.9.2 tables>=3.4.2 python-snappy s3fs diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index ac73859b22598..6ae10c2cb07d2 100755 --- a/scripts/generate_pip_deps_from_conda.py +++ b/scripts/generate_pip_deps_from_conda.py @@ -20,7 +20,7 @@ EXCLUDE = {"python=3"} -RENAME = {"pytables": "tables"} +RENAME = {"pytables": "tables", "pyqt": "pyqt5"} def conda_package_to_pip(package): From b37f0ac4a00850553b696f95d6e9271b5f001e5d Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Fri, 2 Aug 2019 10:53:22 +0200 Subject: [PATCH 08/11] Resubmit --- doc/source/whatsnew/v1.0.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index 049ea3b9d2c45..029325f71b571 100644 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -182,7 +182,7 @@ Sparse Build Changes ^^^^^^^^^^^^^ -- Fixed pyqt development dependency (:issue:`26838`) +- Fixed pyqt development dependency issue (:issue:`26838`) ExtensionArray From 6dbe2acc042b65e0e8d0d85d915f692c91735901 Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Mon, 5 Aug 2019 20:32:35 +0200 Subject: [PATCH 09/11] Fix typo --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index db5054209b6d8..6d2cd701c3854 100644 --- a/environment.yml +++ b/environment.yml @@ -71,7 +71,7 @@ dependencies: - lxml # pandas.read_html - openpyxl # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile - pyarrow>=0.9.0 # pandas.read_paquet, DataFrame.to_parquet, pandas.read_feather, DataFrame.to_feather - - pyqt>=5.9.2 # pandas.read_clipbobard + - pyqt>=5.9.2 # pandas.read_clipboard - pytables>=3.4.2 # pandas.read_hdf, DataFrame.to_hdf - python-snappy # required by pyarrow - s3fs # pandas.read_csv... when using 's3://...' path From b25d83b28a83b6bca6f6905b713ffc5e19e72a58 Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Mon, 5 Aug 2019 20:37:16 +0200 Subject: [PATCH 10/11] Rephrase whatsnew note --- doc/source/whatsnew/v1.0.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index 24c96102b074f..38553eb2d2c11 100644 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -186,7 +186,7 @@ Sparse Build Changes ^^^^^^^^^^^^^ -- Fixed pyqt development dependency issue (:issue:`26838`) +- Fixed pyqt development dependency issue due to different pyqt package name in conda and PyPI (:issue:`26838`) ExtensionArray From 29decf9088eb208d4dd963b40d1c3f88a4b58e4b Mon Sep 17 00:00:00 2001 From: charlesdong1991 Date: Tue, 6 Aug 2019 08:41:26 +0200 Subject: [PATCH 11/11] Resubmit PR --- doc/source/whatsnew/v1.0.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index 38553eb2d2c11..06a243bea4b2b 100644 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -186,7 +186,7 @@ Sparse Build Changes ^^^^^^^^^^^^^ -- Fixed pyqt development dependency issue due to different pyqt package name in conda and PyPI (:issue:`26838`) +- Fixed pyqt development dependency issue because of different pyqt package name in conda and PyPI (:issue:`26838`) ExtensionArray