diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-04 20:15:55 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-04 20:15:55 -0500 |
| commit | a2484bd0b21ddd984823067dc2c4fbcdf0bc70e6 (patch) | |
| tree | 3e5f2252c683ee750457f4e35cd71b984c58fe15 | |
| parent | f81c6c36c062d40834cee8add4947c211e5e152c (diff) | |
| download | external_python_setuptools-a2484bd0b21ddd984823067dc2c4fbcdf0bc70e6.tar.gz external_python_setuptools-a2484bd0b21ddd984823067dc2c4fbcdf0bc70e6.tar.bz2 external_python_setuptools-a2484bd0b21ddd984823067dc2c4fbcdf0bc70e6.zip | |
Move six to pkg_resources for use there.
--HG--
branch : feature/issue-229
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | pkg_resources/_vendor/six.py (renamed from setuptools/_vendor/six.py) | 0 | ||||
| -rw-r--r-- | pkg_resources/_vendor/vendored.txt | 1 | ||||
| -rw-r--r-- | pkg_resources/extern/__init__.py | 2 | ||||
| -rw-r--r-- | setuptools/_vendor/__init__.py | 0 | ||||
| -rw-r--r-- | setuptools/_vendor/vendored.txt | 1 | ||||
| -rw-r--r-- | setuptools/extern/__init__.py | 2 |
7 files changed, 6 insertions, 9 deletions
@@ -2,10 +2,7 @@ empty: exit 1 update-vendored: - rm -rf pkg_resources/_vendor/packaging - python3.5 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/ + rm -rf pkg_resources/_vendor/packaging* + rm -rf pkg_resources/_vendor/six* + python3 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/ rm -rf pkg_resources/_vendor/*.{egg,dist}-info - - rm -rf setuptools/_vendor/six - python3.5 -m pip install -r setuptools/_vendor/vendored.txt -t setuptools/_vendor/ - rm -rf setuptools/_vendor/*.{egg,dist}-info diff --git a/setuptools/_vendor/six.py b/pkg_resources/_vendor/six.py index 190c0239..190c0239 100644 --- a/setuptools/_vendor/six.py +++ b/pkg_resources/_vendor/six.py diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt index 4cf7664e..eec98267 100644 --- a/pkg_resources/_vendor/vendored.txt +++ b/pkg_resources/_vendor/vendored.txt @@ -1 +1,2 @@ packaging==15.3 +six==1.10.0 diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py index 5e81c0bb..317f4b8d 100644 --- a/pkg_resources/extern/__init__.py +++ b/pkg_resources/extern/__init__.py @@ -67,5 +67,5 @@ class VendorImporter: if self not in sys.meta_path: sys.meta_path.append(self) -names = 'packaging', +names = 'packaging', 'six' VendorImporter(__name__, names).install() diff --git a/setuptools/_vendor/__init__.py b/setuptools/_vendor/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/setuptools/_vendor/__init__.py +++ /dev/null diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt deleted file mode 100644 index b6e34eb2..00000000 --- a/setuptools/_vendor/vendored.txt +++ /dev/null @@ -1 +0,0 @@ -six==1.10.0 diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py index 7a0c5780..6859aa5b 100644 --- a/setuptools/extern/__init__.py +++ b/setuptools/extern/__init__.py @@ -2,4 +2,4 @@ from pkg_resources.extern import VendorImporter names = 'six', -VendorImporter(__name__, names).install() +VendorImporter(__name__, names, 'pkg_resources._vendor').install() |