-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Ensure conda does not allow for mixing input file types #14725
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
Conversation
CodSpeed Performance ReportMerging #14725 will not alter performanceComparing Summary
|
a9ea1cf
to
c566564
Compare
c4d320a
to
94cbb6f
Compare
b47a4b7
to
54d0e3f
Compare
pre-commit.ci autofix |
1 similar comment
pre-commit.ci autofix |
@soapy1 I took the liberty to fill in the TODO, so we can continue with conda/conda-planning#15. Do these changes work for you? |
Looks great @jezdez ! Following the bug reproduction steps from the original issue, I get the result:
Where the input files are: env1.txt (explicit file)
env2.txt (regular text file)
I think this is not exactly right. Related issues: |
for more information, see https://pre-commit.ci
23a87fc
to
d029190
Compare
This just needs a news file! |
b964dcb
to
3a7bf33
Compare
Calling out that this PR does not fully fix the issue described in #14684. I can confirm that this PR together with conda/conda-planning#47 does fully resolve the issue. Using the env1.txt and env2.txt files specified in the issue:
|
@soapy1 Makes sense, I think we can merge this separately, and then close the ticket once they landed. |
Ok, I see the concern of @soapy1 and @jjhelmus in #14820 about not merging that, so I have the sense that we'll end up stalling everything to get the environment class refactor in first. This is a traditional "perfect is the enemy of the good" moment, we need to start somewhere and most of the PRs around the environment changes are just snapshots in time until the next release anyways. Remember that we have the 25.5.x release branch in case we need to do patch release in between. |
* Add test to ensure conda does not allow for mixing input filetypes * Validate that input files are of the same type * Add validation to prevent mixing different environment file formats * Improve error handling when mixing environment file types in conda create * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Consolidate environment file validation and test file organization * Delete unneeded files. * Add validation check to conda env command as well. * Simplify environment file type validation by removing unnecessary variable * No need to test for this, since `env create --file` is a singular option * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * remove unused EnvironmentFileTypeMismatchError import in test_create.py * Move get_environment_specifier_name method and add unit tests * Fix linting errors * Fix rebase error * Add news --------- Co-authored-by: Jannis Leidel <jannis@leidel.info> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Description
Refs #14684
Depends on resolving conda/conda-planning#15 and conda/conda-planning#18
Checklist - did you ...
news
directory (using the template) for the next release's release notes?