stack/macros: Simplify pythonpath macro

See merge request !1398

component/macros/macro.pythonpath.eggs.cfg

@@ -3,22 +3,14 @@ parts =
 
 [macro.pythonpath.eggs]
 recipe = slapos.recipe.build
-_name_ = ${:_buildout_section_name_}
 init =
-  prerequisite = """
-  [.%(_name_)s.prerequisite]
-  recipe = slapos.recipe.build
-  init =
-    section = self.buildout['%(_name_)s']
-    self.eggs = [e.strip() for e in section['eggs'].splitlines() if e.strip()]
-  update =
+  self.eggs = [e.strip() for e in options['eggs'].splitlines() if e.strip()]
+update =
   from zc.buildout.easy_install import working_set
   buildout = self.buildout['buildout']
   eggs_directory = buildout['eggs-directory']
   develop_eggs_directory = buildout['develop-eggs-directory']
   dists = working_set(self.eggs, [develop_eggs_directory, eggs_directory])
   paths = ':'.join(dist.location for dist in dists)
-    self.buildout['%(environment)s']['PYTHONPATH'] = paths
+  self.buildout[options['environment']]['PYTHONPATH'] = paths
   print("PYTHONPATH=" + paths)
-  """ % options
-  self.buildout.parse(prerequisite)

software/jupyter/test/test.py

@@ -32,6 +32,7 @@ import os
 import requests
 import sqlite3
 import subprocess
+import tempfile
 
 from slapos.proxy.db_version import DB_VERSION
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
@@ -271,65 +272,75 @@ class TestJupyterCustomAdditional(SelectMixin, InstanceTestCase):
     r.destroyed()
 
 
-class TestIPython(InstanceTestCase):
-
-  converted_notebook = 'test.nbconvert.ipynb'
-  notebook_filename = 'test.ipynb'
-  test_sentence = 'test'
+class IPythonNotebook(object):
+  def __init__(self, name, binary):
+    self.tempdir = tempdir = tempfile.TemporaryDirectory()
+    path = os.path.join(tempdir.name, name)
+    self.path = path + '.ipynb'# input notebook
+    self.output_path = path + '.nbconvert.ipynb' # output notebook
+    self.binary = binary
 
-  def setUp(self):
-    super().setUp()
-    notebook_source = {
+  def write(self, code):
+    content = {
       "cells": [
         {
           "cell_type": "code",
           "execution_count": None,
           "metadata": {},
           "outputs": [],
-        "source": [
-          "import sys\n",
-          "print('" + self.test_sentence + "')"
-        ]
+          "source": code.splitlines(keepends=True)
         }
       ],
       "metadata": {},
       "nbformat": 4,
       "nbformat_minor": 4
     }
-    with open(self.notebook_filename, 'w') as notebook:
-      notebook.write(json.dumps(notebook_source))
+    with open(self.path, 'w') as notebook:
+      notebook.write(json.dumps(content))
+
+  def run(self):
+    return subprocess.check_output(
+      (self.binary,'--execute', '--to', 'notebook', self.path),
+      stderr=subprocess.STDOUT, text=True)
+
+  def readResult(self):
+    with open(self.output_path) as result:
+      return json.loads(result.read())['cells'][0]['outputs'][0]['text'][0]
+
+  def __enter__(self):
+    return self
+
+  def __exit__(self, *args):
+    if self.tempdir:
+      self.tempdir.cleanup()
+      del self.tempdir
+
 
-  def tearDown(self):
-    os.remove(self.notebook_filename)
-    if os.path.exists(self.converted_notebook):
-      os.remove(self.converted_notebook)
-    super().tearDown()
+class TestIPython(InstanceTestCase):
+  message = 'test_sys'
+  module = 'sys'
 
   def test(self):
-    conversion_output = subprocess.check_output([
-      os.path.join(
+    binary = os.path.join(
       self.computer_partition_root_path,
-        'software_release',
-        'bin',
-        'jupyter-nbconvert',
-      ),
-      '--execute',
-      '--to',
-      'notebook',
-      self.notebook_filename,
-    ], stderr=subprocess.STDOUT, text=True)
+      'software_release', 'bin', 'jupyter-nbconvert')
+    with IPythonNotebook('test', binary) as notebook:
+      notebook.write("import %s\nprint(%r)" % (self.module, self.message))
+      out = notebook.run()
+
       self.assertIn(
-      '[NbConvertApp] Converting notebook %s to notebook' % self.notebook_filename,
-      conversion_output,
+        "[NbConvertApp] Converting notebook %s to notebook" % notebook.path,
+        out,
       )
       self.assertRegex(
-      conversion_output,
-      r'\[NbConvertApp\] Writing \d+ bytes to %s' % self.converted_notebook
+        out,
+        r"\[NbConvertApp\] Writing \d+ bytes to %s" % notebook.output_path
       )
 
-    self.assertTrue(os.path.exists(self.converted_notebook))
-    with open(self.converted_notebook) as json_result:
-      self.assertEqual(
-        json.loads(json_result.read())['cells'][0]['outputs'][0]['text'][0],
-        self.test_sentence + '\n',
-      )
+      self.assertTrue(os.path.exists(notebook.output_path))
+      self.assertEqual(notebook.readResult(), self.message + '\n')
+
+
+class TestIPythonNumpy(TestIPython):
+  message = 'test_numpy'
+  module = 'numpy'