From 8ec6e2147c16ee866a4c26a1f45768c09b86b4da Mon Sep 17 00:00:00 2001 From: "David H. Irving" Date: Mon, 1 Jul 2024 15:28:14 -0700 Subject: [PATCH] Revert "Update Butler library dependencies" Roll back to the previous Butler version, since the new one is unusable due to DM-45088. This reverts commit 2e231e389c5afc07adab5820d3a04409ba98d761. --- .../20240701_153114_david.irving_DM_45088.md | 3 + requirements/main.txt | 62 ++++++++++--------- 2 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 changelog.d/20240701_153114_david.irving_DM_45088.md diff --git a/changelog.d/20240701_153114_david.irving_DM_45088.md b/changelog.d/20240701_153114_david.irving_DM_45088.md new file mode 100644 index 0000000..b6a1329 --- /dev/null +++ b/changelog.d/20240701_153114_david.irving_DM_45088.md @@ -0,0 +1,3 @@ +### Backwards-incompatible changes + +- Rolled back the Butler version due to a bug that makes the new release unusable. \ No newline at end of file diff --git a/requirements/main.txt b/requirements/main.txt index b94ac05..e911fb3 100644 --- a/requirements/main.txt +++ b/requirements/main.txt @@ -529,7 +529,9 @@ idna==3.7 \ importlib-resources==6.4.0 \ --hash=sha256:50d10f043df931902d4194ea07ec57960f66a80449ff867bfe782b4c486ba78c \ --hash=sha256:cdb2b453b8046ca4e3798eb1d84f3cce1446a0e8e7b5ef4efb600f19fc398145 - # via lsst-utils + # via + # lsst-resources + # lsst-utils jinja2==3.1.3 \ --hash=sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa \ --hash=sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90 @@ -539,38 +541,38 @@ jmespath==1.0.1 \ # via # boto3 # botocore -lsst-daf-butler==27.2024.2600 \ - --hash=sha256:1157d9abc45e1cef7d3b500b10a00d92ac4b863985cd932018f025c8c7d681da \ - --hash=sha256:c2708101ae2f3a49ffb24598a5fa93191259e333e5ee77588b4bb68110f2f1d2 -lsst-daf-relation==27.2024.2600 \ - --hash=sha256:200b16991397e6538509c9ad48e1ff595e5f98bdc5634f9dd6c505d74b05c3a3 \ - --hash=sha256:592b599f3496d5d483719c931803c91dce8fdda4491e3a968352ea5fa4eb6626 +lsst-daf-butler==26.2024.1500 \ + --hash=sha256:3b414f91cada980614a486da0c9b47c0f87e8750b55901055d84994eaef79b81 \ + --hash=sha256:a31db858c8663288a2e06b39899614b0ae4898fabd0391ee1c9ed62443c46d92 +lsst-daf-relation==26.2024.1400 \ + --hash=sha256:4ae83cf6837bb6548cdb94008a58ed10e0d04e39944a51f34fa549fcb9b63b4f \ + --hash=sha256:cc55ded66e80407300ba3af02fef2ac745497e79cfffc6d0e92958355599089c # via lsst-daf-butler -lsst-resources==27.2024.2600 \ - --hash=sha256:35d17d686ca663aa3913c9e228567ff897a49e6478a354060e48016b19c9b28a \ - --hash=sha256:458f122d3453ef74b377b50bc4e146f071d47cf498d5dadf861dfcd84d4c8b0e +lsst-resources==26.2024.1500 \ + --hash=sha256:46ee7a7bd7915727ed937a31d12a3684dfd160ef00c053dd7f7a8d6f2f2ae654 \ + --hash=sha256:74706d076196e77653f7ab142596e427dd043e1abc54cfa5fe6e8e88b29400b7 # via lsst-daf-butler -lsst-sphgeom==27.2024.2600 \ - --hash=sha256:0892119653eddc8a37ad55a41038cc036effabc2539a689697ce5a28698af4d2 \ - --hash=sha256:1e6c1123769d61db3c32563fdf5db4488ac288b35e8b4d192fccd4d21f344faa \ - --hash=sha256:283db6c02e7b16cc099bd95a3a3992b1c53e817f1ba8a2ac0485cb7468e9361e \ - --hash=sha256:2881ee9f9f7599706cdf4876d6eb5dd7157b8f4f480c5777a9ee2c312a8fb979 \ - --hash=sha256:45f8876b34126f8cbfeab4cebe7da65db87c85c7f5b7fe9fd9bdfd60c5ee1948 \ - --hash=sha256:4b8d85a54ae51484dec721512687edfe0579b93639eeb3d938067df9368d9986 \ - --hash=sha256:4f6b62f0e78f5f942829d86f7d8694fc330919a9dcac13bfb4c440efad53699d \ - --hash=sha256:53252e172a7fc81068ea376797514329e2921fc31a05f6a3236602bd5e84a4ba \ - --hash=sha256:5475338bcc703649cdd94bd4329c8f5052d94281544d8a69f0bdd2fa627221f9 \ - --hash=sha256:559987cfc6b29f8e9e2292ebaa1f372fccf3f11da34a0e8c551896163281e98d \ - --hash=sha256:8fbf5e26f03acd32261350e8fd8c182f691e8ceb7b8f91a1130c1ffa7527521f \ - --hash=sha256:9f52ae8d57fb12d8a58af5eeac03c2f82ef29c36f6c975983f16b507d2a87385 \ - --hash=sha256:ac15fc7c911245c2f7f09d865ccc691e1679d1c6e258fb9707af5ec16527b5bf \ - --hash=sha256:acc7b4f955ff879ddebfbe5e9801cb18285b6189016a48d52a52f3342248e64b \ - --hash=sha256:b911e40d507b17d0b4adc6d0f175ea1703045fd65bd79422d23833f0df7217f9 \ - --hash=sha256:dd1a298250a8b3334709ab910247a8b20a017c4397474cc036cb1d57081c6e3d +lsst-sphgeom==26.2024.1500 \ + --hash=sha256:0d7d5954016561a68f71de431fb2509409fdc3fe0109a17b69cce8ef7fb2c902 \ + --hash=sha256:116dbd5ec100561c51ea1beb847aebb82ef2442fbf50063253ded59f4a44bf89 \ + --hash=sha256:216e1fe2fd463aaa9fea80cc7eaca4513c54ae435c2cedcb45658baa028a317d \ + --hash=sha256:292445a2990d02b289d5459f8726e32c426cc81a8b51440102c145943cae3ffe \ + --hash=sha256:37245f1bfce29d3f69eaf82357dc72f5816e4bd91b2dba2f7bb8f67dd09b6f0e \ + --hash=sha256:3c8d7a33c620b64a8cc144f0248d0291a120f7df1bd488ce11b78ff1b1f1d6f7 \ + --hash=sha256:43b5e1440a742ad67b0fe7c6e3d1ec3ba7a0ef011801d9e597aaa5ce9b9e8a78 \ + --hash=sha256:58b65f069395b9b4ee4db64fabed0496b5897cb1e0326e9cdd10eae9e1a9e57f \ + --hash=sha256:598926d55f620448444d9b87d1d1791fa86639aa84e0b9972b2ff252913f0041 \ + --hash=sha256:5ebee049fd94d7c33724aee6726deae4b770f478ab29764036fab51ac9945b0e \ + --hash=sha256:6a7b2872f3ba0ee2ec80871b701703fc6ae0004a550d84aa9f0bed4e283a10f1 \ + --hash=sha256:96974424c02eed3f5cff330162a474a14b4b8a65960766ed0f6fe0fb187317c0 \ + --hash=sha256:9da6b2ded31b11129ded0fc081f1f05f3d6fcf6354cd1ae5e10b584ac36bad79 \ + --hash=sha256:b4711966f6994c84644572284a5e4b7f886d60cbda614ceaeda7d1939922176c \ + --hash=sha256:b77c6f7f88fca097d51b362d26a9d266dc2288336017736e4aa3f6de6c6d3e03 \ + --hash=sha256:c88fcd9c8462fe3beaabe83e90ce0f94030648600fa2c17b732007412468ef39 # via lsst-daf-butler -lsst-utils==27.2024.2600 \ - --hash=sha256:5c8a0a2448343986b49a04338dc02563cc3a79a4b865ce33a4cf498f1d24c825 \ - --hash=sha256:67fccb4cceb75797d6f7d5b83e4c3bec6147c8fe274b83aae507321725a546d6 +lsst-utils==26.2024.1500 \ + --hash=sha256:61e6e934a8d3f89669bf5ae99770f742b1f5faf425b72d59a0435d48832bb91c \ + --hash=sha256:a23ee2b8284945bf155a0ee14425b387b82bc2edec250b95d5feb3a09938faab # via # lsst-daf-butler # lsst-daf-relation