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.

Sign up for GitHub

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

Jump to bottom

Add nyaml2nxdl updates from NIAC PR1303 #100

Closed
wants to merge 37 commits into from
Closed

Add nyaml2nxdl updates from NIAC PR1303 #100

wants to merge 37 commits into from

Conversation

RubelMozumder
Copy link

@RubelMozumder RubelMozumder commented Nov 1, 2023 •
edited by domna
Loading

  • Bring code modification from the nyam2nxd-migration branch (in PR for NIAC).

Fixes #96

RubelMozumder and others added 30 commits November 1, 2023 11:11
@RubelMozumder
Resolving rebase conflict.
60ecca7
@RubelMozumder
Resolving rebase conflict.
9c38136
@RubelMozumder
Change request in nyaml2nxdl_backward_tools.py
450c40b
@RubelMozumder
nyaml2nxdl backward tools: fixing requested changes in that file.
11a1a8a
@RubelMozumder
Resolving rebase conflict.
7692478
@RubelMozumder
Resolving rebase conflict.
dac935a
@RubelMozumder
Resolving rebase conflict.
4e52ad6
@RubelMozumder
Resolving rebase conflict.
278df30
@domna @RubelMozumder
Removes unused code
3898b26
@domna @RubelMozumder
Addresses some review comments in nxdl_utils
2c65e93
@domna @RubelMozumder
Addresses comments in nxdl_utils
aa9ed68
@domna @RubelMozumder
Fixes typo in readme
b95c86e
@RubelMozumder
Resolving rebase conflict.
d7c0d85
@domna @RubelMozumder
Fix typo in setuptools_scm
262e940
@RubelMozumder
Resolving requested changes.
3733525
@RubelMozumder
Fixing attributes for nxdl and yaml separately.
3f7186c
@RubelMozumder
REsolving PR comments
b64fdb9
@RubelMozumder
Updating PR comments.
a9330b0
@RubelMozumder
updating PR comments.
d79c76f
@RubelMozumder
updating PR comments.
d39b0ca
@RubelMozumder
updating PR comments.
6a7eced
@RubelMozumder
Resolving rebase conflict.
a7ff25f
@RubelMozumder
updating PR comments.
65cf0d6
@RubelMozumder
Implementing black on nyal2nxdl converter files.
af47273
@RubelMozumder
Fixing test.
18d1a8b
@RubelMozumder
Fixing build errors.
a076fa2
@RubelMozumder
Resolving rebase conflict.
deebe33
@domna @RubelMozumder
Remove $(DIRS) from nyaml command
15c86ab
@domna @RubelMozumder
Updates a warning for using make nxdl
eee023a
@domna @RubelMozumder
Fix codestyle
c7a7bf7
@RubelMozumder
Copy link
Author

@domna, this is the separate PR for the code modification nyam2nxdl-migration.

@RubelMozumder RubelMozumder marked this pull request as ready for review November 1, 2023 10:45
@RubelMozumder RubelMozumder requested a review from domna November 1, 2023 10:45
@domna domna changed the title Nyaml2nxdl migration for fairmat Add nyaml2nxdl updates from NIAC PR1303 Nov 1, 2023
@domna domna mentioned this pull request Nov 1, 2023
Closed
@domna
Copy link

domna commented Nov 1, 2023

This should be merged as soon as nexusformat#1303 is accepted

domna
domna requested changes Nov 1, 2023
View reviewed changes
Copy link

@domna domna left a comment

Choose a reason for hiding this comment

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

Something is wrong here. The Makefile has duplicate build instructions which are not in the NIAC PR.

@RubelMozumder
Copy link
Author

Something is wrong here. The Makefile has duplicate build instructions which are not in the NIAC PR.

Can you refer the lines:
I checked the highlighted code (green color) theses are coming from either NIAC or Fairmat. I do not GH is behaving weirdly. Because the part that exists in the Fairmat branch is also showing in green highlighted.

domna
domna reviewed Nov 2, 2023
View reviewed changes
Makefile Outdated Show resolved Hide resolved
domna
domna reviewed Nov 3, 2023
View reviewed changes
pyproject.toml
Copy link

Choose a reason for hiding this comment

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

This was removed in the NIAC PR. Why is it still here?

@domna
Copy link

domna commented Nov 3, 2023

Closing this in favor of #102

@domna domna closed this Nov 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@domna domna domna requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fetching changes from NAIC PR1303 to FAIRmat
2 participants
@RubelMozumder @domna