-
Notifications
You must be signed in to change notification settings - Fork 5
R2025 11 #8
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
Open
sanbrock
wants to merge
45
commits into
nexusformat:main
Choose a base branch
from
FAIRmat-NFDI:r2025_11
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
R2025 11 #8
Changes from all commits
Commits
Show all changes
45 commits
Select commit
Hold shift + click to select a range
0870126
Changes made in NeXusOntology.py to extend Application classes to app…
Tanmay2028 c3e12ec
Generate OWL files using definitions submodule commit hash
Tanmay2028 114829a
Update NeXusOntology submodule pointer
Tanmay2028 53af542
Restore .owl files and definitions submodule without reverting script…
Tanmay2028 7887015
Revert script directory changes from commit 114829a
Tanmay2028 49b3e8c
add NeXusOntology_full.owl
Tanmay2028 99b7516
Harmonize generate_ontology.py for dual usage: import as module or ru…
Tanmay2028 580fa47
Update definitions submodule and modify generate_ontology.py
Tanmay2028 373a135
Add nw commit hash in generate_ontology.sh
Tanmay2028 ed34b65
New .owl files
Tanmay2028 f055b72
Setting is_a for given concept directly
Tanmay2028 8325f21
Refactor restricition comparision and remove NX_ANY from disjointness
Tanmay2028 3c3ce74
fix for disjointness of Unit Categories,; also for open enums
sanbrock c6759f2
fix merge
sanbrock c3545b5
Minor formatting changes
Tanmay2028 3891af6
try-except import of nxdl_utils
Tanmay2028 b18d8f0
Sobmoduled NeXusOntology in esrf-ontologies
Tanmay2028 68411d6
Update definitions submodule and ontology
Tanmay2028 2721e9b
Update .owl files to latest commit
Tanmay2028 a36cd7c
Exclude NX_UNITLESS and NX_DIMENSIONLESS from disjointness
Tanmay2028 f258a03
Update submodule and OWL files to latest definitions
Tanmay2028 7316a98
added ontology classes foreach enum items; simplified IRI by removing…
sanbrock 4032dab
proper IRI for individuals in test dataset
sanbrock b3b9bbd
Import ESRFET from oscars-deliverable-2
Tanmay2028 641c6a2
Added untracked files
Tanmay2028 303fa4e
Storing reasoned ontology
Tanmay2028 49bc067
Never use commit hash in owl file name
Tanmay2028 85ba801
Optional commit hash in owl file
Tanmay2028 cdb1e40
Optional commit hash in owl file 2
Tanmay2028 2823268
definitions according to r2025_11
sanbrock 6cf0537
Update definitions and NeXusOntology.py
Tanmay2028 1b3d474
merged NeXusOntology.py
Tanmay2028 9e109ac
Update generate_ontology.py
Tanmay2028 de110c2
Merge remote-tracking branch 'origin/r2025_11' into oscars-project
Tanmay2028 5f7af6f
Add option of importing ontologies
Tanmay2028 b8eb2f6
bring store_commit_filename variable from #7
0c5b271
track owl files
Tanmay2028 71282ca
Revert "track owl files"
Tanmay2028 1ecdb85
Suggest w3id IRI
Tanmay2028 1daa818
Merge oscars-project into r2025_11
Tanmay2028 8ba02d4
Revert "Suggest w3id IRI"
Tanmay2028 e32499d
Update .gitignore
Tanmay2028 8de5550
allow optionally different output dir
91758de
Merge branch 'oscars-project' into r2025_11
Tanmay2028 8d3dd86
Merge new commits from oscars-project branch
Tanmay2028 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,197 @@ | ||
| # https://github.com/github/gitignore/blob/main/Global/macOS.gitignore | ||
| # General | ||
| .DS_Store | ||
| .AppleDouble | ||
| .LSOverride | ||
|
|
||
| # Icon must end with two \r | ||
| Icon | ||
|
|
||
|
|
||
| # Thumbnails | ||
| ._* | ||
|
|
||
| # Files that might appear in the root of a volume | ||
| .DocumentRevisions-V100 | ||
| .fseventsd | ||
| .Spotlight-V100 | ||
| .TemporaryItems | ||
| .Trashes | ||
| .VolumeIcon.icns | ||
| .com.apple.timemachine.donotpresent | ||
|
|
||
| # Directories potentially created on remote AFP share | ||
| .AppleDB | ||
| .AppleDesktop | ||
| Network Trash Folder | ||
| Temporary Items | ||
| .apdisk | ||
|
|
||
| # https://github.com/github/gitignore/blob/main/Python.gitignore | ||
|
|
||
| # Byte-compiled / optimized / DLL files | ||
| __pycache__/ | ||
| *.py[cod] | ||
| *$py.class | ||
|
|
||
| # C extensions | ||
| *.so | ||
|
|
||
| # Distribution / packaging | ||
| .Python | ||
| build/ | ||
| develop-eggs/ | ||
| dist/ | ||
| downloads/ | ||
| eggs/ | ||
| .eggs/ | ||
| lib/ | ||
| lib64/ | ||
| parts/ | ||
| sdist/ | ||
| var/ | ||
| wheels/ | ||
| share/python-wheels/ | ||
| *.egg-info/ | ||
| .installed.cfg | ||
| *.egg | ||
| MANIFEST | ||
|
|
||
| # PyInstaller | ||
| # Usually these files are written by a python script from a template | ||
| # before PyInstaller builds the exe, so as to inject date/other infos into it. | ||
| *.manifest | ||
| *.spec | ||
|
|
||
| # Installer logs | ||
| pip-log.txt | ||
| pip-delete-this-directory.txt | ||
|
|
||
| # Unit test / coverage reports | ||
| htmlcov/ | ||
| .tox/ | ||
| .nox/ | ||
| .coverage | ||
| .coverage.* | ||
| .cache | ||
| nosetests.xml | ||
| coverage.xml | ||
| *.cover | ||
| *.py,cover | ||
| .hypothesis/ | ||
| .pytest_cache/ | ||
| cover/ | ||
|
|
||
| # Translations | ||
| *.mo | ||
| *.pot | ||
|
|
||
| # Django stuff: | ||
| *.log | ||
| !tests/data/nexus/Ref_nexus_test.log | ||
| local_settings.py | ||
| db.sqlite3 | ||
| db.sqlite3-journal | ||
|
|
||
| # Flask stuff: | ||
| instance/ | ||
| .webassets-cache | ||
|
|
||
| # Scrapy stuff: | ||
| .scrapy | ||
|
|
||
| # Sphinx documentation | ||
| docs/_build/ | ||
|
|
||
| # PyBuilder | ||
| .pybuilder/ | ||
| target/ | ||
|
|
||
| # Jupyter Notebook | ||
| .ipynb_checkpoints | ||
|
|
||
| # IPython | ||
| profile_default/ | ||
| ipython_config.py | ||
|
|
||
| # pyenv | ||
| # For a library or package, you might want to ignore these files since the code is | ||
| # intended to run in multiple environments; otherwise, check them in: | ||
| # .python-version | ||
|
|
||
| # pipenv | ||
| # According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. | ||
| # However, in case of collaboration, if having platform-specific dependencies or dependencies | ||
| # having no cross-platform support, pipenv may install dependencies that don't work, or not | ||
| # install all needed dependencies. | ||
| #Pipfile.lock | ||
|
|
||
| # poetry | ||
| # Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. | ||
| # This is especially recommended for binary packages to ensure reproducibility, and is more | ||
| # commonly ignored for libraries. | ||
| # https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control | ||
| #poetry.lock | ||
|
|
||
| # pdm | ||
| # Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. | ||
| #pdm.lock | ||
| # pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it | ||
| # in version control. | ||
| # https://pdm.fming.dev/#use-with-ide | ||
| .pdm.toml | ||
|
|
||
| # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm | ||
| __pypackages__/ | ||
|
|
||
| # Celery stuff | ||
| celerybeat-schedule | ||
| celerybeat.pid | ||
|
|
||
| # SageMath parsed files | ||
| *.sage.py | ||
|
|
||
| # Environments | ||
| .env | ||
| .venv | ||
| env/ | ||
| venv/ | ||
| ENV/ | ||
| env.bak/ | ||
| venv.bak/ | ||
|
|
||
| # Spyder project settings | ||
| .spyderproject | ||
| .spyproject | ||
|
|
||
| # Rope project settings | ||
| .ropeproject | ||
|
|
||
| # mkdocs documentation | ||
| /site | ||
|
|
||
| # mypy | ||
| .mypy_cache/ | ||
| .dmypy.json | ||
| dmypy.json | ||
|
|
||
| # Pyre type checker | ||
| .pyre/ | ||
|
|
||
| # pytype static type analyzer | ||
| .pytype/ | ||
|
|
||
| # Cython debug symbols | ||
| cython_debug/ | ||
|
|
||
| # PyCharm | ||
| # JetBrains specific template is maintained in a separate JetBrains.gitignore that can | ||
| # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore | ||
| # and can be added to the global gitignore or merged into this file. For a more nuclear | ||
| # option (not recommended) you can uncomment the following to ignore the entire idea folder. | ||
| #.idea/ | ||
|
|
||
|
|
||
| # Custom settings | ||
|
|
||
| .ontology/ |
Submodule definitions
updated
455 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| # This script generates the NeXus ontology in OWL format. | ||
| python -m script.generate_ontology | ||
| python -m script.generate_ontology full | ||
| python -m script.generate_ontology full testdata | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.