Drop Julia 0.6

Author: tkf

.travis.yml

@@ -6,7 +6,6 @@ python:
   - "3.6"
 env:
   matrix:
-    - JULIA_VERSION=0.6.4 CROSS_VERSION=1
     - JULIA_VERSION=1.0
     - JULIA_VERSION=nightly
   global:
@@ -32,26 +31,13 @@ matrix:
           - JULIA_VERSION=1.0
           # - JULIA_VERSION=nightly
         os: osx
-      - language: generic
-        env:
-          - PYTHON=python2
-          - JULIA_VERSION=0.6.4
-          - CROSS_VERSION=1
-        os: osx
       - language: generic
         env:
           - PYTHON=python3
           - PYJULIA_TEST_INCOMPATIBLE_PYTHONS=python2
           - JULIA_VERSION=1.0
           # - JULIA_VERSION=nightly
         os: osx
-      - language: generic
-        env:
-          - PYTHON=python3
-          - PYJULIA_TEST_INCOMPATIBLE_PYTHONS=python2
-          - JULIA_VERSION=0.6.4
-          - CROSS_VERSION=1
-        os: osx
 
       # Upload the package to `test.pypi.org` when there is a push to
       # `release/test` branch:
@@ -124,18 +110,6 @@ script:
     fi
   - echo "$PYJULIA_TEST_INCOMPATIBLE_PYTHONS"
 
-  # "py,py27" below would be redundant when the main interpreter is
-  # Python 2.7 but it simplifies the CI setup.
-  - if [ "$CROSS_VERSION" = "1" ]; then
-    $PYTHON -m tox -e py,py27;
-    fi
-  - if [ "$CROSS_VERSION" = "1" ]; then
-    cat .tox/py/log/pytest.log;
-    fi
-  - if [ "$CROSS_VERSION" = "1" ]; then
-    cat .tox/py27/log/pytest.log;
-    fi
-
   - PYJULIA_TEST_REBUILD=yes $PYTHON -m tox -- --cov=julia
   - cat .tox/py/log/pytest.log
 

README.md

@@ -6,7 +6,7 @@ PyJulia
 [![Build Status](https://travis-ci.org/JuliaPy/pyjulia.svg?branch=master)](https://travis-ci.org/JuliaPy/pyjulia)
 [![Build status](https://ci.appveyor.com/api/projects/status/github/JuliaPy/pyjulia?svg=true)](https://ci.appveyor.com/project/Keno/pyjulia)
 
-Experimenting with developing a better interface to [Julia language](https://julialang.org/) that works with [Python](https://www.python.org/) 2 & 3 and Julia v0.6+.
+Experimenting with developing a better interface to [Julia language](https://julialang.org/) that works with [Python](https://www.python.org/) 2 & 3 and Julia v1.0+.
 
 Quick usage
 -----------

appveyor.yml

@@ -7,12 +7,6 @@ environment:
   # for more python versions have a look at
   # https://github.com/ogrisel/python-appveyor-demo/blob/master/appveyor.yml
   matrix:
-  # 32 julia-0.6 Python-35
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-    PYTHONDIR: "C:\\Python35"
-    BATDIR: ci\appveyor\win32
-    CROSS_VERSION: 1
-
   # 32 julia-1.0 Python-35
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/1.0/julia-1.0-latest-win32.exe"
     PYTHONDIR: "C:\\Python35"
@@ -23,12 +17,6 @@ environment:
   #   PYTHONDIR: "C:\\Python35"
   #   BATDIR: ci\appveyor\win32
 
-  # 64 julia-0.6 Python-35
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
-    PYTHONDIR: "C:\\Python35-x64"
-    BATDIR: ci\appveyor\win64
-    CROSS_VERSION: 1
-
   # 64 julia-1.0 Python-35
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0-latest-win64.exe"
     PYTHONDIR: "C:\\Python35-x64"
@@ -78,14 +66,6 @@ test_script:
   - "SET PATH=%cd%\\%BATDIR%;%PYTHONDIR%;%PYTHONDIR%\\Scripts;C:\\projects\\julia\\bin;%PATH%"
   - dir
 
-  # Run cross-version tests but ignore the failures (from Python 2).
-  # Once cross-version in Windows is fmixed, stop using
-  # Invoke-Expression (which ignores the exit status).
-  - ps: if ($env:CROSS_VERSION -eq 1) { Invoke-Expression "tox" }
-  # - ps: if ($env:CROSS_VERSION -eq 1) { tox }
-  - ps: if ($env:CROSS_VERSION -eq 1) { Invoke-Expression "cat .tox\py\log\pytest.log" }
-  - ps: if ($env:CROSS_VERSION -eq 1) { Invoke-Expression "cat .tox\py27\log\pytest.log" }
-
   # Rebuild PyCall.ji for each Python interpreter before testing:
   - "SET PYJULIA_TEST_REBUILD=yes"
   - tox

docs/source/index.rst

@@ -5,7 +5,7 @@ Welcome to PyJulia’s documentation!
 
 Experimenting with developing a better interface to
 `Julia language <https://julialang.org/>`_ that works with
-`Python <https://www.python.org/>`_ 2 & 3 and Julia v0.6+.
+`Python <https://www.python.org/>`_ 2 & 3 and Julia v1.0+.
 
 PyJulia is tested against Python versions 2.7, 3.5, 3.6, and 3.7.
 

docs/source/installation.rst

@@ -26,7 +26,7 @@
 See below for more detailed explanations.
 
 **Note:** If you are using Python installed with Ubuntu or ``conda``,
-PyJulia may not work with Julia ≥ 0.7. For workarounds, see
+PyJulia may not work with the default setting. For workarounds, see
 :doc:`Troubleshooting <troubleshooting>`. Same caution applies to any
 Debian-based and possibly other GNU/Linux distributions.
 
@@ -115,7 +115,7 @@ Alternatively, you can use Julia's builtin package manager.
 
 .. code-block:: jlcon
 
-   julia> using Pkg  # for julia ≥ 0.7
+   julia> using Pkg
    julia> Pkg.add("PyCall")
 
 Note that PyCall must be built with Python executable that is used to

docs/source/troubleshooting.rst

@@ -8,7 +8,7 @@ Your Python interpreter is statically linked to libpython
 
 If you use Python installed with Debian-based Linux distribution such as
 Ubuntu or install Python by ``conda``, you might have noticed that
-PyJulia cannot be initialized properly with Julia ≥ 0.7. This is because
+PyJulia cannot be initialized properly out-of-the-box. This is because
 those Python executables are statically linked to libpython. (See
 :doc:`limitations` for why that's a problem.)
 

setup.py

@@ -75,7 +75,7 @@ def pyload(path):
       },
       packages=find_packages("src"),
       package_dir={"": "src"},
-      package_data={'julia': ['fake-julia/*', "*.jl"]},
+      package_data={"julia": ["*.jl"]},
       extras_require={
           # Update `ci/test-upload/tox.ini` when "test" is changed:
           "test": [

src/julia/core.py

@@ -311,6 +311,8 @@ def is_accessible_name(name):
                 isprotected(name) or
                 notascii(name))
 
+# fmt: on
+
 
 def isdefined(julia, parent, member):
     return julia.eval("isdefined({}, :({}))".format(parent, member))
@@ -338,39 +340,6 @@ def determine_if_statically_linked():
     return linked_libpython() is None
 
 
-juliainfo_script = """
-println(VERSION < v"0.7.0-DEV.3073" ? JULIA_HOME : Base.Sys.BINDIR)
-if VERSION >= v"0.7.0-DEV.3630"
-    using Libdl
-    using Pkg
-end
-println(Libdl.dlpath(string("lib", splitext(Base.julia_exename())[1])))
-println(unsafe_string(Base.JLOptions().image_file))
-
-println(VERSION)
-println(VERSION.major)
-println(VERSION.minor)
-println(VERSION.patch)
-
-if VERSION < v"0.7.0"
-    PyCall_depsfile = Pkg.dir("PyCall","deps","deps.jl")
-else
-    pkg = Base.PkgId(Base.UUID(0x438e738f_606a_5dbb_bf0a_cddfbfd45ab0), "PyCall")
-    modpath = Base.locate_package(pkg)
-    if modpath == nothing
-        PyCall_depsfile = nothing
-    else
-        PyCall_depsfile = joinpath(dirname(modpath),"..","deps","deps.jl")
-    end
-end
-if PyCall_depsfile !== nothing && isfile(PyCall_depsfile)
-    include(PyCall_depsfile)
-    println(pyprogramname)
-    println(libpython)
-end
-"""
-
-
 class JuliaInfo(object):
     """
     Information required for initializing Julia runtime.
@@ -417,16 +386,22 @@ def load(cls, julia="julia", **popen_kwargs):
         # object file: No such file or directory":
         popen_kwargs.setdefault("env", _enviorn)
 
+        juliainfo_script = os.path.join(
+            os.path.dirname(os.path.realpath(__file__)), "juliainfo.jl"
+        )
         proc = subprocess.Popen(
-            [julia, "--startup-file=no", "-e", juliainfo_script],
+            [julia, "--startup-file=no", juliainfo_script],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             universal_newlines=True,
-            **popen_kwargs)
+            **popen_kwargs
+        )
 
         stdout, stderr = proc.communicate()
         retcode = proc.wait()
         if retcode != 0:
+            logger.debug("STDOUT from %s:\n%s", julia, stdout)
+            logger.debug("STDERR from %s:\n%s", julia, stderr)
             if sys.version_info[0] < 3:
                 output = "\n".join(["STDOUT:", stdout, "STDERR:", stderr])
                 raise subprocess.CalledProcessError(
@@ -445,9 +420,19 @@ def load(cls, julia="julia", **popen_kwargs):
 
         return cls(julia, *args)
 
-    def __init__(self, julia, bindir, libjulia_path, sysimage,
-                 version_raw, version_major, version_minor, version_patch,
-                 python=None, libpython_path=None):
+    def __init__(
+        self,
+        julia,
+        version_raw,
+        version_major,
+        version_minor,
+        version_patch,
+        bindir=None,
+        libjulia_path=None,
+        sysimage=None,
+        python=None,
+        libpython_path=None,
+    ):
         self.julia = julia
         self.bindir = bindir
         self.libjulia_path = libjulia_path
@@ -501,6 +486,9 @@ def is_compatible_exe(jl_libpython):
     # `jl_libpython` to be a `str` always.
 
 
+# fmt: off
+
+
 def setup_libjulia(libjulia):
     # Store the running interpreter reference so we can start using it via self.call
     libjulia.jl_.argtypes = [c_void_p]
@@ -951,77 +939,28 @@ def __init__(self, init_julia=True, jl_init_path=None, runtime=None,
             self.api = get_libjulia()
         elif init_julia:
             jlinfo = JuliaInfo.load(runtime)
+            if jlinfo.version_info < (0, 7):
+                raise RuntimeError("PyJulia does not support Julia < 0.7 anymore")
+
             self.api = LibJulia.from_juliainfo(jlinfo)
 
             if jl_init_path:
                 self.api.bindir = jl_init_path
 
             options = JuliaOptions(**julia_options)
 
-            use_separate_cache = not (
-                options.compiled_modules == "no" or jlinfo.is_compatible_python()
-            )
-            logger.debug("use_separate_cache = %s", use_separate_cache)
-            if use_separate_cache:
-                PYCALL_JULIA_HOME = os.path.join(
-                    os.path.dirname(os.path.realpath(__file__)), "fake-julia").replace("\\", "\\\\")
-                os.environ["JULIA_HOME"] = PYCALL_JULIA_HOME  # TODO: this line can be removed when dropping Julia v0.6
-                os.environ["JULIA_BINDIR"] = PYCALL_JULIA_HOME
-                self.api.bindir = PYCALL_JULIA_HOME
+            is_compatible_python = jlinfo.is_compatible_python()
+            logger.debug("is_compatible_python = %r", is_compatible_python)
+            logger.debug("compiled_modules = %r", options.compiled_modules)
+            if not (options.compiled_modules == "no" or is_compatible_python):
+                raise_separate_cache_error(runtime, jlinfo)
 
             was_initialized = self.api.jl_is_initialized()
             if was_initialized:
                 set_libjulia(self.api)
             else:
                 self.api.init_julia(options)
 
-            if use_separate_cache:
-                if jlinfo.version_info < (0, 6):
-                    raise RuntimeError(
-                        "PyJulia does not support Julia < 0.6 anymore")
-                elif jlinfo.version_info >= (0, 7):
-                    raise_separate_cache_error(runtime, jlinfo)
-                # Intercept precompilation
-                os.environ["PYCALL_PYTHON_EXE"] = sys.executable
-                os.environ["PYCALL_JULIA_HOME"] = PYCALL_JULIA_HOME
-                os.environ["PYJULIA_IMAGE_FILE"] = jlinfo.sysimage
-                os.environ["PYCALL_LIBJULIA_PATH"] = os.path.dirname(jlinfo.libjulia_path)
-                # Add a private cache directory. PyCall needs a different
-                # configuration and so do any packages that depend on it.
-                self._call(u"unshift!(Base.LOAD_CACHE_PATH, abspath(Pkg.Dir._pkgroot()," +
-                    "\"lib\", \"pyjulia%s-v$(VERSION.major).$(VERSION.minor)\"))" % sys.version_info[0])
-
-                # If PyCall.jl is already pre-compiled, for the global
-                # environment, hide it while we are loading PyCall.jl
-                # for PyJulia which has to compile a new cache if it
-                # does not exist.  However, Julia does not compile a
-                # new cache if it exists in Base.LOAD_CACHE_PATH[2:end].
-                # https://github.com/JuliaPy/pyjulia/issues/92#issuecomment-289303684
-                self._call(u"""
-                for path in Base.LOAD_CACHE_PATH[2:end]
-                    cache = joinpath(path, "PyCall.ji")
-                    backup = joinpath(path, "PyCall.ji.backup")
-                    if isfile(cache)
-                        mv(cache, backup; remove_destination=true)
-                    end
-                end
-                """)
-
-            # This is mainly for initiating the precompilation:
-            self._call(u"using PyCall")
-
-            if use_separate_cache:
-                self._call(u"""
-                for path in Base.LOAD_CACHE_PATH[2:end]
-                    cache = joinpath(path, "PyCall.ji")
-                    backup = joinpath(path, "PyCall.ji.backup")
-                    if !isfile(cache) && isfile(backup)
-                        mv(backup, cache)
-                    end
-                    rm(backup; force=true)
-                end
-                """)
-
             # We are assuming that `jl_is_initialized()` was true only
             # if this process was a Julia process (hence PyCall had
             # already called `atexit(Py_Finalize)`).  This is not true