Merge pull request #514 from JuliaPy/release/test

mkitti · web-flow · commit 51104a83797a · 2022-11-20T21:17:57.000-05:00
Merge release/test into release/main for 0.6.0
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,18 +24,15 @@ jobs:
         julia-version:
           - '1.0'
           - '1.6'
-          - '~1.7.0-rc1'
-          - 'nightly'
+          - '1.7'
+          - '1.8'
         exclude:
           - os: ubuntu-latest
             architecture: x86
           - os: macos-latest
             architecture: x86
           - os: macos-latest
             julia-version: '1.6'
-          - os: windows-latest
-            architecture: x86
-            python-version: '3.10'  # not added yet?
           - os: windows-latest
             julia-version: '1.6'
           - os: macos-latest
@@ -56,19 +53,11 @@ jobs:
             architecture: x64
             python-version: '3.8'
             julia-version: '1'
-          # Python 2.7 (TODO: drop):
-          - os: ubuntu-latest
-            architecture: x64
-            python-version: '2.7'
-            julia-version: '1'
-          - os: windows-latest
-            architecture: x64
-            python-version: '2.7'
-            julia-version: '1'
       fail-fast: false
-    name: Test ${{ matrix.os }} ${{ matrix.architecture }}
-      Python ${{ matrix.python-version }}
-      Julia ${{ matrix.julia-version }}
+    name: Test 
+      py${{ matrix.python-version }}
+      jl${{ matrix.julia-version }}
+      ${{ matrix.os }} ${{ matrix.architecture }}
     steps:
       - uses: actions/checkout@v1
       - name: Setup python
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:  # using `matrix` to define a constant
-        package: ['julia==0.5.7']
+        package: ['julia==0.6.0']
     steps:
       - name: Set up Python 3.9
         uses: actions/setup-python@v1
diff --git a/ci/test-upload/tox.ini b/ci/test-upload/tox.ini
@@ -16,7 +16,7 @@ deps =
 
 commands =
     shell-retry --backoff=2 --interval-max=20 --retry-count=30 --verbose -- \
-    pip install --index-url https://test.pypi.org/simple/ julia==0.5.7
+    pip install --index-url https://test.pypi.org/simple/ julia==0.6.0
 
     python -c "from julia import install; install()"
     python -m julia.runtests -- \
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -25,9 +25,9 @@
 author = 'The Julia and IPython development teams'
 
 # The short X.Y version
-version = '0.5.7'
+version = '0.6.0'
 # The full version, including alpha/beta/rc tags
-release = '0.5.7'
+release = '0.6.0'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -5,9 +5,9 @@ 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 v1.0+.
+`Python <https://www.python.org/>`_ 3 and Julia v1.0+.
 
-PyJulia is tested against Python versions 2.7, 3.5, 3.6, and 3.7.
+PyJulia is tested against Python versions 3.5+
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -38,7 +38,7 @@ Step 1: Install Julia
 
 Get the Julia installer from https://julialang.org/downloads/.  See
 also the `Platform Specific Instructions
-<https://julialang.org/downloads/platform.html>`_.
+<https://julialang.org/downloads/platform>`_.
 
 Your python installation must be able to call command line program
 ``julia``. If your installer does not add the Julia binary directory to
diff --git a/docs/source/limitations.rst b/docs/source/limitations.rst
@@ -50,7 +50,7 @@ No threading support
 
 PyJulia cannot be used in different threads since libjulia is not
 thread safe. However, you can `use multiple threads within Julia
-<https://docs.julialang.org/en/v1.0/manual/parallel-computing/#Multi-Threading-(Experimental)-1>`_.
+<https://docs.julialang.org/en/v1/manual/parallel-computing/#Multi-Threading-(Experimental)-1>`_.
 For example, start IPython by ``JULIA_NUM_THREADS=4 ipython`` and then
 run:
 
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
@@ -26,8 +26,8 @@ Other variants of Python import syntax also work:
 .. code-block:: pycon
 
    >>> import julia.Base
-   >>> from julia.Base import Enums    # import a submodule
-   >>> from julia.Base import sin      # import a function from a module
+   >>> from julia.Base import Enums     # import a submodule
+   >>> from julia.Base import sin, sind # import functions from a module
 
 The global namespace of Julia’s interpreter can be accessed via a
 special module ``julia.Main``:
diff --git a/setup.py b/setup.py
@@ -59,8 +59,6 @@ def pyload(path):
 
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
@@ -79,6 +77,7 @@ def pyload(path):
       packages=find_packages("src"),
       package_dir={"": "src"},
       package_data={"julia": ["*.jl"]},
