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.

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

Add Damnit and Related Packages #29

Merged
merged 2 commits into from
Apr 24, 2024
Merged

Add Damnit and Related Packages #29

merged 2 commits into from
Apr 24, 2024

Conversation

RobertRosca
Copy link
Member

Adds recipes for damnit and mpl-pan-zoom.

In damnit's pyproject.toml QScintilla is pinned to 2.13 ("QScintilla==2.13"), I want to pin this to 2.13.* instead, but that makes pip check fail as the version specified in pyproject.toml and installed do not match. There's a patch to fix this in the pyproject.toml file.

This change should also be done on damnit directly, but the patch should remain so that it's possible to build other versions/branches which have not had the version change made yet.

@RobertRosca
Copy link
Member Author

To test on Maxwell:

module load exfel mambaforge

conda activate amore-mid

@JamesWrigley JamesWrigley requested review from tmichela and removed request for JamesWrigley April 23, 2024 15:19
Copy link
Contributor

github-actions bot commented Apr 23, 2024

View preview here - https://European-XFEL.github.io/environments/pr/29 (build for 6536b4f)

Preview removed on merge/PR close with 26f96aa

@JamesWrigley
Copy link
Member

@RobertRosca I took the liberty of rebasing and updating this branch in preparation for the DAMNIT API package. Namely:

  • Reverted the addition of mpl-pan-zoom since it's not needed in the API (and that's all we're packaging).
  • Updated the dependency list and a few other things in the DAMNIT recipe.

If you think this is ok then I'll delete 8da9aee and f9bbee3 before merging.

@tmichela
Copy link
Member

LGTM

@RobertRosca
Copy link
Member Author

👍 sounds good! Go ahead and make the changes @JamesWrigley and feel free to merge after

@JamesWrigley JamesWrigley merged commit 37fd020 into main Apr 24, 2024
3 checks passed
@JamesWrigley JamesWrigley deleted the feat/add-damnit branch April 24, 2024 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants