Commit 3ab878d8 by Kazuhiko Shiozaki

buildout-versions is no longer required with buildout 2.

1 parent 8aad4476
......@@ -28,14 +28,9 @@ parts =
py
firewalld-patch
extensions -=
buildout-versions
extensions +=
slapos.rebootstrap
show-picked-versions = true
[environment]
# Note: For now original PATH is appended to the end, as not all tools are
# provided by SlapOS
......
......@@ -20,9 +20,6 @@ extends =
# Monitoring stack (keep on bottom)
../../stack/monitor/buildout.cfg
extensions -=
buildout-versions
parts +=
template
template-apache-frontend
......
......@@ -8,10 +8,6 @@ parts =
template
download-cache = ${:directory}/download-cache
# Required for recent buildout.
extensions -=
buildout-versions
[template]
recipe = slapos.recipe.template:jinja2
# XXX: "template.cfg" is hardcoded in instanciation recipe
......
......@@ -10,11 +10,6 @@ extends =
../../component/apache/buildout.cfg
../../stack/monitor/buildout.cfg
extensions -=
buildout-versions
show-picked-versions = true
parts =
slapos-cookbook
template
......
......@@ -6,10 +6,6 @@ parts =
slapos-cookbook
template
# Required for recent buildout.
extensions -=
buildout-versions
[template]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg.in
......
......@@ -14,9 +14,6 @@ extends =
# Monitoring stack (keep on bottom)
../../stack/monitor/buildout.cfg
extensions -=
buildout-versions
parts +=
slapos-cookbook-develop
slapos-cookbook
......
......@@ -38,11 +38,6 @@ common-parts =
rdiff-backup
pbs-recipe-egg
extensions -=
buildout-versions
show-picked-versions = true
parts =
${:common-parts}
......
......@@ -66,10 +66,6 @@ slapos.recipe.template = 2.7
# Explicitly disable download-cache
download-cache =
# Generate list of automatically chosen eggs version
extensions +=
buildout-versions
# Separate from site eggs
allowed-eggs-from-site-packages =
include-site-packages = false
......
[buildout]
extensions += buildout-versions
versions = versions
parts =
......
......@@ -9,11 +9,11 @@ python = python2.7
# Note that if you want a develop version of slapos-cookbook from a git
# checkout, you must add both slapos-cookbook-develop and slapos-cookbook in parts
# Generate list of automatically chosen eggs version
extensions +=
buildout-versions
slapos.extension.strip
show-picked-versions = true
# Use shacache and lxml
extends =
../component/git/buildout.cfg
......@@ -109,7 +109,6 @@ Jinja2 = 2.9.5
MarkupSafe = 0.23
PyYAML = 3.12
Werkzeug = 0.11.15
buildout-versions = 1.7
cffi = 1.9.1
click = 6.7
cliff = 2.4.0
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!