diff options
| -rw-r--r-- | pavement.py | 38 | ||||
| -rw-r--r-- | setuptools/version.py | 4 |
2 files changed, 21 insertions, 21 deletions
diff --git a/pavement.py b/pavement.py index 8d7574e2..303e9bac 100644 --- a/pavement.py +++ b/pavement.py @@ -4,25 +4,25 @@ from paver.easy import task, path as Path import pip def remove_all(paths): - for path in paths: - path.rmtree() if path.isdir() else path.remove() + for path in paths: + path.rmtree() if path.isdir() else path.remove() @task def update_vendored(): - vendor = Path('pkg_resources/_vendor') - remove_all(vendor.glob('packaging*')) - remove_all(vendor.glob('six*')) - remove_all(vendor.glob('pyparsing*')) - install_args = [ - 'install', - '-r', str(vendor/'vendored.txt'), - '-t', str(vendor), - ] - pip.main(install_args) - packaging = vendor / 'packaging' - for file in packaging.glob('*.py'): - text = file.text() - text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text) - file.write_text(text) - remove_all(vendor.glob('*.dist-info')) - remove_all(vendor.glob('*.egg-info')) + vendor = Path('pkg_resources/_vendor') + remove_all(vendor.glob('packaging*')) + remove_all(vendor.glob('six*')) + remove_all(vendor.glob('pyparsing*')) + install_args = [ + 'install', + '-r', str(vendor/'vendored.txt'), + '-t', str(vendor), + ] + pip.main(install_args) + packaging = vendor / 'packaging' + for file in packaging.glob('*.py'): + text = file.text() + text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text) + file.write_text(text) + remove_all(vendor.glob('*.dist-info')) + remove_all(vendor.glob('*.egg-info')) diff --git a/setuptools/version.py b/setuptools/version.py index 049e7feb..f2b40722 100644 --- a/setuptools/version.py +++ b/setuptools/version.py @@ -1,6 +1,6 @@ import pkg_resources try: - __version__ = pkg_resources.require('setuptools')[0].version + __version__ = pkg_resources.require('setuptools')[0].version except Exception: - __version__ = 'unknown' + __version__ = 'unknown' |