Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v5

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: default
activate-environment: default
Expand All @@ -59,7 +59,7 @@ jobs:
uses: actions/checkout@v5

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: default
activate-environment: default
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
uses: actions/checkout@v5

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: default
activate-environment: default
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
fetch-depth: 0

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: default
activate-environment: default
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
# Set up the pixi package manager and install dependencies from pixi.toml.
# Uses frozen lockfile to ensure reproducible builds.
- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: default
activate-environment: default
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fetch-depth: '0' # full history with tags to get the version number by versioningit

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: default
activate-environment: default
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
run-install: false
cache: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: actions/checkout@v5

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: default
activate-environment: default
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-notes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fetch-depth: 0 # full history with tags to get the version number

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: default
activate-environment: default
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
fetch-depth: '0' # full history with tags to get the version number by versioningit

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: ${{ env.PIXI_ENVS }}
run-install: true
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
path: . # directory to extract downloaded zipped artifacts

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: ${{ env.PIXI_ENVS }}
run-install: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tutorial-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
uses: actions/checkout@v5

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.0
uses: prefix-dev/setup-pixi@v0.9.3
with:
environments: default
activate-environment: default
Expand Down
1,116 changes: 562 additions & 554 deletions pixi.lock

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ jupyterlab = '*' # Jupyter notebooks
pixi-kernel = '*' # Pixi Jupyter kernel
easydiffraction = { version = '*', extras = ['all'] } # Main package

[target.osx.pypi-dependencies]
h5py = "==3.14.0" # macOS only: avoid broken 3.15.0 wheel

# Features for specific Python versions
# Specific features

# Each feature sets a specific Python version for the environment.

Expand Down Expand Up @@ -193,7 +190,7 @@ docs-setup = { depends-on = [
dist-build = 'python -m build --wheel --outdir dist'
spdx-update = 'python tools/update_spdx.py'
#dev-install = 'uv pip install --requirements pyproject.toml --extra all'
dev-install = "python -m uv pip install --editable '.[all]'"
dev-install = "python -m uv pip install --force-reinstall --editable '.[all]'"
npm-config = 'npm config set registry https://registry.npmjs.org/'
prettier-install = 'npm install --no-save --no-audit --no-fund prettier prettier-plugin-toml'
pre-commit-setup = 'pre-commit clean && pre-commit uninstall && pre-commit install --hook-type pre-commit --hook-type pre-push --overwrite'
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ classifiers = [
]
requires-python = '>=3.11,<3.14'
dependencies = [
'numpy<2.4', # Numerical computing library; <2.4 required for cryspy 0.9.x compatibility
'numpy', # Numerical computing library
'colorama', # Color terminal output
'tabulate', # Pretty-print tabular data for terminal output
'asciichartpy', # ASCII charts for terminal output
Expand Down Expand Up @@ -68,8 +68,8 @@ docs = [
'mike', # MkDocs: Versioned documentation support
'mkdocs', # Static site generator
'mkdocs-material', # Documentation framework on top of MkDocs
'mkdocs-autorefs<1.3.0', # MkDocs: Auto-references support. 1.3.0 => DeprecationWarning: Setting a fallback anchor function is deprecated and ...
'mkdocs-jupyter', # MkDocs: Jupyter notebook support.
'mkdocs-autorefs', # MkDocs: Auto-references support
'mkdocs-jupyter', # MkDocs: Jupyter notebook support
'mkdocs-plugin-inline-svg', # MkDocs: Inline SVG support
'mkdocs-markdownextradata-plugin', # MkDocs: Markdown extra data support, such as global variables
'mkdocstrings-python', # MkDocs: Python docstring support
Expand Down
Loading