chore: copy over SAS code - #1
Merged
sbillinge merged 4 commits intoOct 16, 2026
Merged
sbillinge merged 4 commits into
sbillinge merged 4 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
The SAS port needs srfit 3.4.0, but conda-forge only has 3.3.1. Install the rc from PyPI in the workflows' run step until 3.4.0 is on conda-forge. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Verbatim copy of srfit 3.4.0-rc.0 (507aa4e5) sas/ into diffpy.cmisas, with imports pointed at diffpy.cmisas. SASCF moves from srfit's pdf/characteristicfunctions.py into diffpy.cmisas.characteristicfunctions, which holds only SASCF. - Tests: copy test_sas.py, the 4 SASCF tests (keeping their known-broken skip) and their testdata, and add the datafile fixture. The has_sas skips are removed; test_generator and testGenerator2 are strict xfails because sasmodels' load_standard_models imports SasView, which is not installable on Python 3.12+. - Requirements: numpy, scipy, diffpy.srfit, sasdata; sasmodels for tests. - Remove the template functions.py and its test; add LICENSE_DANSE.rst. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Copy link
Copy Markdown
Contributor
Author
|
@sbillinge ready for review/merge. Added an issue for removing srfit ci pin |
Sorry, something went wrong.
Copy link
Copy Markdown
Welcome to Codecov 🎉Once you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests. Thanks for integrating Codecov - We've got you covered ☂️ |
Sorry, something went wrong.
- pyproject.toml, cookiecutter.json: support Python 3.12-3.14, matching diffpy.srfit (sasmodels and sasdata are noarch). - pyproject.toml: point the diffpy-cmisas entry point at cmisas_app:main (app.py does not exist), and fail tests when cmisas calls its own deprecated names, matching srfit. - src/diffpy/__init__.py: add extend_path so an editable cmisas does not hide other diffpy packages. - docs: replace the template API page with the cmisas modules, and use m2r2 instead of the unmaintained m2r. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Set requires-python, the classifiers and cookiecutter.json to 3.11-3.13, matching the other diffpy.cmi* packages. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.