Commit b2c06906 authored by Kirill Smelkov's avatar Kirill Smelkov

pygolang: Always use git checkout for both release and development version

Similarly to wendelin.core (see ad34ff4a "wendelin.core: Always use git
checkout for both release and development version") let's switch pygolang to
install via git checkout for both release and tests.

This way we avoid dependency on pypi and will be able to do minor updates
without doing bigger to-pypi releases. Always using git checkout also helps
security a bit because we remove reliance on trust to tarball received from pypi.

/cc @kazuhiko
/reviewed-by @jerome
/reviewed-on !1569
parent a304fdc3
# SlapOS component for pygolang development.
[buildout]
extends =
buildout.cfg
../git/buildout.cfg
# override pygolang to install it from latest git version
[pygolang]
recipe = zc.recipe.egg:develop
setup = ${pygolang-repository:location}
[pygolang-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/pygolang.git
branch = master
location = ${buildout:parts-directory}/pygolang-dev
git-executable = ${git:location}/bin/git
# unpin pygolang from versions, so that buildout does not fallback to
# installing non-dev egg if dev one has changed its version.
[versions]
pygolang =
...@@ -4,15 +4,17 @@ ...@@ -4,15 +4,17 @@
[buildout] [buildout]
extends = extends =
../../component/cython/buildout.cfg ../../component/cython/buildout.cfg
../git/buildout.cfg
parts = parts =
pygolang pygolang
gpython gpython
# pygolang installed from released egg from pypi # pygolang is installed from git checkout
[pygolang] [pygolang]
recipe = zc.recipe.egg:custom recipe = zc.recipe.egg:develop
setup = ${pygolang-repository:location}
egg = pygolang egg = pygolang
setup-eggs = setup-eggs =
${cython:egg} ${cython:egg}
...@@ -27,6 +29,15 @@ scripts = gpython ...@@ -27,6 +29,15 @@ scripts = gpython
# convenience for gpython users # convenience for gpython users
exe = ${buildout:bin-directory}/gpython exe = ${buildout:bin-directory}/gpython
[pygolang-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/pygolang.git
branch = master
revision = pygolang-0.1-0-g7b72d418
location = ${buildout:parts-directory}/pygolang
git-executable = ${git:location}/bin/git
# python-interpreter provides python interpreter with all specified eggs. # python-interpreter provides python interpreter with all specified eggs.
# eggs default to pygolang, but can be overwritten or changed in inherited section. # eggs default to pygolang, but can be overwritten or changed in inherited section.
# if eggs are changes, they must still have pygolang. # if eggs are changes, they must still have pygolang.
...@@ -106,7 +117,3 @@ init = ...@@ -106,7 +117,3 @@ init =
eggs += %(eggs)s eggs += %(eggs)s
interpreter = $${:_buildout_section_name_} interpreter = $${:_buildout_section_name_}
""" % locals()) """ % locals())
[versions]
pygolang = 0.1
...@@ -5,7 +5,7 @@ extends = ...@@ -5,7 +5,7 @@ extends =
../../stack/nxdtest.cfg ../../stack/nxdtest.cfg
../pytest/buildout.cfg ../pytest/buildout.cfg
../numpy/buildout.cfg ../numpy/buildout.cfg
buildout-dev.cfg buildout.cfg
parts = parts =
pygolang pygolang
......
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