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

Align dataset folder with namespace #122

Merged

Conversation

IsakNaslundBh
Copy link
Contributor

@IsakNaslundBh IsakNaslundBh commented Jun 2, 2022

NOTE: Depends on

Does not depend on to compile, but should not be merged before
BHoM/BHoM_Engine#2845

Issues addressed by this PR

Closes #121

Update Dataset folder to match namespace for Structures and Graphics

Test files

https://burohappold.sharepoint.com/:f:/s/BHoM/ElZxIn8tk9hEmFlsGsYwfxsBDQj3Q6jEijbald347pTANg?e=2geUir

Note 1 to test this, the C:\ProgramData\BHoM\Datasets folder needs to be cleared of any current instances of the files being migrated, as without doing so, the files on main will still exist and be picked up.

Note 2, you will need to build versioning toolkit after you have compiled this to ensure that the Upgraders are copied across to the UpgradesFile.

Changelog

Additional comments

Putting this on a separate branch name intentionally, as the versioning should be able to be merged without this PR being merged at the same time. This is raised now, before the versioning is merged, to enable simpler testing.

@peterjamesnugent @JosefTaylor putting you as reviewers as a bit of FYI that this might be happening.

@IsakNaslundBh IsakNaslundBh added status:do-not-merge For instance, test PR, for discussion, or dependant PRs not ready for merge type:feature New capability or enhancement labels Jun 2, 2022
@IsakNaslundBh IsakNaslundBh self-assigned this Jun 2, 2022
@IsakNaslundBh
Copy link
Contributor Author

Putting do-not-merge tag on until versioning PRs have been merged

@IsakNaslundBh
Copy link
Contributor Author

Would not merge this PR until after the release of BHoM 5.2 beta. Best merged early in 5.3. Before merging, the code should be evaluated to find any places where the library engine is called, referencing any of the datasets in here and appropriate updates made to ensure the same data is still received.

@FraserGreenroyd
Copy link
Contributor

@JosefTaylor would you have any capacity to review this so we can merge before the beta? 😄

Copy link
Contributor

@JosefTaylor JosefTaylor left a comment

Choose a reason for hiding this comment

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

Sorry for the delay!

Dataset location works fine, though I'd consider:
"Structures\Materials\USA\Steel.json" rather than
"Structures\Materials\MaterialsUSA\Steel.json"

As for versioning, I am not sure it's working as intended- I built datasets from Main, put US Concrete and US Steel in a grasshopper script and saved it. I then built datasets from this PR, opened the script, and got this:
image

This may have something to do with the prototype flag, which I get when I place these datasets with the PR built:
image

@JosefTaylor JosefTaylor self-requested a review September 7, 2022 17:37
JosefTaylor
JosefTaylor previously approved these changes Sep 7, 2022
Copy link
Contributor

@JosefTaylor JosefTaylor left a comment

Choose a reason for hiding this comment

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

After following the directions, versioning works great!

@JosefTaylor
Copy link
Contributor

@BHoMBot check copyright-compliance
@BHoMBot check dataset-compliance
@BHoMBot check project-compliance

@JosefTaylor
Copy link
Contributor

@BHoMBot check compliance

@IsakNaslundBh
Copy link
Contributor Author

thanks @JosefTaylor .

As discussed offline, will aim to get this merged early next milestone, rather than in this one.

Will also require the Versioning json file to get its name updated to 6.0.

@FraserGreenroyd
Copy link
Contributor

@IsakNaslundBh any update on this?

@IsakNaslundBh IsakNaslundBh changed the base branch from main to develop January 3, 2023 09:19
@IsakNaslundBh IsakNaslundBh dismissed JosefTaylor’s stale review January 3, 2023 09:19

The base branch was changed.

@IsakNaslundBh IsakNaslundBh force-pushed the BHoM_Dataset-#121-AlignDatasetFolderWithNamespace branch from 9087b3c to 478253c Compare January 5, 2023 09:23
Copy link
Member

@peterjamesnugent peterjamesnugent left a comment

Choose a reason for hiding this comment

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

Tested with script and no issues.

@peterjamesnugent
Copy link
Member

@BHoMBot check required

@bhombot-ci
Copy link

bhombot-ci bot commented Jan 5, 2023

@peterjamesnugent to confirm, the following actions are now queued:

  • check code-compliance
  • check documentation-compliance
  • check project-compliance
  • check core
  • check null-handling
  • check serialisation
  • check versioning
  • check installer

Copy link
Member

@peterjamesnugent peterjamesnugent left a comment

Choose a reason for hiding this comment

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

Approved based on previous review and final commit (compliance change).

@bhombot-ci
Copy link

bhombot-ci bot commented Jan 5, 2023

@IsakNaslundBh just to let you know, I have provided a check-versioning result to this Pull Request as it was detected to be linked to other Pull Requests in a series. The comment which triggered this check came from @IsakNaslundBh on BHoM_Engine

@IsakNaslundBh
Copy link
Contributor Author

@BHoMBot check copyright-compliance
@BHoMBot check dataset-compliance
@BHoMBot check project-compliance

@bhombot-ci
Copy link

bhombot-ci bot commented Jan 6, 2023

@IsakNaslundBh to confirm, the following actions are now queued:

  • check copyright-compliance
  • check dataset-compliance
  • check project-compliance

There are 9 requests in the queue ahead of you.

@IsakNaslundBh
Copy link
Contributor Author

@BHoMBot check ready-to-merge

@bhombot-ci
Copy link

bhombot-ci bot commented Jan 6, 2023

@IsakNaslundBh to confirm, the following actions are now queued:

  • check ready-to-merge

There are 44 requests in the queue ahead of you.

@IsakNaslundBh
Copy link
Contributor Author

@BHoMBot check core

@bhombot-ci
Copy link

bhombot-ci bot commented Jan 6, 2023

@IsakNaslundBh to confirm, the following actions are now queued:

  • check core

There are 23 requests in the queue ahead of you.

@IsakNaslundBh
Copy link
Contributor Author

@BHoMBot check ready-to-merge

@bhombot-ci
Copy link

bhombot-ci bot commented Jan 6, 2023

@IsakNaslundBh to confirm, the following actions are now queued:

  • check ready-to-merge

There are 11 requests in the queue ahead of you.

@IsakNaslundBh IsakNaslundBh merged commit ca4aaa3 into develop Jan 6, 2023
@IsakNaslundBh IsakNaslundBh deleted the BHoM_Dataset-#121-AlignDatasetFolderWithNamespace branch January 6, 2023 11:57
@bhombot-ci bhombot-ci bot mentioned this pull request Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type:feature New capability or enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reorganise internal folder structure of Datasets folder
4 participants