Merge remote-tracking branch 'origin/master' into unit-tests

Author: AnHeuermann

ompackagemanager/__main__.py

@@ -1,10 +1,20 @@
+from ompackagemanager import generate_cache
 import argparse
+import warnings
 
-from ompackagemanager import updateinfo
-from ompackagemanager import genindex
-from ompackagemanager import generate_cache
-from ompackagemanager import check_missing
-from ompackagemanager import check_uses
+importError = False
+try:
+    from ompackagemanager import updateinfo
+    from ompackagemanager import genindex
+    from ompackagemanager import check_missing
+    from ompackagemanager import check_uses
+except ImportError as e:
+    importError = True
+    updateinfo = None
+    genindex = None
+    check_missing = None
+    check_uses = None
+    warnings.warn("Failed to load some modules!\n%s" % str(e))
 
 
 def main(argv=None):
@@ -15,12 +25,14 @@ def main(argv=None):
     # updateinfo command
     parser1 = subparsers.add_parser(
         'updateinfo', help='Generate up-to-date `rawdata.json`.')
-    parser1.set_defaults(func=updateinfo.main)
+    if not importError:
+        parser1.set_defaults(func=updateinfo.main)
 
     # genindex command
     parser2 = subparsers.add_parser(
         'genindex', help='Generate `index.json` from `rawdata.json`.')
-    parser2.set_defaults(func=genindex.main)
+    if not importError:
+        parser2.set_defaults(func=genindex.main)
 
     # generate-cache command
     parser3 = subparsers.add_parser(
@@ -34,11 +46,13 @@ def main(argv=None):
     parser4 = subparsers.add_parser(
         'check-missing',
         help='Print all GitHub repositories missing from modelica-3rdparty for packages from `repos.json`.')
-    parser4.set_defaults(func=check_missing.main)
+    if not importError:
+        parser4.set_defaults(func=check_missing.main)
 
     # check-uses
     parser5 = subparsers.add_parser('check-uses', help='Some help')
-    parser5.set_defaults(func=check_uses.main)
+    if not importError:
+        parser5.set_defaults(func=check_uses.main)
 
     args = parser.parse_args(argv)
     print(args.script)

ompackagemanager/updateinfo.py

@@ -1,14 +1,14 @@
+import glob
+import json
 import OMPython
 import os
-from github import Github, Auth
-from atlassian import Bitbucket
-import json
 import pygit2
-import glob
 import re
-import shutil
 import requests
+import shutil
 import zipfile
+from github import Github, Auth
+from atlassian import Bitbucket
 
 from ompackagemanager import common
 

rawdata.json

@@ -1567,7 +1567,7 @@
             "version": "13.0.0-master"
           }
         },
-        "sha": "f95071768b745154ce8aea5a1f6af90fc073e1e1"
+        "sha": "0acc53fe087d25b2842acc6c03b27381e4fe936e"
       },
       "v1.4_build1": {
         "libs": {
@@ -4332,7 +4332,7 @@
             "version": "1.8.0-master"
           }
         },
-        "sha": "e0b84a3b12958aeb8106ba585c7c07494ee8bc0e"
+        "sha": "b2a5ca2f80f3bf2a011fd697ca31e047dbbee219"
       },
       "nightly": {
         "libs": {
@@ -4344,7 +4344,7 @@
             "version": "1.8.0-nightly"
           }
         },
-        "sha": "e0b84a3b12958aeb8106ba585c7c07494ee8bc0e"
+        "sha": "b2a5ca2f80f3bf2a011fd697ca31e047dbbee219"
       },
       "nightly-release": {
         "libs": {
@@ -4560,7 +4560,7 @@
             "version": "1.8.0-Master"
           }
         },
-        "sha": "e0b84a3b12958aeb8106ba585c7c07494ee8bc0e"
+        "sha": "b2a5ca2f80f3bf2a011fd697ca31e047dbbee219"
       }
     }
   },
@@ -10970,7 +10970,7 @@
             "version": "25.8.0-main"
           }
         },
-        "sha": "94547ad9193efc284b272cb86d6b616cf7457d31"
+        "sha": "fdb16e9cb1e7f1e438d6ca1b8070050d7e3eadc9"
       },
       "v25.04-beta.1": {
         "libs": {
@@ -11983,7 +11983,7 @@
             "version": "2.0.0-master"
           }
         },
-        "sha": "ad3f7b73d369a21f157e5bef04f675c8000bbfa5"
+        "sha": "f816b76ef538d470f5498fa21ad8b5878c77442f"
       },
       "v1.2.0": {
         "libs": {