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

notpip is pip, Vendor in pip==22.2.1, standalone pipenv #5199

Merged
merged 1 commit into from
Jul 28, 2022

Conversation

matteius
Copy link
Member

Was branched from and supersedes this PR: #5193
Also supersedes this PR: #5196
which had one failing test that I decided to see if upgrading to the latest pip 22.2 would fix, and it has fixed it locally -- woo-hoo!

Fixes #5188

The issue

This accomplishes the following:

  • rename patched notpip to pip to be clear that its a patched version of pip.
  • Remove the part of the _post_pip_import.patch that overrode the standalone pip to be the user installed pip -- and instead go with the patched import to use our vendor'd pip.
  • Vendor in the next newest version of pip==22.2.1
  • Vendor in latest requirementslib
  • Vendor in latest vistir

This will allow for conversion off of some pip-shims, not needing pip installed to use pipenv (or having conflicting versions), and several bug fixes from the vendored dependencies

@@ -9,7 +9,7 @@
try:
import importlib.metadata as imp_meta
except ImportError:
import pipenv.vendor.importlib_metadata as imp_meta
import importlib_metadata as imp_meta
Copy link
Contributor

Choose a reason for hiding this comment

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

We never fail here with ImportError. But it's still confusing that this was changed.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think I recall pondering about it because import pipenv.vendor.importlib_metadata doesn't exist -- It was confusing to me we would reference a fallabck import that does not exist.

@oz123 oz123 merged commit cd5a968 into main Jul 28, 2022
@oz123 oz123 deleted the vendor-pip-22.2.1-take3 branch July 28, 2022 09:58
jeffwidman added a commit to dependabot/dependabot-core that referenced this pull request Aug 10, 2023
Upstream `pipenv` renamed their internal patched version of `pip` folder
to be called `patch.pip`:
* pypa/pipenv#5199

So this updates our code as well.
jeffwidman added a commit to dependabot/dependabot-core that referenced this pull request Aug 18, 2023
Upstream `pipenv` renamed their internal patched version of `pip` folder
to be called `patch.pip`:
* pypa/pipenv#5199

So this updates our code as well.
jeffwidman added a commit to dependabot/dependabot-core that referenced this pull request Aug 31, 2023
Upstream `pipenv` renamed their internal patched version of `pip` folder
to be called `patch.pip`:
* pypa/pipenv#5199

So this updates our code as well.
jurre pushed a commit to dependabot/dependabot-core that referenced this pull request Sep 22, 2023
Upstream `pipenv` renamed their internal patched version of `pip` folder
to be called `patch.pip`:
* pypa/pipenv#5199

So this updates our code as well.
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.

Vendor in Pip 22.2.x
2 participants