Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: modified example to be a bit more logical for my taste. #2674

Merged
merged 7 commits into from
Dec 13, 2024
Merged

fix: modified example to be a bit more logical for my taste. #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73bf8ce
modified example to be a bit more logical for my taste.
tdejager Dec 9, 2024
4be166b
fix: linting
tdejager Dec 9, 2024
d7e4490
Merge branch 'main' into fix/rich-example
tdejager Dec 10, 2024
fb7502e
fix: update lock
tdejager Dec 10, 2024
254f8fe
feat: add to correct section
tdejager Dec 12, 2024
f8aa140
Merge branch 'main' into fix/rich-example
tdejager Dec 13, 2024
10b451e
fix: remove add from test, we should re-add later
tdejager Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/rich_example/pixi.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 12 additions & 11 deletions examples/rich_example/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ name = "rich_example"
requires-python = ">= 3.11"
version = "0.1.0"

[project.scripts]
rich_example = "rich_example:main"

[build-system]
build-backend = "hatchling.build"
requires = ["hatchling"]

[tool.pixi.project]
[tool.pixi.workspace]
channels = ["https://prefix.dev/conda-forge"]
platforms = ["win-64", "linux-64", "osx-64", "osx-arm64"]
preview = ["pixi-build"]
Expand All @@ -24,9 +27,12 @@ hatchling = "==1.26.3"
# This way uv is used instead of pip
uv = "*"


[project.scripts]
rich_example = "rich_example:main"
# This section marks the project as a pixi package.
#
# Normally a number of fields would be set here, like the name, version, etc.
# However, since all these fields are already defined in the [project] section
# at the top of this file they are not required.
[tool.pixi.package]

# The build-system section defines the build system that will be used to turn
# the source code of this package into a conda package. Similarly to the above
Expand All @@ -53,12 +59,7 @@ channels = [
test = "rich_example"

[tool.pixi.dependencies]
rich = ">=13.9.4,<14"
rich_example = { path = "." }

# This section marks the project as a pixi package.
#
# Normally a number of fields would be set here, like the name, version, etc.
# However, since all these fields are already defined in the [project] section
# at the top of this file they are not required.
[tool.pixi.package]
[tool.pixi.run-dependencies]
rich = ">=13.9.4,<14"
12 changes: 0 additions & 12 deletions tests/integration_python/pixi_build/test_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import shutil
import json


from ..common import verify_cli_command


Expand All @@ -17,17 +16,6 @@ def test_build_conda_package(pixi: Path, examples_dir: Path, tmp_pixi_workspace:

manifest_path = target_dir / "pyproject.toml"

# Add a boltons package to it
verify_cli_command(
[
pixi,
"add",
"boltons",
"--manifest-path",
manifest_path,
],
)

# build it
verify_cli_command(
[pixi, "build", "--manifest-path", manifest_path, "--output-dir", manifest_path.parent]
Expand Down
Loading