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
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
c53cda3d
Commit
c53cda3d
authored
Nov 10, 2014
by
Godefroid Chapelle
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into pin_setuptools_in_bootstrap
parents
3af72fe6
38b6495d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
2 deletions
+21
-2
.gitignore
.gitignore
+1
-0
setup.py
setup.py
+1
-0
src/zc/buildout/tests.py
src/zc/buildout/tests.py
+2
-2
tox.ini
tox.ini
+17
-0
No files found.
.gitignore
View file @
c53cda3d
...
...
@@ -9,3 +9,4 @@ python*/
*.egg
*.egg-info
dist
.tox
setup.py
View file @
c53cda3d
...
...
@@ -104,6 +104,7 @@ setup(
'Programming Language :: Python :: 3'
,
'Programming Language :: Python :: 3.2'
,
'Programming Language :: Python :: 3.3'
,
'Programming Language :: Python :: 3.4'
,
'Topic :: Software Development :: Build Tools'
,
'Topic :: Software Development :: Libraries :: Python Modules'
,
],
...
...
src/zc/buildout/tests.py
View file @
c53cda3d
...
...
@@ -3204,10 +3204,10 @@ def makeNewRelease(project, ws, dest, version='99.99'):
zip
=
zipfile
.
ZipFile
(
dest
,
'a'
)
zip
.
writestr
(
'EGG-INFO/PKG-INFO'
,
((
zip
.
read
(
'EGG-INFO/PKG-INFO'
).
decode
()
((
zip
.
read
(
'EGG-INFO/PKG-INFO'
).
decode
(
'ISO-8859-1'
)
).
replace
(
"Version: %s"
%
oldver
,
"Version: %s"
%
version
)
).
encode
()
).
encode
(
'ISO-8859-1'
)
)
zip
.
close
()
else
:
...
...
tox.ini
0 → 100644
View file @
c53cda3d
[tox]
envlist
=
py26,py27,py32,py33
[testenv]
commands
=
# buildout's dev.py wants python to not have setuptools
pip
uninstall
-y
zc.buildout
setuptools
pip
python
dev.py
{toxinidir}/bin/test
-1
-v
-c
# since we're removing setuptools we can't possibly reuse the virtualenv
recreate
=
true
# if the user has ccache installed, PATH may contain /usr/lib/ccache that has a
# gcc wrapper that fails to build anything when buildout's tests set HOME to a
# non-existent directory under /tmp
setenv
=
PATH
=
/usr/bin:/bin
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