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

Update from upstream schema.org master 2020-07-07 (v.8.x) #8

Open
wants to merge 330 commits into
base: master
Choose a base branch
from

Conversation

stain
Copy link

@stain stain commented Jul 7, 2020

A kind of "rebase" but as a merge to avoid breaking history of bioschemas changes. Important changes from upstream is the move from RDFa to Turtle which has a much simpler syntax, but I think our existing rdfa files should still work.

RichardWallis and others added 30 commits January 2, 2020 12:56
* Rationalise definitions of enumerations and enumeration values

* Modifications to support enumeration & enumerationvalue rationalisation

* Tweaked tests and added new ones to cope withe enumeration and enumerationvalue rationalisation

Co-authored-by: Richard Wallis <rjw@dataliberate.com>
* properties for job requirements relating to citizenship, physical abilities, sensory abilities and security clearance, issue 2384; with examples

* removing citizenship requirement from properties
* adds properties applicationContact and employerOverview to JobPosting

* extends range of industry property to include DefinedTerm

* Eamples: applicationContact, employerOverview, & industry as DefinedTerm
* Fixing domain and range of eventSchedule property

* Adding Schedule to the domain of duration

* Extending byDay property to accept iCal rrule values.

* Adding scheduleTimezone as a property of Schedule.

* Adding note about IANA TZ ID conformance.
* Issue schemaorg#2341: Added SportsTeam to the domain for gender.

* Remove file added to wrong branch.

* Issue schemaorg#2418: Created financialAidEligible.
…ram. (schemaorg#2429)

* Issue schemaorg#2341: Added SportsTeam to the domain for gender.

* Remove file added to wrong branch.

* Issue schemaorg#2419: Added properties to EducationalOccupationalProgram.
Removed duplicate label declarations and issue tag from the core
terms whose domains are being extended.

/cc schemaorg#2419 @vtardif
…chemaorg#2424)

* Issue schemaorg#2341: Added SportsTeam to the domain for gender.

* Remove file added to wrong branch.

* Issue schemaorg#2420: Added MusicRecording to the range for audio.

* Added to the range rather than the domain.
… interactionStatistic (schemaorg#2423)

* Issue schemaorg#2341: Added SportsTeam to the domain for gender.

* Remove file added to wrong branch.

* Issue schemaorg#2421: Added Person and Organization to the domain for interactionStatistic.
* Add new MediaGallery type

From proposal schemaorg#2139 

Creating a new parent type, MediaGallery for the subtypes of ImageGallery and VideoGallery, to allow for a mixed-media collection page type.

* Subtypes for MediaGallery

Making IMageGallery and VideoGallery subtypes of MediaGallery

* Fixing mistaken entry from earlier commit
* Create issue-2405-examples.txt

* Create issue-2405.rdfa

* Update issue-2405.rdfa

Fixing incorrect label for http://schema.org/Recommendation

* Update issue-2405, adding new domains to existing properties category and reviewAspect

Initial proposal would like to extend the domain of reviewAspect to include the newly proposed Guide type (this was mentioned on the issue#2405 but accidentally left out of the initial commits.

Also it would be advantageous to allow the use of the category property  for the newly proposed type Recommendation.

* Update issue-2405.rdfa
* Issue schemaorg#2341: Added SportsTeam to the domain for gender.

* Remove file added to wrong branch.

* Issue schemaorg#2394: Added isResizable property to 3DModel.
…uage (schemaorg#2399)

* Issue schemaorg#2341: Added SportsTeam to the domain for gender.

* Remove file added to wrong branch.

* Issue schemaorg#2382: Added BroadcastService to the domain for inLanguage.
…ema.org/sport. (schemaorg#2400)

* Issue schemaorg#2341: Added SportsTeam to the domain for gender.

* Remove file added to wrong branch.

* Issue schemaorg#1951: Added SportsEvent to the domain for https://schema.org/sport.
danbri and others added 22 commits June 19, 2020 14:27
Hyperlinked 'size' in ProductGroup definition.
Removed accidental quote chars.
/cc schemaorg#1797
* Issue schemaorg#2341: Added SportsTeam to the domain for gender.

* Remove file added to wrong branch.

* Issue schemaorg#2486: Added startDate/endDate to Schedule

* Issue schemaorg#2599: Added byMonthWeek to Schedule

* Removed stale RDFa files to sync with schema.org main.

* Issue schemaorg#2599: Added byMonthWeek to Schedule

* Fixed formatting
Rationalisation of enum definitions
* Various examples added

* cutOffTime in OfferShippingDetails: Date substituted with Time

Co-authored-by: Anastasiia <anastasiia.byvsheva@gmail.com>
Updated RadioStation description see issue schemaorg#2102
@stain stain changed the title Update from upstream schema.org v8.0 Update from upstream schema.org master (v.8.x) Jul 7, 2020
@stain stain changed the title Update from upstream schema.org master (v.8.x) Update from upstream schema.org master 2020-07-07 (v.8.x) Jul 7, 2020
@stain
Copy link
Author

stain commented Jul 7, 2020

It seems the BioSchemas additions are not on the branch master but confusingly on the branch BioChemEntity which also should be made up to date.

If we are working with a different head perhaps change the preferred branch in the GitHub settings so that pull requests can go there?

@stain
Copy link
Author

stain commented Jul 8, 2020

#9 attempts to merge it into BioChemEntity (?) branch - which requires manual resolution on:

Conflicting files
sdoapp.py
sdoconfig.json
sdoconfigTermsData.json

Presumably this is mainly just the additional type files BioSchemas are adding, but not sure what the BioSchemas-specific sdoapp.py changes are.

@AlasdairGray
Copy link
Member

@stain thanks for your efforts on this front.

Important changes from upstream is the move from RDFa to Turtle which has a much simpler syntax, but I think our existing rdfa files should still work

As we have not yet got our extensions into schema.org, it may be best if we transform these into Turtle to help keep them relevant into the future. What do you think?

It seems the BioSchemas additions are not on the branch master but confusingly on the branch BioChemEntity which also should be made up to date.

If we are working with a different head perhaps change the preferred branch in the GitHub settings so that pull requests can go there?

When we created the fork we were advised against working on the master branch since this would cause issues for generating a PR back into schemaorg. If this isn't the case then I would be more than happy for us to simplify the process (and particularly the maintenance).

@AlasdairGray
Copy link
Member

#9 attempts to merge it into BioChemEntity (?) branch - which requires manual resolution on:

Conflicting files
sdoapp.py
sdoconfig.json
sdoconfigTermsData.json

Presumably this is mainly just the additional type files BioSchemas are adding, but not sure what the BioSchemas-specific sdoapp.py changes are.

Yes these are the files that we needed to make changes in to make the bio extension work. Do you need me to resolve the conflicts in #9?

@AlasdairGray
Copy link
Member

Is this PR still relevant? The main branch and the two bioschemas branches have been caught up with the upstream/main.

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.