Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ Sparse

Build Changes
^^^^^^^^^^^^^
- Fixed pyqt development dependency (:issue:`26838`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you be a little more specific here; IOW what would someone reading these notes need to know about this change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, make sense, will change later today! @jreback

Copy link
Contributor Author

@charlesdong1991 charlesdong1991 Aug 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as well as that typo



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_clipbobard
- 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