edit files for add pixi

osl-incubator · Jul 20, 2024 · 5baf191 · 5baf191
1 parent 4018593
commit 5baf191
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 1 deletion.
diff --git a/src/scicookie/cookiecutter.json b/src/scicookie/cookiecutter.json
@@ -51,7 +51,8 @@
     "hatch",
     "maturin",
     "scikit-build-core",
-    "pybind11"
+    "pybind11",
+    "pixi"
   ],
   "use_bandit": "no",
   "use_black": "no",

diff --git a/src/scicookie/hooks/post_gen_project.py b/src/scicookie/hooks/post_gen_project.py
@@ -91,6 +91,8 @@
 BUILD_SYSTEM = "scikit-build-core"
 {% elif cookiecutter.build_system == "pybind11" -%}
 BUILD_SYSTEM = "pybind11"
+{% elif cookiecutter.build_system == "pixi" -%}
+BUILD_SYSTEM = "pixi"
 {%- else %}
 BUILD_SYSTEM = None
 {%- endif %}
@@ -252,6 +254,11 @@ def clean_up_build_system():
             build_system_dir / "pyproject.toml",
             PROJECT_DIRECTORY / 'pyproject.toml'
         )
+    elif BUILD_SYSTEM == "pixi":
+        shutil.move(
+            build_system_dir / "pyproject.toml",
+            PROJECT_DIRECTORY / 'pyproject.toml'
+        )
     elif BUILD_SYSTEM == "poetry":
         shutil.move(
             build_system_dir / "pyproject.toml",

diff --git a/src/scicookie/profiles/base.yaml b/src/scicookie/profiles/base.yaml
@@ -96,6 +96,7 @@ build_system:
     - maturin
     - scikit-build-core
     - pybind11
+    - pixi
   visible: true
 
 command_line_interface:

diff --git a/src/scicookie/{{cookiecutter.project_slug}}/.github/workflows/main.yaml b/src/scicookie/{{cookiecutter.project_slug}}/.github/workflows/main.yaml
@@ -79,6 +79,8 @@ jobs:
           flit install
           {%- elif cookiecutter.build_system == "pdm" %}
           pdm install
+          {%- elif cookiecutter.build_system == "pixi" %}
+          pixi install
           {%- else %}
           pip install .
           {%- endif %}

diff --git a/src/scicookie/{{cookiecutter.project_slug}}/.github/workflows/release.yaml b/src/scicookie/{{cookiecutter.project_slug}}/.github/workflows/release.yaml
@@ -55,6 +55,8 @@ jobs:
           flit install
           {%- elif cookiecutter.build_system == "pdm" %}
           pdm install
+          {%- elif cookiecutter.build_system == "pixi" %}
+          pixi install
           {%- else %}
           pip install .
           {%- endif %}

diff --git a/src/scicookie/{{cookiecutter.project_slug}}/.makim.yaml b/src/scicookie/{{cookiecutter.project_slug}}/.makim.yaml
@@ -115,6 +115,8 @@ groups:
           maturin build
           {%- elif cookiecutter.build_system == "pybind11" %}
           python -m build
+          {%- elif cookiecutter.build_system == "pixi" %}
+          cargo build
           {%- endif %}
 
   release:

diff --git a/src/scicookie/{{cookiecutter.project_slug}}/Makefile b/src/scicookie/{{cookiecutter.project_slug}}/Makefile
@@ -129,6 +129,8 @@ build:
 	maturin build
 	{%- elif cookiecutter.build_system == "pybind11" %}
 	python -m build
+	{%- elif cookiecutter.build_system == "pixi" %}
+	cargo build
 	{%- endif %}
 
 .PHONY:release-ci

diff --git a/src/scicookie/{{cookiecutter.project_slug}}/virtualenvs/conda/dev.yaml b/src/scicookie/{{cookiecutter.project_slug}}/virtualenvs/conda/dev.yaml
@@ -27,6 +27,8 @@ dependencies:
 {%- elif cookiecutter.build_system == "pybind11" %}
   - pybind11
   - cmake
+{%- elif cookiecutter.build_system == "pixi" %}
+  - pixi
 {%- endif %}
   - nodejs # used by semantic-release
 {%- if cookiecutter.use_shellcheck == "yes" %}

diff --git a/src/scicookie/{{cookiecutter.project_slug}}/virtualenvs/pyenv/requirements.txt b/src/scicookie/{{cookiecutter.project_slug}}/virtualenvs/pyenv/requirements.txt
@@ -21,6 +21,8 @@ cmake
 {%- elif cookiecutter.build_system == "pybind11" %}
 pybind11
 cmake
+{%- elif cookiecutter.build_system == "pixi" %}
+pixi
 {%- endif %}
 nodejs  # used by semantic-release
 {%- if cookiecutter.use_shellcheck == "yes" %}

diff --git a/tests/profiles/test-depends-on.yaml b/tests/profiles/test-depends-on.yaml
@@ -100,6 +100,7 @@ build_system:
     - maturin
     - scikit-build-core
     - pybind11
+    - pixi
   visible: true
 
 command_line_interface:

diff --git a/tests/profiles/test-main.yaml b/tests/profiles/test-main.yaml
@@ -96,6 +96,7 @@ build_system:
     - maturin
     - scikit-build-core
     - pybind11
+    - pixi
   visible: true
 
 command_line_interface:

diff --git a/tests/smoke/base.sh b/tests/smoke/base.sh
@@ -77,6 +77,8 @@ if command -v poetry &> /dev/null; then
   poetry install
 elif command -v flit &> /dev/null; then
   flit install
+elif command -v pixi &> /dev/null; then
+  pixi install
 elif command -v meson &> /dev/null; then
   BUILD_SYSTEM="mesonpy"
   pip install ".[dev]"

diff --git a/tests/smoke/build-systems.sh b/tests/smoke/build-systems.sh
@@ -11,4 +11,5 @@ SMOKE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 . ${SMOKE_DIR}/base.sh "build_system=maturin"
 . ${SMOKE_DIR}/base.sh "build_system=scikit-build-core"
 . ${SMOKE_DIR}/base.sh "build_system=pybind11"
+. ${SMOKE_DIR}/base.sh "build_system=pixi"
 . ${SMOKE_DIR}/base.sh "build_system=poetry"