Skip to content

common, make my beta #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 13, 2016
Merged

common, make my beta #395

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7aabf1
common, make my beta
Sep 13, 2016
6f422b7
forcing update pip always ends badly
Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down