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

Split pypi and conda solve steps #601

Merged
merged 12 commits into from
Jan 4, 2024

Conversation

tdejager
Copy link
Contributor

@tdejager tdejager commented Jan 1, 2024

Did a large refactor that does two main things:

  • Split the solve, into a conda solve and a pypi solve after. This will make it easier to use the conda environment and python interpreter when using sdist resolution.
  • I changed the get_up_to_date_prefix function so it accepts a no_install flag. This way we can actually use it everywhere instead of duplicating a lot of code.

Later on we will need to actually use the interpreter in the sdist resolution step.

PR depends on #589, need to merge that first.

baszalmstra pushed a commit that referenced this pull request Jan 2, 2024
Refactored the pypi environment installation code into it's own module.

#601 depends on this.
src/cli/add.rs Show resolved Hide resolved
src/environment.rs Outdated Show resolved Hide resolved
src/environment.rs Show resolved Hide resolved
src/environment.rs Show resolved Hide resolved
@ruben-arts ruben-arts changed the title Feat/split pypi conda solve Refactor: split pypi and conda solve steps Jan 2, 2024
@ruben-arts ruben-arts changed the title Refactor: split pypi and conda solve steps Split pypi and conda solve steps Jan 2, 2024
@ruben-arts ruben-arts added the 🔃 refactor Specifies PR or Issue is related to a refactor label Jan 2, 2024
@baszalmstra
Copy link
Contributor

Im currently looking at the test failures and merge conflict.

src/lock_file/mod.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@ruben-arts ruben-arts left a comment

Choose a reason for hiding this comment

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

Works for me!

@ruben-arts ruben-arts merged commit 7ab9466 into prefix-dev:main Jan 4, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔃 refactor Specifies PR or Issue is related to a refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants