Skip to content
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

Jump to bottom

Revert "Change behaviour of build/binary_has_prefix_files" #3916

Merged
merged 1 commit into from
Apr 1, 2020
Merged

Revert "Change behaviour of build/binary_has_prefix_files" #3916

merged 1 commit into from
Apr 1, 2020

Conversation

jjhelmus
Copy link
Contributor

@jjhelmus jjhelmus commented Mar 26, 2020 •
edited by mbargull
Loading

Fixes #3920
Reverts #3893

@cla-bot cla-bot bot added the cla-signed [bot] added once the contributor has signed the CLA label Mar 26, 2020
@mbargull mbargull requested a review from mingwandroid March 26, 2020 14:30
@jjhelmus jjhelmus changed the title DO NOT MERGE: Revert "Change behaviour of build/binary_has_prefix_files" Revert "Change behaviour of build/binary_has_prefix_files" Mar 26, 2020
@mbargull
Copy link
Member

Updated the PR comment to reference issue gh-3920 with a closing keyword.

@mbargull mbargull mentioned this pull request Mar 31, 2020
Merged
mbargull
mbargull approved these changes Mar 31, 2020
View reviewed changes
Copy link
Member

@mbargull mbargull left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Needs a news entry but other than that, LGTM.

(BTW, in regards to news/changelog:

conda-build/CHANGELOG.txt

Lines 46 to 61 in 89e2c87

2020-03-02 3.18.12:
------------------
* Keep python pinning in hashing if there is a space #3895
* ci launcher supporting python d shebangs on Windows #3894
* Allow build/binary_has_prefix_files to specify a list of files #3893
* Use patchelf to set RPATH by default #3897
Contributors:
-------------
* @isuruf
* @jjhelmus
* @mingwandroid
should be removed.)

@jjhelmus
Copy link
Contributor Author

jjhelmus commented Apr 1, 2020

Thanks for the review @mbargull.
I'm merging this as is. I will address the extra content in the CHANGELOG and add a new entry in a second PR in a little bit.

@jjhelmus jjhelmus merged commit b8d2c32 into master Apr 1, 2020
jjhelmus added a commit to jjhelmus/conda-build that referenced this pull request Apr 1, 2020
@jjhelmus
add news for PR conda#3916
f1e1852
mbargull added a commit to mbargull/conda-build that referenced this pull request Apr 14, 2020
@mbargull
Add noarch regression test for condagh-3916
701fdb2
@mbargull mbargull mentioned this pull request Apr 14, 2020
Open
@jjhelmus jjhelmus deleted the revert-3893-06-CI-Reask-binary-files-with-prefix branch August 27, 2020 20:01
@github-actions
Copy link

Hi there, thank you for your contribution!

This pull request has been automatically locked because it has not had recent activity after being closed.

Please open a new issue or pull request if needed.

Thanks!

@github-actions github-actions bot added the locked [bot] locked due to inactivity label Mar 10, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 10, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mbargull mbargull mbargull approved these changes

@mingwandroid mingwandroid Awaiting requested review from mingwandroid

Assignees
No one assigned
Labels
cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

python packages using setuptools not updating shebang with conda prefix
2 participants
@jjhelmus @mbargull