Skip to content

slapos
slapos
Commit c56da5c4 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

Merge branch 'erp5testnode-pyOpenSSL-0.14' 

Conflicts:
	component/python-cffi/buildout.cfg
	component/python-cryptography/buildout.cfg
	component/python-openssl/buildout.cfg
parents 568ffc57 edb4085e
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 80 deletions
component/python-cffi/buildout.cfg
View file @ c56da5c4
[buildout] [buildout]
extends = extends =
../libffi/buildout.cfg ../libffi/buildout.cfg
../pkgconfig/buildout.cfg
parts = parts =
python-cffi python-cffi
[python-cffi-env]
PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig
[python-cffi] [python-cffi]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
egg = cffi egg = cffi
include-dirs = environment = python-cffi-env
${libffi:location}/lib/libffi-3.0.13/include/
library-dirs = library-dirs =
${openssl:location}/lib/ ${libffi:location}/lib/
rpath = rpath =
${libffi:location}/lib/ ${libffi:location}/lib/
environment = python-cffi-env
[python-cffi-env]
PATH = ${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig
component/python-cryptography/buildout.cfg
View file @ c56da5c4
[buildout] [buildout]
extends = extends =
../python-cffi/buildout.cfg
../libffi/buildout.cfg ../libffi/buildout.cfg
../openssl/buildout.cfg
../pkgconfig/buildout.cfg
parts = parts =
python-cryptography python-cryptography
[python-cryptography-env]
PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig
[python-cryptography] [python-cryptography]
depends = ${python-cffi:egg}
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:custom
egg = cryptography egg = cryptography
include-dirs =
${libffi:location}/lib/libffi-3.0.13/include/
library-dirs =
${openssl:location}/lib/
rpath =
${libffi:location}/lib/
environment = python-cryptography-env environment = python-cryptography-env
[python-cryptography-env]
PATH = ${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig
LD_LIBRARY_PATH = ${libffi:location}/lib
CPATH = ${openssl:location}/include
component/python-openssl/buildout.cfg deleted 100644 → 0
View file @ 568ffc57
[buildout]
extends =
../openssl/buildout.cfg
../python-cryptography/buildout.cfg
parts =
python-openssl
[python-openssl]
depends = ${python-cryptography:egg}
recipe = zc.recipe.egg:custom
egg = pyOpenSSL
include-dirs =
${openssl:location}/include/
library-dirs =
${openssl:location}/lib/
rpath =
${openssl:location}/lib/
component/slapos/buildout.cfg
View file @ c56da5c4
...@@ -17,7 +17,8 @@ extends = ...@@ -17,7 +17,8 @@ extends =
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../popt/buildout.cfg ../popt/buildout.cfg
../python-2.7/buildout.cfg ../python-2.7/buildout.cfg
../python-openssl/buildout.cfg ../python-cffi/buildout.cfg
../python-cryptography/buildout.cfg
../readline/buildout.cfg ../readline/buildout.cfg
../sqlite3/buildout.cfg ../sqlite3/buildout.cfg
../swig/buildout.cfg ../swig/buildout.cfg
...@@ -91,14 +92,19 @@ output = ${buildout:directory}/environment.sh ...@@ -91,14 +92,19 @@ output = ${buildout:directory}/environment.sh
[lxml-python] [lxml-python]
python = python2.7 python = python2.7
[python-openssl] [python-cffi]
python = python2.7
[python-cryptography]
python = python2.7 python = python2.7
[slapos] [slapos]
recipe = z3c.recipe.scripts recipe = z3c.recipe.scripts
python = python2.7 python = python2.7
eggs = eggs =
${python-openssl:egg} ${python-cffi:egg}
${python-cryptography:egg}
pyOpenSSL
slapos.libnetworkcache slapos.libnetworkcache
zc.buildout zc.buildout
${lxml-python:egg} ${lxml-python:egg}
...@@ -150,14 +156,16 @@ MarkupSafe = 0.18 ...@@ -150,14 +156,16 @@ MarkupSafe = 0.18
Pygments = 1.6 Pygments = 1.6
Werkzeug = 0.9.4 Werkzeug = 0.9.4
buildout-versions = 1.7 buildout-versions = 1.7
cffi = 0.8.1
cmd2 = 0.6.7 cmd2 = 0.6.7
collective.recipe.template = 1.10 collective.recipe.template = 1.10
cryptography = 0.2.1
itsdangerous = 0.23 itsdangerous = 0.23
lxml = 3.2.3 lxml = 3.2.3
meld3 = 0.6.10 meld3 = 0.6.10
netaddr = 0.7.10 netaddr = 0.7.10
prettytable = 0.7.2 prettytable = 0.7.2
pyOpenSSL = 0.13.1 pyOpenSSL = 0.14
pyparsing = 2.0.1 pyparsing = 2.0.1
setuptools = 1.1.6 setuptools = 1.1.6
slapos.libnetworkcache = 0.13.4 slapos.libnetworkcache = 0.13.4
......
software/erp5testnode/software.cfg
View file @ c56da5c4
...@@ -6,6 +6,8 @@ find-links += http://dist.repoze.org ...@@ -6,6 +6,8 @@ find-links += http://dist.repoze.org
extends = extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
../../component/python-2.7/buildout.cfg ../../component/python-2.7/buildout.cfg
../../component/python-cffi/buildout.cfg
../../component/python-cryptography/buildout.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/zip/buildout.cfg ../../component/zip/buildout.cfg
...@@ -67,6 +69,12 @@ python = python2.7 ...@@ -67,6 +69,12 @@ python = python2.7
[lxml-python] [lxml-python]
python = python2.7 python = python2.7
[python-cffi]
python = python2.7
[python-cryptography]
python = python2.7
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
...@@ -196,7 +204,9 @@ PyXML = 0.8.5 ...@@ -196,7 +204,9 @@ PyXML = 0.8.5
Pygments = 1.6 Pygments = 1.6
Werkzeug = 0.9.4 Werkzeug = 0.9.4
buildout-versions = 1.7 buildout-versions = 1.7
cffi = 0.8.1
cmd2 = 0.6.7 cmd2 = 0.6.7
cryptography = 0.2.1
erp5.util = 0.4.36 erp5.util = 0.4.36
inotifyx = 0.2.0-1 inotifyx = 0.2.0-1
itsdangerous = 0.23 itsdangerous = 0.23
...@@ -205,7 +215,7 @@ meld3 = 0.6.10 ...@@ -205,7 +215,7 @@ meld3 = 0.6.10
netaddr = 0.7.10 netaddr = 0.7.10
plone.recipe.command = 1.1 plone.recipe.command = 1.1
psutil = 1.2.1 psutil = 1.2.1
pyOpenSSL = 0.13.1 pyOpenSSL = 0.14
pyparsing = 2.0.1 pyparsing = 2.0.1
pytz = 2013.9 pytz = 2013.9
slapos.core = 1.0.2.1 slapos.core = 1.0.2.1
......
software/seleniumrunner/software.cfg
View file @ c56da5c4
...@@ -5,6 +5,8 @@ extends = ...@@ -5,6 +5,8 @@ extends =
../../component/xorg/buildout.cfg ../../component/xorg/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/python-2.7/buildout.cfg ../../component/python-2.7/buildout.cfg
../../component/python-cffi/buildout.cfg
../../component/python-cryptography/buildout.cfg
../../component/firefox/buildout.cfg ../../component/firefox/buildout.cfg
../../component/dash/buildout.cfg ../../component/dash/buildout.cfg
../../stack/shacache-client.cfg ../../stack/shacache-client.cfg
...@@ -23,6 +25,15 @@ parts = ...@@ -23,6 +25,15 @@ parts =
unzip = true unzip = true
[lxml-python]
python = python2.7
[python-cffi]
python = python2.7
[python-cryptography]
python = python2.7
[instance-recipe] [instance-recipe]
egg = slapos.cookbook egg = slapos.cookbook
module = seleniumrunner module = seleniumrunner
...@@ -54,70 +65,90 @@ output = ${buildout:directory}/template-selenium.cfg ...@@ -54,70 +65,90 @@ output = ${buildout:directory}/template-selenium.cfg
mode = 0644 mode = 0644
[versions] [versions]
# Use SlapOS patched zc.buildout # pin version of setuptools
zc.buildout = 1.6.0-dev-SlapOS-004 setuptools = 2.2
Jinja2 = 2.6 Jinja2 = 2.7.2
Werkzeug = 0.8.3 MarkupSafe = 0.18
Werkzeug = 0.9.4
buildout-versions = 1.7 buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.5.0 cffi = 0.8.1
meld3 = 0.6.8 cmd2 = 0.6.7
slapos.cookbook = 0.46 cryptography = 0.2.1
slapos.recipe.build = 0.7 itsdangerous = 0.23
slapos.recipe.template = 2.2 meld3 = 0.6.10
pyOpenSSL = 0.14
pyparsing = 2.0.1
slapos.cookbook = 0.85
slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2
slapos.recipe.template = 2.5
# Required by:
# slapos.core==1.0.3
Flask = 0.10.1
# Required by: # Required by:
# slapos.core==0.23 # slapos.core==1.0.3
Flask = 0.8 cliff = 1.5.2
# Required by: # Required by:
# slapos.cookbook==0.42 # slapos.cookbook==0.85
PyXML = 0.8.4 inotifyx = 0.2.0-1
# Required by: # Required by:
# slapos.cookbook==0.42 # slapos.cookbook==0.85
inotifyx = 0.2.0 lock-file = 2.0
# Required by: # Required by:
# slapos.cookbook==0.42 # slapos.cookbook==0.85
# slapos.core==0.23 # slapos.core==1.0.3
# xml-marshaller==0.9.7 # xml-marshaller==0.9.7
lxml = 2.3.4 lxml = 3.3.1
# Required by: # Required by:
# slapos.cookbook==0.42 # slapos.cookbook==0.85
netaddr = 0.7.6 netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.23 # slapos.core==1.0.3
netifaces = 0.8 netifaces = 0.8-1
# Required by: # Required by:
# slapos.cookbook==0.42 # cffi==0.8.1
# slapos.core==0.23 pycparser = 2.10
# zc.buildout==1.5.3-dev-SlapOS-010
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# Required by: # Required by:
# slapos.cookbook==0.42 # slapos.cookbook==0.85
slapos.core = 0.23 pytz = 2013.9
# Required by: # Required by:
# slapos.core==0.23 # slapos.core==1.0.3
supervisor = 3.0a12 requests = 2.2.1
# Required by: # Required by:
# slapos.cookbook==0.42 # cliff==1.5.2
xml-marshaller = 0.9.7 six = 1.5.2
# Required by:
# slapos.cookbook==0.85
slapos.core = 1.0.3
# Required by:
# cliff==1.5.2
stevedore = 0.14.1
# Required by:
# slapos.core==1.0.3
supervisor = 3.0
# Required by: # Required by:
# slapos.cookbook==0.42 # slapos.cookbook==0.85
zc.recipe.egg = 1.3.2 xml-marshaller = 0.9.7
# Required by: # Required by:
# slapos.core==0.23 # slapos.core==1.0.3
zope.interface = 3.8.0 zope.interface = 4.1.0
[networkcache] [networkcache]
# signature certificates of the following uploaders. # signature certificates of the following uploaders.
......
stack/slapos.cfg
View file @ c56da5c4
...@@ -12,7 +12,8 @@ extensions += ...@@ -12,7 +12,8 @@ extensions +=
# Use shacache and lxml # Use shacache and lxml
extends = extends =
../component/lxml-python/buildout.cfg ../component/lxml-python/buildout.cfg
../component/python-openssl/buildout.cfg ../component/python-cffi/buildout.cfg
../component/python-cryptography/buildout.cfg
# Separate from site eggs # Separate from site eggs
allowed-eggs-from-site-packages = allowed-eggs-from-site-packages =
...@@ -60,7 +61,9 @@ networkcache-section = networkcache ...@@ -60,7 +61,9 @@ networkcache-section = networkcache
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${python-openssl:egg} ${python-cffi:egg}
${python-cryptography:egg}
pyOpenSSL
slapos.cookbook slapos.cookbook
cliff cliff
hexagonit.recipe.download hexagonit.recipe.download
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7