Merge branch 'master' into pr/Roger-luo/918

Author: tkf

.github/workflows/TagBot.yml

@@ -1,9 +1,12 @@
 name: TagBot
 on:
-  schedule:
-    - cron: 0 * * * *
+  issue_comment:
+    types:
+      - created
+  workflow_dispatch:
 jobs:
   TagBot:
+    if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
     runs-on: ubuntu-latest
     steps:
       - uses: JuliaRegistries/TagBot@v1

.github/workflows/aot.yml

@@ -16,8 +16,11 @@ jobs:
         os:
           - ubuntu-latest
         architecture: [x64]
-        python-version: ['3.8']
-        julia-version: ['1.5', 'nightly']
+        python-version: ['3.x']
+        julia-version:
+          - '1'
+          - '~1.7.0-rc1'
+          # - 'nightly'  # TODO: reenable
       fail-fast: false
     env:
       PYTHON: python${{ matrix.python-version }}
@@ -34,6 +37,9 @@ jobs:
           architecture: ${{ matrix.architecture }}
       - run: python --version
       - run: python -m pip install --user numpy scipy
+      - name: Install libpython2.7 for `find_libpython` test
+        run: sudo apt-get install python2.7-dev
+        if: ${{ matrix.python-version != '2.7' && matrix.os == 'ubuntu-latest' }}
       - name: Setup julia
         uses: julia-actions/setup-julia@v1
         with:

.github/workflows/conda.yml

@@ -18,11 +18,11 @@ jobs:
           - macos-latest
           - windows-latest
         architecture: [x64]
-        julia-version: ['1.5']
+        julia-version: ['1']
         include:
           - os: windows-latest
             architecture: x86
-            julia-version: '1.5'
+            julia-version: '1'
       fail-fast: false
     env:
       PYTHON: ""
@@ -32,6 +32,9 @@ jobs:
       ${{ matrix.os }} ${{ matrix.architecture }}
     steps:
       - uses: actions/checkout@v1
+      - name: Install libpython2.7 for `find_libpython` test
+        run: sudo apt-get install python2.7-dev
+        if: ${{ matrix.python-version != '2.7' && matrix.os == 'ubuntu-latest' }}
       - name: Setup julia
         uses: julia-actions/setup-julia@v1
         with:

.github/workflows/system.yml

@@ -18,25 +18,40 @@ jobs:
           - macos-latest
           - windows-latest
         architecture: [x64]
-        python-version: ['2.7', '3.8']
-        julia-version: ['1.0', '1.5', 'nightly']
+        python-version: ['3.x']
+        julia-version:
+          - '1.0'
+          - '1'
+          - 'nightly'
         include:
+          # 32 bit Windows:
           - os: windows-latest
             architecture: x86
-            python-version: '3.8'
+            python-version: '3.x'
             julia-version: '1.5'
+          # Sweep python-version and julia-version only on Ubuntu:
           - os: ubuntu-latest
             architecture: x64
-            python-version: '3.7'
+            python-version: '3.9'
+            julia-version: '1'
+          - os: ubuntu-latest
+            architecture: x64
+            python-version: '3.x'
             julia-version: '1.5'
           - os: ubuntu-latest
             architecture: x64
-            python-version: '3.8'
+            python-version: '3.x'
             julia-version: '1.4'
+          # Test Python 2.7 only with a few combinations (TODO: drop 2.7).
+          # Note that it does not work in macOS:
           - os: ubuntu-latest
             architecture: x64
-            python-version: '3.8'
-            julia-version: '1.3'
+            python-version: '2.7'
+            julia-version: '1'
+          - os: windows-latest
+            architecture: x64
+            python-version: '2.7'
+            julia-version: '1'
       fail-fast: false
     name: Test
       Julia ${{ matrix.julia-version }}
@@ -56,6 +71,9 @@ jobs:
         if: ${{ matrix.python-version != '2.7' }}
       - run: virtualenv --version
         if: ${{ matrix.python-version != '2.7' }}
