ogc-na 0.4.5__tar.gz → 0.4.7__tar.gz

{ogc_na-0.4.5 → ogc_na-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ogc_na
-Version: 0.4.5
+Version: 0.4.7
 Summary: OGC Naming Authority tools
 Author-email: Rob Atkinson <ratkinson@ogc.org>, Piotr Zaborowski <pzaborowski@ogc.org>, Alejandro Villar <avillar@ogc.org>
 License-Expression: Apache-2.0

{ogc_na-0.4.5 → ogc_na-0.4.7}/ogc/na/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.5'
-__version_tuple__ = version_tuple = (0, 4, 5)
+__version__ = version = '0.4.7'
+__version_tuple__ = version_tuple = (0, 4, 7)
 
-__commit_id__ = commit_id = 'gf687441ec'
+__commit_id__ = commit_id = 'ge70441585'

{ogc_na-0.4.5 → ogc_na-0.4.7}/ogc/na/annotate_schema.py

@@ -538,29 +538,16 @@ class SchemaAnnotator:
         updated_refs: set[int] = set()
 
         def find_prop_context(prop, context_stack) -> dict | None:
-            vocab = UNDEFINED
             for ctx in reversed(context_stack):
-                if vocab is UNDEFINED and '@vocab' in ctx:
-                    vocab = ctx.get('@vocab')
                 if prop in ctx:
                     prop_ctx = ctx[prop]
                     if isinstance(prop_ctx, str):
-                        if vocab and ':' not in prop_ctx and prop_ctx not in JSON_LD_KEYWORDS:
-                            prop_ctx = f"{vocab}{prop_ctx}"
                         return {'@id': prop_ctx}
-                    elif '@id' not in prop_ctx and '@reverse' not in prop_ctx and not vocab:
+                    elif '@id' not in prop_ctx and '@reverse' not in prop_ctx:
                         raise ValueError(f'Missing @id for property {prop} in context {json.dumps(ctx, indent=2)}')
                     else:
                         result = {k: v for k, v in prop_ctx.items() if k in JSON_LD_KEYWORDS}
-                        if vocab:
-                            prop_id = result.get('@id')
-                            if not prop_id:
-                                result['@id'] = f"{vocab}{prop}"
-                            elif ':' not in prop_id and prop_id not in JSON_LD_KEYWORDS:
-                                result['@id'] = f"{vocab}{prop_id}"
                         return result
-            if vocab != UNDEFINED and isinstance(vocab, str):
-                return {'@id': f"{vocab}{prop}"}
 
         def process_properties(obj: dict, context_stack: list[dict[str, Any]],
                                from_schema: ReferencedSchema, level) -> Iterable[str]:

{ogc_na-0.4.5 → ogc_na-0.4.7}/ogc/na/download.py

@@ -20,6 +20,7 @@ def download_file(url: str,
                   dest: str | Path,
                   object_diff: bool = True,
                   ignore_diff_errors: bool = True):
+    logger.info('Downloading %s to %s', url, dest)
     if not isinstance(dest, Path):
         dest = Path(dest)
     r = requests.get(url)
@@ -30,12 +31,15 @@ def download_file(url: str,
             newcontent = util.load_yaml(content=r.content)
             oldcontent = util.load_yaml(filename=dest)
             overwrite = newcontent != oldcontent
+            if overwrite:
+                logger.info('Contents have changed, existing file will be overwritten', dest)
         except Exception as e:
             if ignore_diff_errors:
                 logger.warning('Error when loading content for diff: %s', str(e))
             else:
                 raise
     if overwrite:
+        logger.info('Saving %s', dest)
         dest.parent.mkdir(parents=True, exist_ok=True)
         with open(dest, 'wb') as f:
             f.write(r.content)

{ogc_na-0.4.5 → ogc_na-0.4.7}/ogc_na.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ogc_na
-Version: 0.4.5
+Version: 0.4.7
 Summary: OGC Naming Authority tools
 Author-email: Rob Atkinson <ratkinson@ogc.org>, Piotr Zaborowski <pzaborowski@ogc.org>, Alejandro Villar <avillar@ogc.org>
 License-Expression: Apache-2.0