Try simplifying the noxfile

procrastinate-org · Dec 1, 2024 · 05e182b · 05e182b
1 parent 0e83c30
commit 05e182b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -97,9 +97,9 @@ jobs:
           python-version: "3.12"
           cache: "poetry"
 
-      - name: Get latest version
-        id: get-latest-version
-        run: gh release list --limit 1 --json tagName --jq '"checkout_ref="+.[0].tagName' >> $GITHUB_OUTPUT
+      - name: Get latest tag
+        id: get-latest-tag
+        run: gh release list --limit 1 --json tagName --jq '"latest_tag="+.[0].tagName' >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -109,7 +109,7 @@ jobs:
           PGHOST: localhost
           PGUSER: postgres
           PGPASSWORD: postgres
-          LATEST_VERSION: ${{ steps.get-latest-version.outputs.checkout_ref }}
+          LATEST_TAG: ${{ steps.get-latest-tag.outputs.latest_tag }}
 
   static-typing:
     name: Run Pyright

diff --git a/noxfile.py b/noxfile.py
@@ -53,7 +53,6 @@ def current_version_without_post_migration(session: nox.Session):
     latest_tag = fetch_latest_tag(session)
     pre_migration = get_pre_migration(latest_tag)
 
-    session.install("poetry")
     session.run("poetry", "install", "--all-extras")
     session.run(
         "poetry",
@@ -71,33 +70,24 @@ def stable_version_without_post_migration(session: nox.Session):
     pre_migration = get_pre_migration(latest_tag)
 
     with tempfile.TemporaryDirectory() as temp_dir:
+        session.chdir(temp_dir)
+
         temp_path = pathlib.Path(temp_dir)
         base_path = pathlib.Path(__file__).parent
+
+        # Install test dependencies and copy tests
         shutil.copytree(base_path / "tests", temp_path / "tests")
         shutil.copy(base_path / "pyproject.toml", temp_path / "pyproject.toml")
         shutil.copy(base_path / "poetry.lock", temp_path / "poetry.lock")
-        session.chdir(temp_dir)
+        session.run("poetry", "install", "--with", "test", "--no-root")
 
-        session.install("poetry")
-        session.install("poetry-plugin-export")
-        session.run(
-            "poetry",
-            "export",
-            "--output",
-            "requirements.txt",
-            "--with",
-            "test",
-            "--all-extras",
-            "--without-hashes",
-            env={"POETRY_WARNINGS_EXPORT": "false"},
-        )
-        session.install("-r", "requirements.txt")
+        # Install latest procrastinate from PyPI
         session.install("procrastinate")
+
         session.run(
             "pytest",
             f"--migrate-until={pre_migration}",
             f"--latest-version={latest_tag}",
             "./tests/acceptance",
             *session.posargs,
-            env={"PYTHONPATH": temp_dir},
         )