+      - name: Install libpython2.7 for `find_libpython` test
+        run: sudo apt-get install python2.7-dev
+        if: ${{ matrix.python-version != '2.7' && matrix.os == 'ubuntu-latest' }}
       - name: Setup julia
         uses: julia-actions/setup-julia@v1
         with:

Project.toml

@@ -1,7 +1,7 @@
 name = "PyCall"
 uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 authors = ["Steven G. Johnson <[email protected]>", "Yichao Yu <[email protected]>", "Takafumi Arakaki <[email protected]>", "Simon Kornblith <[email protected]>", "Páll Haraldsson <[email protected]>", "Jon Malmaud <[email protected]>", "Jake Bolewski <[email protected]>", "Keno Fischer <[email protected]>", "Joel Mason <[email protected]>", "Jameson Nash <[email protected]>", "The JuliaPy development team"]
-version = "1.92.3"
+version = "1.92.4"
 
 [deps]
 Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"

README.md

@@ -20,7 +20,12 @@ install the files. Julia 0.7 or later is required.
 
 The latest development version of PyCall is available from
 <https://github.com/JuliaPy/PyCall.jl>.  If you want to switch to
-this after installing the package, run `Pkg.checkout("PyCall"); Pkg.build("PyCall")`.
+this after installing the package, run:
+
+```julia
+Pkg.add(PackageSpec(name="PyCall", rev="master"))
+Pkg.build("PyCall")`
+```
 
 By default on Mac and Windows systems, `Pkg.add("PyCall")`
 or `Pkg.build("PyCall")` will use the
@@ -298,7 +303,7 @@ use `PyDict` as the return type of a `pycall` returning a dictionary,
 or call `PyDict(o::PyObject)` on a dictionary object `o`.  By
 default, a `PyDict` is an `Any => Any` dictionary (or actually `PyAny
 => PyAny`) that performs runtime type inference, but if your Python
-dictionary has known, fixed types you can insteady use `PyDict{K,V}` given
+dictionary has known, fixed types you can instead use `PyDict{K,V}` given
 the key and value types `K` and `V` respectively.
 
 Currently, passing Julia dictionaries to Python makes a copy of the Julia
@@ -359,7 +364,8 @@ and also by providing more type information to the Julia compiler.
   Python's [`eval`](https://docs.python.org/3/library/functions.html#eval) function, and returns the result
   converted to `PyAny`.  Alternatively, `py"..."o` returns the raw `PyObject`
   (which can then be manually converted if desired).   You can interpolate
-  Julia variables and other expressions into the Python code with `$`,
+  Julia variables and other expressions into the Python code (except for into
+  Python strings contained in Python code), with `$`,
   which interpolates the *value* (converted to `PyObject`) of the given
   expression---data is not passed as a string, so this is different from
   ordinary Julia string interpolation.  e.g. `py"sum($([1,2,3]))"` calls the
@@ -387,7 +393,7 @@ and also by providing more type information to the Julia compiler.
 * `pybuiltin(s)`: Look up `s` (a string or symbol) among the global Python
   builtins.  If `s` is a string it returns a `PyObject`, while if `s` is a
   symbol it returns the builtin converted to `PyAny`.  (You can also use `py"s"`
-  to look up builtins or other Python globas.)
+  to look up builtins or other Python globals.)
 
 Occasionally, you may need to pass a keyword argument to Python that
 is a [reserved word](https://en.wikipedia.org/wiki/Reserved_word) in Julia.

deps/build.jl

@@ -43,7 +43,7 @@ mkpath(dirname(prefsfile))
 try # make sure deps.jl file is removed on error
     python = try
         let py = get(ENV, "PYTHON", isfile(prefsfile) ? readchomp(prefsfile) :
-                     (Sys.isunix() && !Sys.isapple()) || Sys.ARCH ∉ (:i686, :x86_64) ?
+                     (Sys.isunix() && !Sys.isapple()) ?
                      whichfirst("python3", "python") : "Conda"),
             vers = isempty(py) || py == "Conda" ? v"0.0" : vparse(pyconfigvar(py,"VERSION","0.0"))
             if vers < v"2.7"
@@ -64,19 +64,14 @@ try # make sure deps.jl file is removed on error
             py
         end
     catch e1
-        if Sys.ARCH in (:i686, :x86_64)
-            if isa(e1, UseCondaPython)
-                @info string("Using the Python distribution in the Conda package by default.\n",
-                     "To use a different Python version, set ENV[\"PYTHON\"]=\"pythoncommand\" and re-run Pkg.build(\"PyCall\").")
-            else
-                @info string( "No system-wide Python was found; got the following error:\n",
-                      "$e1\nusing the Python distribution in the Conda package")
-            end
-            abspath(Conda.PYTHONDIR, "python" * (Sys.iswindows() ? ".exe" : ""))
+        if isa(e1, UseCondaPython)
+            @info string("Using the Python distribution in the Conda package by default.\n",
+                 "To use a different Python version, set ENV[\"PYTHON\"]=\"pythoncommand\" and re-run Pkg.build(\"PyCall\").")
         else
-            error("No system-wide Python was found; got the following error:\n",
-                  "$e1")
+            @info string("No system-wide Python was found; got the following error:\n",
+                  "$e1\nusing the Python distribution in the Conda package")
         end
+        abspath(Conda.PYTHONDIR, "python" * (Sys.iswindows() ? ".exe" : ""))
     end
 
     use_conda = dirname(python) == abspath(Conda.PYTHONDIR)

src/PyCall.jl

@@ -512,7 +512,7 @@ that you did not install $name in the Python version being used by PyCall.
 PyCall is currently configured to use the Julia-specific Python distribution
 installed by the Conda.jl package.  To install the $name module, you can
 use `pyimport_conda("$(escape_string(name))", PKG)`, where PKG is the Anaconda
-package the contains the module $name, or alternatively you can use the
+package that contains the module $name, or alternatively you can use the
 Conda package directly (via `using Conda` followed by `Conda.add` etcetera).
 
 Alternatively, if you want to use a different Python distribution on your

src/exception.jl

@@ -140,7 +140,7 @@ end
 #########################################################################
 # Mapping of Julia Exception types to Python exceptions
 
-const pyexc = Dict{DataType, PyPtr}()
+const pyexc = IdDict{DataType, PyPtr}()
 mutable struct PyIOError <: Exception end
 
 function pyexc_initialize()
@@ -213,7 +213,7 @@ end
 
 function pyraise(e, bt = nothing)
     eT = typeof(e)
-    pyeT = haskey(pyexc::Dict, eT) ? pyexc[eT] : pyexc[Exception]
+    pyeT = haskey(pyexc, eT) ? pyexc[eT] : pyexc[Exception]
     err = PyJlError(e, bt)
     ccall((@pysym :PyErr_SetObject), Cvoid, (PyPtr, PyPtr),
           pyeT, PyObject(err))

src/io.jl

@@ -11,7 +11,7 @@
 function ioraise(e, bt = nothing)
     if isa(e, MethodError) || isa(e, ErrorException)
         ccall((@pysym :PyErr_SetString), Cvoid, (PyPtr, Cstring),
-              (pyexc::Dict)[PyIOError],
+              pyexc[PyIOError],
               showerror_string(e, bt))
     else
         pyraise(e, bt)

test/check_deps_version.jl

@@ -1,9 +1,16 @@
 using Test
-const desired_version = VersionNumber(ARGS[1])
+const desired_version_str = ARGS[1]  # e.g., "2.7", "3.10.0", "3.x"
 include("../deps/deps.jl")
-@testset "pyversion_build ≈ $desired_version" begin
+@testset "pyversion_build ≈ $desired_version_str" begin
+    v = desired_version_str
+    while endswith(v, ".x")
+        v = v[1:end-2]
+    end
+    desired_version = VersionNumber(v)
     @test desired_version.major == pyversion_build.major
-    @test desired_version.minor == pyversion_build.minor
+    if desired_version.minor != 0
+        @test desired_version.minor == pyversion_build.minor
+    end
     if desired_version.patch != 0
         @test desired_version.patch == pyversion_build.patch
     end