Commit de489b4fcb82b3de86eaef96b278479599bb3508
1 parent
ce433a1c
Add fixed versions for zc.buildout and setuptools
Also, a default value for `--setuptools-to-dir` is now specified. This change will make ez_setup.py use the cached setuptools.zip file, so there will be no more need to redownload it every time when `bootstrap.py` is invoked.
Showing
2 changed files
with
10 additions
and
1 deletions
| ... | ... | @@ -29,6 +29,12 @@ __version__ = '2015-07-01' |
| 29 | 29 | # See zc.buildout's changelog if this version is up to date. |
| 30 | 30 | |
| 31 | 31 | tmpeggs = tempfile.mkdtemp(prefix='bootstrap-') |
| 32 | +eggsdir = os.path.join(os.path.dirname(__file__), 'eggs') | |
| 33 | +try: | |
| 34 | + os.mkdir(eggsdir) | |
| 35 | +except OSError as e: | |
| 36 | + if e.errno != 17: | |
| 37 | + raise | |
| 32 | 38 | |
| 33 | 39 | usage = '''\ |
| 34 | 40 | [DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] |
| ... | ... | @@ -64,10 +70,13 @@ parser.add_option("--allow-site-packages", |
| 64 | 70 | action="store_true", default=False, |
| 65 | 71 | help=("Let bootstrap.py use existing site packages")) |
| 66 | 72 | parser.add_option("--buildout-version", |
| 73 | + default='2.5.3', | |
| 67 | 74 | help="Use a specific zc.buildout version") |
| 68 | 75 | parser.add_option("--setuptools-version", |
| 76 | + default='33.1.1', | |
| 69 | 77 | help="Use a specific setuptools version") |
| 70 | 78 | parser.add_option("--setuptools-to-dir", |
| 79 | + default=eggsdir, | |
| 71 | 80 | help=("Allow for re-use of existing directory of " |
| 72 | 81 | "setuptools versions")) |
| 73 | 82 | ... | ... |
Please
register
or
login
to post a comment