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

Vendor in pip==22.2, rename notpip -> pip and exclusively use vendored pip #5196

Closed
wants to merge 21 commits into from

Conversation

matteius
Copy link
Member

@matteius matteius commented Jul 27, 2022

Was branched from and supersedes this PR: #5193
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

@oz123 oz123 self-requested a review July 27, 2022 22:26
@@ -1,29 +0,0 @@
BSD 3-Clause License

Copy link
Contributor

Choose a reason for hiding this comment

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

This file should not be removed.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

Copy link
Contributor

Choose a reason for hiding this comment

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

Should not be removed.

Copy link
Contributor

Choose a reason for hiding this comment

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

It should be renamed.

@@ -1,27 +0,0 @@
Copyright (c) 2010 Jonathan Hartley
Copy link
Contributor

Choose a reason for hiding this comment

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

Keep this file.

@@ -1,284 +0,0 @@
A. HISTORY OF THE SOFTWARE
Copy link
Contributor

Choose a reason for hiding this comment

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

Keep this file.

@@ -1,504 +0,0 @@
GNU LESSER GENERAL PUBLIC LICENSE
Copy link
Contributor

Choose a reason for hiding this comment

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

Keep this file.


Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
Copy link
Contributor

Choose a reason for hiding this comment

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

keep this file.


Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Copy link
Contributor

Choose a reason for hiding this comment

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

Keep this file.

@@ -1,18 +0,0 @@
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Copy link
Contributor

Choose a reason for hiding this comment

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

Keep this file.

Copyright (c) 2006-2021 by the respective authors (see AUTHORS file).
All rights reserved.

Redistribution and use in source and binary forms, with or without
Copy link
Contributor

Choose a reason for hiding this comment

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

keep this file.

@@ -1,19 +0,0 @@
Copyright (C) 2016 Jason R Coombs <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy of
Copy link
Contributor

Choose a reason for hiding this comment

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

Keep this file.

@matteius
Copy link
Member Author

You are right @oz123 -- I had too many changes in this PR and the vendoring process was problematic. Not sure why the rename did not work in this PR, but I used git mv in this new PR and I re-wrote the PR from scratch following what I know now, and improved the GLOBAL_REPLACEMENT in the vendoring script. Closing this, please review this one instead: #5199

@matteius matteius closed this Jul 28, 2022
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