Skip to content

Commit

Permalink
Update project
Browse files Browse the repository at this point in the history
  • Loading branch information
renan-r-santos committed Dec 21, 2024
1 parent 59186c4 commit 4fe982d
Show file tree
Hide file tree
Showing 12 changed files with 362 additions and 350 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/data/bad_pixi_toml/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion tests/unit/data/missing_ipykernel/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "*"
2 changes: 1 addition & 1 deletion tests/unit/data/non_existing_dependency/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/data/pixi_in_pixi/good_project/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "*"
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/data/pixi_in_pixi/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion tests/unit/data/pixi_project/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "*"
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/data/pyproject_project/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "*"
4 changes: 2 additions & 2 deletions tests/unit/test_pixi.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
686 changes: 349 additions & 337 deletions uv.lock

Large diffs are not rendered by default.

0 comments on commit 4fe982d

Please sign in to comment.