Skip to content

Conversation

chris-b1
Copy link
Contributor

@chris-b1 chris-b1 commented Apr 2, 2020

Will also make a PR in https://github.com/MacPython/pandas-wheels to add the DLLs to the wheel packaging script

@WillAyd
Copy link
Member

WillAyd commented Apr 2, 2020

Should we explicitly include the files we want? Just wondering if there's any licensing risk to recursively bundling dlls

@chris-b1
Copy link
Contributor Author

chris-b1 commented Apr 2, 2020

Fair question - whole thing is a bit clunky - we will still specify the specific files in wheel building script, so no risk for now.
https://github.com/MacPython/pandas-wheels/pull/82/files#diff-c57957756c5cc094d7bb705d01a62868R74

@jreback
Copy link
Contributor

jreback commented Apr 3, 2020

Will also make a PR in https://github.com/MacPython/pandas-wheels to add the DLLs to the wheel packaging script

I believe we are using azure to build and NOT the original MacPython repo.

@jreback jreback added Build Library building on various platforms Windows Windows OS labels Apr 3, 2020
@jreback
Copy link
Contributor

jreback commented Apr 3, 2020

Should we explicitly include the files we want? Just wondering if there's any licensing risk to recursively bundling dlls

NO, this is much easier.

@jreback
Copy link
Contributor

jreback commented Apr 3, 2020

@chris-b1 can you add a bug fix note in Other section (for 1.1). whether we backport is a different issue (we might not be doing a 1.0.4)

@jreback jreback added this to the 1.1 milestone Apr 3, 2020
@TomAugspurger
Copy link
Contributor

I believe we are using azure to build and NOT the original MacPython repo.

The azure stuff is running in the same MacPython repo.

@jreback
Copy link
Contributor

jreback commented Apr 3, 2020

I believe we are using azure to build and NOT the original MacPython repo.

The azure stuff is running in the same MacPython repo.

oh my mistake, I thought we were now generating wheels on the pandas runs? guess not

@TomAugspurger
Copy link
Contributor

CI is passing here. Is this good to go?

@chris-b1
Copy link
Contributor Author

chris-b1 commented Apr 8, 2020 via email

@jreback jreback merged commit aa8e869 into pandas-dev:master Apr 10, 2020
@jreback
Copy link
Contributor

jreback commented Apr 10, 2020

we might need a what's new (esp if we backport to 1.0.4), can you do a followon (stick in 1.1 for now).

@simonjayhawkins
Copy link
Member

@meeseeksdev backport to 1.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented May 5, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 aa8e869d76878f07dff065f947c99b5663342087
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #33246: BLD: recursive inclusion of DLLs in package data'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-33246-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #33246 on branch 1.0.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Build Library building on various platforms Windows Windows OS

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants