diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index fc33dd8..d9d7476 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -17,8 +17,5 @@ jobs: project: diffpy.cmipdf c_extension: false headless: false - run: | - set -Eeuo pipefail - python -m pip install --no-deps diffpy.srfit==3.4.0rc0 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index e40d41e..3ecbc4c 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -11,8 +11,5 @@ jobs: project: diffpy.cmipdf c_extension: false headless: false - run: | - set -Eeuo pipefail - python -m pip install --no-deps diffpy.srfit==3.4.0rc0 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/news/rm-srfit-rc-pin.rst b/news/rm-srfit-rc-pin.rst new file mode 100644 index 0000000..4f3ace6 --- /dev/null +++ b/news/rm-srfit-rc-pin.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* 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. + +**Security:** + +* diff --git a/requirements/conda.txt b/requirements/conda.txt index 6b1daa8..a5f839f 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -1,4 +1,4 @@ numpy diffpy.srreal -diffpy.srfit +diffpy.srfit>=3.4.0 diffpy.structure diff --git a/requirements/pip.txt b/requirements/pip.txt index 6b1daa8..a5f839f 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,4 +1,4 @@ numpy diffpy.srreal -diffpy.srfit +diffpy.srfit>=3.4.0 diffpy.structure