rename environment variables

Author: Christopher Doris

.github/workflows/tests.yml

@@ -89,7 +89,7 @@ jobs:
       - uses: julia-actions/julia-runtest@v1
         env:
           JULIA_DEBUG: PythonCall
-          PYTHONJL_EXE: CONDA
+          JULIA_PYTHONCALL_EXE: CONDA
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:

docs/src/getting-started.md

@@ -38,10 +38,10 @@ packages can always `import juliacall`.
 
 If Julia and Python are in your PATH, then no further set-up is required.
 Otherwise, the following environment variables control how the package finds these.
-- `PYTHONJL_EXE`: Path to the Python executable. Or the special value `CONDA` which uses
+- `JULIA_PYTHONCALL_EXE`: Path to the Python executable. Or the special value `CONDA` which uses
   Python from the default conda environment, or `CONDA:{env}` to use the given environment.
-- `PYTHONJL_LIB`: Path to the Python library. Normally this is inferred from the Python
+- `JULIA_PYTHONCALL_LIB`: Path to the Python library. Normally this is inferred from the Python
   executable, but can be over-ridden.
-- `JULIAPY_EXE`: Path to the Julia executable.
-- `JULIAPY_LIB`: Path to the Julia library. Normally this is inferred from the Julia
+- `PYTHON_JULIACALL_EXE`: Path to the Julia executable.
+- `PYTHON_JULIACALL_LIB`: Path to the Julia library. Normally this is inferred from the Julia
   executable, but can be over-ridden.

juliacall/__init__.py

@@ -2,21 +2,21 @@
 
 def init():
     import os, os.path, sys, ctypes as c, types, shutil, subprocess
-    libpath = os.environ.get('JULIAPY_LIB')
+    libpath = os.environ.get('PYTHON_JULIACALL_LIB')
     if libpath is None:
-        exepath = os.environ.get('JULIAPY_EXE')
+        exepath = os.environ.get('PYTHON_JULIACALL_EXE')
         if exepath is None:
             exepath = shutil.which('julia')
             if exepath is None:
-                raise Exception('Cannot find Julia. Ensure it is in your PATH, set JULIAPY_EXE to its path, or set JULIAPY_LIB to the path to libjuliacall.')
+                raise Exception('Cannot find Julia. Ensure it is in your PATH, set PYTHON_JULIACALL_EXE to its path, or set PYTHON_JULIACALL_LIB to the path to libjuliacall.')
         else:
             if not os.path.isfile(exepath):
-                raise Exception('JULIAPY_EXE=%s does not exist' % repr(exepath))
+                raise Exception('PYTHON_JULIACALL_EXE=%s does not exist' % repr(exepath))
         CONFIG['exepath'] = exepath
         libpath = subprocess.run([exepath, '-e', 'import Libdl; print(abspath(Libdl.dlpath("libjulia")))'], stdout=(subprocess.PIPE)).stdout.decode('utf8')
     else:
         if not os.path.isfile(libpath):
-            raise Exception('JULIAPY_LIB=%s does not exist' % repr(libpath))
+            raise Exception('PYTHON_JULIACALL_LIB=%s does not exist' % repr(libpath))
     CONFIG['libpath'] = libpath
     try:
         d = os.getcwd()
@@ -34,7 +34,7 @@ def init():
     res = lib.jl_eval_string(
         '''
         try
-            ENV["PYTHONJL_LIBPTR"] = "{}"
+            ENV["JULIA_PYTHONCALL_LIBPTR"] = "{}"
             import PythonCall
         catch err
             @error "Error loading PythonCall.jl" err=err

src/PythonCall.jl

@@ -37,7 +37,7 @@ include("utils.jl")
     pyprogname_w::Vector{Cwchar_t} = []
     "True if this is stackless Python."
     isstackless::Bool = false
-    """True if Julia is embedded into Python (indicated by ENV["PYTHONJL_LIBPTR"] being set)."""
+    """True if Julia is embedded into Python (indicated by ENV["JULIA_PYTHONCALL_LIBPTR"] being set)."""
     isembedded::Bool = false
     "True if the Python interpreter is currently initialized."
     isinitialized::Bool = false

src/init.jl

@@ -8,19 +8,19 @@ end
 
 @init begin
     # Check if libpython is already loaded (i.e. if the Julia interpreter was started from a Python process)
-    CONFIG.isembedded = haskey(ENV, "PYTHONJL_LIBPTR")
+    CONFIG.isembedded = haskey(ENV, "JULIA_PYTHONCALL_LIBPTR")
 
     if CONFIG.isembedded
         # In this case, getting a handle to libpython is easy
-        CONFIG.libptr = Ptr{Cvoid}(parse(UInt, ENV["PYTHONJL_LIBPTR"]))
+        CONFIG.libptr = Ptr{Cvoid}(parse(UInt, ENV["JULIA_PYTHONCALL_LIBPTR"]))
         # Check Python is initialized
         C.Py_IsInitialized() == 0 && error("Python is not already initialized.")
         CONFIG.isinitialized = CONFIG.preinitialized = true
     else
         # Find Python executable
         exepath = something(
             CONFIG.exepath,
-            get(ENV, "PYTHONJL_EXE", nothing),
+            get(ENV, "JULIA_PYTHONCALL_EXE", nothing),
             Sys.which("python3"),
             Sys.which("python"),
             Some(nothing),
@@ -30,7 +30,7 @@ end
                 """
               Could not find Python executable.
 
-              Ensure 'python3' or 'python' is in your PATH or set environment variable 'PYTHONJL_EXE'
+              Ensure 'python3' or 'python' is in your PATH or set environment variable 'JULIA_PYTHONCALL_EXE'
               to the path to the Python executable.
               """,
             )
@@ -52,8 +52,8 @@ end
 
                 Ensure either:
                 - python3 or python is in your PATH
-                - PYTHONJL_EXE is "CONDA" or "CONDA:<env>"
-                - PYTHONJL_EXE is the path to the Python executable
+                - JULIA_PYTHONCALL_EXE is "CONDA" or "CONDA:<env>"
+                - JULIA_PYTHONCALL_EXE is the path to the Python executable
                 """)
         end
 
@@ -66,7 +66,7 @@ end
 
         # Find Python library
         libpath =
-            something(CONFIG.libpath, get(ENV, "PYTHONJL_LIB", nothing), Some(nothing))
+            something(CONFIG.libpath, get(ENV, "JULIA_PYTHONCALL_LIB", nothing), Some(nothing))
         if libpath !== nothing
             libptr = dlopen_e(path, CONFIG.dlopenflags)
             if libptr == C_NULL
@@ -91,7 +91,7 @@ end
             CONFIG.libpath === nothing && error("""
                 Could not find Python library for Python executable $(repr(CONFIG.exepath)).
 
-                If you know where the library is, set environment variable 'PYTHONJL_LIB' to its path.
+                If you know where the library is, set environment variable 'JULIA_PYTHONCALL_LIB' to its path.
                 """)
         end