From d7aabf12e308bd3e57957d8498811f8ba6f395ea Mon Sep 17 00:00:00 2001 From: stonebig Date: Tue, 13 Sep 2016 18:57:11 +0200 Subject: [PATCH 1/2] common, make my beta --- make.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.py b/make.py index c300494a..43bcb3f9 100644 --- a/make.py +++ b/make.py @@ -1022,7 +1022,7 @@ def make(self, remove_existing=True, requirements=None, my_winpydir=None): #, f print("WARNING: this is just a simulation!", file=sys.stderr) self.python_fname = self.get_package_fname( - r'python-([0-9\.rc]*)((\.|\-)amd64)?\.(msi|zip)') + r'python-([0-9\.rcb]*)((\.|\-)amd64)?\.(msi|zip)') self.python_name = osp.basename(self.python_fname)[:-4] distname = 'win%s' % self.python_name vlst = re.match(r'winpython-([0-9\.]*)', distname From 6f422b7c4e052ae4d8a2f54906786e5d97cfc72c Mon Sep 17 00:00:00 2001 From: stonebig Date: Tue, 13 Sep 2016 22:45:21 +0200 Subject: [PATCH 2/2] forcing update pip always ends badly --- make.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make.py b/make.py index 43bcb3f9..c695a2ce 100644 --- a/make.py +++ b/make.py @@ -1071,9 +1071,9 @@ def make(self, remove_existing=True, requirements=None, my_winpydir=None): #, f # pre-patch current pip (until default python has pip 8.0.3) self.distribution.patch_standard_packages('pip') - # force update of pip (FIRST) and setuptools here + # not forced update of pip (FIRST) and setuptools here for req in ('pip', 'setuptools'): - actions = ["install","--upgrade", "--force-reinstall", req] + actions = ["install","--upgrade", req] if self.install_options is not None: actions += self.install_options print("piping %s" % ' '.join(actions))