Skip to content

DEV: assorted Pixi workspace improvements - #175

Merged
steppi merged 4 commits into
scipy:mainfrom
lucascolley:pixi-2
Jun 13, 2026
Merged

DEV: assorted Pixi workspace improvements#175
steppi merged 4 commits into
scipy:mainfrom
lucascolley:pixi-2

Conversation

@lucascolley

@lucascolley lucascolley commented Jun 8, 2026

Copy link
Copy Markdown
Member

@fbourgey another one! I think after this PR I can rebase gh-41. Probably easiest to review commits individually :)

depends on scipy/xsref#17

@fbourgey

fbourgey commented Jun 9, 2026

Copy link
Copy Markdown
Member

GPU tests failed.

@steppi

steppi commented Jun 9, 2026

Copy link
Copy Markdown
Member

GPU tests failed.

It looks like SciPy got brought in as a dependency for the CuPy tests despite only being an optional dependency of CuPy. I'm not sure why.

Update: Oh, it's because xsref is currently being installed as a package and it depends on an old SciPy. xsref doesn't actually need to depend on SciPy, that was supposed to be a temporary expedient. I'll remove the SciPy dependency tomorrrow.

@lucascolley

Copy link
Copy Markdown
Member Author

Update: Oh, it's because xsref is currently being installed as a package and it depends on an old SciPy. xsref doesn't actually need to depend on SciPy, that was supposed to be a temporary expedient. I'll remove the SciPy dependency tomorrrow.

cool, let's return to this PR after that and scipy/xsref#15

@lucascolley
lucascolley marked this pull request as draft June 9, 2026 09:18
@steppi steppi closed this Jun 10, 2026
@steppi steppi reopened this Jun 10, 2026
@steppi

steppi commented Jun 10, 2026

Copy link
Copy Markdown
Member

Oh sorry, I guess this isn't just going to work out of the box, because the pixi.lock file needs to be updated.

Comment thread pixi.toml Outdated
@lucascolley
lucascolley marked this pull request as ready for review June 11, 2026 15:31
@lucascolley

Copy link
Copy Markdown
Member Author

could you check that the CI logs look to be picking up the xsref tables correctly @steppi ?

@steppi

steppi commented Jun 11, 2026

Copy link
Copy Markdown
Member

could you check that the CI logs look to be picking up the xsref tables correctly @steppi ?

Everything looks fine with the tables. The Windows failure is unrelated and is something that we had run into before and fixed. I'm not sure what retriggered it.

Comment thread include/xsf/bessel.h
}

inline std::complex<float> cyl_bessel_je(float v, std::complex<float> x) {
return static_cast<std::complex<float>>(cyl_bessel_je(static_cast<double>(v), static_cast<std::complex<double>>(x))

@steppi steppi Jun 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's kind of annoying that clang-format changes its mind on how to format things almost every time we update clang. Can we keep it pinned to the previous version in this PR, and put clang updates in separate PRs, doing the .git-blame-ignore-revs thing for the style change commits?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep sounds good

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be saved for a future PR which runs pixi update.

@steppi steppi mentioned this pull request Jun 11, 2026
@lucascolley
lucascolley force-pushed the pixi-2 branch 5 times, most recently from 0e4608c to 9830a0b Compare June 12, 2026 14:01
Comment thread tests/CMakeLists.txt

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this has been generalised from requiring the xsref source to be cloned into the root directory, to having xsref installed in a Python virtual environment. Requires scipy/xsref#17 to merge first.

Comment thread pixi.toml

[environments.lint]
features = ["clang-format"]
no-default-feature = true

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xsref is added to the default feature, but we don't need xsref (or python) for the lint env

Comment thread pixi.toml Outdated
@lucascolley

Copy link
Copy Markdown
Member Author

this PR is now ready from my side! Reminder to review commits individually.

@lucascolley lucascolley added the DX Everything related to making the experience of working on XSF more pleasant. label Jun 13, 2026

@steppi steppi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Thanks @lucascolley, this is a major improvement

@steppi
steppi merged commit 1aabfe0 into scipy:main Jun 13, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

DX Everything related to making the experience of working on XSF more pleasant.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants