🚸 backward compatible fix for OZI.build 1.3+

Signed-off-by: rjdbcm <[email protected]>
OZI-Project · Aug 28, 2024 · cae39ae · cae39ae
1 parent 751c690
commit cae39ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ozi/scripts/meson_dist_setuptools_scm.py b/ozi/scripts/meson_dist_setuptools_scm.py
@@ -57,7 +57,11 @@
     with (source / 'pyproject.toml').open('rb') as project_file:
         pyproject_toml = toml.load(project_file)
     setuptools_scm = pyproject_toml.get('tool', {}).get('setuptools_scm', {})
-    path = Path(dist / setuptools_scm.get('version_file')).resolve()
+    try:
+        path = Path(source / setuptools_scm.get('version_file')).resolve()
+    except TypeError:
+        print('no METADATA path provided by setuptools_scm, assuming OZI.build 1.3+', file=sys.stderr)
+        exit(0)
     if path.exists():
         path.unlink()
     if path.parent != Path(dist).resolve():

diff --git a/ozi/scripts/meson_setuptools_scm.py b/ozi/scripts/meson_setuptools_scm.py
@@ -50,7 +50,11 @@
     with (source / 'pyproject.toml').open('rb') as project_file:
         pyproject_toml = toml.load(project_file)
     setuptools_scm = pyproject_toml.get('tool', {}).get('setuptools_scm', {})
-    path = Path(source / setuptools_scm.get('version_file')).resolve()
+    try:
+        path = Path(source / setuptools_scm.get('version_file')).resolve()
+    except TypeError:
+        print('no METADATA path provided by setuptools_scm, assuming OZI.build 1.3+', file=sys.stderr)
+        exit(0)
     if path.parent != Path(source).resolve():
         raise RuntimeError('Invalid version_file path in pyproject.toml')
     else: