Commit 577f27ea authored by Jérome Perrin's avatar Jérome Perrin

software/slapos-sr-testing: fix python-interpreter for python3

The initial intent was to use an interpreter named `python_for_test` and not
`python`, so that software do not accidentally pick up this python during
compilation.
6033e4fa (software/slapos-sr-testing: fix python3 profile, 2020-12-01)
was a quick fix for some python3 compatibility issues discovered after merge,
but it was not correct, because by using ${python-interpreter:eggs}, it was
installing the default python-interpreter section, which has an interpreter
named `python`.

This caused issues while building proxysql, which assumes /usr/bin/env python
is python2.

The fix is to override python-interpreter directly, we don't need another
section eggs here.
parent b1bbe050
......@@ -5,8 +5,8 @@ extends =
[python]
part = python3
[eggs]
eggs +=
[python-interpreter]
extra-eggs +=
# plantuml 0.3.0 is only available for Python 3
${slapos.test.plantuml-setup:egg}
......
......@@ -167,10 +167,9 @@ branch = master
egg = slapos.core
setup = ${slapos.core-repository:location}
[eggs]
<= python-interpreter
eggs =
${python-interpreter:eggs}
[python-interpreter]
eggs += ${:extra-eggs}
extra-eggs =
${lxml-python:egg}
${slapos.core-setup:egg}
${pillow-python:egg}
......@@ -217,7 +216,7 @@ PyPDF2-patch-options = -p1
[eggs/scripts]
recipe = zc.recipe.egg
eggs = ${eggs:eggs}
eggs = ${python-interpreter:eggs}
scripts =
slapos
supervisord
......@@ -244,7 +243,7 @@ context =
key nxdtest_instance nxdtest-instance.cfg:rendered
key git_location git:location
key slapos_location slapos-repository:location
key interpreter eggs:interpreter
key interpreter python-interpreter:interpreter
key curl_location curl:location
key openssl_location openssl-output:bin
key faketime_location faketime:location
......
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