Merge pull request #273 from cadCAD-org/multi_os

 Test in CI: Jupyter server not recognizing cadCAD module

.circleci/config.yml

@@ -41,15 +41,12 @@ jobs:
   jupyterServerTest:
     docker:
       - image: cimg/python:3.9.5
-#    executor: python3_9_5/default
     steps:
       - checkout
       - python/load-cache
-#      - python/install-deps
-#      - python/save-cache
       - run: python --version
       - run: pip install --upgrade pip
-      - run: pip install -r requirements.txt
+      - run: pip install jupyter
       - python/save-cache
       - run: python setup.py bdist_wheel
       - run: pip install dist/*.whl --force-reinstall

requirements.txt

@@ -14,7 +14,7 @@ plotly==4.10.0
 pyarrow>=1.0.1
 pytest==6.0.2
 scikit-learn==0.23.2
-scipy==1.5.2
+scipy>=1.5.2
 seaborn==0.11.0
 tabulate==0.8.7
 xarray==0.16.0

testing/tests/import_cadCAD.ipynb

@@ -17,8 +17,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "dunder_file = os.path.abspath('')\n",
-    "file_path = f'{dunder_file}/expected_results/cadCAD_memory_address.json'\n",
+    "# dunder_file = os.path.abspath('')\n",
+    "# file_path = f'{dunder_file}/expected_results/cadCAD_memory_address.json'\n",
+    "file_path = f'{os.getcwd()}/cadCAD_memory_address.json'\n",
     "with open(file_path, 'w') as json_file:\n",
     "    memory_address = {'memory_address': hex(id(cadCAD))}\n",
     "    json.dump(memory_address, json_file)"

testing/tests/import_cadCAD_test.py

@@ -2,10 +2,10 @@
 
 class JupyterServerTest(unittest.TestCase):
     def test_row_count(self):
-        command = 'jupyter nbconvert --to=notebook --ExecutePreprocessor.enabled=True import_cadCAD.ipynb'
+        command = f'jupyter nbconvert --to=notebook --ExecutePreprocessor.enabled=True {os.getcwd()}/testing/tests/import_cadCAD.ipynb'
         process = subprocess.Popen(command.split(), stdout=subprocess.PIPE)
         process.communicate()
-        json_path = f'{os.getcwd()}/expected_results/cadCAD_memory_address.json'
+        json_path = f'{os.getcwd()}/testing/tests/cadCAD_memory_address.json'
         memory_address = json.load(open(json_path))['memory_address']
         self.assertEqual(type(memory_address) == str, True, "cadCAD is not importable by jupyter server")