-
Notifications
You must be signed in to change notification settings - Fork 176
Add support for protected conda environments #1058
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
Merged
Merged
Changes from all commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
181519f
Set CONDA_PROTECT_FROZEN_ENVS to 0
Jrice1317 3ec3015
Implement version check for frozen env
Jrice1317 1e59d8f
First attempt at testing
Jrice1317 8150b81
Fix version check
Jrice1317 7540633
Fix test
Jrice1317 c43f6bb
Change source in extra files mapping to use empty json
Jrice1317 bfce427
Only search `extra_files` for frozen file and xfail if version is 25.5.x
Jrice1317 285d8d8
Handle str and dict instances
Jrice1317 5ea8513
Add helper function for version ranges
marcoesters 596f10d
Remove stray comma
marcoesters 5d05eac
Merge pull request #1 from Jrice1317/frozen_fork
Jrice1317 e3b8659
Fix pre-commit errors
Jrice1317 7509f2a
Merge branch 'protected_envs' into conda-standalone-version-helper
marcoesters 023f815
Invert boolean logic for shortcut check
marcoesters 6ff480e
Merge branch 'conda-standalone-version-helper' of github.com:marcoest…
marcoesters f4c092e
Merge pull request #2 from marcoesters/conda-standalone-version-helper
Jrice1317 3255967
Use path for frozen file search
Jrice1317 0a3acff
Add news file
Jrice1317 9196951
Merge branch 'main' of https://github.com/conda/constructor into prot…
Jrice1317 7e758da
Pre-commit fixes
Jrice1317 adc94a4
Apply suggestions from code review
Jrice1317 9265135
Apply suggestions from code review
Jrice1317 c841a22
Fix typo
Jrice1317 60b87bc
Expand test to test base and extra envs
Jrice1317 bee6aaf
Fix pre-commit
Jrice1317 a66bc0c
Merge branch 'main' of https://github.com/conda/constructor into prot…
Jrice1317 98ba9a4
Apply code suggestions
Jrice1317 f58bb03
Apply suggestions from code review
Jrice1317 60cf7ef
Merge branch 'main' into protected_envs
jaimergp 1e1efdf
Merge branch 'main' into protected_envs
marcoesters d40f731
Merge branch 'main' into protected_envs
marcoesters 5bfd549
Update tests/test_examples.py
marcoesters dc496d5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 630d022
Swap test_frozen_environment with test_regressions
marcoesters 289cd07
Revert "Update tests/test_examples.py"
marcoesters 84d9326
Remove installation directory after sh installations
marcoesters 1e0b0b0
Add comment to explain finalizer
marcoesters File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # yaml-language-server: $schema=../../constructor/data/construct.schema.json | ||
| "$schema": "../../constructor/data/construct.schema.json" | ||
|
|
||
| name: ProtectedBaseEnv | ||
| version: X | ||
| installer_type: all | ||
|
|
||
| channels: | ||
| - defaults | ||
|
|
||
| specs: | ||
| - python | ||
| - conda | ||
|
|
||
| extra_envs: | ||
| default: | ||
| specs: | ||
| - python | ||
| - pip | ||
| - conda | ||
|
|
||
| extra_files: | ||
| - frozen.json: conda-meta/frozen | ||
Jrice1317 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| - frozen.json: envs/default/conda-meta/frozen | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| ### Enhancements | ||
|
|
||
| * Add support for installing [protected conda environments](https://conda.org/learn/ceps/cep-0022#specification). (#1058) | ||
|
|
||
| ### Bug fixes | ||
|
|
||
| * <news item> | ||
|
|
||
| ### Deprecations | ||
|
|
||
| * <news item> | ||
|
|
||
| ### Docs | ||
|
|
||
| * <news item> | ||
|
|
||
| ### Other | ||
|
|
||
| * <news item> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.