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

Readd collapsible feature and super-concept links for documentation + removes nyaml2nxdl #117

Merged
merged 5 commits into from
Nov 29, 2023

Conversation

domna
Copy link

@domna domna commented Nov 15, 2023

This readds the collapsible feature which was accidentally removed in f0d7e06.
This is also missing in NIAC PR1303, so it should probablye be merged in nyaml2nxdl-migration branch and the PR.

@domna domna requested a review from mkuehbach November 15, 2023 08:26
Copy link
Collaborator

@mkuehbach mkuehbach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as the scope of this PR is to just reactivate the collapse functionalities, this PR is acceptable but:
I walked again through the state of commit f0d7e06. that is behind PR1303: this revealed that we also have to check carefully if the functionalities from e.g. Russ (collect xml annotations) as they have been carried over work as expected.

In addition, PR1303 had significant changes for nyaml2nxdl forward and backward direction.
Also here we should watch out carefully if the behavior after the PR of 1303 is as expected.

I spotted e.g. that the now the indentation depth for NXDL files went from four space to two spaces in effect there are again at least for the first commit to a changed or new yaml file many changes which however is a difference in the indentation but not in the logics and the definitions.

Finally, there is a section in one of the nexus_definitions Makefile which handles yaml files with the _parsed suffix. @RubelMozumder is it right that there is a test within the nyaml2nxdl which writes a yaml file with the "_parsed" suffix in this case we should consider renaming this to avoid polluting the Makefile more naming conventions on the yaml side as necessary
We should check carefully as @domna mentioned the PR1303 changes if not also other poin

@domna
Copy link
Author

domna commented Nov 20, 2023

We should also readd the little arrows which point to the super concepts before merging this. So I agree @mkuehbach that we should go through and check what is in PR1303 and what we need to add there.

@domna domna changed the title Readd collapsible feature for documentation Readd collapsible feature and super-concept links for documentation + removes nyaml2nxdl Nov 29, 2023
@domna domna force-pushed the readd-collapsible-feature branch from 02490bf to 2c028b5 Compare November 29, 2023 08:36
Copy link
Collaborator

@mkuehbach mkuehbach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Except for nxdl_utils lgtm
Merge this in and then create a clean feature branch + PR from that merged fairmat compare with later code from nxdl_utils to check what additional changes we might have missed or unintentionally reverted with using here an older but at the time functional code snippet for nxdl_utils

@domna domna mentioned this pull request Nov 29, 2023
@domna domna merged commit a15798b into fairmat Nov 29, 2023
@domna domna deleted the readd-collapsible-feature branch November 29, 2023 08:58
lukaspie pushed a commit that referenced this pull request Sep 23, 2024
… removes nyaml2nxdl (#117)

* Readd collapsible features

* Restore super-concept links

* Remove nyaml2nxdl

* Use nyaml package

* Readd pyyaml
# Conflicts:
#	Makefile
#	contributed_definitions/NXcalibration.nxdl.xml
#	dev_tools/utils/nxdl_utils.py
#	requirements.txt
lukaspie pushed a commit that referenced this pull request Sep 24, 2024
… removes nyaml2nxdl (#117)

* Readd collapsible features

* Restore super-concept links

* Remove nyaml2nxdl

* Use nyaml package

* Readd pyyaml
# Conflicts:
#	Makefile
#	base_classes/NXroot.nxdl.xml
#	contributed_definitions/NXcalibration.nxdl.xml
#	contributed_definitions/NXidentifier.nxdl.xml
#	contributed_definitions/NXserialized.nxdl.xml
#	dev_tools/utils/nxdl_utils.py
#	requirements.txt
lukaspie pushed a commit that referenced this pull request Sep 24, 2024
… removes nyaml2nxdl (#117)

* Readd collapsible features

* Restore super-concept links

* Remove nyaml2nxdl

* Use nyaml package

* Readd pyyaml
# Conflicts:
#	Makefile
#	base_classes/NXroot.nxdl.xml
#	contributed_definitions/NXcalibration.nxdl.xml
#	dev_tools/utils/nxdl_utils.py
#	requirements.txt
lukaspie pushed a commit that referenced this pull request Sep 24, 2024
… removes nyaml2nxdl (#117)

* Readd collapsible features

* Restore super-concept links

* Remove nyaml2nxdl

* Use nyaml package

* Readd pyyaml
# Conflicts:
#	Makefile
#	base_classes/NXroot.nxdl.xml
#	contributed_definitions/NXcalibration.nxdl.xml
#	contributed_definitions/NXidentifier.nxdl.xml
#	contributed_definitions/NXserialized.nxdl.xml
#	dev_tools/utils/nxdl_utils.py
#	requirements.txt
lukaspie pushed a commit that referenced this pull request Sep 24, 2024
… removes nyaml2nxdl (#117)

* Readd collapsible features

* Restore super-concept links

* Remove nyaml2nxdl

* Use nyaml package

* Readd pyyaml
# Conflicts:
#	Makefile
#	base_classes/NXroot.nxdl.xml
#	contributed_definitions/NXcalibration.nxdl.xml
#	contributed_definitions/NXidentifier.nxdl.xml
#	contributed_definitions/NXserialized.nxdl.xml
#	dev_tools/utils/nxdl_utils.py
#	requirements.txt
lukaspie pushed a commit that referenced this pull request Oct 4, 2024
… removes nyaml2nxdl (#117)

* Readd collapsible features

* Restore super-concept links

* Remove nyaml2nxdl

* Use nyaml package

* Readd pyyaml
# Conflicts:
#	Makefile
#	base_classes/NXroot.nxdl.xml
#	contributed_definitions/NXcalibration.nxdl.xml
#	contributed_definitions/NXidentifier.nxdl.xml
#	contributed_definitions/NXserialized.nxdl.xml
#	dev_tools/utils/nxdl_utils.py
#	requirements.txt
lukaspie pushed a commit that referenced this pull request Oct 4, 2024
… removes nyaml2nxdl (#117)

* Readd collapsible features

* Restore super-concept links

* Remove nyaml2nxdl

* Use nyaml package

* Readd pyyaml
# Conflicts:
#	Makefile
#	base_classes/NXroot.nxdl.xml
#	contributed_definitions/NXcalibration.nxdl.xml
#	contributed_definitions/NXidentifier.nxdl.xml
#	contributed_definitions/NXserialized.nxdl.xml
#	dev_tools/utils/nxdl_utils.py
#	requirements.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants