From f0f9c918d9bd30088303316c880fe7d68c5ba63f Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Thu, 4 Jul 2024 18:06:25 +0200 Subject: [PATCH] feat: Update coffea to v2024.6.1 (#58) * Update coffea to v2024.6.1 and uproot to v5.3.9. --- docker/requirements.lock | 101 ++++++++++++++++++++------------------- docker/requirements.txt | 4 +- 2 files changed, 53 insertions(+), 52 deletions(-) diff --git a/docker/requirements.lock b/docker/requirements.lock index 8c98ed1..88b95e6 100644 --- a/docker/requirements.lock +++ b/docker/requirements.lock @@ -84,6 +84,7 @@ aiohttp==3.9.5 \ --hash=sha256:fcde4c397f673fdec23e6b05ebf8d4751314fa7c24f93334bf1f1364c1c69ac7 \ --hash=sha256:ff84aeb864e0fac81f676be9f4685f0527b660f1efdc40dcede3c251ef1e867f # via + # coffea # jupyter-server-proxy # kopf # kubernetes-asyncio @@ -479,9 +480,9 @@ cloudpickle==3.0.0 \ # coffea # dask # distributed -coffea==2024.4.1 \ - --hash=sha256:9007db5def2e5cdcec7de9debeb32a165bd856e9fadb5b28dc7f15895024cbe1 \ - --hash=sha256:eafb6ffdb32ea2c35eedeb4db26f7c0798914b32f2033dc2cab4b21eb9590fc8 +coffea==2024.6.1 \ + --hash=sha256:9935a96a02326b0e0f6e14c617fb5f9954a26e0018b5297f9cf527fd0d088790 \ + --hash=sha256:99441798de7ef39fe695b146ae55640f0da9ee7fbde8602a8e91b5c79842dbdb # via -r requirements.txt colorama==0.4.6 \ --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ @@ -541,50 +542,49 @@ contourpy==1.2.1 \ # via # bokeh # matplotlib -correctionlib==2.5.0 \ - --hash=sha256:0ae55f7ec10b4c708e373c18586b9465006b687aaaa096818fe0902885308742 \ - --hash=sha256:0ea8c57304c6992d8e9c897be8cf38a8018605d42623596b586622e8d9a5ba22 \ - --hash=sha256:116f9c0d7585856912674fbaa5b944eab579f7b102c039abd56b5de60065d3a2 \ - --hash=sha256:1289554080f4e5187a7973d0633bfc65adf8f0f2ffd1f005f204143f5dab74f1 \ - --hash=sha256:13de756c291b5bc862ba9601ec93f1064ba641036822195a618d886a08490fe2 \ - --hash=sha256:153c4846ea109f338c2897461ec8cec52029b4a75ff5e387501f57976b7382f1 \ - --hash=sha256:19b3d6f1f093777255a9d4733fb1c1a69242eef2bad3b47aa4ab8ac9de4e049c \ - --hash=sha256:1ec7c02ab796055b4dde36276752e2dbdd5e7669841ec3e0e55d4d9d841afb4e \ - --hash=sha256:1fc402754ea988176a24424e1956eccfee9ec8c84556ec13a481ca52829a7f80 \ - --hash=sha256:207050697f78a9a439b1bfc1a2969dbc2a08496a49521935f927230ad6e18048 \ - --hash=sha256:28cf798b0c57ad1e4120bf14acfd05d9331dad3f39e3db9dc24df705b1354b19 \ - --hash=sha256:30ad8d61aa34cc5f00a38fca47bdf0ca7c9e81a66cf178ebbd4a5354932f5e6b \ - --hash=sha256:3174717ca906021e2e84e6635bc1bc86989e996b8ad3aecb11ad47648e577575 \ - --hash=sha256:33761655961b65cf5cbe9338a53c2ae6aaa92730f7ee00564caf0984b2de7a51 \ - --hash=sha256:34473e9e75629a6c1309d3cc6b7e8d85948867d6461232797bb744ff091c9a95 \ - --hash=sha256:4a7a2699b6915311e91eae515094d537697d23eb6f87dae839f59871182769c0 \ - --hash=sha256:4f25673bbfca44b4f42b420b035cb30465c0d7536f80dfb703c746d32b7f64c2 \ - --hash=sha256:50edecf13d0f7a37d5836fd6358f59a336841679598b84de8e4f2fe7c3547d05 \ - --hash=sha256:527bde3e90b3c57b1dba8140783b25b9cc6e6d14b0305a05f1af295f3bd925fc \ - --hash=sha256:570f5a164d07c84f9c435136394801838e633d019536373cdf68c103d2e449fc \ - --hash=sha256:65e338847cfe27c9294d091adbe66371b7ec7ec9e87deefd663e971c1fae98e8 \ - --hash=sha256:683f40fa6c22ba19e05434511e8954ab6027761af226373d6f1f21f31cfd5e2e \ - --hash=sha256:71487819865a355aeab63a538c2704dff05ab62c430864b7311d267a03c901cc \ - --hash=sha256:7e3c17c694a429798c7c7b3e44da9ad2dd3d7c6a5bf616829a30cb126728b2c2 \ - --hash=sha256:7ef77f1679f44e825746b82ad6b4d7d0123b8c78294b7c9cfa65ab5f1fcb8247 \ - --hash=sha256:7f9fd1c10cc39e3756ea0c536531c34ddab95606999f8e7d3c28059952b89441 \ - --hash=sha256:91cd09c3738bfbfe3850698fc59da28b6335caecf17aeb893b2541a2390a6743 \ - --hash=sha256:96bc3bc7b4b282b02b219f78110e0e14eefaa9fe1c59f8682e33eed7444179e3 \ - --hash=sha256:a8f3111b8c907ce6a01f2698c7a938808121fcacb486f42af7a7e7a4fe04ab7d \ - --hash=sha256:b39b03cc21dc05340d3b090690bb434f141e2d15fbbbe2cca7abd38854cf0ae6 \ - --hash=sha256:b963892f0c98f53a84febcd44bdda062e86f78f36fefa4235a74b5023827acfa \ - --hash=sha256:bab9c06ff0f8a46eeec377788c809d4149b59940f1dfd4524a22c42f1cef1170 \ - --hash=sha256:cc22b7f949ac8498b24d73fd680b864cde4c5a296e3bd84c26deca7312cf686d \ - --hash=sha256:d27d8eca26c68f3a468591db9fafdd166c6d1ba298d26998f26322af33ea8f9f \ - --hash=sha256:d66bbd840ffb25ef1bf5ca71cf02919cf50057a02e6ef942375d355604457f80 \ - --hash=sha256:da163fad99f580b3ec67efbdc943419a147c32586af82cf7b5e3fca88ec8033d \ - --hash=sha256:e3e60dd5ed68e34f646bac84b76a7b2b18f625a70a18bbac0a5e03332f67c612 \ - --hash=sha256:e7b01a951311fabab6f6bf7b2ca87bc01004b3019a52ecd8ad815eccf2971ebb \ - --hash=sha256:eb54c06e31ef9a9a952845c6d19426304567bc0df4177dba7eb21d5a1cab2b1b \ - --hash=sha256:f62db4c9975b5eb94063d9ef4cf0d41d7a1d3001642b6aa51a651bec5e8d98a1 \ - --hash=sha256:f6b8eaca80c6786b03b8468642c83c8370bcbe210df095910b72a13a15b81199 \ - --hash=sha256:fa0b83851b0826ea015e2543664adc11ba8daec1de2a51ad7ed185f8de46b561 \ - --hash=sha256:fb2452f56bbfe0fdb0440cafcb6bd6275375407cb744f21e8a44dc0972cf2b0f +correctionlib==2.6.1 \ + --hash=sha256:060b9312181f5b0850382b3288378e2a2238f62e9b3be8a65232a67a612a61ba \ + --hash=sha256:07fe80dac4a8be9c0e2a377862a197d2a7d196cd7496aa91b898ec92ecc4bcae \ + --hash=sha256:0b0c3a4c45ddc5b1ec6ffd1ce5a9cde120b700f62f4501c12f0683c2b9efea73 \ + --hash=sha256:0cebe7323638ee68c0055b907a1b2cac9a725d67f5ab91078ef12507ba1ef9e2 \ + --hash=sha256:0ef32563bbb43aca9d98f983803614c8c3fed23fe72d01b990f09e077a145bb7 \ + --hash=sha256:0ff4c7df7a51cba50a236fb568bbac5641d05aeec0a09814dbfe42b582872d55 \ + --hash=sha256:1bdb6dd054e256d219605d9d79d90e3eafed7516fbb9b80400cbf49f90034d86 \ + --hash=sha256:1cae92ea82990104442c4238269da6837c52a85972401ebb2989f83137f4c6a4 \ + --hash=sha256:1fd01fe208802593cf160ca518ec7a4a6162affae4b609b22727aafff5902ab5 \ + --hash=sha256:24d1452feb758833fd9672b309bb7fd6f175873b7c0aa30a3892e520f07c49a3 \ + --hash=sha256:2a786cfa3080b010e1c1b00c6564011e97b168ea1aa17cee5dadd794e32c55ac \ + --hash=sha256:2d4936bc24726245b60c54e52006ba66e6343093ab2d32f22e12b8468bb6daac \ + --hash=sha256:33e6afa7c8d29b91b191f85292bfe310d05109f7cb86bb2be32348279a70933a \ + --hash=sha256:346a888f7fbc7be1f3396864b2108e177892684ef941652bc101304f409520c2 \ + --hash=sha256:3501ddb4fa36344fbf4c20ee22c7035d2e6d209a59e4b2555573c4f10506bf54 \ + --hash=sha256:362f617bc979b62097960006aa60580787fd0accb845365d2508b1fececa7bde \ + --hash=sha256:38f86ba0fe471c6d11db0b7805ae6d36f5f2ac051e74cc5f15d08b4c1ccd019a \ + --hash=sha256:41d218938ed595f62a722c4c713ceb954059d2c2ea0a3a60653a6d6cadcb50a8 \ + --hash=sha256:4e8b7a1a83505db89499d273c9fb9a5a4947d7cd6ec62dc2a956a06d72e5da88 \ + --hash=sha256:4ecac7d896d77da63d5123bf5943de0610db5f42824ac75e24806d02fcad64fa \ + --hash=sha256:5ab96bfa1f3f80d6bb34ad7b0a7a582a76f63fad71b9ab53145277eec8789ecd \ + --hash=sha256:62abef0214094f198773435a97f3b44a5497b2ed3dd7e9b2b55779576b81685d \ + --hash=sha256:6afb72f5041a164d7ee911246abdfc158c59a65c20ba8ace14b015de09ef26e8 \ + --hash=sha256:7efdcd1816aad3221c81158ab7ee20069667454f9e8b760a985d295ecb6ebc9b \ + --hash=sha256:889e519233420fe34e094a62e8b65bd9918201fa26be70263bc2a65aa541f98d \ + --hash=sha256:8d9ef4e8297585ecd5c99e3b46ccec1c96f9bb562fabc70d6ae6fa6eda949b6d \ + --hash=sha256:90db21fced38fe44f4cec95a3f6ee446a94fff0e8fbc4b8f9f3d3d5254c8750d \ + --hash=sha256:9246be60cd90b79b30e349645579cea9ac62ea3a9a70ae544718f87d52b6c1f5 \ + --hash=sha256:97a3c300fefb6f7a77a25ce22746aa54eeb1d4162a01e3ebb9118ff1d72e0b82 \ + --hash=sha256:a68ffb7513f44ae8187613b34990dde18db96968ec58aacf60981889ff078876 \ + --hash=sha256:ad46654913f1738ee1f1f925b06d99a774490f2e3ad15ed3571568b0e61c0271 \ + --hash=sha256:ade0aa7e133aa144353415b6e42ca416fef1d7e3f88a8e289f9f9c6d09b60c07 \ + --hash=sha256:adf7d151527a346a1afb260075869fd79bcbbdd704b3b76e4208fca59ebb6b44 \ + --hash=sha256:b763c95cdebb13a5457f1cceabab92193caafe5e66afc3bbb6bdda141bf5d58b \ + --hash=sha256:bf8dea55b76fa9dcd0ffeaca0e846a5ad4789818e20949effd2344d08f975bac \ + --hash=sha256:dd8fbbd927790e0ea687132dfffc8df5f3f151010d3b9abc94427cfe5fa0c289 \ + --hash=sha256:e02ec0ad60df7a0d48b1ecad409880d087a00f8c9d92ec0f7354f7ffc7cfbc26 \ + --hash=sha256:e40f195e2d0d06d7977446a36d778428eb50a6fae22beaa6eea9f52871c6ac61 \ + --hash=sha256:f2ddba129e7fc282c78e6774ce4d3b19abf37c74f6a513f1a7818984c4dd96b9 \ + --hash=sha256:f79957b5fa91c5b4468b650042a2417ff6594bf1ec34d3919a0513bf7c6bca37 \ + --hash=sha256:f9ed24b78bbf72f291d801de00ee9baa3d7fe18212739361cbb26f49ee34cd93 \ + --hash=sha256:fb157e71a07e64771cd7d5a191b9d4ea88ed09db64002065fdf7a366823eff52 # via coffea cramjam==2.8.3 \ --hash=sha256:00524bb23f4abb3a3bfff08aa32b9274843170c5b43855807e0f59670e2ac98c \ @@ -2347,6 +2347,7 @@ requests==2.31.0 \ --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 # via + # coffea # jupyterlab-server # kubernetes # nbdime @@ -2687,9 +2688,9 @@ uhi==0.4.0 \ # via # histoprint # mplhep -uproot==5.3.8rc1 \ - --hash=sha256:92fec5b86517a1efc46eecef0bd9d62053edf8058186e7a65c6ead7d05de0215 \ - --hash=sha256:ed508d4644c6adbb49bd590e6baffaf46c71384184b57eb9a5d5087e5242c1bf +uproot==5.3.9 \ + --hash=sha256:0f7cc2e15d720c6d2071db5aacd39ec7b362e4c264cb09a5f6c23d4293f77889 \ + --hash=sha256:847519b6f2d4a505a6287e4d7d7a8d4f3623ba8aac4cf4dd75a224aa8a9bf843 # via # -r requirements.txt # coffea diff --git a/docker/requirements.txt b/docker/requirements.txt index c1b7205..7600bbf 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -1,11 +1,11 @@ -uproot==5.3.8rc1 +uproot==5.3.9 # Do not upgrade Dask until move off KubeCluster # Requires https://github.com/usatlas/analysisbase-dask-uc/issues/9 dask[distributed]==2024.4.2 dask-awkward==2024.3.0 fsspec-xrootd==0.3.0 # Z->ee notebook -coffea==2024.4.1 +coffea==2024.6.1 zstandard==0.22.0 mplhep==0.3.50 vector==1.4.0