Merge pull request #163 from 0Hughman0/migrate-binder

Migrate binder to 0.3.0, thanks to the migration tool!

binder/Home.ipynb

@@ -30,7 +30,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "print(project.project_folder)\n",
     "print(project.hierarchy)"
@@ -408,7 +408,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.8"
+   "version": "3.8.18"
   }
  },
  "nbformat": 4,

binder/WorkPackages/.wps/WP1.json

@@ -1 +1 @@
-{"description":"Optimizing sample synthesis.\n\nThe first line of any description is taken as the 'info' which is displayed in the browser columns.","started":"29/08/2023","conclusion":"A moderate success.\n\nThe first line of the conclusion is taken as the outcome.","key":"text"}
+{"description": "Optimizing sample synthesis.\n\nThe first line of any description is taken as the 'info' which is displayed in the browser columns.", "started": "2023-08-29 00:00:00", "conclusion": "A moderate success.\n\nThe first line of the conclusion is taken as the outcome.", "key": "text"}

binder/WorkPackages/.wps/WP2.json

@@ -1 +1 @@
-{"description":"Integrating sample into device.\n\n*Markdown* is also _rendered_ in the tier preview panel.\n\nIncluding...\n\n$y = \\sin(x)$\n\nMaths!","started":"29/08/2023","conclusion":""}
+{"description": "Integrating sample into device.\n\n*Markdown* is also _rendered_ in the tier preview panel.\n\nIncluding...\n\n$y = \\sin(x)$\n\nMaths!", "started": "2023-08-29 00:00:00", "conclusion": ""}

binder/WorkPackages/WP1.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "wp = project.env('WP1')\n",
     "wp.gui.header()"

binder/WorkPackages/WP1/.exps/WP1.1.json

@@ -1 +1 @@
-{"description":"Replicating reported method.","started":"29/08/2023","conclusion":"Reported method is nonsense.\n\nThere must be a missing step to the synthesis.\n"}
+{"description": "Replicating reported method.", "started": "2023-08-29 00:00:00", "conclusion": "Reported method is nonsense.\n\nThere must be a missing step to the synthesis.\n"}

binder/WorkPackages/WP1/.exps/WP1.2.json

@@ -1 +1 @@
-{"description": "Trying to use more beans.\n\nWP1.1's approach wasn't great. WP1.1d indicated could be due to a lack of beans, so going to try improving.", "started": "29/08/2023"}
+{"description": "Trying to use more beans.\n\nWP1.1's approach wasn't great. WP1.1d indicated could be due to a lack of beans, so going to try improving.", "started": "2023-08-29 00:00:00"}

binder/WorkPackages/WP1/WP1.1.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "exp = project.env('WP1.1')\n",
     "exp.gui.header()"

binder/WorkPackages/WP1/WP1.1/.smpls/WP1.1a.json

@@ -1 +1 @@
-{"description":"First attempt.","started":"29/08/2023","conclusion":"Not bad! Looked a bit gray though.","cook_time":100}
+{"description": "First attempt.", "started": "2023-08-29 00:00:00", "conclusion": "Not bad! Looked a bit gray though.", "cook_time": 100}

binder/WorkPackages/WP1/WP1.1/.smpls/WP1.1b.json

@@ -1 +1 @@
-{"description":"Trying longer cook time.\n\nFirst attempt was good. Looked a bit gray. Will trying doing for longer.","started":"29/08/2023","cook_time":12}
+{"description": "Trying longer cook time.\n\nFirst attempt was good. Looked a bit gray. Will trying doing for longer.", "started": "2023-08-29 00:00:00", "cook_time": 12}

binder/WorkPackages/WP1/WP1.1/.smpls/WP1.1c.json

@@ -1 +1 @@
-{"description": "Increasing cook time.\n\n1.1b was a bit too far under.", "cook_time": "32", "started": "29/08/2023"}
+{"description": "Increasing cook time.\n\n1.1b was a bit too far under.", "cook_time": "32", "started": "2023-08-29 00:00:00"}

binder/WorkPackages/WP1/WP1.1/.smpls/WP1.1d.json

@@ -1 +1 @@
-{"description": "Just a bit more.\n\n1.1c looking good but not quite.", "cook_time": "42", "started": "29/08/2023"}
+{"description": "Just a bit more.\n\n1.1c looking good but not quite.", "cook_time": "42", "started": "2023-08-29 00:00:00"}

