Update project

renan-r-santos · Dec 21, 2024 · 4b8a594 · 4b8a594
1 parent 59186c4
commit 4b8a594
Show file tree

Hide file tree

Showing 19 changed files with 9,247 additions and 10,668 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        pixi-version: ["0.30.0", "0.38.0"]
+        pixi-version: ["0.30.0", "0.39.3"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repo
@@ -25,7 +25,7 @@ jobs:
           run-install: false
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
 
       - name: Test, lint and typecheck
         run: uv run tox

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
 
       - name: Build release
         run: uv build

diff --git a/pyproject.toml b/pyproject.toml
@@ -42,7 +42,7 @@ dev-dependencies = [
     "jupyter-kernel-test>=0.7,<0.8",
     "mypy>=1,<2",
     "pytest>=8,<9",
-    "pytest-asyncio>=0.24,<0.25",
+    "pytest-asyncio>=0.25,<0.26",
     "pytest-cov>=6,<7",
     "ruff>=0.8,<0.9",
     "tox-uv>=1,<2",

diff --git a/tests/integration/ipykernel/pixi.lock b/tests/integration/ipykernel/pixi.lock
diff --git a/tests/integration/r-irkernel/pixi.lock b/tests/integration/r-irkernel/pixi.lock
diff --git a/tests/unit/data/bad_pixi_toml/pixi.toml b/tests/unit/data/bad_pixi_toml/pixi.toml
@@ -2,6 +2,6 @@
 name = "pixi_project"
 version = "0.1.0"
 channels = ["conda-forge"]
-platforms = ["linux-64"]
+platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64"]
 
 [dependencies_typo]
diff --git a/tests/unit/data/missing_ipykernel/pixi.toml b/tests/unit/data/missing_ipykernel/pixi.toml
@@ -2,7 +2,7 @@
 name = "missing_ipykernel"
 version = "0.1.0"
 channels = ["conda-forge"]
-platforms = ["linux-64"]
+platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64"]
 
 [dependencies]
 python = "*"
diff --git a/tests/unit/data/non_existing_dependency/pixi.toml b/tests/unit/data/non_existing_dependency/pixi.toml
@@ -2,7 +2,7 @@
 name = "pixi_project"
 version = "0.1.0"
 channels = ["conda-forge"]
-platforms = ["linux-64", "osx-64", "win-64"]
+platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64"]
 
 [dependencies]
 python = "4.*"

diff --git a/tests/unit/data/pixi_in_pixi/good_project/pixi.lock b/tests/unit/data/pixi_in_pixi/good_project/pixi.lock
diff --git a/tests/unit/data/pixi_in_pixi/good_project/pixi.toml b/tests/unit/data/pixi_in_pixi/good_project/pixi.toml
@@ -2,7 +2,7 @@
 name = "pixi_project"
 version = "0.1.0"
 channels = ["conda-forge"]
-platforms = ["linux-64", "osx-64", "win-64"]
+platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64"]
 
 [dependencies]
 python = "*"

diff --git a/tests/unit/data/pixi_in_pixi/pixi.lock b/tests/unit/data/pixi_in_pixi/pixi.lock
diff --git a/tests/unit/data/pixi_in_pixi/pixi.toml b/tests/unit/data/pixi_in_pixi/pixi.toml
@@ -2,6 +2,6 @@
 name = "empty_project"
 version = "0.1.0"
 channels = ["conda-forge"]
-platforms = ["linux-64", "osx-64", "win-64"]
+platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64"]
 
 [dependencies]
diff --git a/tests/unit/data/pixi_project/pixi.lock b/tests/unit/data/pixi_project/pixi.lock
diff --git a/tests/unit/data/pixi_project/pixi.toml b/tests/unit/data/pixi_project/pixi.toml
@@ -2,7 +2,7 @@
 name = "pixi_project"
 version = "0.1.0"
 channels = ["conda-forge"]
-platforms = ["linux-64", "osx-64", "win-64"]
+platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64"]
 
 [dependencies]
 python = "*"

diff --git a/tests/unit/data/pyproject_project/pixi.lock b/tests/unit/data/pyproject_project/pixi.lock
diff --git a/tests/unit/data/pyproject_project/pyproject.toml b/tests/unit/data/pyproject_project/pyproject.toml
@@ -5,7 +5,7 @@ version = "0.1.0"
 
 [tool.pixi.project]
 channels = ["conda-forge"]
-platforms = ["linux-64", "osx-64", "win-64"]
+platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64"]
 
 [tool.pixi.pypi-dependencies]
 ipykernel = "*"
diff --git a/tests/unit/data/pyproject_project/uv.lock b/tests/unit/data/pyproject_project/uv.lock
diff --git a/tests/unit/test_pixi.py b/tests/unit/test_pixi.py
@@ -96,7 +96,7 @@ def test_empty_project():
 
 def test_bad_pixi_toml():
     cwd = data_dir / "bad_pixi_toml"
-    message = re.escape("failed to parse project manifest")
+    message = re.escape("failed to parse project manifest") + "|" + re.escape("unknown field")
     with pytest.raises(RuntimeError, match=message):
         ensure_readiness(
             cwd=cwd, env=os.environ.copy(), required_package="pixi", kernel_name="Pixi"
@@ -179,7 +179,7 @@ def test_pyproject_project():
 @pytest.fixture
 def env_for_pixi_in_pixi():
     result = subprocess.run(
-        ["pixi", "run", "env"],
+        ["pixi", "run", "printenv"],
         cwd=data_dir / "pixi_in_pixi",
         capture_output=True,
         text=True,

diff --git a/uv.lock b/uv.lock