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

fix linux-ppc64 for linux-ppc64le subdir recognition #9877

Merged
merged 7 commits into from
Apr 27, 2020
Merged

fix linux-ppc64 for linux-ppc64le subdir recognition #9877

merged 7 commits into from
Apr 27, 2020

Conversation

kalefranz
Copy link
Contributor

No description provided.

@kalefranz kalefranz requested a review from a team as a code owner April 24, 2020 05:35
@cla-bot cla-bot bot added the cla-signed [bot] added once the contributor has signed the CLA label Apr 24, 2020
@kalefranz kalefranz changed the title fix linux-ppcle for linux-ppcle64 subdir recognition fix linux-ppc64 for linux-ppc64le subdir recognition Apr 24, 2020
@kalefranz
better split_platform regex
5938fa2 
Signed-off-by: Kale Franz <kfranz@continuum.io>
@kalefranz
PLATFORM_DIRECTORIES should really be named KNOWN_SUBDIRS
63b226c 
Signed-off-by: Kale Franz <kfranz@continuum.io>
@kalefranz
fix flake8
b027842 
Signed-off-by: Kale Franz <kfranz@continuum.io>
@kalefranz
can't use lru_cache() with py27
99f308e 
Signed-off-by: Kale Franz <kfranz@continuum.io>
@kalefranz
fix broken test_conda_pip_interop_conda_editable_package
1f2d601 
Signed-off-by: Kale Franz <kfranz@continuum.io>
@kalefranz
Copy link
Contributor Author

Appveyor py27 test failure is due to failure in building conda's own conda build conda.recipe.

conda.CondaMultiError: post-link script failed for package defaults::m2-base-1.0.0-3
location of failed script: C:\Miniconda\conda-bld\conda_1587924169557\_build_env\Scripts\.m2-base-post-link.bat
==> script messages <==
<None>
==> script output <==
stdout: 
stderr: 
return code: 254
()

@kalefranz kalefranz mentioned this pull request Apr 26, 2020
Merged
kalefranz
kalefranz commented Apr 26, 2020
View reviewed changes
conda/base/constants.py Outdated Show resolved Hide resolved
@kalefranz
remove comment resolved by regex fix
a8ae23b 
Signed-off-by: Kale Franz <kfranz@continuum.io>
@kalefranz kalefranz added this to the 4.8.4 milestone Apr 27, 2020
@kalefranz kalefranz merged commit 13dac97 into conda:master Apr 27, 2020
@kalefranz kalefranz deleted the fix-ppc64le-order branch April 27, 2020 14:37
@github-actions
Copy link

Hi there, thank you for your contribution to Conda!

This pull request has been automatically locked since it has not had recent activity after it was closed.

Please open a new issue or pull request if needed.

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

@cjmartian cjmartian cjmartian approved these changes

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
4.8.4
Development

Successfully merging this pull request may close these issues.
2 participants
@kalefranz @cjmartian