add requests library to requirements, fix submodule paths

docs/notebooks/IntegrationTests.ipynb

@@ -0,0 +1,56 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "id": "81e3f644-d121-43c4-9771-7279112614f4",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from science_jubilee.Machine import Machine"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "id": "c0fb2556-e63b-4c2e-8ce4-6c6a33f84da8",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from science_jubilee.decks.Deck import Deck\n",
+    "from science_jubilee.tools.Syringe import Syringe\n",
+    "from science_jubilee.tools.Loop import Loop\n",
+    "from science_jubilee.tools.Camera import Camera"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "20937719-861b-44ee-9123-1436b7872f6d",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "plos-revisions",
+   "language": "python",
+   "name": "plos-revisions"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.9"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

docs/notebooks/Labware_Object_Demo.ipynb

@@ -447,7 +447,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.12"
+   "version": "3.8.9"
   }
  },
  "nbformat": 4,

science_jubilee/Machine.py

@@ -12,11 +12,11 @@
 # import pprint
 #from inpromptu import Inpromptu, cli_method
 
-from decks.Deck import Deck
+from science_jubilee.decks.Deck import Deck
 from pathlib import Path
 from functools import wraps
 #from serial.tools import list_ports
-from tools.Tool import Tool
+from science_jubilee.tools.Tool import Tool
 from typing import Union
 
 

science_jubilee/decks/Deck.py

@@ -3,7 +3,7 @@
 import numpy as np
 
 from dataclasses import dataclass
-from labware.Labware import Labware
+from science_jubilee.labware.Labware import Labware
 from typing import Dict, Tuple
 
 @dataclass

setup.py

@@ -23,5 +23,5 @@ def read(fname):
         "Operating System :: POSIX :: Linux",
     ],
     python_requires='>=3.6',
-    install_requires=['pyserial==3.5', 'ipykernel', 'numpy', 'opencv_contrib_python==4.5.3.56', 'matplotlib', "Jinja2", "picamera;platform_system=='Linux'"]
+    install_requires=['pyserial==3.5', 'requests', 'ipykernel', 'numpy', 'opencv_contrib_python==4.5.3.56', 'matplotlib', "Jinja2", "picamera;platform_system=='Linux'"]
 )