test suite fixes

Author: rmorshea

.github/workflows/test.yaml

@@ -13,22 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
     steps:
       - uses: actions/checkout@v2
-      - uses: nanasess/setup-chromedriver@master
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: "12"
-      - name: Install latest NPM
-        run: |
-          npm install -g npm@latest
-          npm --version
+          node-version: "14"
+      - name: install NPM version
+        run: npm install -g [email protected]
       - name: Use Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
       - name: Create Repo From Template
         run: |
           pip install nox
-          nox -s test
+          nox -t test

.github/workflows/test.yml

@@ -1,8 +1,5 @@
-from contextlib import contextmanager
-from functools import wraps
 from pathlib import Path
 from shutil import rmtree
-from tempfile import TemporaryDirectory
 from typing import Callable
 
 from nox import Session, session
@@ -14,66 +11,25 @@
 SessionFunc = Callable[[Session], None]
 
 
-def build_test_repo(install: bool = True) -> Callable[[SessionFunc], SessionFunc]:
-    """Build a test repo from test-config.yaml before a session"""
-
-    def decorator(session_func: SessionFunc) -> SessionFunc:
-        @wraps(session_func)
-        def wrapper(session: Session) -> None:
-            _build_test_repo(session, install)
-            return session_func(session)
-
-        return wrapper
-
-    return decorator
-
-
-def install_latest_reactpy(session_func: SessionFunc) -> SessionFunc:
-    # install the latest version of ReactPy by pulling it from the main repo
-
-    @wraps(session_func)
-    def wrapper(session: Session) -> None:
-        try:
-            session.run(
-                "git",
-                "clone",
-                "https://github.com/reactive-python/reactpy.git",
-                external=True,
-            )
-            session.install("./reactpy[testing,starlette]")
-            session_func(session)
-        finally:
-            reactpy_dir = HERE / "reactpy"
-            if reactpy_dir.exists():
-                rmtree(reactpy_dir)
-
-    return wrapper
-
-
-@session
-def test(session: Session) -> None:
-    session.notify("test_suite", posargs=session.posargs)
-    session.notify("test_style")
-
-
-@session
-@build_test_repo()
-@install_latest_reactpy
+@session(tags=["test"])
 def test_suite(session: Session) -> None:
+    build_test_repo(session)
+    install_latest_reactpy(session)
     session.chdir("test-repo")
     session.run("playwright", "install", "chromium")
     session.run("pytest", "tests", "--import-mode=importlib", *session.posargs)
 
 
-@session
-@build_test_repo(install=False)
+@session(tags=["test"])
 def test_style(session: Session) -> None:
+    build_test_repo(session, install=False)
     session.install("black", "flake8")
     session.run("black", "--check", "test-repo", *list(map(str, HERE.glob("*.py"))))
     session.run("flake8", "test-repo")
 
 
-def _build_test_repo(session: Session, install: bool) -> None:
+def build_test_repo(session: Session, install: bool = True) -> None:
+    """Build a test repo from test-config.yaml"""
     # Need to remove node_modules so cookiecutter doesn't think since the cookiecutter
     # will try to format those files if present
     for path in TEMPLATE_DIR.rglob("node_modules"):
@@ -94,3 +50,15 @@ def _build_test_repo(session: Session, install: bool) -> None:
         session.install(".")
         session.install("-r", "requirements.txt")
         session.chdir("..")
+
+
+def install_latest_reactpy(session: Session) -> SessionFunc:
+    # install the latest version of ReactPy by pulling it from the main repo
+    try:
+        session.install(
+            "reactpy[testing,starlette] @ git+https://github.com/reactive-python/reactpy"
+        )
+    finally:
+        reactpy_dir = HERE / "reactpy"
+        if reactpy_dir.exists():
+            rmtree(reactpy_dir)