Merge branch 'cjdoris:main' into main

Author: pitmonticone

.github/workflows/CompatHelper.yml

@@ -3,16 +3,35 @@ on:
   schedule:
     - cron: 0 0 * * *
   workflow_dispatch:
+permissions:
+  contents: write
+  pull-requests: write
 jobs:
   CompatHelper:
     runs-on: ubuntu-latest
     steps:
+      - name: Check if Julia is already available in the PATH
+        id: julia_in_path
+        run: which julia
+        continue-on-error: true
+      - name: Install Julia, but only if it is not already available in the PATH
+        uses: julia-actions/setup-julia@v1
+        with:
+          version: '1'
+          arch: ${{ runner.arch }}
+        if: steps.julia_in_path.outcome != 'success'
+      - name: "Add the General registry via Git"
+        run: |
+          import Pkg
+          ENV["JULIA_PKG_SERVER"] = ""
+          Pkg.Registry.add("General")
+        shell: julia --color=yes {0}
       - name: "Install CompatHelper"
         run: |
           import Pkg
           name = "CompatHelper"
           uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
-          version = "2"
+          version = "3"
           Pkg.add(; name, uuid, version)
         shell: julia --color=yes {0}
       - name: "Run CompatHelper"
@@ -23,3 +42,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
+          # COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

.github/workflows/docs.yml

@@ -2,8 +2,10 @@ name: Docs
 
 on:
   push:
-    branches: [main]
-    tags: '*'
+    branches:
+    - main
+    tags:
+    - '*'
 
 jobs:
   docs:

.github/workflows/register-pypi.yml

@@ -0,0 +1,32 @@
+name: Register to PyPI
+
+on:
+  workflow_dispatch:
+
+jobs:
+  register:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install build
+      run: >-
+        python -m
+        pip install
+        build
+        --user
+    - name: Build distribution
+      run: >-
+        python -m
+        build
+        --sdist
+        --wheel
+        --outdir dist/
+        .
+    - name: Publish to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/tests-nightly.yml

@@ -2,10 +2,13 @@ name: Tests (nightly)
 
 on:
   pull_request:
-    branches: [main]
+    branches:
+    - main
   push:
-    branches: [main]
-    tags: '*'
+    branches:
+    - main
+    tags:
+    - '*'
 
 jobs:
   tests:

.github/workflows/tests.yml

@@ -2,14 +2,17 @@ name: Tests
 
 on:
   pull_request:
-    branches: [main]
+    branches:
+    - main
   push:
-    branches: [main]
-    tags: '*'
+    branches:
+    - main
+    tags:
+    - '*'
 
 jobs:
-  tests:
-    name: Test (${{ matrix.os }}-${{ matrix.arch }}, julia ${{ matrix.jlversion }})
+  julia:
+    name: Test (${{ matrix.os }}, julia ${{ matrix.jlversion }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -19,7 +22,8 @@ jobs:
         jlversion: ['1','1.6']
     steps:
       - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - name: Set up Julia ${{ matrix.jlversion }}
+        uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.jlversion }}
           arch: ${{ matrix.arch }}
@@ -33,11 +37,43 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
-      - uses: julia-actions/julia-buildpkg@v1
-      - uses: julia-actions/julia-runtest@v1
+      - name: Build package
+        uses: julia-actions/julia-buildpkg@v1
+      - name: Run tests
+        uses: julia-actions/julia-runtest@v1
         env:
           JULIA_DEBUG: PythonCall
-      - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v1
+      - name: Process coverage
+        uses: julia-actions/julia-processcoverage@v1
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v2
+  python:
+    name: Test (${{ matrix.os }}, python ${{ matrix.pyversion }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        pyversion: ["3.7", "3.10"]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.pyversion }}
+        uses: actions/setup-python@v4
         with:
-          file: lcov.info
+          python-version: ${{ matrix.pyversion }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8 pytest pytest-cov
+          cp pysrc/juliacall/juliapkg-dev.json pysrc/juliacall/juliapkg.json
+          pip install -e .
+      - name: Lint with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 . --count --select=E9,F63,F7,F82 --ignore=F821 --show-source --statistics
+          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      - name: Run tests
+        run: |
+          pytest -s --cov=pysrc
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v2

.gitignore

@@ -5,3 +5,4 @@ __pycache__
 build/
 dist/
 .CondaPkg/
+/jltest.*

CondaPkg.toml

@@ -1,4 +1,8 @@
 
+[deps.libstdcxx-ng]
+channel = "conda-forge"
+version = "<=julia"
+
 [deps.python]
 channel = "conda-forge"
 build = "*cpython*"

Project.toml

@@ -1,7 +1,7 @@
 name = "PythonCall"
 uuid = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
 authors = ["Christopher Doris <github.com/cjdoris>"]
-version = "0.9.3"
+version = "0.9.10"
 
 [deps]
 CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
@@ -10,13 +10,14 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 UnsafePointers = "e17b2a0c-0bdf-430a-bd0c-3a23cae4ff39"
 
 [compat]
-CondaPkg = "0.2.11"
+CondaPkg = "0.2.15"
 MacroTools = "0.5"
 Requires = "1"
 Tables = "1"
@@ -26,6 +27,7 @@ julia = "1.6.1"
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
 
 [targets]
-test = ["Aqua", "Test"]
+test = ["Aqua", "Test", "TestItemRunner"]

bump.jl

@@ -0,0 +1,30 @@
+using Dates
+
+oldver = ARGS[1]
+newver = ARGS[2]
+
+function bump(file, oldpat, newpat)
+    println("Bumping $file...")
+    @assert oldpat != newpat
+    oldtext = read(file, String)
+    newtext = replace(oldtext, oldpat => newpat)
+    @assert newtext != oldtext
+    write(file, newtext)    
+end
+
+function bumpver(file, pattern, oldver, newver)
+    @assert oldver != newver
+    oldpat = replace(pattern, "{}" => oldver)
+    @assert oldpat != pattern
+    newpat = replace(pattern, "{}" => newver)
+    @assert newpat != pattern
+    bump(file, oldver, newver)
+end
+
+bumpver("Project.toml", "version = \"{}\"\n", oldver, newver)
+bumpver("setup.cfg", "version = {}\n", oldver, newver)
+bumpver("pysrc/juliacall/__init__.py", "__version__ = '{}'\n", oldver, newver)
+bumpver("pysrc/juliacall/juliapkg.json", "\"version\": \"={}\"", oldver, newver)
+bumpver("pysrc/juliacall/juliapkg-dev.json", "\"version\": \"={}\"", oldver, newver)
+bumpver("src/PythonCall.jl", "VERSION = v\"{}\"", oldver, newver)
+bump("docs/src/releasenotes.md", "## Unreleased", "## $newver ($(today()))")

docs/make.jl

@@ -48,6 +48,7 @@ makedocs(
             "Python to Julia" => "conversion-to-julia.md",
         ],
         "compat.md",
+        "faq.md",
         "pycall.md",
         "releasenotes.md",
     ]