Skip to content

Commit

Permalink
BUG: Add mapping for pyqt for successful package installation (#27645)
Browse files Browse the repository at this point in the history
* Add mapping for pyqt
  • Loading branch information
charlesdong1991 authored and TomAugspurger committed Aug 7, 2019
1 parent 3581073 commit c0ff67a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ Sparse

Build Changes
^^^^^^^^^^^^^
- Fixed pyqt development dependency issue because of different pyqt package name in conda and PyPI (:issue:`26838`)


ExtensionArray
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ html5lib
lxml
openpyxl
pyarrow>=0.9.0
pyqt
pyqt5>=5.9.2
tables>=3.4.2
python-snappy
s3fs
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_pip_deps_from_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


EXCLUDE = {"python=3"}
RENAME = {"pytables": "tables"}
RENAME = {"pytables": "tables", "pyqt": "pyqt5"}


def conda_package_to_pip(package):
Expand Down

0 comments on commit c0ff67a

Please sign in to comment.