always default to official julia downloads

Author: Christopher Doris

juliacall/deps.py

@@ -208,7 +208,7 @@ def required_julia():
         raise Exception("'julia' compat entries have empty intersection:\n{}".format('\n'.join(['- {!r} at {}'.format(v,f) for (f,v) in compats.items()])))
     return compat
 
-def best_julia_version(compat=None):
+def best_julia_version(compat=None, upstream=None):
     """
     Selects the best Julia version available matching required_julia().
 
@@ -222,7 +222,7 @@ def best_julia_version(compat=None):
     arch = jill.install.current_architecture()
     if system == 'linux' and jill.install.current_libc() == 'musl':
         system = 'musl'
-    releases = jill.utils.version_utils.read_releases()
+    releases = jill.utils.version_utils.read_releases(upstream=upstream)
     releases = [r for r in releases if r[1]==system and r[2]==arch]
     if compat is not None:
         _releases = releases

juliacall/init.py

@@ -64,7 +64,8 @@
         else:
             # Find the best available version
             exepath = None
-            exever = deps.best_julia_version(compat)
+            jill_upstream = os.getenv("JILL_UPSTREAM") or "Official"
+            exever = deps.best_julia_version(compat, upstream=jill_upstream)
             v = jlcompat.julia_version_str("julia")
             if v is not None and v == exever:
                 exepath = "julia"
@@ -88,7 +89,7 @@
                     else:
                         os.environ["PATH"] += os.pathsep + jlbin
                     os.chdir(jldownload)
-                    jli.install_julia(version=exever, confirm=True, install_dir=jlinstall, symlink_dir=jlbin, upstream=os.getenv("JILL_UPSTREAM") or "Official")
+                    jli.install_julia(version=exever, confirm=True, install_dir=jlinstall, symlink_dir=jlbin, upstream=jill_upstream)
                 finally:
                     if p is None:
                         del os.environ["PATH"]