Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Yusei Tahara
slapos.buildout
Commits
b7cd5cad
Commit
b7cd5cad
authored
May 25, 2015
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include '.postN' in generated egg's version so that version pinning with 'N.N.N.postN' works.
parent
09a84d6c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
7 deletions
+18
-7
CHANGES.SlapOS.txt
CHANGES.SlapOS.txt
+5
-0
setup.py
setup.py
+1
-1
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+12
-6
No files found.
CHANGES.SlapOS.txt
View file @
b7cd5cad
1.7.1.post8
-----------
- Include '.postN' in generated egg's version so that version pinning with 'N.N.N.postN' works.
1.7.1.post7
1.7.1.post7
-----------
-----------
...
...
setup.py
View file @
b7cd5cad
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#
#
##############################################################################
##############################################################################
name
=
"zc.buildout"
name
=
"zc.buildout"
version
=
"1.7.1.post
7
"
version
=
"1.7.1.post
8
"
import
os
import
os
from
setuptools
import
setup
from
setuptools
import
setup
...
...
src/zc/buildout/easy_install.py
View file @
b7cd5cad
...
@@ -1082,7 +1082,6 @@ class Installer:
...
@@ -1082,7 +1082,6 @@ class Installer:
ws = working_set
ws = working_set
for requirement in requirements:
for requirement in requirements:
if patch_dict and requirement.project_name in patch_dict:
self._env.scan(
self._env.scan(
self.build(str(requirement), {}, patch_dict=patch_dict))
self.build(str(requirement), {}, patch_dict=patch_dict))
for dist in self._get_dist(requirement, ws, self._always_unzip):
for dist in self._get_dist(requirement, ws, self._always_unzip):
...
@@ -1189,11 +1188,16 @@ class Installer:
...
@@ -1189,11 +1188,16 @@ class Installer:
base = os.path.dirname(setups[0])
base = os.path.dirname(setups[0])
setup_cfg_dict = {'build_ext':build_ext}
setup_cfg_dict = {'build_ext':build_ext}
parsed_version = dist.parsed_version
if parsed_version.is_postrelease and
\
dist.version.startswith(parsed_version.base_version):
tag_build = dist.version[len(parsed_version.base_version):]
else:
tag_build = ''
patch_dict = (patch_dict or {}).get(re.sub('[<>=].*', '', spec))
patch_dict = (patch_dict or {}).get(re.sub('[<>=].*', '', spec))
if patch_dict:
if patch_dict:
setup_cfg_dict.update(
tag_build += '+%s%03d' % (PATCH_MARKER,
{'egg_info':{'tag_build':'+%s%03d' % (PATCH_MARKER,
patch_dict['patch_revision'])
patch_dict['patch_revision'])}})
for patch in patch_dict['patches']:
for patch in patch_dict['patches']:
url, md5sum = (patch.strip().split('#', 1) + [''])[:2]
url, md5sum = (patch.strip().split('#', 1) + [''])[:2]
download = zc.buildout.download.Download()
download = zc.buildout.download.Download()
...
@@ -1207,6 +1211,8 @@ class Installer:
...
@@ -1207,6 +1211,8 @@ class Installer:
if popen.returncode != 0:
if popen.returncode != 0:
raise subprocess.CalledProcessError(
raise subprocess.CalledProcessError(
popen.returncode, ' '.join(args))
popen.returncode, ' '.join(args))
setup_cfg_dict.update(
{'egg_info':{'tag_build':tag_build}})
setup_cfg = os.path.join(base, 'setup.cfg')
setup_cfg = os.path.join(base, 'setup.cfg')
if not os.path.exists(setup_cfg):
if not os.path.exists(setup_cfg):
f = open(setup_cfg, 'w')
f = open(setup_cfg, 'w')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment