Skip to content

fix: use diffpy.cmistructure - #17

Merged
sbillinge merged 2 commits into
diffpy:mainfrom
cadenmyers13:use-cmistructure
Oct 27, 2026
Merged

sbillinge merged 2 commits into
diffpy:mainfrom
cadenmyers13:use-cmistructure

Conversation

@cadenmyers13

Copy link
Copy Markdown
Contributor

No description provided.

cadenmyers13 and others added 2 commits October 26, 2026 17:22
srfit 3.4.0 is on conda-forge, so CI no longer needs to pip install the
rc (reverts 000e71b). cmipdf calls methods that srfit 3.3.1 lacks (19 of
49 tests fail with it), so declare the lower bound in conda.txt and
pip.txt.

Closes diffpy#6.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
basepdfgenerator.py still built diffpy.srfit.structure parameter sets
with struToParameterSet and read .stru and .useSymmetry, so a
diffpy.cmistructure parameter set raised AttributeError: stru. Use
structure_to_parameter_set, .structure and use_symmetry from
diffpy.cmistructure, add it to pip.txt, and pip install it in CI until it
is on conda-forge. Tests cover both generators, PDFContribution, and
constrain_as_space_group taking a real PDFGenerator.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
run: |
set -Eeuo pipefail
python -m pip install --no-deps diffpy.srfit==3.4.0rc0
python -m pip install --no-deps diffpy.cmistructure

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Added a test to remove this when cmistructure is out on conda forge

@cadenmyers13

cadenmyers13 commented Oct 26, 2026 •

Copy link
Copy Markdown
Contributor Author

@sbillinge ready for review. Please merge #13 first

@codecov

codecov Bot commented Oct 26, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 96.71%. Comparing base (2b2ef8a) to head (3de597a).

Additional details and impacted files
@@            Coverage Diff             @@
##             main      #17      +/-   ##
==========================================
+ Coverage   96.21%   96.71%   +0.49%     
==========================================
  Files           6        6              
  Lines         264      304      +40     
==========================================
+ Hits          254      294      +40     
  Misses         10       10              
Files with missing lines Coverage Δ
tests/test_generators.py 100.00% <100.00%> (ø)
tests/test_pdfcontribution.py 100.00% <100.00%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@sbillinge
sbillinge merged commit ca7e0db into diffpy:main Oct 27, 2026
6 checks passed
@sbillinge

Copy link
Copy Markdown
Contributor

@cadenmyers13 this is really coming together nicely! I think we did a good thing here.

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.

2 participants