Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Klaus Wölfel
slapos
Commits
133fb058
Commit
133fb058
authored
Apr 18, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Update Release for 1.0.50
parents
41c5ed06
e38ad10b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
9 deletions
+26
-9
CHANGES.rst
CHANGES.rst
+7
-0
setup.py
setup.py
+1
-1
software/gitlab/software.cfg
software/gitlab/software.cfg
+16
-6
stack/slapos.cfg
stack/slapos.cfg
+2
-2
No files found.
CHANGES.rst
View file @
133fb058
Changes
Changes
=======
=======
1.0.50 (2017-04-18)
-------------------
* pbs: Do not parallelize calculus when the heaviest task is IO
* re6st-registry: Refactor integration with re6st registry
* erp5testnode: make shellinabox reusing password file of pwgen
1.0.48 (2017-01-31)
1.0.48 (2017-01-31)
-------------------
-------------------
...
...
setup.py
View file @
133fb058
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'1.0.
49.dev
0'
version
=
'1.0.
5
0'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.rst"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.rst"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.rst"
).
read
()
+
"
\
n
"
open
(
"CHANGES.rst"
).
read
()
+
"
\
n
"
...
...
software/gitlab/software.cfg
View file @
133fb058
...
@@ -39,6 +39,7 @@ parts =
...
@@ -39,6 +39,7 @@ parts =
python-4gitlab
python-4gitlab
gitlab-shell/vendor
gitlab-shell/vendor
gitlab/vendor/bundle
gitlab/vendor/bundle
github-markup-patch
gitlab-workhorse
gitlab-workhorse
git-backup
git-backup
...
@@ -74,11 +75,7 @@ md5sum = 3cd1dca37be60668f482545716923b72
...
@@ -74,11 +75,7 @@ md5sum = 3cd1dca37be60668f482545716923b72
# python with eggs, that will be used in gitlab
# python with eggs, that will be used in gitlab
[python-4gitlab]
[python-4gitlab]
# NOTE cannot use zc.recipe.egg - github-markup invoks `python2 -S` and
recipe = zc.recipe.egg
# interpreter generated by zc.recipe.egg cannot handle that.
recipe = z3c.recipe.scripts
# NOTE github-markup invokes it as `python2`, that's why we are naming it this way
# https://github.com/github/markup/blob/5393ae93/lib/github/markups.rb#L36
interpreter = python2
interpreter = python2
eggs =
eggs =
docutils
docutils
...
@@ -152,7 +149,20 @@ repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
...
@@ -152,7 +149,20 @@ repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
revision = v0.7.1-5-gd23a3247829fc3200e3dc784dcd57b5a0febac48
revision = v0.7.1-5-gd23a3247829fc3200e3dc784dcd57b5a0febac48
location = ${buildout:parts-directory}/gitlab-workhorse
location = ${buildout:parts-directory}/gitlab-workhorse
# Patch github markup to not call "python2 -S /path/to/rest2html" but only "python2 /path/to/rest2html"
# NOTE github-markup invokes it as `python2`, that's why we are naming it this way
# https://github.com/github/markup/blob/5393ae93/lib/github/markups.rb#L36
[github-markup-patch]
recipe = plone.recipe.command
command =
files=$(ls ${gitlab-repository:location}/vendor/bundle/ruby/*/gems/github-markup-*/lib/github/markups.rb) || true
if [ ! -z $files ]; then
for file in $files; do
sed -i 's#python2 -S#python2#' $file
done
fi
update-command = ${:command}
stop-on-error = True
# build needed-by-gitlab gems via bundler
# build needed-by-gitlab gems via bundler
[gitlab/vendor/bundle]
[gitlab/vendor/bundle]
...
...
stack/slapos.cfg
View file @
133fb058
...
@@ -135,7 +135,7 @@ pytz = 2016.10
...
@@ -135,7 +135,7 @@ pytz = 2016.10
requests = 2.13.0
requests = 2.13.0
setuptools = 33.1.1
setuptools = 33.1.1
six = 1.10.0
six = 1.10.0
slapos.cookbook = 1.0.
48
slapos.cookbook = 1.0.
50
slapos.core = 1.3.18
slapos.core = 1.3.18
slapos.extension.strip = 0.2
slapos.extension.strip = 0.2
slapos.libnetworkcache = 0.14.5
slapos.libnetworkcache = 0.14.5
...
@@ -163,7 +163,7 @@ functools32 = 3.2.3.post2
...
@@ -163,7 +163,7 @@ functools32 = 3.2.3.post2
ipaddress = 1.0.18
ipaddress = 1.0.18
# Required by:
# Required by:
# slapos.cookbook==1.0.
48
# slapos.cookbook==1.0.
50
jsonschema = 2.6.0
jsonschema = 2.6.0
# Required by:
# Required by:
...
...
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