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

Merge main into v7.1 #556

Merged
merged 35 commits into from
Oct 22, 2024
Merged

Merge main into v7.1 #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
43d30e9
Update extracted files (#443)
github-actions[bot] Mar 8, 2024
e9ca421
decribe branches in README.md (#451)
tychonievich Mar 8, 2024
33acf8e
Add contact info to auto-generated YAML files (#454)
tychonievich Apr 11, 2024
b1b355c
Add CI/CD workflow to validate YAML files (#457)
dthaler Apr 25, 2024
f62020f
yamllint is recursive (#460)
dthaler May 1, 2024
f00a9a8
Add Separation event (#459)
cdhorn May 11, 2024
bd43eb7
Fix workflow (#462)
dthaler May 11, 2024
f00c223
Track request for Separated as a future FAM attribute (#469)
dthaler May 23, 2024
73000c2
Fix reference to FilePath data type (#466)
dthaler May 23, 2024
a6c05e1
Typo in README.md (#472)
dstathis May 30, 2024
5f4f42b
Add the meaning of WWW (#480)
tychonievich Jun 18, 2024
c762c9b
Remove substructure-specific extension wording (#481)
tychonievich Jun 18, 2024
9ae5646
Add some possible additional family events for consideration (#479)
cdhorn Jun 18, 2024
e871b23
Clarify no-FORM PLACs (#487)
tychonievich Jun 25, 2024
18028c7
Define "principle date" (#492)
tychonievich Jun 25, 2024
e731e3c
Update extracted files (#485)
github-actions[bot] Jul 1, 2024
68bbe57
Clarify nickname (#482)
tychonievich Jul 2, 2024
0630554
Update extracted files (#501)
github-actions[bot] Jul 6, 2024
7dad7fe
Restore 3.0's definition of jurisdiction (#506)
tychonievich Jul 9, 2024
3b379a1
Update extracted files (#508)
github-actions[bot] Jul 9, 2024
c967b75
Increase largest PLAC example (#514)
tychonievich Jul 16, 2024
b11458a
Update extracted files (#515)
github-actions[bot] Jul 16, 2024
f461257
Fix validate-yaml warnings (#513)
dthaler Jul 16, 2024
2467a28
Update changelog.md (#525)
tychonievich Aug 13, 2024
5186d91
EXID.TYPE for BillionGraves.com and WikiTree identifiers (#540)
elyoh Aug 27, 2024
64b182c
v7.0.15 release (#537)
tychonievich Aug 27, 2024
d83d3fa
Update exid-types.json (#543)
tychonievich Sep 3, 2024
add0488
Clarify a deprecation (#547)
tychonievich Sep 3, 2024
f17281b
Update extracted files (#542)
github-actions[bot] Sep 3, 2024
7e683d5
Fix documentation confusion about HEAD-SOUR-DATA (#553)
dthaler Oct 8, 2024
97dedf9
Add note about blank payloads (#554)
dthaler Oct 15, 2024
49eb952
Always quote tags (#560)
tychonievich Oct 15, 2024
4397a15
Update generate-files to use a PAT (#557)
dthaler Oct 22, 2024
36ff031
Update extracted files (#555)
github-actions[bot] Oct 22, 2024
5bf2ea8
Merge branch 'v7.1' into merge-main-into-v7.1
dthaler Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/generate-files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
# 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:
branches: [main, v7.1]

Expand Down Expand Up @@ -70,4 +70,4 @@
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
# 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:
branches: [main]

Expand Down
2 changes: 1 addition & 1 deletion build/uri-def.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading