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

Bring in NOMAD examples #27

Merged
merged 36 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
47639c6
Nexus eln examples
Dec 21, 2022
7fd6fb0
Updates north + pynxtools apm test branch
domna Sep 5, 2023
de1ffe7
Merge branch 'update-north-markus' into 'develop'
Sep 5, 2023
9ea2163
Implementing fixes for EM and APM examples in NOMAD
kuehbachm Jun 12, 2024
252e866
Merge branch 'em-sprint20-fixes' into 'develop'
kuehbachm Jun 12, 2024
c893e78
Pluginise pynxtools
domna Jul 9, 2024
3fe4388
Merge branch 'pluginise-nexus-code' into 'develop'
domna Jul 9, 2024
72acb50
Merge ../temp-source into bring-in-examples
lukaspie Oct 14, 2024
124d8d6
initial commit for nomad entrypoints
lukaspie Oct 14, 2024
87a1965
typo fix in MANIFEST.in
lukaspie Oct 14, 2024
59ca76d
Merge branch 'bring-in-examples' of github.com:FAIRmat-NFDI/pynxtools…
lukaspie Oct 14, 2024
886e4ba
bring in additional changes from SprintNomadBaseSectionEmApmFixes branch
lukaspie Oct 14, 2024
d4bad5f
add integration tests for nomad example entrypoints
lukaspie Oct 14, 2024
b4f4ff2
linting of entrypoints
lukaspie Oct 14, 2024
3468eb9
missing closing bracket
lukaspie Oct 14, 2024
b790914
return archive dict in testing function
lukaspie Oct 14, 2024
0d3a95c
fix pyproject.toml
lukaspie Oct 14, 2024
bf89e41
use relative path in tests
lukaspie Oct 15, 2024
363ac17
bump ruff to >v0.6
lukaspie Oct 21, 2024
2fa87ee
update dev-requirements and pre-commit
lukaspie Oct 22, 2024
b7157d3
platform-independent dev-requirements
lukaspie Oct 22, 2024
361c22c
update dev-requirements
lukaspie Oct 22, 2024
cfcc8e3
Merge branch 'bump-ruff' into bring-in-examples
lukaspie Nov 25, 2024
f15bffc
use resource in ExampleUploadEntryPoint
lukaspie Nov 26, 2024
0c359a8
linting
lukaspie Nov 26, 2024
7be8f46
ruff 0.8 formatting
lukaspie Nov 26, 2024
c6120e5
bump ruff
lukaspie Nov 26, 2024
2724aa4
update nomad exmaple tests
lukaspie Nov 26, 2024
eba1fcc
move some test functionality to pynxtools
lukaspie Nov 26, 2024
da826d6
update MANIFEST
lukaspie Nov 27, 2024
807e9a8
simplify nomad import test in test_nomad_examples
lukaspie Nov 27, 2024
7d7da9c
CI: install nomad with infrastructure extra and test also with python…
lukaspie Nov 29, 2024
c99d081
fix typo in CI/CD
lukaspie Nov 29, 2024
5895369
update pynxtools dependency
lukaspie Nov 29, 2024
6c40ee4
update pynxtools in dev-requirements
lukaspie Nov 29, 2024
a126930
Merge branch 'main' into bring-in-examples
atomprobe-tc Dec 3, 2024
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
4 changes: 4 additions & 0 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ jobs:
run: |
curl -LsSf https://astral.sh/uv/install.sh | sh
uv pip install coverage coveralls
- name: Install nomad
if: "${{ matrix.python_version != '3.8'}}"
run: |
uv pip install nomad-lab[infrastructure]@git+https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-FAIR.git
- name: Install package
run: |
uv pip install ".[dev]"
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.5.5
rev: v0.8.0
hooks:
# Run the linter.
- id: ruff
Expand Down
5 changes: 5 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
prune *
exclude *
recursive-include src/pynxtools_apm *.py
include pyproject.toml README.md dev-requirements.txt
graft src/pynxtools_apm/nomad/examples
Loading
Loading