Skip to content

BLD: include dll in package_data on Windows #21321

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 4 commits into from
Jun 8, 2018
Merged

BLD: include dll in package_data on Windows #21321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
712ab77
BLD: static link c++ runtime on Windows
Jun 5, 2018
d9fe49f
revert /MT and include dll in package_data
Jun 6, 2018
e7bc33a
Merge remote-tracking branch 'upstream/master' into windows-dll-bld
Jun 8, 2018
7845eb2
rebase fixup
Jun 8, 2018
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/v0.23.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,4 @@ Bug Fixes
**Other**

- Tab completion on :class:`Index` in IPython no longer outputs deprecation warnings (:issue:`21125`)
- Bug preventing pandas being used on Windows without C++ redistributable installed (:issue:`21106`)
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,10 @@ def pxd(name):
return pjoin('pandas', name + '.pxd')


# args to ignore warnings
if is_platform_windows():
extra_compile_args = []
else:
# args to ignore warnings
extra_compile_args = ['-Wno-unused-function']

lib_depends = lib_depends + ['pandas/_libs/src/numpy_helper.h',
Expand Down Expand Up @@ -733,7 +733,7 @@ def pxd(name):
maintainer=AUTHOR,
version=versioneer.get_version(),
packages=find_packages(include=['pandas', 'pandas.*']),
package_data={'': ['data/*', 'templates/*'],
package_data={'': ['data/*', 'templates/*', '_libs/*.dll'],
'pandas.tests.io': ['data/legacy_hdf/*.h5',
'data/legacy_pickle/*/*.pickle',
'data/legacy_msgpack/*/*.msgpack',
Expand Down