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

Remove TreatyOrganization (accidentally left in) #877

Merged
merged 2 commits into from
Jun 19, 2023

Conversation

stevenchalem
Copy link
Contributor

Peter found at the last minute that TreatyOrganization was still present in gistCore.ttl. This PR is to remove it consistent with the intention of issue #766 and pr #825

@stevenchalem
Copy link
Contributor Author

@dylan-sa does this look right?

@stevenchalem stevenchalem changed the title removed TreatyOrganization Remove TreatyOrganization (accidentally left in) Jun 16, 2023
@stevenchalem stevenchalem marked this pull request as ready for review June 16, 2023 23:15
@dylan-sa
Copy link
Contributor

dylan-sa commented Jun 16, 2023

Getting close to what we need, but looks like Heather's changes to the annotations for IntergovernmentalOrganization didn't make it in, either: https://github.com/semanticarts/gist/pull/825/files

If you change the prefLabel, definition, and example for IntergovernmentalOrganization, I think that'll be it.

Copy link
Contributor

@dylan-sa dylan-sa left a comment

Choose a reason for hiding this comment

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

Just need to change the annotations for IntergovernmentalOrganization

@stevenchalem stevenchalem requested a review from dylan-sa June 17, 2023 00:30
Copy link
Contributor Author

@stevenchalem stevenchalem left a comment

Choose a reason for hiding this comment

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

requested changes are complete

@dylan-sa
Copy link
Contributor

dylan-sa commented Jun 18, 2023

I did some more digging here and believe I found the root of the issue.

It looks like one of my commits on the inverses branch was not caught up with some of the work that came right before it. (Surprising to me since I had made a point to merge the develop branch into my inverses branch, but it appears that not everything was updated as expected.) So, I've looked to see what exactly got lost, and I believe this is what we need to get caught up:

As best I can tell, this would fill in the gaps, but I would appreciate some more eyes on this just to make sure I've got it right. (@stevenchalem @rjyounes @Jamie-SA, if you could please take a look.) If this is looking right, I can make the remaining changes since my branch appears to be the culprit.

@Jamie-SA
Copy link
Contributor

I looked and I think all of the TimeZone changes, including the atDateTime scopeNote change, are in the current develop branch.

@Jamie-SA
Copy link
Contributor

Jamie-SA commented Jun 19, 2023

I retract my last statement... due to something I was working on, I was not looking at the correct version of gistCore.ttl.

@stevenchalem
Copy link
Contributor Author

@dylan-sa I think you've caught everything.

@Jamie-SA
Copy link
Contributor

I submitted PR #879 to re-apply the TimeZone changes. Steven approved, and I merged it.
I have submitted PR #880 to re-apply the lost TimeInterval commit.

@dylan-sa
Copy link
Contributor

Thank you, @Jamie-SA. With the TimeInterval PR, I believe we're all caught up. 👍

@Jamie-SA Jamie-SA merged commit acd545f into develop Jun 19, 2023
@Jamie-SA Jamie-SA deleted the fix-for-issue-766-remove-treaty-organization branch June 19, 2023 17:05
@Jamie-SA
Copy link
Contributor

Hopefully everything is fixed now...

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.

3 participants