mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Drop vendoring patch for distro
- python2.6 is no longer supported by pip ```bash git apply --reverse tasks/vendoring/patches/distro.patch git rm tasks/vendoring/patches/distro.patch ```
This commit is contained in:
parent
5d951b2a94
commit
6bf55db7c0
4 changed files with 1 additions and 24 deletions
0
news/22781fda-31a5-4a7e-a8f3-ee28cb974cc9.trivial
Normal file
0
news/22781fda-31a5-4a7e-a8f3-ee28cb974cc9.trivial
Normal file
|
@ -98,7 +98,6 @@ Modifications
|
||||||
* ``CacheControl`` has been modified to import its dependencies from ``pip._vendor``
|
* ``CacheControl`` has been modified to import its dependencies from ``pip._vendor``
|
||||||
* ``packaging`` has been modified to import its dependencies from ``pip._vendor``
|
* ``packaging`` has been modified to import its dependencies from ``pip._vendor``
|
||||||
* ``requests`` has been modified *not* to optionally load any C dependencies
|
* ``requests`` has been modified *not* to optionally load any C dependencies
|
||||||
* Modified distro to delay importing ``argparse`` to avoid errors on 2.6
|
|
||||||
|
|
||||||
|
|
||||||
Automatic Vendoring
|
Automatic Vendoring
|
||||||
|
|
|
@ -34,6 +34,7 @@ import sys
|
||||||
import json
|
import json
|
||||||
import shlex
|
import shlex
|
||||||
import logging
|
import logging
|
||||||
|
import argparse
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
|
|
||||||
|
@ -1074,8 +1075,6 @@ _distro = LinuxDistribution()
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
import argparse
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
logger.setLevel(logging.DEBUG)
|
logger.setLevel(logging.DEBUG)
|
||||||
logger.addHandler(logging.StreamHandler(sys.stdout))
|
logger.addHandler(logging.StreamHandler(sys.stdout))
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
diff --git a/src/pip/_vendor/distro.py b/src/pip/_vendor/distro.py
|
|
||||||
index 0afa527..9e7daad 100644
|
|
||||||
--- a/src/pip/_vendor/distro.py
|
|
||||||
+++ b/src/pip/_vendor/distro.py
|
|
||||||
@@ -34,7 +34,6 @@ import sys
|
|
||||||
import json
|
|
||||||
import shlex
|
|
||||||
import logging
|
|
||||||
-import argparse
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1052,6 +1051,8 @@ _distro = LinuxDistribution()
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
+ import argparse
|
|
||||||
+
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
logger.setLevel(logging.DEBUG)
|
|
||||||
logger.addHandler(logging.StreamHandler(sys.stdout))
|
|
Loading…
Reference in a new issue