+      python_requires=">=3.4",
       extras_require={
           # Update `ci/test-upload/tox.ini` when "test" is changed:
           "test": [
diff --git a/src/julia/core.py b/src/julia/core.py
@@ -478,8 +478,14 @@ def __init__(self, init_julia=True, jl_init_path=None, runtime=None,
 
             is_compatible_python = jlinfo.is_compatible_python()
             logger.debug("is_compatible_python = %r", is_compatible_python)
+            use_custom_sysimage = options.sysimage is not None
+            logger.debug("use_custom_sysimage = %r", use_custom_sysimage)
             logger.debug("compiled_modules = %r", options.compiled_modules)
-            if not (options.compiled_modules == "no" or is_compatible_python):
+            if not (
+                options.compiled_modules == "no"
+                or is_compatible_python
+                or use_custom_sysimage
+            ):
                 raise UnsupportedPythonError(jlinfo)
 
             self.api.init_julia(options)
diff --git a/src/julia/libjulia.py b/src/julia/libjulia.py
@@ -169,7 +169,7 @@ class LibJulia(BaseLibJulia):
 
     However, a proper use of the C-API is more involved and presumably
     very challenging without C macros.  See also:
-    https://docs.julialang.org/en/latest/manual/embedding/
+    https://docs.julialang.org/en/v1/manual/embedding/.
 
     Attributes
     ----------
@@ -216,12 +216,6 @@ def __init__(self, libjulia_path, bindir, sysimage):
                 'Julia library ("libjulia") not found! {}'.format(libjulia_path)
             )
 
-        # fixes a specific issue with python 2.7.13
-        # ctypes.windll.LoadLibrary refuses unicode argument
-        # http://bugs.python.org/issue29294
-        if sys.version_info >= (2, 7, 13) and sys.version_info < (2, 7, 14):
-            libjulia_path = libjulia_path.encode("ascii")
-
         with self._pathhack():
             self.libjulia = ctypes.PyDLL(libjulia_path, ctypes.RTLD_GLOBAL)
 
diff --git a/src/julia/magic.py b/src/julia/magic.py
@@ -19,6 +19,7 @@
 
 from __future__ import absolute_import, print_function
 
+import inspect
 import sys
 import warnings
 
@@ -48,8 +49,7 @@ def no_var_expand(f):
 
 @magics_class
 class JuliaMagics(Magics):
-    """A set of magics useful for interactive work with Julia.
-    """
+    """A set of magics useful for interactive work with Julia."""
 
     highlight = Bool(
         True,
@@ -109,12 +109,20 @@ def julia(self, line, cell=None):
         """
         src = unicode(line if cell is None else cell)
 
+        caller_frame = inspect.currentframe()
+        if caller_frame is None:
+            caller_frame = sys._getframe(3)  # May not work.
+
         # We assume the caller's frame is the first parent frame not in the
         # IPython module. This seems to work with IPython back to ~v5, and
         # is at least somewhat immune to future IPython internals changes,
         # although by no means guaranteed to be perfect.
-        caller_frame = sys._getframe(3)
-        while caller_frame.f_globals.get("__name__").startswith("IPython"):
+        while any(
+            (
+                caller_frame.f_globals.get("__name__").startswith("IPython"),
+                caller_frame.f_globals.get("__name__").startswith("julia"),
+            )
+        ):
             caller_frame = caller_frame.f_back
 
         return_value = "nothing" if src.strip().endswith(";") else ""
diff --git a/src/julia/options.py b/src/julia/options.py
@@ -41,6 +41,35 @@ def _domain(self):  # used in test
         return str
 
 
+class IntEtc(OptionDescriptor):
+    def __init__(self, name, *, etc={}):
+        self.name = name
+        self.default = etc
+
+    def __set__(self, instance, value):
+        if instance is None:
+            raise AttributeError(self.name)
+        elif value in {None, *self.default} or isinstance(value, int):
+            setattr(instance, self.dataname, value)
+        else:
+            if self.default:
+                part = " or " + " ".join(map(str, self.default))
+            else:
+                part = ""
+            raise ValueError(
+                f"Option {self.name} only accepts integers{part}. Got: {value}"
+            )
+
+    def _domain(self):
+        return {int, *self.default}
+
+    def cli_argument_spec(self):
+        return dict(
+            super(IntEtc, self).cli_argument_spec(),
+            choices=list(self.default) + ["1", "2", "3", "..."],
+        )
+
+
 class Choices(OptionDescriptor):
     def __init__(self, name, choicemap, default=None):
         self.name = name
@@ -110,6 +139,12 @@ def yes_no_etc(*etc):
 
 warn_overwrite: {True, False, 'yes', 'no'}
     Enable or disable method overwrite warnings.
+
+min_optlevel: {0, 1, 2, 3}
+    Lower bound on the optimization level.
+
+threads: {int, 'auto'}
+    How many threads to use.
 """
 
 
@@ -134,9 +169,11 @@ class JuliaOptions(object):
     compile = Choices("compile", yes_no_etc("all", "min"))
     depwarn = Choices("depwarn", yes_no_etc("error"))
     warn_overwrite = Choices("warn_overwrite", yes_no_etc())
-    optimize = Choices("optimize", dict(zip(range(4), range(4))))
+    min_optlevel = Choices("min_optlevel", dict(zip(range(4), map(str, range(4)))))
+    optimize = Choices("optimize", dict(zip(range(4), map(str, range(4)))))
     inline = Choices("inline", yes_no_etc())
     check_bounds = Choices("check_bounds", yes_no_etc())
+    threads = IntEtc("threads", etc={"auto"})
 
     def __init__(self, **kwargs):
         unsupported = []
@@ -168,8 +205,12 @@ def specified(self):
     def as_args(self):
         args = []
         for (desc, value) in self.specified():
-            args.append(desc.cli_argument_name())
-            args.append(value)
+            if value is None:
+                ...
+            elif len(desc.cli_argument_name()) == 1:
+                args.append(desc.cli_argument_name() + str(value))
+            else:
+                args.append(desc.cli_argument_name() + "=" + str(value))
         return args
 
     @classmethod
diff --git a/src/julia/pytestplugin.py b/src/julia/pytestplugin.py
@@ -125,7 +125,7 @@ def pytest_configure(config):
 
 @pytest.fixture(scope="session")
 def julia(request):
-    """ pytest fixture for providing a `Julia` instance. """
+    """pytest fixture for providing a `Julia` instance."""
     if not request.config.getoption("julia"):
         pytest.skip("--no-julia is given.")
 
@@ -136,7 +136,7 @@ def julia(request):
 
 @pytest.fixture(scope="session")
 def juliainfo(julia):
-    """ pytest fixture for providing `JuliaInfo` instance. """
+    """pytest fixture for providing `JuliaInfo` instance."""
     return _JULIA_INFO
 
 
diff --git a/src/julia/release.py b/src/julia/release.py
@@ -1,5 +1,5 @@
 # This file is executed via setup.py and imported via __init__.py
 
-__version__ = "0.5.7"
+__version__ = "0.6.0"
 # For Python versioning scheme, see:
 # https://www.python.org/dev/peps/pep-0440/#version-scheme
diff --git a/src/julia/tests/conftest.py b/src/julia/tests/conftest.py
@@ -3,7 +3,7 @@
 
 @pytest.fixture(scope="session")
 def Main(julia):
-    """ pytest fixture for providing a Julia `Main` name space. """
+    """pytest fixture for providing a Julia `Main` name space."""
     from julia import Main
 
     return Main
diff --git a/src/julia/tests/test_compatible_exe.py b/src/julia/tests/test_compatible_exe.py
@@ -23,7 +23,7 @@ def discover_other_pythons():
         [sys.executable, "--version"], universal_newlines=True, stderr=subprocess.STDOUT
     )
 
-    candidate_names = ["python", "python2", "python2.7", "python3"] + [
+    candidate_names = ["python", "python3"] + [
         "python3.{}".format(i) for i in range(20)
     ]
     found = {}
diff --git a/src/julia/tests/test_core.py b/src/julia/tests/test_core.py
@@ -11,6 +11,8 @@
 from julia import JuliaError
 from julia.core import jl_name, py_name
 
+from .utils import retry_failing_if_windows
+
 python_version = sys.version_info
 
 
@@ -35,7 +37,7 @@ def test_call_error(julia):
 
 
 def test_call_julia_function_with_python_args(Main):
-    assert list(Main.map(Main.uppercase, array.array("u", [u"a", u"b", u"c"]))) == [
+    assert list(Main.map(Main.uppercase, array.array("u", ["a", "b", "c"]))) == [
         "A",
         "B",
         "C",
@@ -127,7 +129,7 @@ def test_getattr_submodule(Main):
 def test_star_import_julia_module(julia, tmp_path):
     # Create a Python module __pyjulia_star_import_test
     path = tmp_path / "__pyjulia_star_import_test.py"
-    path.write_text(u"from julia.Base.Enums import *")
+    path.write_text("from julia.Base.Enums import *")
     sys.path.insert(0, str(tmp_path))
 
     import __pyjulia_star_import_test
@@ -155,6 +157,11 @@ def test_module_dir(julia):
 @pytest.mark.pyjulia__using_default_setup
 @pytest.mark.julia
 def test_import_without_setup():
+    check_import_without_setup()
+
+
+@retry_failing_if_windows
+def check_import_without_setup():
     command = [sys.executable, "-c", "from julia import Base"]
     print("Executing:", *command)
     subprocess.check_call(command)
diff --git a/src/julia/tests/test_juliaoptions.py b/src/julia/tests/test_juliaoptions.py
diff --git a/src/julia/tests/test_libjulia.py b/src/julia/tests/test_libjulia.py
diff --git a/src/julia/tests/test_magic.py b/src/julia/tests/test_magic.py
diff --git a/src/julia/tests/test_options.py b/src/julia/tests/test_options.py
diff --git a/src/julia/tests/test_plugin.py b/src/julia/tests/test_plugin.py
diff --git a/src/julia/tests/test_runtests.py b/src/julia/tests/test_runtests.py
diff --git a/src/julia/tests/test_utils.py b/src/julia/tests/test_utils.py
diff --git a/src/julia/tests/utils.py b/src/julia/tests/utils.py
diff --git a/tox.ini b/tox.ini
