Skip to content

Commit

Permalink
Merge main into v7.1 (#556)
Browse files Browse the repository at this point in the history
* Update extracted files (#443)

Co-authored-by: Luther Tychonievich <[email protected]>

* decribe branches in README.md (#451)

* decribe branches in README.md

* Update README.md

Co-authored-by: Dave Thaler <[email protected]>

---------

Co-authored-by: Dave Thaler <[email protected]>

* Add contact info to auto-generated YAML files (#454)

Per discussion in steering committee meeting 2024-04-04, using <https://gedcom.io/community/> as the contact info because that page describes various means of contact and is expected to be updated from time to time as means of contact change.

* Add CI/CD workflow to validate YAML files (#457)

* Add CI/CD workflow to validate YAML files

Signed-off-by: Dave Thaler <[email protected]>

* Update YAML files to resolve yamllint errors

Signed-off-by: Dave Thaler <[email protected]>

* Update .github/workflows/validate-yaml.yml

* Update .github/workflows/validate-yaml.yml

---------

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>

* yamllint is recursive (#460)

Avoid validating the same file multiple times

https://github.com/FamilySearch/GEDCOM/actions/runs/8838156091/job/24268618756
under "Validate YAML" shows multiple occurences of files under
.github/workflow since .github and .github/workflow are both passed to
yamllint

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>

* Add Separation event (#459)

* Add Separation event

* Remove FS API reference

* Fix workflow (#462)

https://github.com/FamilySearch/GEDCOM/actions/runs/9044561163 failure
reports: "The workflow is not valid.
.github/workflows/propagate-main-to-v7.1.yml (Line: 18, Col: 3): The
identifier 'merge-to-v7.1' is invalid. IDs may only contain alphanumeric
characters, '_', and '-'. IDs must start with a letter or '_' and and
must be less than 100 characters."

This PR therefore removes the '.' that is causing the failure.

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>

* Track request for Separated as a future FAM attribute (#469)

Related to PR #459 which tracks the separation event

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>

* Fix reference to FilePath data type (#466)

Fixes #465

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>

* Typo in README.md (#472)

* Add the meaning of WWW (#480)

* Add the meaning of WWW

Previously (in both 5.5.1 and 7.0.0–7.0.14) `WWW` was defined only by the type of is payload. This is an attempt to fix that without invalidating any existing files.

Resolves #476

* Update specification/gedcom-3-structures-3-meaning.md

Co-authored-by: Dave Thaler <[email protected]>

---------

Co-authored-by: Dave Thaler <[email protected]>

* Remove substructure-specific extension wording (#481)

Resolves #478

* Add some possible additional family events for consideration (#479)

Co-authored-by: Luther Tychonievich <[email protected]>

* Clarify no-FORM PLACs (#487)

Resolves #486

* Define "principle date" (#492)

* Define "principle date"

As pointed out in #488 and #490, the definition of DATE includes the vague phrase "principle date" which could use some clarification. This is my effort to provide that clarification.

Note, if competing definitions of the principle date in these contexts exists then this suggestion could be seen as backwards-incompatible and may need to be reworded as a non-normative recommendation or note. That said, I'm not aware of any conflicting definitions.

Resolves #490

* typos

* typo

* Update extracted files (#485)

Co-authored-by: Luther Tychonievich <[email protected]>

* Clarify nickname (#482)

* Clarify nickname

Add additional clarification to nickname, explaining the word's meaning in English which is not shared by several European countries. See [this comment](#473 (comment)) and the rest of issue #473 for more on why this clarification is needed.

Although #473's discussion covers many more topics, if we go back to the title and first question in the issue I think this resolves #473.

* Update specification/gedcom-3-structures-3-meaning.md

* Change recommendation

* Update specification/gedcom-3-structures-3-meaning.md

* Update specification/gedcom-3-structures-3-meaning.md

---------

Co-authored-by: Dave Thaler <[email protected]>

* Update extracted files (#501)

Co-authored-by: Luther Tychonievich <[email protected]>

* Restore 3.0's definition of jurisdiction (#506)

* Restore 3.0's definition of jurisdiction

Restored the definition of "jurisdiction" that was present in version 3.0.

Resolved #496

* Update specification/gedcom-3-structures-3-meaning.md

Additional examples and less proscriptive text

* Update extracted files (#508)

Co-authored-by: Luther Tychonievich <[email protected]>

* Increase largest PLAC example (#514)

* Increase largest PLAC example

resolves #512

* Update specification/gedcom-3-structures-3-meaning.md

* Update extracted files (#515)

Co-authored-by: Luther Tychonievich <[email protected]>

* Fix validate-yaml warnings (#513)

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>
Co-authored-by: Luther Tychonievich <[email protected]>

* Update changelog.md (#525)

* Update changelog.md

We've been making changes without updating the changelog. This summarizes the changes since v7.14 was released.

* Update changelog.md

* Update changelog.md

---------

Co-authored-by: Dave Thaler <[email protected]>

* EXID.TYPE for BillionGraves.com and WikiTree identifiers (#540)

* EXID.TYPE for BillionGraves.com and WikiTree identifiers

Fixes #539

* Update exid-types.json

Co-authored-by: Luther Tychonievich <[email protected]>

* Apply suggestions from code review

Co-authored-by: Luther Tychonievich <[email protected]>

---------

Co-authored-by: Dave Thaler <[email protected]>
Co-authored-by: Luther Tychonievich <[email protected]>

* v7.0.15 release (#537)

Co-authored-by: Dave Thaler <[email protected]>

* Update exid-types.json (#543)

* Update exid-types.json

Resolve incorrect URIs as noted in #539

* move /name

* move /name

* move /name

* move /name

* Clarify a deprecation (#547)

* Update extracted files (#542)

Co-authored-by: Dave Thaler <[email protected]>

* Fix documentation confusion about HEAD-SOUR-DATA (#553)

* Make HEAD.SOUR.DATA wording consistent between two places in spec

Signed-off-by: Dave Thaler <[email protected]>

* Deprecate HEAD.SOUR.DATA

Signed-off-by: Dave Thaler <[email protected]>

* Update specification/gedcom-3-structures-1-organization.md

* Update specification/gedcom-3-structures-3-meaning.md

* Update specification/gedcom-3-structures-3-meaning.md

---------

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>

* Add note about blank payloads (#554)

* Add note about blank payloads

Based on discussion in issue #495

Signed-off-by: Dave Thaler <[email protected]>

* Update specification/gedcom-3-structures-1-organization.md

* Update specification/gedcom-3-structures-1-organization.md

* Update specification/gedcom-3-structures-1-organization.md

---------

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>

* Always quote tags (#560)

* Update generate-files to use a PAT (#557)

* Fix names of workflows
* Make generate-files use a PAT so that validate-yaml will run

The PAT is already generated and configured in the repository secrets

Fixes #503

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>

* Update extracted files (#555)

Co-authored-by: Dave Thaler <[email protected]>

---------

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Luther Tychonievich <[email protected]>
Co-authored-by: Luther Tychonievich <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>
Co-authored-by: Christopher Horn <[email protected]>
Co-authored-by: Dylan Stephano-Shachter <[email protected]>
Co-authored-by: elyoh <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>
  • Loading branch information
9 people authored Oct 22, 2024
1 parent cefdaa8 commit 36e2ad3
Show file tree
Hide file tree
Showing 293 changed files with 324 additions and 301 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/generate-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# For documentation on the syntax of this file, see
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
---
name: Build
name: Generate files

on:

Check warning on line 11 in .github/workflows/generate-files.yml

View workflow job for this annotation

GitHub Actions / validate-yaml

11:1 [truthy] truthy value should be one of [false, true]
push:
Expand Down Expand Up @@ -70,4 +70,4 @@ jobs:
gh pr create -B ${{steps.extract_branch.outputs.branch}} -H ${{steps.extract_branch.outputs.branch}}-generate-files --title 'Update extracted-files in ${{steps.extract_branch.outputs.branch}}' --body $'Update extracted files\nThis PR is auto-generated by [gh pr create].' --label 'automated pr'
fi
env:
GH_TOKEN: ${{ github.token }}
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/propagate-main-to-v7.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# For documentation on the syntax of this file, see
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
---
name: Build
name: Propagate main to 7.1

on:

Check warning on line 11 in .github/workflows/propagate-main-to-v7.1.yml

View workflow job for this annotation

GitHub Actions / validate-yaml

11:1 [truthy] truthy value should be one of [false, true]
push:
Expand Down
2 changes: 1 addition & 1 deletion build/uri-def.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ def expand_prefix(txt, prefixes):

if g7[tag][0] in ('structure', 'enumeration', 'calendar', 'month'):
ptag = re.sub(r'.*-', '', re.sub(r'-[A-Z]?[a-z].*', '', tag))
print('\nstandard tag: '+(repr(ptag) if ptag in ('YES','NO','TRUE','FALSE', '0', '1', '2', '3') else ptag), file=fh)
print('\nstandard tag: '+repr(ptag), file=fh)

if len(g7[tag][1]) > 0:
print('\nspecification:', file=fh)
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ABBR
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ABBR

standard tag: ABBR
standard tag: 'ABBR'

specification:
- Abbreviation
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ADDR
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ADDR

standard tag: ADDR
standard tag: 'ADDR'

specification:
- Address
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ADOP
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ADOP

standard tag: ADOP
standard tag: 'ADOP'

specification:
- Adoption
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ADOP-FAMC
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ADOP-FAMC

standard tag: FAMC
standard tag: 'FAMC'

specification:
- Family child
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ADR1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ADR1

standard tag: ADR1
standard tag: 'ADR1'

specification:
- Address Line 1
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ADR2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ADR2

standard tag: ADR2
standard tag: 'ADR2'

specification:
- Address Line 2
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ADR3
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ADR3

standard tag: ADR3
standard tag: 'ADR3'

specification:
- Address Line 3
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/AGE
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/AGE

standard tag: AGE
standard tag: 'AGE'

specification:
- Age at event
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/AGNC
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/AGNC

standard tag: AGNC
standard tag: 'AGNC'

specification:
- Responsible agency
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ALIA
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ALIA

standard tag: ALIA
standard tag: 'ALIA'

specification:
- Alias
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ANCI
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ANCI

standard tag: ANCI
standard tag: 'ANCI'

specification:
- Ancestor interest
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ANUL
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ANUL

standard tag: ANUL
standard tag: 'ANUL'

specification:
- Annulment
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/ASSO
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/ASSO

standard tag: ASSO
standard tag: 'ASSO'

specification:
- Associates
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/AUTH
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/AUTH

standard tag: AUTH
standard tag: 'AUTH'

specification:
- Author
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/BAPL
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/BAPL

standard tag: BAPL
standard tag: 'BAPL'

specification:
- Baptism, Latter-Day Saint
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/BAPM
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/BAPM

standard tag: BAPM
standard tag: 'BAPM'

specification:
- Baptism
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/BARM
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/BARM

standard tag: BARM
standard tag: 'BARM'

specification:
- Bar Mitzvah
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/BASM
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/BASM

standard tag: BASM
standard tag: 'BASM'

specification:
- Bas Mitzvah
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/BIRT
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/BIRT

standard tag: BIRT
standard tag: 'BIRT'

specification:
- Birth
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/BLES
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/BLES

standard tag: BLES
standard tag: 'BLES'

specification:
- Blessing
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/BURI
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/BURI

standard tag: BURI
standard tag: 'BURI'

specification:
- Depositing remains
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CALN
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CALN

standard tag: CALN
standard tag: 'CALN'

specification:
- Call number
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CAST
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CAST

standard tag: CAST
standard tag: 'CAST'

specification:
- Caste
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CAUS
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CAUS

standard tag: CAUS
standard tag: 'CAUS'

specification:
- Cause
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CHAN
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CHAN

standard tag: CHAN
standard tag: 'CHAN'

specification:
- Change
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CHIL
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CHIL

standard tag: CHIL
standard tag: 'CHIL'

specification:
- Child
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CHR
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CHR

standard tag: CHR
standard tag: 'CHR'

specification:
- Christening
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CHRA
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CHRA

standard tag: CHRA
standard tag: 'CHRA'

specification:
- Christening, adult
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CITY
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CITY

standard tag: CITY
standard tag: 'CITY'

specification:
- City
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CONF
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CONF

standard tag: CONF
standard tag: 'CONF'

specification:
- Confirmation
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CONL
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CONL

standard tag: CONL
standard tag: 'CONL'

specification:
- Confirmation, Latter-Day Saint
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CONT
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CONT

standard tag: CONT
standard tag: 'CONT'

specification:
- Continued
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/COPR
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/COPR

standard tag: COPR
standard tag: 'COPR'

specification:
- Copyright
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CORP
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CORP

standard tag: CORP
standard tag: 'CORP'

specification:
- Corporate name
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CREA
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CREA

standard tag: CREA
standard tag: 'CREA'

specification:
- Creation
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CREM
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CREM

standard tag: CREM
standard tag: 'CREM'

specification:
- Cremation
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CROP
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CROP

standard tag: CROP
standard tag: 'CROP'

specification:
- Crop
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/CTRY
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/CTRY

standard tag: CTRY
standard tag: 'CTRY'

specification:
- Country
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/DATA
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/DATA

standard tag: DATA
standard tag: 'DATA'

specification:
- Data
Expand Down
2 changes: 1 addition & 1 deletion extracted-files/tags/DATA-EVEN
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: structure

uri: https://gedcom.io/terms/v7/DATA-EVEN

standard tag: EVEN
standard tag: 'EVEN'

specification:
- Event
Expand Down
Loading

0 comments on commit 36e2ad3

Please sign in to comment.