fix: update scripts not working with new pyproject.toml installs

DCOR-dev · Aug 5, 2024 · 3508c88 · 3508c88
1 parent 705358f
commit 3508c88
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+0.11.6
+ - fix: update scripts not working with new pyproject.toml installs
 0.11.5
  - setup: remove symlinks
 0.11.4

diff --git a/dcor_control/resources/compatible_versions.txt b/dcor_control/resources/compatible_versions.txt
@@ -1,5 +1,5 @@
 ckan      ckanext-dc_log_view  ckanext-dc_serve  ckanext-dc_view  ckanext-dcor_depot  ckanext-dcor_schemas  ckanext-dcor_theme  dcor_control  dcor_shared
-2.10.4    0.5.0                0.16.0            0.10.0           0.15.0              0.20.0                0.8.0               0.11.5        0.11.0
+2.10.4    0.5.6                0.16.2            0.10.2           0.15.2              0.20.2                0.8.2               0.11.6        0.11.2
 2.10.4    0.4.0                0.15.4            0.9.1            0.14.1              0.19.1                0.7.8               0.10.10       0.10.3
 2.10.4    0.4.0                0.15.4            0.9.1            0.14.0              0.19.0                0.7.8               0.10.6        0.10.3
 2.10.3    0.3.3                0.14.1            0.8.2            0.13.8              0.18.11               0.7.7               0.9.5         0.5.6

diff --git a/dcor_control/update.py b/dcor_control/update.py
@@ -152,6 +152,7 @@ def update_package(name):
     new_ver = get_package_version(name)
     if old_ver != new_ver:
         print(f"...updated {name} from {old_ver} to {new_ver}.")
+    return new_ver
 
 
 def version_greater(va: str, vb: str):

diff --git a/scripts/list_extension_versions.py b/scripts/list_extension_versions.py
@@ -7,32 +7,31 @@
 but at the least whenever an incompatibility is
 introduced.
 """
-try:
-    from ckan import __version__ as ckan_version
-except BaseException:
-    ckan_version = "unknown!"
-
-from ckanext import dc_log_view
-from ckanext import dc_serve
-from ckanext import dc_view
-from ckanext import dcor_depot
-from ckanext import dcor_schemas
-from ckanext import dcor_theme
-import dcor_control
-import dcor_shared
-
-
-versions = {
-    "ckan": ckan_version,
-    "ckanext.dc_log_view": dc_log_view.__version__,
-    "ckanext.dc_serve": dc_serve.__version__,
-    "ckanext.dc_view": dc_view.__version__,
-    "ckanext.dcor_depot": dcor_depot.__version__,
-    "ckanext.dcor_schemas": dcor_schemas.__version__,
-    "ckanext.dcor_theme": dcor_theme.__version__,
-    "dcor_control": dcor_control.__version__,
-    "dcor_shared": dcor_shared.__version__,
-    }
+import ckan
+from dcor_control import update
+
+
+packages = [
+    "ckan",
+    "ckanext.dc_log_view",
+    "ckanext.dc_serve",
+    "ckanext.dc_view",
+    "ckanext.dcor_depot",
+    "ckanext.dcor_schemas",
+    "ckanext.dcor_theme",
+    "dcor_control",
+    "dcor_shared",
+]
+
+versions = {}
+
+for name in packages:
+    print(f"Detecting {name}")
+    if name == "ckan":
+        new_ver = ckan.__version__
+    else:
+        new_ver = update.update_package(name)
+    versions[name] = new_ver
 
 
 min_cell_width = 10