From 40ff567e9a57e0fc490112c87d65e57da4a377f4 Mon Sep 17 00:00:00 2001 From: Alvin Noe Ladines Date: Wed, 21 Aug 2024 11:29:05 +0200 Subject: [PATCH 1/4] Update deps --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ab37067..b0a04a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,8 +10,8 @@ readme = "README.md" authors = [{ name = "The NOMAD Authors" }] license = { text = "Apache-2.0" } dependencies = [ - "nomad-lab>=1.2.0", - "nomad-schema-plugin-run@git+https://github.com/nomad-coe/nomad-schema-plugin-run.git@develop", + "nomad-lab>=1.3.6.dev1", + "nomad-schema-plugin-run@git+https://github.com/nomad-coe/nomad-schema-plugin-run.git@c543bacbcc0b3c5c1395c8ec7d83e360cbc0fca7", ] [project.urls] From 538702011771006187e8691fdc7706b3c71f3e42 Mon Sep 17 00:00:00 2001 From: Alvin Noe Ladines Date: Wed, 21 Aug 2024 12:39:37 +0200 Subject: [PATCH 2/4] Do not use nomad develop for testing --- .github/workflows/actions.yaml | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index b2fd8ae..2bd262d 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -13,7 +13,7 @@ jobs: run: | pip install --upgrade pip # we need the latest nomad version for testing - pip install nomad-lab[infrastructure]@git+https://github.com/nomad-coe/nomad.git@develop + # pip install nomad-lab[infrastructure]@git+https://github.com/nomad-coe/nomad.git@develop pip install '.[dev]' --index-url https://gitlab.mpcdf.mpg.de/api/v4/projects/2187/packages/pypi/simple pip install coverage coveralls - name: mypy @@ -50,4 +50,4 @@ jobs: - uses: actions/checkout@v3 - uses: chartboost/ruff-action@v1 with: - args: "check" \ No newline at end of file + args: "check" diff --git a/pyproject.toml b/pyproject.toml index b0a04a9..10e9ebe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ authors = [{ name = "The NOMAD Authors" }] license = { text = "Apache-2.0" } dependencies = [ "nomad-lab>=1.3.6.dev1", - "nomad-schema-plugin-run@git+https://github.com/nomad-coe/nomad-schema-plugin-run.git@c543bacbcc0b3c5c1395c8ec7d83e360cbc0fca7", + "nomad-schema-plugin-run@git+https://github.com/nomad-coe/nomad-schema-plugin-run.git@d30f1594d831a91b3a4db56a0bc5e7dc446bbffc", ] [project.urls] From 07c382eed09f7ac86cd0efa0bf32e0d4f7fb90ea Mon Sep 17 00:00:00 2001 From: Alvin Noe Ladines Date: Wed, 21 Aug 2024 13:12:31 +0200 Subject: [PATCH 3/4] Add normalizer plugins --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 10e9ebe..3e41eba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,6 +12,8 @@ license = { text = "Apache-2.0" } dependencies = [ "nomad-lab>=1.3.6.dev1", "nomad-schema-plugin-run@git+https://github.com/nomad-coe/nomad-schema-plugin-run.git@d30f1594d831a91b3a4db56a0bc5e7dc446bbffc", + "nomad-normalizer-plugin-bandstructure@git+https://github.com/nomad-coe/nomad-normalizer-plugin-bandstructure.git@669f2c899bc4013975b1b38ca8af630fe2e8a930", + "nomad-normalizer-plugin-system@git+https://github.com/nomad-coe/nomad-normalizer-plugin-system.git@c849c947707f617e434e3ac95249ab33a90b9415", ] [project.urls] From 32e60686307fb9d98a2e3098233c730a65af138e Mon Sep 17 00:00:00 2001 From: Alvin Noe Ladines Date: Wed, 21 Aug 2024 13:23:41 +0200 Subject: [PATCH 4/4] Move normalizer deps to tests --- .github/workflows/actions.yaml | 2 +- pyproject.toml | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index 2bd262d..1bdb472 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -14,7 +14,7 @@ jobs: pip install --upgrade pip # we need the latest nomad version for testing # pip install nomad-lab[infrastructure]@git+https://github.com/nomad-coe/nomad.git@develop - pip install '.[dev]' --index-url https://gitlab.mpcdf.mpg.de/api/v4/projects/2187/packages/pypi/simple + pip install '.[dev,tests]' --index-url https://gitlab.mpcdf.mpg.de/api/v4/projects/2187/packages/pypi/simple pip install coverage coveralls - name: mypy run: | diff --git a/pyproject.toml b/pyproject.toml index 3e41eba..c14939f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,9 +11,7 @@ authors = [{ name = "The NOMAD Authors" }] license = { text = "Apache-2.0" } dependencies = [ "nomad-lab>=1.3.6.dev1", - "nomad-schema-plugin-run@git+https://github.com/nomad-coe/nomad-schema-plugin-run.git@d30f1594d831a91b3a4db56a0bc5e7dc446bbffc", - "nomad-normalizer-plugin-bandstructure@git+https://github.com/nomad-coe/nomad-normalizer-plugin-bandstructure.git@669f2c899bc4013975b1b38ca8af630fe2e8a930", - "nomad-normalizer-plugin-system@git+https://github.com/nomad-coe/nomad-normalizer-plugin-system.git@c849c947707f617e434e3ac95249ab33a90b9415", + "nomad-schema-plugin-run@git+https://github.com/nomad-coe/nomad-schema-plugin-run.git@92d120dc4c5f7f4bcd94990ed009f8ac0019acec", ] [project.urls] @@ -27,6 +25,10 @@ dev = [ "pytest-cov==2.7.1", "ruff==0.1.4", ] +tests = [ + "nomad-normalizer-plugin-bandstructure@git+https://github.com/nomad-coe/nomad-normalizer-plugin-bandstructure.git@develop", + "nomad-normalizer-plugin-system@git+https://github.com/nomad-coe/nomad-normalizer-plugin-system.git@develop", +] [tool.ruff] include = ["simulationworkflowschema/*.py", "tests/*.py"]