Skip to content

Commit e8d8ee0

Browse files
cadenmyers13claude
andcommitted
ci: remove the diffpy.srfit 3.4.0rc0 bridge and require srfit>=3.4.0
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 #6. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 2b2ef8a commit e8d8ee0

5 files changed

Lines changed: 25 additions & 8 deletions

File tree

‎.github/workflows/matrix-and-codecov-on-merge-to-main.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ jobs:
1717
project: diffpy.cmipdf
1818
c_extension: false
1919
headless: false
20-
run: |
21-
set -Eeuo pipefail
22-
python -m pip install --no-deps diffpy.srfit==3.4.0rc0
2320
secrets:
2421
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/tests-on-pr.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@ jobs:
1111
project: diffpy.cmipdf
1212
c_extension: false
1313
headless: false
14-
run: |
15-
set -Eeuo pipefail
16-
python -m pip install --no-deps diffpy.srfit==3.4.0rc0
1714
secrets:
1815
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎news/rm-srfit-rc-pin.rst‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* <news item>
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* <news item>
16+
17+
**Fixed:**
18+
19+
* Require ``diffpy.srfit`` 3.4.0 or later. Older versions lack the methods diffpy.cmipdf calls, so installing it next to ``diffpy.srfit`` 3.3.1 failed at run time.
20+
21+
**Security:**
22+
23+
* <news item>

‎requirements/conda.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
numpy
22
diffpy.srreal
3-
diffpy.srfit
3+
diffpy.srfit>=3.4.0
44
diffpy.structure

‎requirements/pip.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
numpy
22
diffpy.srreal
3-
diffpy.srfit
3+
diffpy.srfit>=3.4.0
44
diffpy.structure

0 commit comments

Comments
 (0)