From 40d3f507d287eee06ec6d489ccbe28ee7c62521c Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Thu, 20 Jun 2024 18:37:01 +0000 Subject: [PATCH 1/2] BLD: pin pcdsdevices to try to fix CI --- conda-recipe/meta.yaml | 2 +- dev-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 3b9a9daa..49d8767c 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -60,7 +60,7 @@ test: - ipython>=7.16 - jinja2<3.1 - line_profiler - - pcdsdevices + - pcdsdevices>=8.4.0 - pytest - pytest-benchmark - pytest-qt diff --git a/dev-requirements.txt b/dev-requirements.txt index ad1c1cea..c6e1b1e8 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -3,7 +3,7 @@ flake8 ipython>=7.16 jinja2<3.1 line_profiler -pcdsdevices +pcdsdevices>=8.4.0 pytest pytest-benchmark pytest-cov From 8559a73933b91a84ad40f81538eb0f9fdc1cbae6 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Thu, 20 Jun 2024 19:02:56 +0000 Subject: [PATCH 2/2] DOC: pre-release notes --- .../615-maint_fix_ci.rst | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 docs/source/upcoming_release_notes/615-maint_fix_ci.rst diff --git a/docs/source/upcoming_release_notes/615-maint_fix_ci.rst b/docs/source/upcoming_release_notes/615-maint_fix_ci.rst new file mode 100644 index 00000000..7e0e43ef --- /dev/null +++ b/docs/source/upcoming_release_notes/615-maint_fix_ci.rst @@ -0,0 +1,22 @@ +615 maint_fix_ci +################ + +API Breaks +---------- +- N/A + +Features +-------- +- N/A + +Bugfixes +-------- +- N/A + +Maintenance +----------- +- In dev/test requirements, pin pcdsdevices to current latest to fix the CI builds. + +Contributors +------------ +- zllentz