From b53c47030162a498f39fa99f91760e3b965d8a48 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Tue, 25 Oct 2022 17:02:30 -0700 Subject: [PATCH 1/4] DOC/BLD: release notes, update dependencies --- conda-recipe/meta.yaml | 8 +++---- docs/source/releases.rst | 20 ++++++++++++++++ .../350-mnt_new_lp_config.rst | 23 ------------------- 3 files changed, 24 insertions(+), 27 deletions(-) delete mode 100644 docs/source/upcoming_release_notes/350-mnt_new_lp_config.rst diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 90e95d2e..ebc1a9b8 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -13,11 +13,11 @@ build: requirements: build: - - python >=3.6 + - python >=3.9 - setuptools run: - - python >=3.6 + - python >=3.9 - archapp >=1.0.2 - bluesky >=1.8.0 - coloredlogs >=15.0.0 @@ -26,12 +26,12 @@ requirements: - happi >=1.9.0 - ipython >=7.26.0 - jinja2 >=2.11.0 - - lightpath >=0.6.0 + - lightpath >=1.0.0 - matplotlib >=3.4.0 - nabs >=1.5.0 - pcdscalc >=0.3.0 - pcdsdaq >=2.3.0 - - pcdsdevices >=4.7.0 + - pcdsdevices >=7.0.0 - pcdsutils >=0.6.0 - psdaq-control-minimal >=3.3.19 - psdm_qs_cli >=0.3.1 diff --git a/docs/source/releases.rst b/docs/source/releases.rst index a787f403..99755288 100644 --- a/docs/source/releases.rst +++ b/docs/source/releases.rst @@ -1,6 +1,26 @@ Release History ############### + +v1.18.0 (2022-10-25) +==================== + +Features +-------- +- Updates database loading to utilize updated lightpath (v1.0.0) + for loading devices. This makes the newe, reworked version of + lightpath available in the session instead of the old version. + +Maintenance +----------- +- Fix issues with running tests offline on LCLS servers. + +Contributors +------------ +- tangkong +- zllentz + + v1.17.0 (2022-07-27) ==================== diff --git a/docs/source/upcoming_release_notes/350-mnt_new_lp_config.rst b/docs/source/upcoming_release_notes/350-mnt_new_lp_config.rst deleted file mode 100644 index 1807e751..00000000 --- a/docs/source/upcoming_release_notes/350-mnt_new_lp_config.rst +++ /dev/null @@ -1,23 +0,0 @@ -350 mnt_new_lp_config -##################### - -API Changes ------------ -- N/A - -Features --------- -- N/A - -Bugfixes --------- -- N/A - -Maintenance ------------ -- Updates database loading to utilize updated lightpath (v1.0.0) - for loading devices - -Contributors ------------- -- tangkong From 54000964195ce5337d52f86289aa84a41430f81f Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Tue, 25 Oct 2022 17:04:57 -0700 Subject: [PATCH 2/4] BLD: remember we want the bugfix here --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index ebc1a9b8..abfaa4a9 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -26,7 +26,7 @@ requirements: - happi >=1.9.0 - ipython >=7.26.0 - jinja2 >=2.11.0 - - lightpath >=1.0.0 + - lightpath >=1.0.1 - matplotlib >=3.4.0 - nabs >=1.5.0 - pcdscalc >=0.3.0 From 5728c81c3a6dc7b7a7fe97232426201aa66504fe Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Wed, 26 Oct 2022 13:25:01 -0700 Subject: [PATCH 3/4] BLD: update pip requirements appropriately --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 43807207..3ceade75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,11 +5,12 @@ cookiecutter>=1.7.0 happi>=1.9.0 ipython>=7.26.0 jinja2>=2.11.0 +lightpath>=1.0.1 matplotlib>=3.4.0 nabs>=1.5.0 pcdscalc>=0.3.0 pcdsdaq>=2.3.0 -pcdsdevices>=4.7.0 +pcdsdevices>=7.0.0 pcdsutils>=0.5.0 pyfiglet>=0.8.0 pyqt5<5.15.0 From e59d499e2104d4c1d898bc7068df0b350cbe6ec2 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Wed, 26 Oct 2022 13:25:10 -0700 Subject: [PATCH 4/4] DOC: typo --- docs/source/releases.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/releases.rst b/docs/source/releases.rst index 99755288..b35b31ae 100644 --- a/docs/source/releases.rst +++ b/docs/source/releases.rst @@ -8,7 +8,7 @@ v1.18.0 (2022-10-25) Features -------- - Updates database loading to utilize updated lightpath (v1.0.0) - for loading devices. This makes the newe, reworked version of + for loading devices. This makes the newer, reworked version of lightpath available in the session instead of the old version. Maintenance