From ae9ace4f51c905e618c625e1e7a6aefdd8de1dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20VALENTIN?= Date: Sat, 27 Jan 2024 01:20:34 +0100 Subject: [PATCH 1/7] fix: update lib --- poetry.lock | 112 ++++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/poetry.lock b/poetry.lock index 167ddebe..40ff8c33 100644 --- a/poetry.lock +++ b/poetry.lock @@ -423,63 +423,63 @@ files = [ [[package]] name = "coverage" -version = "7.4.0" +version = "7.4.1" description = "Code coverage measurement for Python" optional = false python-versions = ">=3.8" files = [ - {file = "coverage-7.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36b0ea8ab20d6a7564e89cb6135920bc9188fb5f1f7152e94e8300b7b189441a"}, - {file = "coverage-7.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0676cd0ba581e514b7f726495ea75aba3eb20899d824636c6f59b0ed2f88c471"}, - {file = "coverage-7.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0ca5c71a5a1765a0f8f88022c52b6b8be740e512980362f7fdbb03725a0d6b9"}, - {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a7c97726520f784239f6c62506bc70e48d01ae71e9da128259d61ca5e9788516"}, - {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:815ac2d0f3398a14286dc2cea223a6f338109f9ecf39a71160cd1628786bc6f5"}, - {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:80b5ee39b7f0131ebec7968baa9b2309eddb35b8403d1869e08f024efd883566"}, - {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5b2ccb7548a0b65974860a78c9ffe1173cfb5877460e5a229238d985565574ae"}, - {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:995ea5c48c4ebfd898eacb098164b3cc826ba273b3049e4a889658548e321b43"}, - {file = "coverage-7.4.0-cp310-cp310-win32.whl", hash = "sha256:79287fd95585ed36e83182794a57a46aeae0b64ca53929d1176db56aacc83451"}, - {file = "coverage-7.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:5b14b4f8760006bfdb6e08667af7bc2d8d9bfdb648351915315ea17645347137"}, - {file = "coverage-7.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:04387a4a6ecb330c1878907ce0dc04078ea72a869263e53c72a1ba5bbdf380ca"}, - {file = "coverage-7.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ea81d8f9691bb53f4fb4db603203029643caffc82bf998ab5b59ca05560f4c06"}, - {file = "coverage-7.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74775198b702868ec2d058cb92720a3c5a9177296f75bd97317c787daf711505"}, - {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:76f03940f9973bfaee8cfba70ac991825611b9aac047e5c80d499a44079ec0bc"}, - {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:485e9f897cf4856a65a57c7f6ea3dc0d4e6c076c87311d4bc003f82cfe199d25"}, - {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6ae8c9d301207e6856865867d762a4b6fd379c714fcc0607a84b92ee63feff70"}, - {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:bf477c355274a72435ceb140dc42de0dc1e1e0bf6e97195be30487d8eaaf1a09"}, - {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:83c2dda2666fe32332f8e87481eed056c8b4d163fe18ecc690b02802d36a4d26"}, - {file = "coverage-7.4.0-cp311-cp311-win32.whl", hash = "sha256:697d1317e5290a313ef0d369650cfee1a114abb6021fa239ca12b4849ebbd614"}, - {file = "coverage-7.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:26776ff6c711d9d835557ee453082025d871e30b3fd6c27fcef14733f67f0590"}, - {file = "coverage-7.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:13eaf476ec3e883fe3e5fe3707caeb88268a06284484a3daf8250259ef1ba143"}, - {file = "coverage-7.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:846f52f46e212affb5bcf131c952fb4075b55aae6b61adc9856222df89cbe3e2"}, - {file = "coverage-7.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26f66da8695719ccf90e794ed567a1549bb2644a706b41e9f6eae6816b398c4a"}, - {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:164fdcc3246c69a6526a59b744b62e303039a81e42cfbbdc171c91a8cc2f9446"}, - {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:316543f71025a6565677d84bc4df2114e9b6a615aa39fb165d697dba06a54af9"}, - {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bb1de682da0b824411e00a0d4da5a784ec6496b6850fdf8c865c1d68c0e318dd"}, - {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:0e8d06778e8fbffccfe96331a3946237f87b1e1d359d7fbe8b06b96c95a5407a"}, - {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a56de34db7b7ff77056a37aedded01b2b98b508227d2d0979d373a9b5d353daa"}, - {file = "coverage-7.4.0-cp312-cp312-win32.whl", hash = "sha256:51456e6fa099a8d9d91497202d9563a320513fcf59f33991b0661a4a6f2ad450"}, - {file = "coverage-7.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:cd3c1e4cb2ff0083758f09be0f77402e1bdf704adb7f89108007300a6da587d0"}, - {file = "coverage-7.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e9d1bf53c4c8de58d22e0e956a79a5b37f754ed1ffdbf1a260d9dcfa2d8a325e"}, - {file = "coverage-7.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:109f5985182b6b81fe33323ab4707011875198c41964f014579cf82cebf2bb85"}, - {file = "coverage-7.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3cc9d4bc55de8003663ec94c2f215d12d42ceea128da8f0f4036235a119c88ac"}, - {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cc6d65b21c219ec2072c1293c505cf36e4e913a3f936d80028993dd73c7906b1"}, - {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a10a4920def78bbfff4eff8a05c51be03e42f1c3735be42d851f199144897ba"}, - {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b8e99f06160602bc64da35158bb76c73522a4010f0649be44a4e167ff8555952"}, - {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7d360587e64d006402b7116623cebf9d48893329ef035278969fa3bbf75b697e"}, - {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:29f3abe810930311c0b5d1a7140f6395369c3db1be68345638c33eec07535105"}, - {file = "coverage-7.4.0-cp38-cp38-win32.whl", hash = "sha256:5040148f4ec43644702e7b16ca864c5314ccb8ee0751ef617d49aa0e2d6bf4f2"}, - {file = "coverage-7.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:9864463c1c2f9cb3b5db2cf1ff475eed2f0b4285c2aaf4d357b69959941aa555"}, - {file = "coverage-7.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:936d38794044b26c99d3dd004d8af0035ac535b92090f7f2bb5aa9c8e2f5cd42"}, - {file = "coverage-7.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:799c8f873794a08cdf216aa5d0531c6a3747793b70c53f70e98259720a6fe2d7"}, - {file = "coverage-7.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7defbb9737274023e2d7af02cac77043c86ce88a907c58f42b580a97d5bcca9"}, - {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a1526d265743fb49363974b7aa8d5899ff64ee07df47dd8d3e37dcc0818f09ed"}, - {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf635a52fc1ea401baf88843ae8708591aa4adff875e5c23220de43b1ccf575c"}, - {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:756ded44f47f330666843b5781be126ab57bb57c22adbb07d83f6b519783b870"}, - {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0eb3c2f32dabe3a4aaf6441dde94f35687224dfd7eb2a7f47f3fd9428e421058"}, - {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bfd5db349d15c08311702611f3dccbef4b4e2ec148fcc636cf8739519b4a5c0f"}, - {file = "coverage-7.4.0-cp39-cp39-win32.whl", hash = "sha256:53d7d9158ee03956e0eadac38dfa1ec8068431ef8058fe6447043db1fb40d932"}, - {file = "coverage-7.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:cfd2a8b6b0d8e66e944d47cdec2f47c48fef2ba2f2dff5a9a75757f64172857e"}, - {file = "coverage-7.4.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:c530833afc4707fe48524a44844493f36d8727f04dcce91fb978c414a8556cc6"}, - {file = "coverage-7.4.0.tar.gz", hash = "sha256:707c0f58cb1712b8809ece32b68996ee1e609f71bd14615bd8f87a1293cb610e"}, + {file = "coverage-7.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:077d366e724f24fc02dbfe9d946534357fda71af9764ff99d73c3c596001bbd7"}, + {file = "coverage-7.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0193657651f5399d433c92f8ae264aff31fc1d066deee4b831549526433f3f61"}, + {file = "coverage-7.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d17bbc946f52ca67adf72a5ee783cd7cd3477f8f8796f59b4974a9b59cacc9ee"}, + {file = "coverage-7.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a3277f5fa7483c927fe3a7b017b39351610265308f5267ac6d4c2b64cc1d8d25"}, + {file = "coverage-7.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6dceb61d40cbfcf45f51e59933c784a50846dc03211054bd76b421a713dcdf19"}, + {file = "coverage-7.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:6008adeca04a445ea6ef31b2cbaf1d01d02986047606f7da266629afee982630"}, + {file = "coverage-7.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c61f66d93d712f6e03369b6a7769233bfda880b12f417eefdd4f16d1deb2fc4c"}, + {file = "coverage-7.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b9bb62fac84d5f2ff523304e59e5c439955fb3b7f44e3d7b2085184db74d733b"}, + {file = "coverage-7.4.1-cp310-cp310-win32.whl", hash = "sha256:f86f368e1c7ce897bf2457b9eb61169a44e2ef797099fb5728482b8d69f3f016"}, + {file = "coverage-7.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:869b5046d41abfea3e381dd143407b0d29b8282a904a19cb908fa24d090cc018"}, + {file = "coverage-7.4.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b8ffb498a83d7e0305968289441914154fb0ef5d8b3157df02a90c6695978295"}, + {file = "coverage-7.4.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3cacfaefe6089d477264001f90f55b7881ba615953414999c46cc9713ff93c8c"}, + {file = "coverage-7.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d6850e6e36e332d5511a48a251790ddc545e16e8beaf046c03985c69ccb2676"}, + {file = "coverage-7.4.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:18e961aa13b6d47f758cc5879383d27b5b3f3dcd9ce8cdbfdc2571fe86feb4dd"}, + {file = "coverage-7.4.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dfd1e1b9f0898817babf840b77ce9fe655ecbe8b1b327983df485b30df8cc011"}, + {file = "coverage-7.4.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6b00e21f86598b6330f0019b40fb397e705135040dbedc2ca9a93c7441178e74"}, + {file = "coverage-7.4.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:536d609c6963c50055bab766d9951b6c394759190d03311f3e9fcf194ca909e1"}, + {file = "coverage-7.4.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7ac8f8eb153724f84885a1374999b7e45734bf93a87d8df1e7ce2146860edef6"}, + {file = "coverage-7.4.1-cp311-cp311-win32.whl", hash = "sha256:f3771b23bb3675a06f5d885c3630b1d01ea6cac9e84a01aaf5508706dba546c5"}, + {file = "coverage-7.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:9d2f9d4cc2a53b38cabc2d6d80f7f9b7e3da26b2f53d48f05876fef7956b6968"}, + {file = "coverage-7.4.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f68ef3660677e6624c8cace943e4765545f8191313a07288a53d3da188bd8581"}, + {file = "coverage-7.4.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:23b27b8a698e749b61809fb637eb98ebf0e505710ec46a8aa6f1be7dc0dc43a6"}, + {file = "coverage-7.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e3424c554391dc9ef4a92ad28665756566a28fecf47308f91841f6c49288e66"}, + {file = "coverage-7.4.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e0860a348bf7004c812c8368d1fc7f77fe8e4c095d661a579196a9533778e156"}, + {file = "coverage-7.4.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe558371c1bdf3b8fa03e097c523fb9645b8730399c14fe7721ee9c9e2a545d3"}, + {file = "coverage-7.4.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:3468cc8720402af37b6c6e7e2a9cdb9f6c16c728638a2ebc768ba1ef6f26c3a1"}, + {file = "coverage-7.4.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:02f2edb575d62172aa28fe00efe821ae31f25dc3d589055b3fb64d51e52e4ab1"}, + {file = "coverage-7.4.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:ca6e61dc52f601d1d224526360cdeab0d0712ec104a2ce6cc5ccef6ed9a233bc"}, + {file = "coverage-7.4.1-cp312-cp312-win32.whl", hash = "sha256:ca7b26a5e456a843b9b6683eada193fc1f65c761b3a473941efe5a291f604c74"}, + {file = "coverage-7.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:85ccc5fa54c2ed64bd91ed3b4a627b9cce04646a659512a051fa82a92c04a448"}, + {file = "coverage-7.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8bdb0285a0202888d19ec6b6d23d5990410decb932b709f2b0dfe216d031d218"}, + {file = "coverage-7.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:918440dea04521f499721c039863ef95433314b1db00ff826a02580c1f503e45"}, + {file = "coverage-7.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:379d4c7abad5afbe9d88cc31ea8ca262296480a86af945b08214eb1a556a3e4d"}, + {file = "coverage-7.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b094116f0b6155e36a304ff912f89bbb5067157aff5f94060ff20bbabdc8da06"}, + {file = "coverage-7.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2f5968608b1fe2a1d00d01ad1017ee27efd99b3437e08b83ded9b7af3f6f766"}, + {file = "coverage-7.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:10e88e7f41e6197ea0429ae18f21ff521d4f4490aa33048f6c6f94c6045a6a75"}, + {file = "coverage-7.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a4a3907011d39dbc3e37bdc5df0a8c93853c369039b59efa33a7b6669de04c60"}, + {file = "coverage-7.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6d224f0c4c9c98290a6990259073f496fcec1b5cc613eecbd22786d398ded3ad"}, + {file = "coverage-7.4.1-cp38-cp38-win32.whl", hash = "sha256:23f5881362dcb0e1a92b84b3c2809bdc90db892332daab81ad8f642d8ed55042"}, + {file = "coverage-7.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:a07f61fc452c43cd5328b392e52555f7d1952400a1ad09086c4a8addccbd138d"}, + {file = "coverage-7.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8e738a492b6221f8dcf281b67129510835461132b03024830ac0e554311a5c54"}, + {file = "coverage-7.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:46342fed0fff72efcda77040b14728049200cbba1279e0bf1188f1f2078c1d70"}, + {file = "coverage-7.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9641e21670c68c7e57d2053ddf6c443e4f0a6e18e547e86af3fad0795414a628"}, + {file = "coverage-7.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aeb2c2688ed93b027eb0d26aa188ada34acb22dceea256d76390eea135083950"}, + {file = "coverage-7.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d12c923757de24e4e2110cf8832d83a886a4cf215c6e61ed506006872b43a6d1"}, + {file = "coverage-7.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0491275c3b9971cdbd28a4595c2cb5838f08036bca31765bad5e17edf900b2c7"}, + {file = "coverage-7.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8dfc5e195bbef80aabd81596ef52a1277ee7143fe419efc3c4d8ba2754671756"}, + {file = "coverage-7.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1a78b656a4d12b0490ca72651fe4d9f5e07e3c6461063a9b6265ee45eb2bdd35"}, + {file = "coverage-7.4.1-cp39-cp39-win32.whl", hash = "sha256:f90515974b39f4dea2f27c0959688621b46d96d5a626cf9c53dbc653a895c05c"}, + {file = "coverage-7.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:64e723ca82a84053dd7bfcc986bdb34af8d9da83c521c19d6b472bc6880e191a"}, + {file = "coverage-7.4.1-pp38.pp39.pp310-none-any.whl", hash = "sha256:32a8d985462e37cfdab611a6f95b09d7c091d07668fdc26e47a725ee575fe166"}, + {file = "coverage-7.4.1.tar.gz", hash = "sha256:1ed4b95480952b1a26d863e546fa5094564aa0065e1e5f0d4d0041f293251d04"}, ] [package.extras] @@ -1342,13 +1342,13 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co [[package]] name = "pluggy" -version = "1.3.0" +version = "1.4.0" description = "plugin and hook calling mechanisms for python" optional = false python-versions = ">=3.8" files = [ - {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"}, - {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"}, + {file = "pluggy-1.4.0-py3-none-any.whl", hash = "sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981"}, + {file = "pluggy-1.4.0.tar.gz", hash = "sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be"}, ] [package.extras] From 55a99291c8ebee722b1bebbaaf9c314ad6be33de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20VALENTIN?= Date: Sat, 27 Jan 2024 01:34:11 +0100 Subject: [PATCH 2/7] fix: remove pytest.ini (configuration in pyproject.toml) --- .coverage | Bin 53248 -> 0 bytes pyproject.toml | 3 ++- pytest.ini | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 .coverage delete mode 100644 pytest.ini diff --git a/.coverage b/.coverage deleted file mode 100644 index ec55ea37578a45497c8560f8779d19b95146bc2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53248 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 Date: Sat, 27 Jan 2024 00:35:16 +0000 Subject: [PATCH 3/7] 0.10.0-rc.19 Automatically generated by python-semantic-release --- CHANGELOG.md | 53 ++++++++++++++++++++++++++++++++++++++++++++++ pyproject.toml | 2 +- src/__version__.py | 2 +- 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3242df6e..b301e0e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,57 @@ +## v0.10.0-rc.19 (2024-01-27) + +### Ci + +* ci: test ([`963095e`](https://github.com/MyElectricalData/myelectricaldata_import/commit/963095e9af91d34df6e1dced26ac8d2af67d30d0)) + +* ci: test ([`d468100`](https://github.com/MyElectricalData/myelectricaldata_import/commit/d468100c445e5e815d86c16e287712e07c5074d3)) + +* ci: test ([`5024826`](https://github.com/MyElectricalData/myelectricaldata_import/commit/50248260ddad3626d148d9352095863210659a8a)) + +* ci: test ([`8bfefc3`](https://github.com/MyElectricalData/myelectricaldata_import/commit/8bfefc3499d8032bfd31f12893a5d18905623f97)) + +* ci: test ([`78250d8`](https://github.com/MyElectricalData/myelectricaldata_import/commit/78250d87b5a6191a30a312e84123bd71eee1ba8f)) + +* ci: test ([`a9f4c6c`](https://github.com/MyElectricalData/myelectricaldata_import/commit/a9f4c6cb1b9c05d05648658283352f82422c9f30)) + +* ci: test ([`337df7d`](https://github.com/MyElectricalData/myelectricaldata_import/commit/337df7d0d1e6fe441f58adb832800cf33403dbbc)) + +* ci: test ([`704ad6c`](https://github.com/MyElectricalData/myelectricaldata_import/commit/704ad6ca07fd45cf436eaf2cdfdb4cf6651d8526)) + +* ci: test ([`d5b2276`](https://github.com/MyElectricalData/myelectricaldata_import/commit/d5b22763f5022e8618b3530f3ac4127befabd7d5)) + +* ci: test ([`7684b09`](https://github.com/MyElectricalData/myelectricaldata_import/commit/7684b092e058c6d945cbef10f9a2855ccb086b4e)) + +* ci: test ([`8ab3f15`](https://github.com/MyElectricalData/myelectricaldata_import/commit/8ab3f15855a70563dce936c9acc043c64abd1328)) + +* ci: test ([`b587f83`](https://github.com/MyElectricalData/myelectricaldata_import/commit/b587f83e98e6abc3f89e79d34fea1c045d1c3e2c)) + +* ci: test ([`81c3a18`](https://github.com/MyElectricalData/myelectricaldata_import/commit/81c3a1886e2350f99486b239d98bfeb33e639e3a)) + +* ci: test ([`3e312d1`](https://github.com/MyElectricalData/myelectricaldata_import/commit/3e312d1499fbe791f2ca0df8f69d7d280c8e2f64)) + +### Fix + +* fix: remove pytest.ini (configuration in pyproject.toml) ([`55a9929`](https://github.com/MyElectricalData/myelectricaldata_import/commit/55a99291c8ebee722b1bebbaaf9c314ad6be33de)) + +* fix: update lib ([`ae9ace4`](https://github.com/MyElectricalData/myelectricaldata_import/commit/ae9ace4f51c905e618c625e1e7a6aefdd8de1dee)) + +### Unknown + +* Merge branch 'main' of github.com:MyElectricalData/myelectricaldata_import ([`1c234a1`](https://github.com/MyElectricalData/myelectricaldata_import/commit/1c234a13b2a31384aea3d28beae1c674f4ba75c2)) + +* Merge pull request #469 from koukihai/to-upstream/fix-tests + +fix: tests ([`602e2f1`](https://github.com/MyElectricalData/myelectricaldata_import/commit/602e2f131538679a9afe80eb97634b82fb4e224f)) + +* Merge branch 'main' into to-upstream/fix-tests ([`5482eab`](https://github.com/MyElectricalData/myelectricaldata_import/commit/5482eaba6b4062ddf1662b7bbca609e6ab729069)) + +* Merge branch 'main' of github.com:MyElectricalData/myelectricaldata_import ([`c335f51`](https://github.com/MyElectricalData/myelectricaldata_import/commit/c335f5116bb66813e7826cb06a0d9d255bb173f6)) + + ## v0.10.0-rc.18 (2024-01-26) ### Fix @@ -49,6 +100,8 @@ * fix: use external workflow ([`ebe074c`](https://github.com/MyElectricalData/myelectricaldata_import/commit/ebe074ca99eb649df96ee6d51ba3391e7964f141)) +* fix: tests ([`b82e817`](https://github.com/MyElectricalData/myelectricaldata_import/commit/b82e817bbd5825978a2aa79e9015ed975e660bdf)) + ### Unknown * Merge remote-tracking branch 'refs/remotes/origin/main' ([`4d66a52`](https://github.com/MyElectricalData/myelectricaldata_import/commit/4d66a52c0a79897b23af38b52f864c44ee821fdb)) diff --git a/pyproject.toml b/pyproject.toml index e059358f..ed4e9bc1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "myelectricaldata-import" -version = "0.10.0-rc.18" +version = "0.10.0-rc.19" description = "MyElectricalData official client" authors = ["Clément VALENTIN "] readme = "README.md" diff --git a/src/__version__.py b/src/__version__.py index 12fb9bcb..c13574ba 100644 --- a/src/__version__.py +++ b/src/__version__.py @@ -1,3 +1,3 @@ """Application version update by Semantic Release.""" -VERSION = "0.10.0-rc.18" +VERSION = "0.10.0-rc.19" From 719169c77723d21cf908ed059b32edd330c7aa7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20VALENTIN?= Date: Sat, 27 Jan 2024 09:30:48 +0100 Subject: [PATCH 4/7] ci: update --- .github/workflows/deploy_prerelease.yaml | 24 +++++++++++++++++------- .github/workflows/deploy_release.yaml | 24 +++++++++++++++++------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy_prerelease.yaml b/.github/workflows/deploy_prerelease.yaml index 9a71f139..c110e7d0 100644 --- a/.github/workflows/deploy_prerelease.yaml +++ b/.github/workflows/deploy_prerelease.yaml @@ -2,6 +2,12 @@ name: "Build/Push Pre-Release" on: workflow_dispatch: + inputs: + FORCE: + description: 'FORCE REBUILD' + required: true + default: false + type: boolean workflow_run: workflows: ["Pre-Release"] types: @@ -26,15 +32,20 @@ jobs: - name: Generate release version id: informations + env: + FORCE: ${{ inputs.FORCE }} run: | version=$(cat src/__version__.py |grep VERSION| awk '{print $3}' | tr -d '"') - echo "version=${version}" >> "$GITHUB_OUTPUT" - - if [ $(docker manifest inspect ${IMAGE_REPO}/${IMAGE_NAME}:${version} > /dev/null ; echo $?) -eq 0 ]; then - echo "Image already build => SKIP BUILDING" - echo "build=false" >> "$GITHUB_OUTPUT" - else + echo "version=${version}" >> "$GITHUB_OUTPUT" + if [ $FORCE == 'true' ]; then echo "build=true" >> "$GITHUB_OUTPUT" + else + if [ $(docker manifest inspect ${IMAGE_REPO}/${IMAGE_NAME}:${version} > /dev/null ; echo $?) -eq 0 ]; then + echo "Image already build => SKIP BUILDING" + echo "build=false" >> "$GITHUB_OUTPUT" + else + echo "build=true" >> "$GITHUB_OUTPUT" + fi fi echo "IMAGE_REPO=${IMAGE_REPO}" >> "$GITHUB_OUTPUT" echo "IMAGE_NAME=${IMAGE_NAME}" >> "$GITHUB_OUTPUT" @@ -63,7 +74,6 @@ jobs: IMAGE_NAME: ${{ needs.informations.outputs.IMAGE_NAME }} PUSH: true TAG: ${{ needs.informations.outputs.version }} -# PLATFORM: "linux/amd64, linux/arm64, linux/arm/v6, linux/arm/v7" LATEST: false secrets: DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/deploy_release.yaml b/.github/workflows/deploy_release.yaml index 089f19b1..77e50581 100644 --- a/.github/workflows/deploy_release.yaml +++ b/.github/workflows/deploy_release.yaml @@ -2,6 +2,12 @@ name: "Build/Push Release" on: workflow_dispatch: + inputs: + FORCE: + description: 'FORCE REBUILD' + required: true + default: false + type: boolean env: IMAGE_REPO: m4dm4rtig4n @@ -22,15 +28,20 @@ jobs: - name: Generate release version id: informations + env: + FORCE: ${{ inputs.FORCE }} run: | version=$(cat src/__version__.py |grep VERSION| awk '{print $3}' | tr -d '"') - echo "version=${version}" >> "$GITHUB_OUTPUT" - - if [ $(docker manifest inspect ${IMAGE_REPO}/${IMAGE_NAME}:${version} > /dev/null ; echo $?) -eq 0 ]; then - echo "Image already build => SKIP BUILDING" - echo "build=false" >> "$GITHUB_OUTPUT" - else + echo "version=${version}" >> "$GITHUB_OUTPUT" + if [ $FORCE == 'true' ]; then echo "build=true" >> "$GITHUB_OUTPUT" + else + if [ $(docker manifest inspect ${IMAGE_REPO}/${IMAGE_NAME}:${version} > /dev/null ; echo $?) -eq 0 ]; then + echo "Image already build => SKIP BUILDING" + echo "build=false" >> "$GITHUB_OUTPUT" + else + echo "build=true" >> "$GITHUB_OUTPUT" + fi fi echo "IMAGE_REPO=${IMAGE_REPO}" >> "$GITHUB_OUTPUT" echo "IMAGE_NAME=${IMAGE_NAME}" >> "$GITHUB_OUTPUT" @@ -59,7 +70,6 @@ jobs: IMAGE_NAME: ${{ needs.informations.outputs.IMAGE_NAME }} PUSH: true TAG: ${{ needs.informations.outputs.version }} - PLATFORM: "linux/amd64, linux/arm64, linux/arm/v6, linux/arm/v7" LATEST: true secrets: DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} From 4fd6afa7f187baeb3592e066b431975aa174be2e Mon Sep 17 00:00:00 2001 From: vingerha <44190435+vingerha@users.noreply.github.com> Date: Sat, 27 Jan 2024 10:41:09 +0100 Subject: [PATCH 5/7] Replaying 'year'-number with 'current' in case it is current year Allows to call MQTT topics having data for current tear directly from HA sensor (and others) --- src/models/export_mqtt.py | 12 ++++++++++-- src/models/export_mqttv1.py | 14 ++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/models/export_mqtt.py b/src/models/export_mqtt.py index 1d82351b..4141ada2 100644 --- a/src/models/export_mqtt.py +++ b/src/models/export_mqtt.py @@ -104,7 +104,10 @@ def daily_annual(self, price, measurement_direction="consumption"): get_daily_year = stat.get_year(year=year) get_daily_month = stat.get_month(year=year) get_daily_week = stat.get_week(year=year) - sub_prefix = f"{self.usage_point_id}/{measurement_direction}/annual/{year}" + if year == int(datetime.now().strftime("%Y")): + sub_prefix = f"{self.usage_point_id}/{measurement_direction}/annual/current" + else: + sub_prefix = f"{self.usage_point_id}/{measurement_direction}/annual/{year}" mqtt_data = { # thisYear f"{sub_prefix}/thisYear/dateBegin": get_daily_year["begin"], @@ -247,7 +250,10 @@ def detail_annual(self, price_hp, price_hc=0, measurement_direction="consumption measure_type="HC", ) - sub_prefix = f"{self.usage_point_id}/{measurement_direction}/annual/{year}" + if year == int(datetime.now().strftime("%Y")): + sub_prefix = f"{self.usage_point_id}/{measurement_direction}/annual/current" + else: + sub_prefix = f"{self.usage_point_id}/{measurement_direction}/annual/{year}" mqtt_data = { # thisYear - HP f"{sub_prefix}/thisYear/hp/Wh": get_detail_year_hp["value"], @@ -460,6 +466,8 @@ def tempo(self): mqtt_data[f"tempo/color/tomorrow"] = tempo_color[0].color if tempo_data: for year, data in ast.literal_eval(tempo_data[0].value).items(): + if year == datetime.now().strftime("%Y"): + year = "current" for color, tempo in data["TEMPO"].items(): mqtt_data[f"{self.usage_point_id}/consumption/annual/{year}/thisYear/tempo/{color}/Wh"] = round( tempo["Wh"], 2 diff --git a/src/models/export_mqttv1.py b/src/models/export_mqttv1.py index aa8be048..4083a1c3 100644 --- a/src/models/export_mqttv1.py +++ b/src/models/export_mqttv1.py @@ -227,9 +227,10 @@ def daily_annual(self, price): date_begin_current = datetime.combine(date_end.replace(month=1).replace(day=1), datetime.min.time()) finish = False while not finish: - sub_prefix = ( - f"{self.usage_point_id}/{self.measurement_direction}/annual/{date_begin_current.strftime('%Y')}" - ) + if date_begin_current.strftime('%Y') == datetime.now().strftime("%Y"): + sub_prefix = f"{self.usage_point_id}/{self.measurement_direction}/annual/current" + else: + sub_prefix = f"{self.usage_point_id}/{self.measurement_direction}/annual/{date_begin_current.strftime('%Y')}" self.load_daily_data(date_begin_current, date_end, price, sub_prefix) # CALCUL NEW DATE if date_begin_current == date_begin: @@ -391,9 +392,10 @@ def detail_annual(self, price_hp, price_hc=0): date_begin_current = datetime.combine(date_end.replace(month=1).replace(day=1), datetime.min.time()) finish = False while not finish: - sub_prefix = ( - f"{self.usage_point_id}/{self.measurement_direction}/annual/{date_begin_current.strftime('%Y')}" - ) + if date_begin_current.strftime('%Y') == datetime.now().strftime("%Y"): + sub_prefix = f"{self.usage_point_id}/{self.measurement_direction}/annual/current" + else: + sub_prefix = f"{self.usage_point_id}/{self.measurement_direction}/annual/{date_begin_current.strftime('%Y')}" self.load_detail_data(date_begin_current, date_end, price_hp, price_hc, sub_prefix) # CALCUL NEW DATE if date_begin_current == date_begin: From 7becf9ec6939cbd25245bbacd72ae45822d039de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20VALENTIN?= Date: Mon, 29 Jan 2024 13:13:25 +0100 Subject: [PATCH 6/7] fix: add dev mode --- Makefile | 11 +++++++++++ env.example | 3 ++- src/models/export_mqtt.py | 2 +- src/models/export_mqttv1.py | 6 +++--- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c201d76a..ee7770ee 100755 --- a/Makefile +++ b/Makefile @@ -89,9 +89,20 @@ enable_debug: disable_debug: sed -i "s/DEBUG=.*/DEBUG=false/g" .env +## Enable debug mode +enable_dev: + sed -i "s/DEV=.*/DEV=true/g" .env + +## Disable debug mode +disable_dev: + sed -i "s/DEV=.*/DEV=false/g" .env + ## Run in local run: init disable_debug bootstrap +## Run local dev (without debug) +dev: init disable_debug enable_dev up bootstrap + ## Run in local in debug debug: init enable_debug up bootstrap down diff --git a/env.example b/env.example index 207e1540..9a94937b 100644 --- a/env.example +++ b/env.example @@ -1,4 +1,5 @@ APPLICATION_PATH=src/ APPLICATION_PATH_DATA=data/cache/ APPLICATION_PATH_LOG=data/log -DEBUG=false \ No newline at end of file +DEBUG=false +DEV=true \ No newline at end of file diff --git a/src/models/export_mqtt.py b/src/models/export_mqtt.py index 4141ada2..17d4adbb 100644 --- a/src/models/export_mqtt.py +++ b/src/models/export_mqtt.py @@ -251,7 +251,7 @@ def detail_annual(self, price_hp, price_hc=0, measurement_direction="consumption ) if year == int(datetime.now().strftime("%Y")): - sub_prefix = f"{self.usage_point_id}/{measurement_direction}/annual/current" + sub_prefix = f"{self.usage_point_id}/{measurement_direction}/annual/current" else: sub_prefix = f"{self.usage_point_id}/{measurement_direction}/annual/{year}" mqtt_data = { diff --git a/src/models/export_mqttv1.py b/src/models/export_mqttv1.py index 4083a1c3..c1a7ee28 100644 --- a/src/models/export_mqttv1.py +++ b/src/models/export_mqttv1.py @@ -227,9 +227,9 @@ def daily_annual(self, price): date_begin_current = datetime.combine(date_end.replace(month=1).replace(day=1), datetime.min.time()) finish = False while not finish: - if date_begin_current.strftime('%Y') == datetime.now().strftime("%Y"): + if date_begin_current.strftime("%Y") == datetime.now().strftime("%Y"): sub_prefix = f"{self.usage_point_id}/{self.measurement_direction}/annual/current" - else: + else: sub_prefix = f"{self.usage_point_id}/{self.measurement_direction}/annual/{date_begin_current.strftime('%Y')}" self.load_daily_data(date_begin_current, date_end, price, sub_prefix) # CALCUL NEW DATE @@ -392,7 +392,7 @@ def detail_annual(self, price_hp, price_hc=0): date_begin_current = datetime.combine(date_end.replace(month=1).replace(day=1), datetime.min.time()) finish = False while not finish: - if date_begin_current.strftime('%Y') == datetime.now().strftime("%Y"): + if date_begin_current.strftime("%Y") == datetime.now().strftime("%Y"): sub_prefix = f"{self.usage_point_id}/{self.measurement_direction}/annual/current" else: sub_prefix = f"{self.usage_point_id}/{self.measurement_direction}/annual/{date_begin_current.strftime('%Y')}" From 5746c929418c297780fc191e21e2bd5c237ef49f Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 29 Jan 2024 12:14:16 +0000 Subject: [PATCH 7/7] 0.10.0-rc.20 Automatically generated by python-semantic-release --- CHANGELOG.md | 23 +++++++++++++++++++++++ pyproject.toml | 2 +- src/__version__.py | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b301e0e8..eeb40406 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,29 @@ +## v0.10.0-rc.20 (2024-01-29) + +### Ci + +* ci: update ([`719169c`](https://github.com/MyElectricalData/myelectricaldata_import/commit/719169c77723d21cf908ed059b32edd330c7aa7e)) + +### Fix + +* fix: add dev mode ([`7becf9e`](https://github.com/MyElectricalData/myelectricaldata_import/commit/7becf9ec6939cbd25245bbacd72ae45822d039de)) + +### Unknown + +* Merge pull request #473 from vingerha/main + +Replacing 'year'-number with 'current' in case it is current year ([`b3bda75`](https://github.com/MyElectricalData/myelectricaldata_import/commit/b3bda75fa3e33febe32fd5468acac4abc34715bb)) + +* Replaying 'year'-number with 'current' in case it is current year + +Allows to call MQTT topics having data for current tear directly from HA sensor (and others) ([`4fd6afa`](https://github.com/MyElectricalData/myelectricaldata_import/commit/4fd6afa7f187baeb3592e066b431975aa174be2e)) + +* Merge remote-tracking branch 'refs/remotes/origin/main' ([`810742c`](https://github.com/MyElectricalData/myelectricaldata_import/commit/810742c7300615f4d7851b6a2d3c09c41bb802ac)) + + ## v0.10.0-rc.19 (2024-01-27) ### Ci diff --git a/pyproject.toml b/pyproject.toml index ed4e9bc1..a79d5c92 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "myelectricaldata-import" -version = "0.10.0-rc.19" +version = "0.10.0-rc.20" description = "MyElectricalData official client" authors = ["Clément VALENTIN "] readme = "README.md" diff --git a/src/__version__.py b/src/__version__.py index c13574ba..3f834368 100644 --- a/src/__version__.py +++ b/src/__version__.py @@ -1,3 +1,3 @@ """Application version update by Semantic Release.""" -VERSION = "0.10.0-rc.19" +VERSION = "0.10.0-rc.20"