Skip to content

BUG: Add mapping for pyqt for successful package installation #27645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Aug 7, 2019
Merged

BUG: Add mapping for pyqt for successful package installation #27645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6576f9b
Add mapping for pyqt
charlesdong1991 Jul 29, 2019
c49823c
Add whatsnew in 0.25.1
charlesdong1991 Jul 29, 2019
bbeb533
change to rename
charlesdong1991 Jul 29, 2019
92a9938
add versiona and run again
charlesdong1991 Jul 30, 2019
59d1317
Move whatsnew note
charlesdong1991 Jul 30, 2019
af78682
Change name in env.yaml
charlesdong1991 Jul 30, 2019
dab50e7
Change env.yaml
charlesdong1991 Jul 30, 2019
785cef9
Merge remote-tracking branch 'upstream/master' into charlesdong1991-i…
TomAugspurger Aug 1, 2019
b37f0ac
Resubmit
charlesdong1991 Aug 2, 2019
6dbe2ac
Fix typo
charlesdong1991 Aug 5, 2019
7307758
Merge branch 'issue_26838' of github.com:charlesdong1991/pandas into …
charlesdong1991 Aug 5, 2019
b25d83b
Rephrase whatsnew note
charlesdong1991 Aug 5, 2019
29decf9
Resubmit PR
charlesdong1991 Aug 6, 2019
2c9186e
Merge remote-tracking branch 'upstream/master' into issue_26838
charlesdong1991 Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.0.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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