From 89b8d8ab02beef499814e5c015cebca173f8c1c5 Mon Sep 17 00:00:00 2001
From: Henry Schreiner <henryschreineriii@gmail.com>
Date: Wed, 16 Feb 2022 11:50:10 -0500
Subject: [PATCH] ci: test pypy upstream

tests: fix leading indent in PyPy code

Update noxfile.py

Co-authored-by: Matti Picus <matti.picus@gmail.com>

Update tests/test_exceptions.py

Co-authored-by: Matti Picus <matti.picus@gmail.com>

Revert "Update tests/test_exceptions.py"

This reverts commit af3061deb2c1d99fa8d7a3322df71d596e308d89.
---
 .github/workflows/upstream.yml | 22 ++++++++++-
 noxfile.py                     | 72 +++++++++++++++++++++++++++++++++-
 tests/test_exceptions.py       |  6 ++-
 3 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index 138c9ad292..dcaea78940 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -16,7 +16,7 @@ jobs:
   standard:
     name: "🐍 3.11 dev • ubuntu-latest • x64"
     runs-on: ubuntu-latest
-    if: "contains(github.event.pull_request.labels.*.name, 'python dev')"
+    if: "contains(github.event.pull_request.labels.*.name, 'python dev') || github.event_name == 'workflow_dispatch'"
 
     steps:
     - uses: actions/checkout@v2
@@ -110,3 +110,23 @@ jobs:
     # setuptools
     - name: Setuptools helpers test
       run: pytest tests/extra_setuptools
+
+  pypy:
+    name: "🐍 PyPy ${{ matrix.pypy-version }} dev • ${{ matrix.runs-on }} • x64"
+    runs-on: ${{ matrix.runs-on }}
+    if: "contains(github.event.pull_request.labels.*.name, 'python dev') || github.event_name == 'workflow_dispatch'"
+    strategy:
+      fail-fast: false
+      matrix:
+        runs-on: [ubuntu-latest, macos-latest]
+        pypy-version: ["3.7", "3.8", "3.9"]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup Boost (Linux)
+      if: runner.os == 'Linux'
+      run: sudo apt-get install libboost-dev
+
+    - name: Build and test
+      run: pipx run nox -s 'pypy_upstream(${{ matrix.pypy-version }})'
diff --git a/noxfile.py b/noxfile.py
index 341d964e95..e68f1d02b1 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -1,11 +1,26 @@
 import os
+import sys
+from pathlib import Path
 
 import nox
 
 nox.needs_version = ">=2022.1.7"
 nox.options.sessions = ["lint", "tests", "tests_packaging"]
 
-PYTHON_VERISONS = ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7", "pypy3.8"]
+DIR = Path(__file__).parent.resolve()
+
+PYTHON_VERISONS = [
+    "3.6",
+    "3.7",
+    "3.8",
+    "3.9",
+    "3.10",
+    "3.11",
+    "pypy3.7",
+    "pypy3.8",
+    "pypy3.9",
+]
+PYPY_VERSIONS = ["3.7", "3.8", "3.9"]
 
 if os.environ.get("CI", None):
     nox.options.error_on_missing_interpreters = True
@@ -95,3 +110,58 @@ def build(session: nox.Session) -> None:
     session.run(
         "python", "-m", "build", *session.posargs, env={"PYBIND11_GLOBAL_SDIST": "1"}
     )
+
+
+@nox.session
+@nox.parametrize("pypy", PYPY_VERSIONS, ids=PYPY_VERSIONS)
+def pypy_upstream(session: nox.Session, pypy: str) -> None:
+    """
+    Test against upstream PyPy (64-bit UNIX only)
+    """
+    import tarfile
+    import urllib.request
+
+    binary = "linux64" if sys.platform.startswith("linux") else "osx64"
+    url = (
+        f"https://buildbot.pypy.org/nightly/py{pypy}/pypy-c-jit-latest-{binary}.tar.bz2"
+    )
+
+    tmpdir = session.create_tmp()
+    with session.chdir(tmpdir):
+        urllib.request.urlretrieve(url, "pypy.tar.bz2")
+        with tarfile.open("pypy.tar.bz2", "r:bz2") as tar:
+            tar.extractall()
+    (found,) = Path(tmpdir).glob("*/bin/pypy3")
+    pypy_prog = str(found.resolve())
+    pypy_dir = found.parent.parent
+
+    session.run(pypy_prog, "-m", "ensurepip", external=True)
+    session.run(pypy_prog, "-m", "pip", "install", "--upgrade", "pip", external=True)
+    session.run(
+        pypy_prog,
+        "-m",
+        "pip",
+        "install",
+        "pytest",
+        "numpy;python_version<'3.9' and platform_system=='Linux'",
+        "--only-binary=:all:",
+        external=True,
+    )
+
+    session.install("cmake", "ninja")
+    build_dir = session.create_tmp()
+    tmpdir = session.create_tmp()
+    session.run(
+        "cmake",
+        f"-S{DIR}",
+        f"-B{build_dir}",
+        "-DPYBIND11_FINDPYTHON=ON",
+        f"-DPython_ROOT={pypy_dir}",
+        "-GNinja",
+        "-DPYBIND11_WERROR=ON",
+        "-DDOWNLOAD_EIGEN=ON",
+        *session.posargs,
+    )
+    session.run("cmake", "--build", build_dir)
+    session.run("cmake", "--build", build_dir, "--target", "pytest")
+    session.run("cmake", "--build", build_dir, "--target", "test_cmake_build")
diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
index 0be61804a6..704f92d3e2 100644
--- a/tests/test_exceptions.py
+++ b/tests/test_exceptions.py
@@ -95,7 +95,11 @@ def ignore_pytest_unraisable_warning(f):
 
 
 # TODO: find out why this fails on PyPy, https://foss.heptapod.net/pypy/pypy/-/issues/3583
-@pytest.mark.xfail(env.PYPY, reason="Failure on PyPy 3.8 (7.3.7)", strict=False)
+@pytest.mark.xfail(
+    env.PYPY and sys.version_info >= (3, 8),
+    reason="Failure on PyPy 3.8 (7.3.7)",
+    strict=False,
+)
 @ignore_pytest_unraisable_warning
 def test_python_alreadyset_in_destructor(monkeypatch, capsys):
     hooked = False