pep8 + use of $PYINT (#163)

sdpython · Aug 20, 2018 · db22845 · db22845
1 parent 7873b80
commit db22845
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/_unittests/ut_jenkinshelper/test_yaml.py b/_unittests/ut_jenkinshelper/test_yaml.py
@@ -335,13 +335,13 @@ def zz_st_jconvert_sequence_into_batch_file(self, platform):
             echo AUTOMATEDSETUP
             export current=ROOT/pyquickhelper/$NAME_JENKINS
 
-            echo interpreter=C:/Python__VERS___x64/python
+            echo interpreter=C:/Python__VERS___x64/$PYINT
 
             echo CREATE VIRTUAL ENVIRONMENT in ROOT/pyquickhelper/$NAME_JENKINS/_venv
             if [-f ROOT/pyquickhelper/$NAME_JENKINS/_venv]; then mkdir "ROOT/pyquickhelper/$NAME_JENKINS/_venv"; fi
             export KEEPPATH=$PATH
             export PATH=C:/Python__VERS___x64:$PATH
-            "C:/Python__VERS___x64/python" -c "from virtualenv import create_environment;create_environment(\\"ROOT/pyquickhelper/$NAME_JENKINS/_venv\\", site_packages=True)"
+            "C:/Python__VERS___x64/$PYINT" -c "from virtualenv import create_environment;create_environment(\\"ROOT/pyquickhelper/$NAME_JENKINS/_venv\\", site_packages=True)"
             export PATH=$KEEPPATH
             if [ $? -ne 0 ]; then exit $?; fi
 

diff --git a/src/pyquickhelper/helpgen/utils_sphinx_doc.py b/src/pyquickhelper/helpgen/utils_sphinx_doc.py
@@ -424,7 +424,7 @@ def apply_modification_template(rootm, store_obj, template, fullname, rootrep,
     not_expected = os.environ.get(
         "USERNAME", os.environ.get("USER", "````````````"))
     if not_expected in fullnamenoext:
-        mes = "The title is probably wrong (5): {0}\nnoext='{1}'\npython='{2}'\nrootm='{3}'\nrootrep='{4}'" +
+        mes = "The title is probably wrong (5): {0}\nnoext='{1}'\npython='{2}'\nrootm='{3}'\nrootrep='{4}'" + \
               "\nfullname='{5}'\nkeepf='{6}'\nnot_expected='{7}'"
         raise HelpGenException(mes.format(
             fullnamenoext, filenoext, pythonname, rootm, rootrep, fullname, keepf, not_expected))
@@ -555,7 +555,7 @@ def apply_modification_template(rootm, store_obj, template, fullname, rootrep,
     not_expected = os.environ.get(
         "USERNAME", os.environ.get("USER", "````````````"))
     if not_expected in fullnamenoext:
-        mes = "The title is probably wrong (3): {0}\nnoext={1}\npython={2}\nrootm={3}\nrootrep={4}" +
+        mes = "The title is probably wrong (3): {0}\nnoext={1}\npython={2}\nrootm={3}\nrootrep={4}" + \
               "\nfullname={5}\nkeepf={6}\nnot_expected='{7}'"
         raise HelpGenException(mes.format(
             fullnamenoext, filenoext, pythonname, rootm, rootrep, fullname, keepf, not_expected))

diff --git a/src/pyquickhelper/jenkinshelper/yaml_helper.py b/src/pyquickhelper/jenkinshelper/yaml_helper.py
@@ -381,8 +381,12 @@ def add_path_win(rows, interpreter, platform, root_project):
                     conda = ospathjoin(
                         value, "bin", "conda", platform=platform)
             else:
-                interpreter = ospathjoin(
-                    value, "python", platform=platform)
+                if iswin:
+                    interpreter = ospathjoin(
+                        value, "python", platform=platform)
+                else:
+                    interpreter = ospathjoin(
+                        value, "$PYINT", platform=platform)
                 venv_interpreter = value
             rows.append(echo + " interpreter=" + interpreter)