Skip to content

Dev to main #10

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

Merged
merged 6 commits into from
Feb 4, 2025
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
17 changes: 10 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,29 @@ name: main

on:
pull_request:
push:
branches: [main]

jobs:
mac_win_test:
strategy:
fail-fast: false
matrix:
python-version: ['3.11']
python-version: ['3.13']
os: [windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: install dependencies
run: |
python -m pip install --upgrade pip
pip install -r configs/dev/requirements.test.txt
pip install .
pip install tox
- name: tox test
run: |
Expand All @@ -34,10 +37,10 @@ jobs:
fail-fast: false
runs-on: ubuntu-latest
steps:
- name: Set up Python 3.11
uses: actions/setup-python@v3
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.13'
- name: Install dependencies
run: |
sudo mkdir -p $CU_HOME && sudo chown runner -R $CU_HOME
Expand All @@ -46,7 +49,7 @@ jobs:
echo "$CU_HOME/$PY_DIR/bin" >> $GITHUB_PATH
echo "$CU_HOME/$PY_DIR/shims" >> $GITHUB_PATH
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: lint and test
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
CU_HOME: /home/custom
runs-on: ubuntu-latest
steps:
- name: Set up Python 3.11
uses: actions/setup-python@v3
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.13'
- name: Install dependencies
run: |
sudo mkdir -p $CU_HOME && sudo chown runner -R $CU_HOME
Expand All @@ -33,15 +33,15 @@ jobs:
echo "$CU_HOME/$PY_DIR/bin" >> $GITHUB_PATH
echo "$CU_HOME/$PY_DIR/shims" >> $GITHUB_PATH
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Create documentation html
run: |
make docs
make runDocs
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
path: ./public
deploy:
Expand All @@ -53,4 +53,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## v0.2.0 (2025-02-04)

### Feat

- source now list of sourcestrings

### Fix

- solve "None" fields are not required

## v0.1.1 (2025-01-15)

### Fix
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ setup:
$(POETRY) env remove --all
$(POETRY) config virtualenvs.in-project true
$(POETRY) env use `pyenv which python`
$(POETRY) self add poetry-plugin-export
$(POETRY) self add poetry-plugin-shell

uninstall:
pyenv local $(PYV)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![release: 0.1.1](https://img.shields.io/badge/rel-0.1.1-blue.svg?style=flat-square)](https://github.com/LeibnizDSMZ/microbial-data-standard)
[![release: 0.2.0](https://img.shields.io/badge/rel-0.2.0-blue.svg?style=flat-square)](https://github.com/LeibnizDSMZ/microbial-data-standard)
[![MIT LICENSE](https://img.shields.io/badge/License-MIT-brightgreen.svg?style=flat-square)](https://choosealicense.com/licenses/mit/)
[![Documentation Status](https://img.shields.io/badge/docs-GitHub-blue.svg?style=flat-square)](https://LeibnizDSMZ.github.io/microbial-data-standard/)

Expand Down
17 changes: 15 additions & 2 deletions docs/graph.md
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ gamma
}

class `CultivationMedia`{
name: string | null
name: string
url: string | null
reagentUsed: string
source: string
Expand Down Expand Up @@ -562,7 +562,7 @@ availability: boolean | null
catalogUrl: string | null
restrictionsOnUse: Restriction | null
axenicCulture: boolean | null
supplyForms: array | null
supplyForms: array[SupplyForm]
history: string | null
depositionDate: string | null
depositor: Person | null
Expand All @@ -576,6 +576,18 @@ Only for non-commercial purposes
For commercial development a special agreement is requested
}

class `SupplyForm`{
<<enumeration>>
Agar
Cryo
Dry ice
Liquid medium
Lyo
Oil
Water
DNA
}

class `OtherMedia`{
url: string | null
name: string | null
Expand Down Expand Up @@ -722,6 +734,7 @@ sources:
`Collection` ..> `Identifier`
`Collection` ..> `Address`
`Collection` ..> `Restriction`
`Collection` ..> `SupplyForm`
`Collection` ..> `Person`
`Microbe` ..> `OtherMedia`
```
4 changes: 2 additions & 2 deletions docs/schema/05. typeStrain.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ Type Strain `Required`
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/06. taxon.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@ Same As
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
7 changes: 5 additions & 2 deletions docs/schema/07. sample.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ Precision
## 07.5. sample.tags
Isolation Source Tags

Description:
> Isolation tag system, original used by BacDive

**array[object]**

---
Expand All @@ -162,6 +165,6 @@ Level 3
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
6 changes: 3 additions & 3 deletions docs/schema/08. isolation.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Address

---
## 08.2.4.1. isolation.isolatedAt.address.addressCountry
Country `Required`
Country

**string, null**

Expand Down Expand Up @@ -159,6 +159,6 @@ URL
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/09. legal.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ GMO Information
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/10. cellShape.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ Cell Shape `Required`
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/11. oxygenRelation.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ Oxygen Relation `Required`
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/12. multiCellComplexForming.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ Multi Cell Complex Forming `Required`
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/13. cellSize.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ Enum:
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/14. motility.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ Gliding
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/15. colony.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ Enum:
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/16. sporeFormation.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ Spore Ejection
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
12 changes: 2 additions & 10 deletions docs/schema/17. temperature.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ Unit `Required`

**string**

Enum:

C

---
## 17.5. temperature.tested
Tests
Expand All @@ -56,10 +52,6 @@ Unit `Required`

**string**

Enum:

C

---
## 17.5.4. temperature.tested.growth
Growth `Required`
Expand All @@ -71,6 +63,6 @@ Growth `Required`
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
12 changes: 2 additions & 10 deletions docs/schema/18. pH.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ Unit `Required`

**string**

Enum:

pH

---
## 18.5. pH.tested
Tests
Expand All @@ -56,10 +52,6 @@ Unit `Required`

**string**

Enum:

pH

---
## 18.5.4. pH.tested.growth
Growth `Required`
Expand All @@ -71,6 +63,6 @@ Growth `Required`
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/19. identifier.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ URL
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/20. connectedPersons.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ Enum:
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/21. pathogenicity.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ Classification
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
4 changes: 2 additions & 2 deletions docs/schema/22. bioSafety.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ URL
Source `Required`

Description:
> JSON path to source object
> List of JSON paths to source object

**string**
**array[string]**
Loading