diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 14:21:49 +1100 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 14:21:49 +1100 |
| commit | 027ca18211667f9467319d8dc2f0ca1137f86474 (patch) | |
| tree | f632a1187ca4a969f31cd40317e70b1ba3e5acf4 /Makefile | |
| parent | 337ea160558acc352c8a61b9d27c93d1f9e09618 (diff) | |
| download | python-setuptools-git-027ca18211667f9467319d8dc2f0ca1137f86474.tar.gz | |
Properly merge from default.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -2,11 +2,10 @@ empty: exit 1 update-vendored: - rm -rf pkg_resources/_vendor/packaging - rm -rf pkg_resources/_vendor/pyparsing - pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/ - sed -i -e 's/ \(pyparsing\)/ pkg_resources._vendor.\1/' \ - pkg_resources/_vendor/packaging/*.py - sed -i -e 's/ \(six\)/ pkg_resources._vendor.\1/' \ + rm -rf pkg_resources/_vendor/packaging* + rm -rf pkg_resources/_vendor/six* + rm -rf pkg_resources/_vendor/pyparsing* + python3 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/ + sed -i -e 's/ \(pyparsing|six\)/ pkg_resources.extern.\1/' \ pkg_resources/_vendor/packaging/*.py rm -rf pkg_resources/_vendor/*.{egg,dist}-info |