rpms
/
python-pip
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
python-pip/pip-allow-different-version...

21 lines
607 B
Diff
Raw Normal View History

Allow to import pip10's main from pip9's /usr/bin/pip Users are upgrading pip9 to pip10 by various manners, one of them is `pip install --user --upgrade pip`. If they do that and they run `pip` or `pip3`, the one from /usr/bin is used. However that's the one from this RPM package (pip9) and the import in there fails (it tries to import from ~/.local, but pip10 is there with a bit different API). We add a patch as a dirty workaround to make /usr/bin/pip* work with both pip9 (from this RPM) and pip10 (from whatever). A proper fix is to put ~/.local/bin in front of /usr/bin in the PATH, however others are against that and we cannot change it for existing installs/user homes anyway. This is a workaround for: * https://bugzilla.redhat.com/show_bug.cgi?id=1569488 * https://bugzilla.redhat.com/show_bug.cgi?id=1571650 Patch is applied in %install, because /usr/bin/pip* are entrypoints.
2018-05-04 10:11:26 +00:00
--- /usr/bin/pip3 2018-03-29 15:22:13.000000000 +0200
+++ pip3 2018-05-04 11:49:08.098821010 +0200
Make /usr/bin/pip(2|3) work with user-installed pip 19.3+ Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1767212 == Before: $ rpm -q python3-pip python3-pip-19.1.1-4.fc31.noarch $ rpm -q python2-pip python2-pip-19.1.1-4.fc31.noarch $ /usr/bin/pip --version pip 19.1.1 from /usr/lib/python3.7/site-packages/pip (python 3.7) $ /usr/bin/pip2 --version pip 19.1.1 from /usr/lib/python2.7/site-packages/pip (python 2.7) $ /usr/bin/pip3 --version pip 19.1.1 from /usr/lib/python3.7/site-packages/pip (python 3.7) $ pip{2,3} install --user --upgrade pip ... Successfully installed pip-19.3.1 $ /usr/bin/pip{,2,3} --version Traceback (most recent call last): File "/usr/bin/pip{,2,3}", line 15, in <module> sys.exit(main()) TypeError: 'module' object is not callable $ rm .local/ -rf $ pip{2,3} install --user --upgrade 'pip<10' ... Successfully installed pip-9.0.3 $ /usr/bin/pip --version pip 9.0.3 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ /usr/bin/pip2 --version pip 9.0.3 from /home/pythonista/.local/lib/python2.7/site-packages (python 2.7) $ /usr/bin/pip3 --version pip 9.0.3 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ pip{2,3} install --user --upgrade 'pip<9' ... Successfully installed pip-8.1.2 $ /usr/bin/pip --version pip 8.1.2 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ /usr/bin/pip2 --version pip 8.1.2 from /home/pythonista/.local/lib/python2.7/site-packages (python 2.7) $ /usr/bin/pip3 --version pip 8.1.2 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) == After $ rpm -q python3-pip python3-pip-19.1.1-5.fc31.noarch $ rpm -q python2-pip python2-pip-19.1.1-5.fc31.noarch $ /usr/bin/pip --version pip 19.1.1 from /usr/lib/python3.7/site-packages/pip (python 3.7) $ /usr/bin/pip2 --version pip 19.1.1 from /usr/lib/python2.7/site-packages/pip (python 2.7) $ /usr/bin/pip3 --version pip 19.1.1 from /usr/lib/python3.7/site-packages/pip (python 3.7) $ pip{2,3} install --user --upgrade pip ... Successfully installed pip-19.3.1 $ /usr/bin/pip --version pip 19.3.1 from /home/pythonista/.local/lib/python3.7/site-packages/pip (python 3.7) $ /usr/bin/pip2 --version pip 19.3.1 from /home/pythonista/.local/lib/python2.7/site-packages/pip (python 2.7) $ /usr/bin/pip3 --version pip 19.3.1 from /home/pythonista/.local/lib/python3.7/site-packages/pip (python 3.7) $ pip{2,3} install --user --upgrade 'pip<10' ... Successfully installed pip-9.0.3 $ /usr/bin/pip --version pip 9.0.3 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ /usr/bin/pip2 --version pip 9.0.3 from /home/pythonista/.local/lib/python2.7/site-packages (python 2.7) $ /usr/bin/pip3 --version pip 9.0.3 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ pip{2,3} install --user --upgrade 'pip<9' ... Successfully installed pip-8.1.2 $ /usr/bin/pip --version pip 8.1.2 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ /usr/bin/pip2 --version pip 8.1.2 from /home/pythonista/.local/lib/python2.7/site-packages (python 2.7) $ /usr/bin/pip3 --version pip 8.1.2 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7)
2019-11-11 10:11:11 +00:00
@@ -4,7 +4,16 @@
Allow to import pip10's main from pip9's /usr/bin/pip Users are upgrading pip9 to pip10 by various manners, one of them is `pip install --user --upgrade pip`. If they do that and they run `pip` or `pip3`, the one from /usr/bin is used. However that's the one from this RPM package (pip9) and the import in there fails (it tries to import from ~/.local, but pip10 is there with a bit different API). We add a patch as a dirty workaround to make /usr/bin/pip* work with both pip9 (from this RPM) and pip10 (from whatever). A proper fix is to put ~/.local/bin in front of /usr/bin in the PATH, however others are against that and we cannot change it for existing installs/user homes anyway. This is a workaround for: * https://bugzilla.redhat.com/show_bug.cgi?id=1569488 * https://bugzilla.redhat.com/show_bug.cgi?id=1571650 Patch is applied in %install, because /usr/bin/pip* are entrypoints.
2018-05-04 10:11:26 +00:00
import re
import sys
Update to 18.0
2018-07-23 15:22:50 +00:00
-from pip._internal import main
Allow to import pip10's main from pip9's /usr/bin/pip Users are upgrading pip9 to pip10 by various manners, one of them is `pip install --user --upgrade pip`. If they do that and they run `pip` or `pip3`, the one from /usr/bin is used. However that's the one from this RPM package (pip9) and the import in there fails (it tries to import from ~/.local, but pip10 is there with a bit different API). We add a patch as a dirty workaround to make /usr/bin/pip* work with both pip9 (from this RPM) and pip10 (from whatever). A proper fix is to put ~/.local/bin in front of /usr/bin in the PATH, however others are against that and we cannot change it for existing installs/user homes anyway. This is a workaround for: * https://bugzilla.redhat.com/show_bug.cgi?id=1569488 * https://bugzilla.redhat.com/show_bug.cgi?id=1571650 Patch is applied in %install, because /usr/bin/pip* are entrypoints.
2018-05-04 10:11:26 +00:00
+try:
Update to 18.0
2018-07-23 15:22:50 +00:00
+ from pip._internal import main
Allow to import pip10's main from pip9's /usr/bin/pip Users are upgrading pip9 to pip10 by various manners, one of them is `pip install --user --upgrade pip`. If they do that and they run `pip` or `pip3`, the one from /usr/bin is used. However that's the one from this RPM package (pip9) and the import in there fails (it tries to import from ~/.local, but pip10 is there with a bit different API). We add a patch as a dirty workaround to make /usr/bin/pip* work with both pip9 (from this RPM) and pip10 (from whatever). A proper fix is to put ~/.local/bin in front of /usr/bin in the PATH, however others are against that and we cannot change it for existing installs/user homes anyway. This is a workaround for: * https://bugzilla.redhat.com/show_bug.cgi?id=1569488 * https://bugzilla.redhat.com/show_bug.cgi?id=1571650 Patch is applied in %install, because /usr/bin/pip* are entrypoints.
2018-05-04 10:11:26 +00:00
+except ImportError:
Update to 18.0
2018-07-23 15:22:50 +00:00
+ # user has most probably downgraded pip in their home
Allow to import pip10's main from pip9's /usr/bin/pip Users are upgrading pip9 to pip10 by various manners, one of them is `pip install --user --upgrade pip`. If they do that and they run `pip` or `pip3`, the one from /usr/bin is used. However that's the one from this RPM package (pip9) and the import in there fails (it tries to import from ~/.local, but pip10 is there with a bit different API). We add a patch as a dirty workaround to make /usr/bin/pip* work with both pip9 (from this RPM) and pip10 (from whatever). A proper fix is to put ~/.local/bin in front of /usr/bin in the PATH, however others are against that and we cannot change it for existing installs/user homes anyway. This is a workaround for: * https://bugzilla.redhat.com/show_bug.cgi?id=1569488 * https://bugzilla.redhat.com/show_bug.cgi?id=1571650 Patch is applied in %install, because /usr/bin/pip* are entrypoints.
2018-05-04 10:11:26 +00:00
+ # so let them run it anyway until ~/.local/bin makes it in front of the PATH
Update to 18.0
2018-07-23 15:22:50 +00:00
+ from pip import main
Make /usr/bin/pip(2|3) work with user-installed pip 19.3+ Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1767212 == Before: $ rpm -q python3-pip python3-pip-19.1.1-4.fc31.noarch $ rpm -q python2-pip python2-pip-19.1.1-4.fc31.noarch $ /usr/bin/pip --version pip 19.1.1 from /usr/lib/python3.7/site-packages/pip (python 3.7) $ /usr/bin/pip2 --version pip 19.1.1 from /usr/lib/python2.7/site-packages/pip (python 2.7) $ /usr/bin/pip3 --version pip 19.1.1 from /usr/lib/python3.7/site-packages/pip (python 3.7) $ pip{2,3} install --user --upgrade pip ... Successfully installed pip-19.3.1 $ /usr/bin/pip{,2,3} --version Traceback (most recent call last): File "/usr/bin/pip{,2,3}", line 15, in <module> sys.exit(main()) TypeError: 'module' object is not callable $ rm .local/ -rf $ pip{2,3} install --user --upgrade 'pip<10' ... Successfully installed pip-9.0.3 $ /usr/bin/pip --version pip 9.0.3 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ /usr/bin/pip2 --version pip 9.0.3 from /home/pythonista/.local/lib/python2.7/site-packages (python 2.7) $ /usr/bin/pip3 --version pip 9.0.3 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ pip{2,3} install --user --upgrade 'pip<9' ... Successfully installed pip-8.1.2 $ /usr/bin/pip --version pip 8.1.2 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ /usr/bin/pip2 --version pip 8.1.2 from /home/pythonista/.local/lib/python2.7/site-packages (python 2.7) $ /usr/bin/pip3 --version pip 8.1.2 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) == After $ rpm -q python3-pip python3-pip-19.1.1-5.fc31.noarch $ rpm -q python2-pip python2-pip-19.1.1-5.fc31.noarch $ /usr/bin/pip --version pip 19.1.1 from /usr/lib/python3.7/site-packages/pip (python 3.7) $ /usr/bin/pip2 --version pip 19.1.1 from /usr/lib/python2.7/site-packages/pip (python 2.7) $ /usr/bin/pip3 --version pip 19.1.1 from /usr/lib/python3.7/site-packages/pip (python 3.7) $ pip{2,3} install --user --upgrade pip ... Successfully installed pip-19.3.1 $ /usr/bin/pip --version pip 19.3.1 from /home/pythonista/.local/lib/python3.7/site-packages/pip (python 3.7) $ /usr/bin/pip2 --version pip 19.3.1 from /home/pythonista/.local/lib/python2.7/site-packages/pip (python 2.7) $ /usr/bin/pip3 --version pip 19.3.1 from /home/pythonista/.local/lib/python3.7/site-packages/pip (python 3.7) $ pip{2,3} install --user --upgrade 'pip<10' ... Successfully installed pip-9.0.3 $ /usr/bin/pip --version pip 9.0.3 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ /usr/bin/pip2 --version pip 9.0.3 from /home/pythonista/.local/lib/python2.7/site-packages (python 2.7) $ /usr/bin/pip3 --version pip 9.0.3 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ pip{2,3} install --user --upgrade 'pip<9' ... Successfully installed pip-8.1.2 $ /usr/bin/pip --version pip 8.1.2 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7) $ /usr/bin/pip2 --version pip 8.1.2 from /home/pythonista/.local/lib/python2.7/site-packages (python 2.7) $ /usr/bin/pip3 --version pip 8.1.2 from /home/pythonista/.local/lib/python3.7/site-packages (python 3.7)
2019-11-11 10:11:11 +00:00
+else:
+ # user might also upgraded pip...
+ if hasattr(main, 'main'):
+ main = main.main
Allow to import pip10's main from pip9's /usr/bin/pip Users are upgrading pip9 to pip10 by various manners, one of them is `pip install --user --upgrade pip`. If they do that and they run `pip` or `pip3`, the one from /usr/bin is used. However that's the one from this RPM package (pip9) and the import in there fails (it tries to import from ~/.local, but pip10 is there with a bit different API). We add a patch as a dirty workaround to make /usr/bin/pip* work with both pip9 (from this RPM) and pip10 (from whatever). A proper fix is to put ~/.local/bin in front of /usr/bin in the PATH, however others are against that and we cannot change it for existing installs/user homes anyway. This is a workaround for: * https://bugzilla.redhat.com/show_bug.cgi?id=1569488 * https://bugzilla.redhat.com/show_bug.cgi?id=1571650 Patch is applied in %install, because /usr/bin/pip* are entrypoints.
2018-05-04 10:11:26 +00:00
if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])