From 73e9727af2d77fcc7aff758d9e4c9c6bbe5958d2 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sun, 6 Nov 2022 15:24:02 -0500 Subject: [PATCH 1/2] relax language/charset requirements, fix keywords model --- docs/content/reference/mcf.md | 6 +++--- pygeometa/schemas/mcf/core.yaml | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/content/reference/mcf.md b/docs/content/reference/mcf.md index 83b45b2..5bc537e 100644 --- a/docs/content/reference/mcf.md +++ b/docs/content/reference/mcf.md @@ -121,7 +121,7 @@ charset|Mandatory|full name of the character coding standard used for the metada parentidentifier|Optional|file identifier of the metadata to which this metadata is a subset|11800c2c-e6b9-11df-b9ae-0014c2c33ebe|ISO 19115:2003 Section B.2.1 hierarchylevel|Mandatory|level to which the metadata applies (must be one of 'series', 'software', 'featureType', 'model', 'collectionHardware', 'collectionSession', 'nonGeographicDataset', 'propertyType', 'fieldSession', 'dataset', 'service', 'attribute', 'attributeType', 'tile', 'feature', 'dimensionGroup'|dataset|ISO 19115:2003 Section B.2.1 datestamp|Mandatory|date that the metadata was created, pygeometa supports specifying the $date$ or $datetime$ variable to update the date value at run time|2000-11-11 or 2000-01-12T11:11:11Z|ISO 19115:2003 Section B.2.1 -dataseturi|Mandatory|Uniformed Resource Identifier (URI) of the dataset to which the metadata applies|`urn:x-wmo:md:int.wmo.wis::http://geo.woudc.org/def/data/uv-radiation/uv-irradiance`|ISO 19115:2003 Section B.2.1 +dataseturi|Optional|Uniformed Resource Identifier (URI) of the dataset to which the metadata applies|`urn:x-wmo:md:int.wmo.wis::http://geo.woudc.org/def/data/uv-radiation/uv-irradiance`|ISO 19115:2003 Section B.2.1 ### `spatial` @@ -135,8 +135,8 @@ geomtype|Mandatory|name of point or vector objects used to locate zero-, one-, t Property Name|Mandatory/Optional|Description|Example|Reference -------------|------------------|-----------|-------|---------: doi|Optional|Digital Object Identifier (DOI)|12345|ISO 19115:2003 Section B.3.2.1 -language|Mandatory|language(s) used within the dataset. If the dataset is made of numerical values, the dataset language can be set to 'missing', 'withheld', 'inapplicable', 'unknown' or 'template'|eng; CAN|ISO 19115:2003 Section B.2.2.1 -charset|Mandatory|full name of the character coding standard used for the dataset|eng; CAN|ISO 19115:2003 Section B.2.1 +language|Optional|language(s) used within the dataset. If the dataset is made of numerical values, the dataset language can be set to 'missing', 'withheld', 'inapplicable', 'unknown' or 'template'|eng; CAN|ISO 19115:2003 Section B.2.2.1 +charset|Optional|full name of the character coding standard used for the dataset|eng; CAN|ISO 19115:2003 Section B.2.1 title|Mandatory|name by which the cited resource is known|Important Bird Areas|ISO 19115:2003 Section B.3.2.1 edition|Optional|version of the cited resource|1.8.0|ISO 19115:2003 Section B.3.2.1 abstract|Mandatory|brief narrative summary of the content of the resource(s)|Birds in important areas...|ISO 19115:2003 Section B.2.2.1 diff --git a/pygeometa/schemas/mcf/core.yaml b/pygeometa/schemas/mcf/core.yaml index 0f3c894..dac91e3 100644 --- a/pygeometa/schemas/mcf/core.yaml +++ b/pygeometa/schemas/mcf/core.yaml @@ -66,7 +66,6 @@ properties: - charset - hierarchylevel - datestamp - - dataseturi spatial: type: object properties: @@ -293,8 +292,6 @@ properties: required: - name required: - - language - - charset - title - abstract - topiccategory @@ -676,7 +673,7 @@ definitions: - boolean i18n_array: oneOf: - - type: string + - type: array - type: object patternProperties: # e.g. keywords_en, keywords_fr '.*_\w{2}$': From f154a81ba0bd9e3038329c91877e7289564e61bc Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sun, 6 Nov 2022 15:25:27 -0500 Subject: [PATCH 2/2] add Python 3.9 to testing matrix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6bb8e64..2305fb2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2