tweak python meta

Author: Christopher Doris

juliacall/deps.py

@@ -1,3 +1,4 @@
+import json
 import os
 import sys
 
@@ -8,41 +9,23 @@
 
 ### META
 
+META_VERSION = 1 # increment whenever the format changes
+
 def load_meta():
-    import json, os.path
     fn = CONFIG['meta']
     if os.path.exists(fn):
         with open(fn) as fp:
-            return json.load(fp)
-    else:
-        return {}
+            meta = json.load(fp)
+            if meta.get('meta_version') == META_VERSION:
+                return meta
 
 def save_meta(meta):
-    import json
+    assert isinstance(meta, dict)
+    assert meta.get('meta_version') == META_VERSION
     fn = CONFIG['meta']
     with open(fn, 'w') as fp:
         json.dump(meta, fp)
 
-def get_meta(*keys):
-    meta = load_meta()
-    for key in keys:
-        if key in meta:
-            meta = meta[key]
-        else:
-            return None
-    return meta
-
-def set_meta(*args):
-    if len(args) < 2:
-        raise TypeError('set_meta requires at least two arguments')
-    keys = args[:-1]
-    value = args[-1]
-    meta2 = meta = load_meta()
-    for key in keys[:-1]:
-        meta2 = meta2.setdefault(key, {})
-    meta2[keys[-1]] = value
-    save_meta(meta)
-
 ### RESOLVE
 
 class PackageSpec:
@@ -83,7 +66,7 @@ def dict(self):
 
 def can_skip_resolve():
     # resolve if we haven't resolved before
-    deps = get_meta("pydeps")
+    deps = load_meta()
     if deps is None:
         return False
     # resolve whenever the version changes
@@ -240,7 +223,8 @@ def best_julia_version(compat=None, upstream=None):
     return max(releases, key=lambda x: jill.utils.version_utils.Version(x[0]))[0]
 
 def record_resolve(pkgs):
-    set_meta("pydeps", {
+    save_meta({
+        "meta_version": META_VERSION,
         "version": __version__,
         "dev": CONFIG["dev"],
         "jlversion": CONFIG.get("exever"),

juliacall/init.py

@@ -129,7 +129,8 @@
         else:
             pkgs.append(deps.PackageSpec(name="PythonCall", uuid="6099a3de-0909-46bc-b1f4-468b9a2dfc0d", compat="= "+__version__))
         # check if pkgs has changed at all
-        prev_pkgs = deps.get_meta("pydeps", "pkgs")
+        meta = deps.load_meta()
+        prev_pkgs = None if meta is None else meta.get('pkgs')
         if prev_pkgs is not None and sorted(prev_pkgs, key=lambda p: p['name']) == sorted([p.dict() for p in pkgs], key=lambda p: p['name']):
             install = ''
         else:

src/juliacall.jl

@@ -10,15 +10,14 @@ function init_juliacall()
     if C.CTX.is_embedded
         # in this case, Julia is being embedded into Python by juliacall, which already exists
         pycopy!(jl, sys.modules["juliacall"])
-        @assert pystr_asstring(jl.CONFIG["meta"]) == Deps.meta_file()
         @assert pystr_asstring(jl.__version__) == string(VERSION)
     elseif "juliacall" in sys.modules
         # otherwise, Python is being embedded into Julia by PythonCall, so should not exist
         error("'juliacall' module already exists")
     else
         # create the juliacall module and save it in sys.modules
         pycopy!(jl, pytype(sys)("juliacall"))
-        jl.CONFIG = pydict(embedded=true, meta=Deps.meta_file())
+        jl.CONFIG = pydict(embedded=true)
         jl.__version__ = string(VERSION)
         jl.__path__ = pylist((joinpath(dirname(dirname(pathof(PythonCall))), "juliacall"),))
         sys.modules["juliacall"] = jl