From f41c54f41ab67da90bd31c3135a40e1c06081531 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Mon, 25 Sep 2023 13:24:30 -0700 Subject: [PATCH 1/5] Add v26 release notes --- doc/lsst.ctrl.bps.htcondor/CHANGES.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/lsst.ctrl.bps.htcondor/CHANGES.rst b/doc/lsst.ctrl.bps.htcondor/CHANGES.rst index a7addff..0c83f35 100644 --- a/doc/lsst.ctrl.bps.htcondor/CHANGES.rst +++ b/doc/lsst.ctrl.bps.htcondor/CHANGES.rst @@ -1,3 +1,11 @@ +lsst-ctrl-bps-htcondor v26.0.0 (2023-09-25) +=========================================== + +No significant changes. +This release includes minor code cleanups and reformatting. +It has been verified to work with Python 3.11. + + lsst-ctrl-bps-htcondor v25.0.0 (2023-03-02) =========================================== From ec0283b37ab4f2669de03c13c3cbedcd890a63f9 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Mon, 25 Sep 2023 13:25:00 -0700 Subject: [PATCH 2/5] Use v26 release branches for builds --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index ead7ebf..4c91443 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ htcondor >= 8.8 -git+https://github.com/lsst/ctrl_bps.git@main#egg=lsst-ctrl-bps -git+https://github.com/lsst/daf_butler@main#egg=lsst-daf-butler -git+https://github.com/lsst/utils@main#egg=lsst-utils +git+https://github.com/lsst/ctrl_bps.git@v26.0.x#egg=lsst-ctrl-bps +git+https://github.com/lsst/daf_butler@v26.0.x#egg=lsst-daf-butler +git+https://github.com/lsst/utils@v26.0.x#egg=lsst-utils From 4a3e4176641f6fa5b44fedbcf13845d3e91ad04a Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Mon, 25 Sep 2023 13:25:32 -0700 Subject: [PATCH 3/5] State that 3.11 works in pyproject file --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index cd26d72..bbf71c7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,6 +16,7 @@ classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Topic :: Scientific/Engineering :: Astronomy", ] keywords = ["lsst"] From 8bcfb737a1b1fbccecd2f3f23fb28c7685d1d063 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Mon, 25 Sep 2023 13:26:50 -0700 Subject: [PATCH 4/5] Mention explicit minimum python version --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index bbf71c7..fabd843 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,6 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "lsst-ctrl-bps-htcondor" +requires-python = ">=3.10.0" description = "HTCondor plugin for lsst-ctrl-bps." license = {text = "GPLv3+ License"} readme = "README.rst" From 254f7cf606968ec8d53bf05926217d923bfcf8b3 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Mon, 25 Sep 2023 13:27:28 -0700 Subject: [PATCH 5/5] Add explicit PyPI pins for v26 official releases --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fabd843..515ec10 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,9 +23,9 @@ classifiers = [ keywords = ["lsst"] dependencies = [ "htcondor >= 8.8", - "lsst-ctrl-bps", - "lsst-daf-butler", - "lsst-utils" + "lsst-ctrl-bps >=26.0,<26.100", + "lsst-daf-butler >=26.0,<26.100", + "lsst-utils >=26.0,<26.100" ] dynamic = ["version"]