binder/WorkPackages/WP1/WP1.1/WP1.1a.ipynb

@@ -22,7 +22,7 @@
     "import matplotlib.pyplot as plt\n",
     "from PIL import Image\n",
     "\n",
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "smpl = project.env('WP1.1a')\n",
     "smpl.gui.header()"

binder/WorkPackages/WP1/WP1.1/WP1.1b.ipynb

@@ -55,7 +55,7 @@
     "import matplotlib.pyplot as plt\n",
     "from PIL import Image\n",
     "\n",
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "smpl = project.env('WP1.1b')\n",
     "smpl.gui.header()"

binder/WorkPackages/WP1/WP1.1/WP1.1c.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "smpl = project.env('WP1.1c')\n",
     "smpl.gui.header()"

binder/WorkPackages/WP1/WP1.1/WP1.1d.ipynb

@@ -22,7 +22,7 @@
     "import matplotlib.pyplot as plt\n",
     "from PIL import Image\n",
     "\n",
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "smpl = project.env('WP1.1d')\n",
     "smpl.gui.header()"

binder/WorkPackages/WP1/WP1.2.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "exp = project.env('WP1.2')\n",
     "exp.gui.header()"
@@ -46,4 +46,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

binder/WorkPackages/WP1/WP1.2/.smpls/WP1.2a.json

@@ -1 +1 @@
-{"description": "First attempt.\n\nGot tips from a colleague. ", "started": "29/08/2023"}
+{"description": "First attempt.\n\nGot tips from a colleague. ", "started": "2023-08-29 00:00:00"}

binder/WorkPackages/WP1/WP1.2/WP1.2a.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "smpl = project.env('WP1.2a')\n",
     "smpl.gui.header()"
@@ -46,4 +46,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

binder/WorkPackages/WP2.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "wp = project.env('WP2')\n",
     "wp.gui.header()"
@@ -46,4 +46,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

binder/cas_project.py

@@ -0,0 +1,6 @@
+from cassini import Project, DEFAULT_TIERS
+
+project = Project(DEFAULT_TIERS, __file__)
+
+if __name__ == '__main__':
+    project.launch()

binder/environment.yml

@@ -4,5 +4,6 @@ dependencies:
   - pip
   - matplotlib
   - pip:
-    - cassini
+    - cassini==0.3.0a4
+
 

binder/postBuild

@@ -3,5 +3,5 @@ cd binder
 mkdir ~/.jupyter
 mv jupyter_jupyterlab_server_config.py ~/.jupyter/jupyter_lab_config.py
 
-python -c "from project import project; project.setup_files()"
-python -c "from project import project; project.setup_files()"
+python -c "from cas_project import project; project.setup_files()"
+python -c "from cas_project import project; project.setup_files()"

binder/start

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd binder
-export CASSINI_PROJECT='project.py:project'
+export CASSINI_PROJECT='cas_project.py:project'
 export PYTHONPATH=$PWD
 
 exec "$@"

binder/templates/Experiment/Experiment.tmplt-Copy1.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "{{ tier.short_type }} = project.env('{{ tier.name }}')\n",
     "{{ tier.short_type }}.gui.header()"

binder/templates/Home/Home.tmplt.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "{{ tier.short_type }} = project.env('{{ tier.name }}')\n",
     "{{ tier.short_type }}.gui.header()"
@@ -46,4 +46,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

binder/templates/Sample/Cooking.ipynb

@@ -14,7 +14,7 @@
     "import matplotlib.pyplot as plt\n",
     "from PIL import Image\n",
     "\n",
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "{{ tier.short_type }} = project.env('{{ tier.name }}')\n",
     "{{ tier.short_type }}.gui.header()"

binder/templates/Sample/Sample.tmplt.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "{{ tier.short_type }} = project.env('{{ tier.name }}')\n",
     "{{ tier.short_type }}.gui.header()"
@@ -46,4 +46,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

binder/templates/WorkPackage/WorkPackage.tmplt.ipynb

@@ -18,7 +18,7 @@
     }
    ],
    "source": [
-    "from project import project\n",
+    "from cas_project import project\n",
     "\n",
     "{{ tier.short_type }} = project.env('{{ tier.name }}')\n",
     "{{ tier.short_type }}.gui.header()"
@@ -46,4 +46,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}