Merge pull request #6 from FAIRChemistry/develop

Develop

.github/workflows/generate_api.yaml

@@ -1,38 +1,38 @@
-name: Generate API
-
-on: push
-
-jobs:
-  generate-api:
-    runs-on: ubuntu-latest
-    env:
-      LIB_NAME: ${{ secrets.LIB_NAME }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-
-      - name: Install sdRDM
-        run: python3 -m pip install git+https://github.com/JR-1991/software-driven-rdm.git@linking-refactor
-
-      - name: Generate API
-        env:
-          URL: ${{github.repositoryUrl}}
-          COMMIT: ${{github.sha}}
-        run: sdrdm generate --path ./specifications/ --out . --name "$LIB_NAME" --url "$URL" --commit "$COMMIT"
-
-      - name: Push source code
-        run: |
-          if [[ `git status --porcelain` ]]; then
-            git add "$LIB_NAME"
-            git config --global user.name 'sdRDM Bot'
-            git config --global user.email '[email protected]'
-            git commit -am "API update"
-            git push
-          else
-            echo "Nothing changed!"
-          fi
+name: Generate API
+
+on: push
+
+jobs:
+  generate-api:
+    runs-on: ubuntu-latest
+    env:
+      LIB_NAME: ${{ secrets.LIB_NAME }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Install sdRDM
+        run: python3 -m pip install git+https://github.com/JR-1991/software-driven-rdm.git@linking-refactor
+
+      - name: Generate API
+        env:
+          URL: ${{github.repositoryUrl}}
+          COMMIT: ${{github.sha}}
+        run: sdrdm generate --path ./specifications/ --out . --name "$LIB_NAME" --url "$URL" --commit "$COMMIT"
+
+      - name: Push source code
+        run: |
+          if [[ `git status --porcelain` ]]; then
+            git add "$LIB_NAME"
+            git config --global user.name 'sdRDM Bot'
+            git config --global user.email '[email protected]'
+            git commit -am "API update"
+            git push
+          else
+            echo "Nothing changed!"
+          fi

.gitignore

@@ -1,18 +1,35 @@
-# experimental data
-data/
+# raw data
+data/Rohdaten
+
+# generated datasets
+datasets/*
 
 # GitHub
-.github/
+# .github/
 
 # VS Code
 .vscode
 
 # images
 *.png
 
+# log files
+*.log
+
 #compiled python files
 *.pyc
 
-.datamodel_b07_tc/core
+# generated python objects
+# datamodel_b07_tc/core
+
+# compiled bython files
+datamodel_b07_tc/__pycache__
+
+# generated schemes of the data model
+datamodel_b07_tc/schemes
+
+# to do list for this notebook
+todo.txt
 
-.datamodel_b07_tc/__pycache__
+# test notebook to try new things
+test_notebook.ipynb

main.ipynb → 1.1_Main.ipynb

@@ -46,7 +46,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lib = DataModel.from_git(url='https://github.com/FAIRChemistry/datamodel_b07_tc.git')\n",
+    "lib = DataModel.from_git(url='https://github.com/FAIRChemistry/datamodel_b07_tc.git', commit='8748a18ee412d72aa1fd01aa80bfacbbb898a856')\n",
     "# lib = DataModel.from_markdown('specifications/datamodel_b07_tc.md')"
    ]
   },
@@ -79,8 +79,8 @@
       "  \"__source__\": {\n",
       "    \"root\": \"Dataset\",\n",
       "    \"repo\": \"https://github.com/FAIRChemistry/datamodel_b07_tc.git\",\n",
-      "    \"commit\": \"1bdb0deb23b5533debf35363fb3cf66df125fede\",\n",
-      "    \"url\": \"https://github.com/FAIRChemistry/datamodel_b07_tc/tree/1bdb0deb23b5533debf35363fb3cf66df125fede\"\n",
+      "    \"commit\": \"b342319c31e24a3228fb1eb0627492dcd63f35d5\",\n",
+      "    \"url\": \"https://github.com/FAIRChemistry/datamodel_b07_tc/tree/b342319c31e24a3228fb1eb0627492dcd63f35d5\"\n",
       "  }\n",
       "}\n"
      ]