Merge branch 'release/test' into release/main

Author: MilesCranmer

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
           - '3.9'
           - '3.10'
         julia-version:
-          - '1.0'
+          - '1.4'
           - '1.6'
           - '1.7'
           - '1.8'

.github/workflows/publish.yml

@@ -29,7 +29,7 @@ jobs:
         if: >-
           (github.ref == 'refs/heads/release/test') ||
           (github.ref == 'refs/heads/release/main')
-        uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29  # v1.4.2
+        uses: pypa/gh-action-pypi-publish@37f50c210e3d2f9450da2cd423303d6a14a6e29f  # v1.5.1
         with:
           password: ${{ secrets.test_pypi_password }}
           repository_url: https://test.pypi.org/legacy/
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:  # using `matrix` to define a constant
-        package: ['julia==0.6.0']
+        package: ['julia==0.6.1']
     steps:
       - name: Set up Python 3.9
         uses: actions/setup-python@v1
@@ -70,6 +70,6 @@ jobs:
       - run: ls -lh dist
       - name: Publish distribution 📦 to PyPI
         if: github.ref == 'refs/heads/release/main'
-        uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29  # v1.4.2
+        uses: pypa/gh-action-pypi-publish@37f50c210e3d2f9450da2cd423303d6a14a6e29f  # v1.5.1
         with:
           password: ${{ secrets.pypi_password }}

README.md

@@ -6,7 +6,7 @@ PyJulia
 [![Main workflow](https://github.com/JuliaPy/pyjulia/workflows/Main%20workflow/badge.svg)](https://github.com/JuliaPy/pyjulia/actions?query=workflow%3A%22Main+workflow%22)
 [![DOI](https://zenodo.org/badge/14576985.svg)](https://zenodo.org/badge/latestdoi/14576985)
 
-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+.
+Experimenting with developing a better interface to [Julia language](https://julialang.org/) that works with [Python](https://www.python.org/) 3 and Julia v1.4+.
 
 Quick usage
 -----------

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.6.0
+    pip install --index-url https://test.pypi.org/simple/ julia==0.6.1
 
     python -c "from julia import install; install()"
     python -m julia.runtests -- \

docs/source/conf.py

@@ -25,9 +25,9 @@
 author = 'The Julia and IPython development teams'
 
 # The short X.Y version
-version = '0.6.0'
+version = '0.6.1'
 # The full version, including alpha/beta/rc tags
-release = '0.6.0'
+release = '0.6.1'
 
 
 # -- General configuration ---------------------------------------------------

src/julia/release.py

@@ -1,5 +1,5 @@
 # This file is executed via setup.py and imported via __init__.py
 
-__version__ = "0.6.0"
+__version__ = "0.6.1"
 # For Python versioning scheme, see:
 # https://www.python.org/dev/peps/pep-0440/#version-scheme

src/julia/tools.py

@@ -96,8 +96,8 @@ def install(julia="julia", color="auto", python=None, quiet=False):
 
     OP = "build" if python else "install"
     install_cmd = julia_cmd + [
-        os.path.join(os.path.dirname(os.path.realpath(__file__)), "install.jl"),
         "--",
+        os.path.join(os.path.dirname(os.path.realpath(__file__)), "install.jl"),
         OP,
         python or sys.executable,
         libpython,
@@ -162,10 +162,19 @@ def julia_py_executable():
 
     # try to find installed julia-py script - check scripts folders under different installation schemes
     # we check the alternate schemes first, at most one of which should give us a julia-py script
+    # if the environment variable `PYTHONPATH` is set, we additionally check whether the script is there
     # if no candidate in an alternate scheme, try the standard install location
     # see https://docs.python.org/3/install/index.html#alternate-installation
     scripts_paths = [
-        sysconfig.get_path("scripts", scheme) for scheme in sysconfig.get_scheme_names()
+        *[
+            sysconfig.get_path("scripts", scheme)
+            for scheme in sysconfig.get_scheme_names()
+        ],
+        *[
+            os.path.join(pypath, "bin")
+            for pypath in os.environ.get("PYTHONPATH", "").split(os.pathsep)
+            if pypath
+        ],
     ]
     scripts_paths.append(sysconfig.get_path("scripts"))