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.

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

Add platform validation #94

Merged
merged 9 commits into from
Jun 9, 2021

Conversation

janjagusch
Copy link
Contributor

Closes #93

@@ -59,6 +62,38 @@
CONDA_PKGS_DIRS = None
DEFAULT_PLATFORMS = ["osx-64", "linux-64", "win-64"]

_PLATFORM_MAP = {"osx-64": "darwin", "linux-64": "linux", "win-64": "win"}
Copy link
Contributor Author

@janjagusch janjagusch May 2, 2021

Choose a reason for hiding this comment

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

I wasn't quite sure what other types there are (e.g -32 versions). If you provide me with a complete list of what value platform in the lockfile can take, I can reflect that here.

conda_lock/conda_lock.py Outdated Show resolved Hide resolved
conda_lock/conda_lock.py Outdated Show resolved Hide resolved
@janjagusch janjagusch marked this pull request as ready for review May 2, 2021 08:30
@janjagusch
Copy link
Contributor Author

Will finish this PR this week, sorry for taking so long, @mariusvniekerk. :)

@janjagusch
Copy link
Contributor Author

@mariusvniekerk, I have added the custom validation error. ready for review.

@mariusvniekerk
Copy link
Collaborator

Looks like we need to adjust the cli tests for the install to get macos to pass

@mariusvniekerk
Copy link
Collaborator

@janjagusch I've adjusted the logic used here to make use of the subdir detection used in ensureconda which should work correctly

@janjagusch
Copy link
Contributor Author

@mariusvniekerk, thanks for helping me with this! i didn't know about platform_subdir but it's definitely the better approach here.

the PR looks good to me. is there anything else you want to see before we get this merged?

@mariusvniekerk mariusvniekerk merged commit 272d94c into conda:main Jun 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fail early when platform is incompatible
2 participants