From d16b2092c03494fb6a2ce64bb89b2a8a2431d4b7 Mon Sep 17 00:00:00 2001 From: jpizarro Date: Wed, 18 Dec 2024 13:49:26 +0100 Subject: [PATCH] Changing name to package folder --- .coveragerc | 2 +- .github/workflows/actions.yml | 8 ++-- .github/workflows/coveralls.yml | 2 +- .gitignore | 8 ++-- .gitmodules | 4 +- .vscode/settings.json | 8 ++-- README.md | 39 ++++++++++++------- bam_data_store/dependencies/openbisschema | 1 - .../__init__.py | 0 .../cli/__init__.py | 0 {bam_data_store => bam_masterdata}/cli/cli.py | 16 ++++---- .../cli/entities_to_excel.py | 2 +- .../cli/entities_to_json.py | 2 +- .../datamodel/__init__.py | 0 .../datamodel/collection_types.py | 4 +- .../datamodel/dataset_types.py | 0 .../datamodel/object_types.py | 4 +- .../datamodel/property_types.py | 2 +- .../datamodel/vocabulary_types.py | 4 +- {bam_data_store => bam_masterdata}/logger.py | 0 .../metadata/__init__.py | 0 .../metadata/definitions.py | 0 .../metadata/entities.py | 2 +- .../utils/__init__.py | 0 .../utils/utils.py | 1 - mkdocs.yml | 6 +-- pyproject.toml | 12 +++--- scripts/install_python_dependencies.sh | 2 +- tests/conftest.py | 6 +-- tests/metadata/test_definitions.py | 2 +- tests/test_logger.py | 2 +- tests/utils/test_utils.py | 4 +- 32 files changed, 75 insertions(+), 68 deletions(-) delete mode 160000 bam_data_store/dependencies/openbisschema rename {bam_data_store => bam_masterdata}/__init__.py (100%) rename {bam_data_store => bam_masterdata}/cli/__init__.py (100%) rename {bam_data_store => bam_masterdata}/cli/cli.py (82%) rename {bam_data_store => bam_masterdata}/cli/entities_to_excel.py (98%) rename {bam_data_store => bam_masterdata}/cli/entities_to_json.py (97%) rename {bam_data_store => bam_masterdata}/datamodel/__init__.py (100%) rename {bam_data_store => bam_masterdata}/datamodel/collection_types.py (91%) rename {bam_data_store => bam_masterdata}/datamodel/dataset_types.py (100%) rename {bam_data_store => bam_masterdata}/datamodel/object_types.py (94%) rename {bam_data_store => bam_masterdata}/datamodel/property_types.py (70%) rename {bam_data_store => bam_masterdata}/datamodel/vocabulary_types.py (95%) rename {bam_data_store => bam_masterdata}/logger.py (100%) rename {bam_data_store => bam_masterdata}/metadata/__init__.py (100%) rename {bam_data_store => bam_masterdata}/metadata/definitions.py (100%) rename {bam_data_store => bam_masterdata}/metadata/entities.py (98%) rename {bam_data_store => bam_masterdata}/utils/__init__.py (100%) rename {bam_data_store => bam_masterdata}/utils/utils.py (99%) diff --git a/.coveragerc b/.coveragerc index 38ed70c..8b25d7a 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,4 +1,4 @@ [run] omit = - bam_data_store/_version.py + bam_masterdata/_version.py */__init__.py \ No newline at end of file diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 82df73e..99eb97b 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -34,10 +34,10 @@ jobs: uv pip install -e '.[dev]' - name: mypy run: | - python -m mypy --ignore-missing-imports --follow-imports=silent --no-strict-optional --exclude dependencies bam_data_store tests + python -m mypy --ignore-missing-imports --follow-imports=silent --no-strict-optional --exclude dependencies bam_masterdata tests - name: Test with pytest run: | - python -m pytest -sv --ignore=bam_data_store/dependencies tests + python -m pytest -sv --ignore=bam_masterdata/dependencies tests build-and-install: runs-on: ubuntu-latest steps: @@ -62,11 +62,11 @@ jobs: - uses: actions/checkout@v4 - uses: chartboost/ruff-action@v1 with: - args: "check . --exclude bam_data_store/dependencies" + args: "check . --exclude bam_masterdata/dependencies" ruff-formatting: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: chartboost/ruff-action@v1 with: - args: "format . --check --verbose --exclude bam_data_store/dependencies" \ No newline at end of file + args: "format . --check --verbose --exclude bam_masterdata/dependencies" \ No newline at end of file diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml index eb51531..fd52b28 100644 --- a/.github/workflows/coveralls.yml +++ b/.github/workflows/coveralls.yml @@ -30,7 +30,7 @@ jobs: uv pip install coveralls - name: Build coverage file run: | - pytest --cov-config=.coveragerc --junitxml=pytest.xml --cov=bam_data_store tests | tee pytest-coverage.txt + pytest --cov-config=.coveragerc --junitxml=pytest.xml --cov=bam_masterdata tests | tee pytest-coverage.txt - name: Pytest coverage comment uses: MishaKav/pytest-coverage-comment@main with: diff --git a/.gitignore b/.gitignore index 6cabf4c..1dda6bb 100644 --- a/.gitignore +++ b/.gitignore @@ -169,9 +169,9 @@ cython_debug/ # Ruff .ruff_cache -# static artifacts -artifacts - # pytest coverage pytest.xml -pytest-coverage.txt \ No newline at end of file +pytest-coverage.txt + +# artifacts +artifacts \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index d59ac33..25664af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "bam_data_store/dependencies/openbisschema"] - path = bam_data_store/dependencies/openbisschema +[submodule "bam_masterdata/dependencies/openbisschema"] + path = bam_masterdata/dependencies/openbisschema url = https://git.bam.de/bam-data-store/development/openbisschema.git diff --git a/.vscode/settings.json b/.vscode/settings.json index 806496d..43caab4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -33,7 +33,7 @@ "type": "debugpy", "request": "launch", "console": "integratedTerminal", - "program": "${workspaceFolder}/src/bam_data_store/app.py", // path to your entry point Python module + "program": "${workspaceFolder}/src/bam_masterdata/app.py", // path to your entry point Python module }, { "name": "bds tests", @@ -51,11 +51,11 @@ ] }, { - "name": "bds export-entities-to-json", + "name": "bds export-to-json", "type": "debugpy", "request": "launch", "cwd": "${workspaceFolder}", - "program": "${workspaceFolder}/.venv/bin/bam_data_store", + "program": "${workspaceFolder}/.venv/bin/bam_masterdata", "justMyCode": false, "args": ["export-entities-to-json"] }, @@ -64,7 +64,7 @@ "type": "debugpy", "request": "launch", "cwd": "${workspaceFolder}", - "program": "${workspaceFolder}/.venv/bin/bam_data_store", + "program": "${workspaceFolder}/.venv/bin/bam_masterdata", "justMyCode": false, "args": ["export-entities-to-excel"] }, diff --git a/README.md b/README.md index e068e91..68d8e5f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ -# BAMDataStore - -This is the main repository of the BAM Data Store project. This is both a Python package and a web connecting the different resources for the Data Store. +# BAM Masterdata +The BAM Masterdata is a repository containing all the masterdata schema defining in BAM, as well as some utility functions to handle the masterdata.