Merge pull request #367 from davidhewitt/test-3.12

ci: test 3.12, pypy 3.10

Author: davidhewitt

.github/dependabot.yml

@@ -20,3 +20,8 @@ updates:
     directory: "examples/rust_with_cffi"
     schedule:
       interval: "monthly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/ci.yml

@@ -62,20 +62,16 @@ jobs:
       # If one platform fails, allow the rest to keep testing if `CI-no-fail-fast` label is present
       fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12-dev", pypy-3.8, pypy-3.9]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", pypy-3.8, pypy-3.9, pypy-3.10]
         platform: [
           { os: "macos-latest",   python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
           { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
           { os: "windows-latest", python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc" },
-          { os: "windows-latest", python-architecture: "x86", rust-target: "i686-pc-windows-msvc" },
         ]
-        exclude:
-          # No 32-bit pypy 3.8 on Windows
-          - python-version: pypy-3.8
-            platform: { os: "windows-latest", python-architecture: "x86" }
-          # No 32-bit pypy 3.9 on Windows
-          - python-version: pypy-3.9
-            platform: { os: "windows-latest", python-architecture: "x86" }
+        include:
+          # Just test one x86 Windows Python for simplicity
+          - python-version: 3.12
+            platform: { os: "windows-latest", python-architecture: "x86", rust-target: "i686-pc-windows-msvc" }
 
     steps:
       - uses: actions/checkout@v3

.gitignore

@@ -2,7 +2,7 @@
 *.pyo
 *.so
 .eggs
-.tox
+.nox
 dist
 build
 target

examples/namespace_package/noxfile.py

@@ -7,8 +7,8 @@
 
 @nox.session()
 def test(session: nox.Session):
-    session.install(SETUPTOOLS_RUST, "wheel", "pytest")
+    session.install(SETUPTOOLS_RUST, "wheel")
     # Ensure build uses version of setuptools-rust under development
-    session.install("--no-build-isolation", ".")
+    session.install("--no-build-isolation", ".[dev]")
     # Test Python package
     session.run("pytest", *session.posargs)

examples/namespace_package/pyproject.toml

@@ -6,6 +6,11 @@ build-backend = "setuptools.build_meta"
 name="namespace_package"
 version="0.1.0"
 
+[project.optional-dependencies]
+dev = ["pytest"]
+
+[tool.pytest.ini_options]
+
 [tool.setuptools.packages]
 # Pure Python packages/modules
 find = { where = ["python"] }

examples/namespace_package/pytest.ini

@@ -1,5 +1,4 @@
 import os
-import tarfile
 from inspect import cleandoc as heredoc
 from glob import glob
 from pathlib import Path
@@ -19,24 +18,33 @@ def test_sdist_vendor(session: nox.Session):
     session.install(".", "build", "wheel")
     namespace_package = Path(__file__).parent / "examples" / "namespace_package"
     os.chdir(namespace_package)
-    tmp = session.create_tmp()
+    tmp = Path(session.create_tmp())
+    extra_config = tmp / "setup.cfg"
 
     build_config = """
         [sdist]
         vendor_crates = True
         """
-    Path(tmp, "setup.cfg").write_text(heredoc(build_config), encoding="utf-8")
+    extra_config.write_text(heredoc(build_config), encoding="utf-8")
 
     env = os.environ.copy()
-    env.update(DIST_EXTRA_CONFIG=str(Path(tmp, "setup.cfg")))
+    env.update(DIST_EXTRA_CONFIG=str(extra_config))
     cmd = ["python", "-m", "build", "--sdist", "--no-isolation"]
     session.run(*cmd, env=env, external=True)
 
-    dist = namespace_package / "dist"
-    with tarfile.open(str(dist / "namespace_package-0.1.0.tar.gz")) as tf:
-        tf.extractall(str(dist))
-    os.chdir(dist / "namespace_package-0.1.0")
-    session.run("cargo", "build", "--offline", external=True)
+    session.run(
+        "python",
+        "-m",
+        "pip",
+        "install",
+        Path("dist") / "namespace_package-0.1.0.tar.gz[dev]",
+        "--no-build-isolation",
+        "-v",
+        # run in offline mode with a blank cargo home to prove the vendored
+        # dependencies are sufficient to build the package
+        env={"CARGO_NET_OFFLINE": "true", "CARGO_HOME": str(tmp / ".cargo")},
+    )
+    session.run("pytest")
 
 
 @nox.session(name="test-crossenv", venv_backend=None)