Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #6

Merged
merged 15 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions .github/workflows/generate_api.yaml
Original file line number Diff line number Diff line change
@@ -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
27 changes: 22 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions main.ipynb → 1.1_Main.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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')"
]
},
Expand Down Expand Up @@ -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"
]
Expand Down
Loading
Loading