diff --git a/.github/actions/setup-esgvoc/action.yml b/.github/actions/setup-esgvoc/action.yml index 26d89b0..cf6e600 100644 --- a/.github/actions/setup-esgvoc/action.yml +++ b/.github/actions/setup-esgvoc/action.yml @@ -18,4 +18,17 @@ runs: - name: Install esgvoc shell: bash - run: uv pip install --system "esgvoc>=4.0.0" ${{ inputs.extra-packages }} + run: | + # Test with an esgvoc able to use the DB built from this CV: esgvoc.min_version of the manifest. + MIN_VERSION=$(python3 - <<'PYEOF' + import re + try: + text = open("esgvoc_manifest.yaml").read() + except FileNotFoundError: + text = "" + match = re.search(r"^esgvoc:[ \t]*\n(?:[ \t]+.*\n)*?[ \t]+min_version:[ \t]*[\"']?([0-9][^\"'\s]*)", text, re.M) + print(match.group(1) if match else "4.0.0") + PYEOF + ) + echo "Installing esgvoc>=${MIN_VERSION} (esgvoc.min_version of esgvoc_manifest.yaml)" + uv pip install --system "esgvoc>=${MIN_VERSION}" ${{ inputs.extra-packages }} diff --git a/catalog_specs.yaml b/catalog_specs.yaml index 090dab4..5faca3c 100644 --- a/catalog_specs.yaml +++ b/catalog_specs.yaml @@ -1,6 +1,6 @@ # STAC CATALOG SPECIFICATIONS -version: v1.0.2 +version: v1.1.0 catalog_properties: name: stac @@ -11,7 +11,7 @@ catalog_properties: - name: alternate-assets version: v1.2.0 regex_id: '^obs4REF(\.[A-Za-z0-9-]+){5}\.v[0-9]{8}$' - regex_base_id: '^obs4REF(\.[A-Za-z0-9-]+){5}$' + regex_title: '^obs4REF(\.[A-Za-z0-9-]+){5}$' dataset_properties: - source_collection: activity_id @@ -99,12 +99,6 @@ dataset_properties: catalog_field_value_type: string is_required: true - - source_collection: variable_id - source_collection_key: units - catalog_field_name: variable_units - catalog_field_value_type: string - is_required: true - - source_collection: variant_label catalog_field_value_type: string is_required: true diff --git a/esgvoc_manifest.yaml b/esgvoc_manifest.yaml index 3d256eb..892327f 100644 --- a/esgvoc_manifest.yaml +++ b/esgvoc_manifest.yaml @@ -5,6 +5,6 @@ project: cv_version: 1.0.0 universe_version: 1.0.23 esgvoc: - min_version: 4.1.0 + min_version: 6.2.0 release_notes: | Initial manifest.