From b42d5e184709a8c34ef0ff67e77c19560ffc83b3 Mon Sep 17 00:00:00 2001 From: ncompare bot Date: Tue, 12 Mar 2024 19:07:41 +0000 Subject: [PATCH 001/107] /version 1.9.0a0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bc375f9..14390d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ncompare" -version = "1.8.0a10" +version = "1.9.0a0" description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" From f9791f4e92dc268fd275aa24f381dc4444de5a4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 21:31:44 +0000 Subject: [PATCH 002/107] Bump ruff from 0.3.2 to 0.3.3 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.3.2 to 0.3.3. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.3.2...v0.3.3) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 40 ++++++++++++++++++++-------------------- pyproject.toml | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3f531db..645b956 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "appnope" @@ -2250,28 +2250,28 @@ files = [ [[package]] name = "ruff" -version = "0.3.2" +version = "0.3.3" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.3.2-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:77f2612752e25f730da7421ca5e3147b213dca4f9a0f7e0b534e9562c5441f01"}, - {file = "ruff-0.3.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:9966b964b2dd1107797be9ca7195002b874424d1d5472097701ae8f43eadef5d"}, - {file = "ruff-0.3.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b83d17ff166aa0659d1e1deaf9f2f14cbe387293a906de09bc4860717eb2e2da"}, - {file = "ruff-0.3.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb875c6cc87b3703aeda85f01c9aebdce3d217aeaca3c2e52e38077383f7268a"}, - {file = "ruff-0.3.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:be75e468a6a86426430373d81c041b7605137a28f7014a72d2fc749e47f572aa"}, - {file = "ruff-0.3.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:967978ac2d4506255e2f52afe70dda023fc602b283e97685c8447d036863a302"}, - {file = "ruff-0.3.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1231eacd4510f73222940727ac927bc5d07667a86b0cbe822024dd00343e77e9"}, - {file = "ruff-0.3.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c6d613b19e9a8021be2ee1d0e27710208d1603b56f47203d0abbde906929a9b"}, - {file = "ruff-0.3.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8439338a6303585d27b66b4626cbde89bb3e50fa3cae86ce52c1db7449330a7"}, - {file = "ruff-0.3.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:de8b480d8379620cbb5ea466a9e53bb467d2fb07c7eca54a4aa8576483c35d36"}, - {file = "ruff-0.3.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b74c3de9103bd35df2bb05d8b2899bf2dbe4efda6474ea9681280648ec4d237d"}, - {file = "ruff-0.3.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:f380be9fc15a99765c9cf316b40b9da1f6ad2ab9639e551703e581a5e6da6745"}, - {file = "ruff-0.3.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:0ac06a3759c3ab9ef86bbeca665d31ad3aa9a4b1c17684aadb7e61c10baa0df4"}, - {file = "ruff-0.3.2-py3-none-win32.whl", hash = "sha256:9bd640a8f7dd07a0b6901fcebccedadeb1a705a50350fb86b4003b805c81385a"}, - {file = "ruff-0.3.2-py3-none-win_amd64.whl", hash = "sha256:0c1bdd9920cab5707c26c8b3bf33a064a4ca7842d91a99ec0634fec68f9f4037"}, - {file = "ruff-0.3.2-py3-none-win_arm64.whl", hash = "sha256:5f65103b1d76e0d600cabd577b04179ff592064eaa451a70a81085930e907d0b"}, - {file = "ruff-0.3.2.tar.gz", hash = "sha256:fa78ec9418eb1ca3db392811df3376b46471ae93792a81af2d1cbb0e5dcb5142"}, + {file = "ruff-0.3.3-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:973a0e388b7bc2e9148c7f9be8b8c6ae7471b9be37e1cc732f8f44a6f6d7720d"}, + {file = "ruff-0.3.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:cfa60d23269d6e2031129b053fdb4e5a7b0637fc6c9c0586737b962b2f834493"}, + {file = "ruff-0.3.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1eca7ff7a47043cf6ce5c7f45f603b09121a7cc047447744b029d1b719278eb5"}, + {file = "ruff-0.3.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e7d3f6762217c1da954de24b4a1a70515630d29f71e268ec5000afe81377642d"}, + {file = "ruff-0.3.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b24c19e8598916d9c6f5a5437671f55ee93c212a2c4c569605dc3842b6820386"}, + {file = "ruff-0.3.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:5a6cbf216b69c7090f0fe4669501a27326c34e119068c1494f35aaf4cc683778"}, + {file = "ruff-0.3.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:352e95ead6964974b234e16ba8a66dad102ec7bf8ac064a23f95371d8b198aab"}, + {file = "ruff-0.3.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d6ab88c81c4040a817aa432484e838aaddf8bfd7ca70e4e615482757acb64f8"}, + {file = "ruff-0.3.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79bca3a03a759cc773fca69e0bdeac8abd1c13c31b798d5bb3c9da4a03144a9f"}, + {file = "ruff-0.3.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:2700a804d5336bcffe063fd789ca2c7b02b552d2e323a336700abb8ae9e6a3f8"}, + {file = "ruff-0.3.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:fd66469f1a18fdb9d32e22b79f486223052ddf057dc56dea0caaf1a47bdfaf4e"}, + {file = "ruff-0.3.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:45817af234605525cdf6317005923bf532514e1ea3d9270acf61ca2440691376"}, + {file = "ruff-0.3.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:0da458989ce0159555ef224d5b7c24d3d2e4bf4c300b85467b08c3261c6bc6a8"}, + {file = "ruff-0.3.3-py3-none-win32.whl", hash = "sha256:f2831ec6a580a97f1ea82ea1eda0401c3cdf512cf2045fa3c85e8ef109e87de0"}, + {file = "ruff-0.3.3-py3-none-win_amd64.whl", hash = "sha256:be90bcae57c24d9f9d023b12d627e958eb55f595428bafcb7fec0791ad25ddfc"}, + {file = "ruff-0.3.3-py3-none-win_arm64.whl", hash = "sha256:0171aab5fecdc54383993389710a3d1227f2da124d76a2784a7098e818f92d61"}, + {file = "ruff-0.3.3.tar.gz", hash = "sha256:38671be06f57a2f8aba957d9f701ea889aa5736be806f18c0cd03d6ff0cbca8d"}, ] [[package]] @@ -2534,4 +2534,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "3741ffc65c34b59f24e49a937be8873996fb4b6d9927c3f7f8c8418065cd8b5b" +content-hash = "8b0395c9bf88cdaef3b5b91a261eff4104da2dc61753f26383a8e1200c5f31ce" diff --git a/pyproject.toml b/pyproject.toml index 14390d5..e760a9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ openpyxl = "^3.1.2" [tool.poetry.group.dev.dependencies] pytest = ">=7.4.2,<9.0.0" -ruff = ">=0.0.291,<0.3.3" +ruff = ">=0.0.291,<0.3.4" black = ">=23.9.1,<25.0.0" mypy = "^1.5.1" pytest-cov = "^4.1.0" From a24d155f5c48481ffa608fe96816e2c214961269 Mon Sep 17 00:00:00 2001 From: ncompare bot Date: Tue, 19 Mar 2024 13:35:38 +0000 Subject: [PATCH 003/107] /version 1.9.0a1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e760a9a..4255e18 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ncompare" -version = "1.9.0a0" +version = "1.9.0a1" description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" From 714168e9a743ad80d4ab980c99ed102cd2ebaa95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 13:37:16 +0000 Subject: [PATCH 004/107] Bump black from 24.2.0 to 24.3.0 Bumps [black](https://github.com/psf/black) from 24.2.0 to 24.3.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.2.0...24.3.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/poetry.lock b/poetry.lock index 645b956..a88c538 100644 --- a/poetry.lock +++ b/poetry.lock @@ -85,33 +85,33 @@ lxml = ["lxml"] [[package]] name = "black" -version = "24.2.0" +version = "24.3.0" description = "The uncompromising code formatter." optional = false python-versions = ">=3.8" files = [ - {file = "black-24.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6981eae48b3b33399c8757036c7f5d48a535b962a7c2310d19361edeef64ce29"}, - {file = "black-24.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d533d5e3259720fdbc1b37444491b024003e012c5173f7d06825a77508085430"}, - {file = "black-24.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61a0391772490ddfb8a693c067df1ef5227257e72b0e4108482b8d41b5aee13f"}, - {file = "black-24.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:992e451b04667116680cb88f63449267c13e1ad134f30087dec8527242e9862a"}, - {file = "black-24.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:163baf4ef40e6897a2a9b83890e59141cc8c2a98f2dda5080dc15c00ee1e62cd"}, - {file = "black-24.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e37c99f89929af50ffaf912454b3e3b47fd64109659026b678c091a4cd450fb2"}, - {file = "black-24.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f9de21bafcba9683853f6c96c2d515e364aee631b178eaa5145fc1c61a3cc92"}, - {file = "black-24.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:9db528bccb9e8e20c08e716b3b09c6bdd64da0dd129b11e160bf082d4642ac23"}, - {file = "black-24.2.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d84f29eb3ee44859052073b7636533ec995bd0f64e2fb43aeceefc70090e752b"}, - {file = "black-24.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1e08fb9a15c914b81dd734ddd7fb10513016e5ce7e6704bdd5e1251ceee51ac9"}, - {file = "black-24.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:810d445ae6069ce64030c78ff6127cd9cd178a9ac3361435708b907d8a04c693"}, - {file = "black-24.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:ba15742a13de85e9b8f3239c8f807723991fbfae24bad92d34a2b12e81904982"}, - {file = "black-24.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7e53a8c630f71db01b28cd9602a1ada68c937cbf2c333e6ed041390d6968faf4"}, - {file = "black-24.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:93601c2deb321b4bad8f95df408e3fb3943d85012dddb6121336b8e24a0d1218"}, - {file = "black-24.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0057f800de6acc4407fe75bb147b0c2b5cbb7c3ed110d3e5999cd01184d53b0"}, - {file = "black-24.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:faf2ee02e6612577ba0181f4347bcbcf591eb122f7841ae5ba233d12c39dcb4d"}, - {file = "black-24.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:057c3dc602eaa6fdc451069bd027a1b2635028b575a6c3acfd63193ced20d9c8"}, - {file = "black-24.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:08654d0797e65f2423f850fc8e16a0ce50925f9337fb4a4a176a7aa4026e63f8"}, - {file = "black-24.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca610d29415ee1a30a3f30fab7a8f4144e9d34c89a235d81292a1edb2b55f540"}, - {file = "black-24.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:4dd76e9468d5536abd40ffbc7a247f83b2324f0c050556d9c371c2b9a9a95e31"}, - {file = "black-24.2.0-py3-none-any.whl", hash = "sha256:e8a6ae970537e67830776488bca52000eaa37fa63b9988e8c487458d9cd5ace6"}, - {file = "black-24.2.0.tar.gz", hash = "sha256:bce4f25c27c3435e4dace4815bcb2008b87e167e3bf4ee47ccdc5ce906eb4894"}, + {file = "black-24.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7d5e026f8da0322b5662fa7a8e752b3fa2dac1c1cbc213c3d7ff9bdd0ab12395"}, + {file = "black-24.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9f50ea1132e2189d8dff0115ab75b65590a3e97de1e143795adb4ce317934995"}, + {file = "black-24.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2af80566f43c85f5797365077fb64a393861a3730bd110971ab7a0c94e873e7"}, + {file = "black-24.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:4be5bb28e090456adfc1255e03967fb67ca846a03be7aadf6249096100ee32d0"}, + {file = "black-24.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4f1373a7808a8f135b774039f61d59e4be7eb56b2513d3d2f02a8b9365b8a8a9"}, + {file = "black-24.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:aadf7a02d947936ee418777e0247ea114f78aff0d0959461057cae8a04f20597"}, + {file = "black-24.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c02e4ea2ae09d16314d30912a58ada9a5c4fdfedf9512d23326128ac08ac3d"}, + {file = "black-24.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:bf21b7b230718a5f08bd32d5e4f1db7fc8788345c8aea1d155fc17852b3410f5"}, + {file = "black-24.3.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:2818cf72dfd5d289e48f37ccfa08b460bf469e67fb7c4abb07edc2e9f16fb63f"}, + {file = "black-24.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4acf672def7eb1725f41f38bf6bf425c8237248bb0804faa3965c036f7672d11"}, + {file = "black-24.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c7ed6668cbbfcd231fa0dc1b137d3e40c04c7f786e626b405c62bcd5db5857e4"}, + {file = "black-24.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:56f52cfbd3dabe2798d76dbdd299faa046a901041faf2cf33288bc4e6dae57b5"}, + {file = "black-24.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:79dcf34b33e38ed1b17434693763301d7ccbd1c5860674a8f871bd15139e7837"}, + {file = "black-24.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e19cb1c6365fd6dc38a6eae2dcb691d7d83935c10215aef8e6c38edee3f77abd"}, + {file = "black-24.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65b76c275e4c1c5ce6e9870911384bff5ca31ab63d19c76811cb1fb162678213"}, + {file = "black-24.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:b5991d523eee14756f3c8d5df5231550ae8993e2286b8014e2fdea7156ed0959"}, + {file = "black-24.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c45f8dff244b3c431b36e3224b6be4a127c6aca780853574c00faf99258041eb"}, + {file = "black-24.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6905238a754ceb7788a73f02b45637d820b2f5478b20fec82ea865e4f5d4d9f7"}, + {file = "black-24.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7de8d330763c66663661a1ffd432274a2f92f07feeddd89ffd085b5744f85e7"}, + {file = "black-24.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:7bb041dca0d784697af4646d3b62ba4a6b028276ae878e53f6b4f74ddd6db99f"}, + {file = "black-24.3.0-py3-none-any.whl", hash = "sha256:41622020d7120e01d377f74249e677039d20e6344ff5851de8a10f11f513bf93"}, + {file = "black-24.3.0.tar.gz", hash = "sha256:a0c9c4a0771afc6919578cec71ce82a3e31e054904e7197deacbc9382671c41f"}, ] [package.dependencies] From e4d4fbf03d95a968b2adfba753c7a1d95a9dec3b Mon Sep 17 00:00:00 2001 From: ncompare bot Date: Tue, 19 Mar 2024 13:40:38 +0000 Subject: [PATCH 005/107] /version 1.9.0a2 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4255e18..461bca1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ncompare" -version = "1.9.0a1" +version = "1.9.0a2" description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" From d93b68d121871015f41c2cba125387f6d16ad51d Mon Sep 17 00:00:00 2001 From: danielfromearth Date: Tue, 19 Mar 2024 10:01:39 -0400 Subject: [PATCH 006/107] use license Identifier from spdx.org/licenses --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 461bca1..15f1397 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" repository = "https://github.com/nasa/ncompare" -license = "license/LAR-20274-1_ncompare_NetCDF_structural_comparison_tool_NOSA_1.3.pdf" +license = "NASA-1.3" classifiers = [ "Environment :: Console", "Intended Audience :: Science/Research", From 7f77f4473c1cdba0356ef0bdb13b51bac0e61868 Mon Sep 17 00:00:00 2001 From: danielfromearth Date: Tue, 19 Mar 2024 10:01:45 -0400 Subject: [PATCH 007/107] update poetry lock --- poetry.lock | 148 ++++++++++++++++++++++++++-------------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/poetry.lock b/poetry.lock index a88c538..b0d8247 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "appnope" @@ -401,63 +401,63 @@ test = ["pytest"] [[package]] name = "coverage" -version = "7.4.3" +version = "7.4.4" description = "Code coverage measurement for Python" optional = false python-versions = ">=3.8" files = [ - {file = "coverage-7.4.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8580b827d4746d47294c0e0b92854c85a92c2227927433998f0d3320ae8a71b6"}, - {file = "coverage-7.4.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:718187eeb9849fc6cc23e0d9b092bc2348821c5e1a901c9f8975df0bc785bfd4"}, - {file = "coverage-7.4.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:767b35c3a246bcb55b8044fd3a43b8cd553dd1f9f2c1eeb87a302b1f8daa0524"}, - {file = "coverage-7.4.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ae7f19afe0cce50039e2c782bff379c7e347cba335429678450b8fe81c4ef96d"}, - {file = "coverage-7.4.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba3a8aaed13770e970b3df46980cb068d1c24af1a1968b7818b69af8c4347efb"}, - {file = "coverage-7.4.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ee866acc0861caebb4f2ab79f0b94dbfbdbfadc19f82e6e9c93930f74e11d7a0"}, - {file = "coverage-7.4.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:506edb1dd49e13a2d4cac6a5173317b82a23c9d6e8df63efb4f0380de0fbccbc"}, - {file = "coverage-7.4.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd6545d97c98a192c5ac995d21c894b581f1fd14cf389be90724d21808b657e2"}, - {file = "coverage-7.4.3-cp310-cp310-win32.whl", hash = "sha256:f6a09b360d67e589236a44f0c39218a8efba2593b6abdccc300a8862cffc2f94"}, - {file = "coverage-7.4.3-cp310-cp310-win_amd64.whl", hash = "sha256:18d90523ce7553dd0b7e23cbb28865db23cddfd683a38fb224115f7826de78d0"}, - {file = "coverage-7.4.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cbbe5e739d45a52f3200a771c6d2c7acf89eb2524890a4a3aa1a7fa0695d2a47"}, - {file = "coverage-7.4.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:489763b2d037b164846ebac0cbd368b8a4ca56385c4090807ff9fad817de4113"}, - {file = "coverage-7.4.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:451f433ad901b3bb00184d83fd83d135fb682d780b38af7944c9faeecb1e0bfe"}, - {file = "coverage-7.4.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fcc66e222cf4c719fe7722a403888b1f5e1682d1679bd780e2b26c18bb648cdc"}, - {file = "coverage-7.4.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3ec74cfef2d985e145baae90d9b1b32f85e1741b04cd967aaf9cfa84c1334f3"}, - {file = "coverage-7.4.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:abbbd8093c5229c72d4c2926afaee0e6e3140de69d5dcd918b2921f2f0c8baba"}, - {file = "coverage-7.4.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:35eb581efdacf7b7422af677b92170da4ef34500467381e805944a3201df2079"}, - {file = "coverage-7.4.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8249b1c7334be8f8c3abcaaa996e1e4927b0e5a23b65f5bf6cfe3180d8ca7840"}, - {file = "coverage-7.4.3-cp311-cp311-win32.whl", hash = "sha256:cf30900aa1ba595312ae41978b95e256e419d8a823af79ce670835409fc02ad3"}, - {file = "coverage-7.4.3-cp311-cp311-win_amd64.whl", hash = "sha256:18c7320695c949de11a351742ee001849912fd57e62a706d83dfc1581897fa2e"}, - {file = "coverage-7.4.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b51bfc348925e92a9bd9b2e48dad13431b57011fd1038f08316e6bf1df107d10"}, - {file = "coverage-7.4.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d6cdecaedea1ea9e033d8adf6a0ab11107b49571bbb9737175444cea6eb72328"}, - {file = "coverage-7.4.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b2eccb883368f9e972e216c7b4c7c06cabda925b5f06dde0650281cb7666a30"}, - {file = "coverage-7.4.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c00cdc8fa4e50e1cc1f941a7f2e3e0f26cb2a1233c9696f26963ff58445bac7"}, - {file = "coverage-7.4.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9a4a8dd3dcf4cbd3165737358e4d7dfbd9d59902ad11e3b15eebb6393b0446e"}, - {file = "coverage-7.4.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:062b0a75d9261e2f9c6d071753f7eef0fc9caf3a2c82d36d76667ba7b6470003"}, - {file = "coverage-7.4.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:ebe7c9e67a2d15fa97b77ea6571ce5e1e1f6b0db71d1d5e96f8d2bf134303c1d"}, - {file = "coverage-7.4.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:c0a120238dd71c68484f02562f6d446d736adcc6ca0993712289b102705a9a3a"}, - {file = "coverage-7.4.3-cp312-cp312-win32.whl", hash = "sha256:37389611ba54fd6d278fde86eb2c013c8e50232e38f5c68235d09d0a3f8aa352"}, - {file = "coverage-7.4.3-cp312-cp312-win_amd64.whl", hash = "sha256:d25b937a5d9ffa857d41be042b4238dd61db888533b53bc76dc082cb5a15e914"}, - {file = "coverage-7.4.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:28ca2098939eabab044ad68850aac8f8db6bf0b29bc7f2887d05889b17346454"}, - {file = "coverage-7.4.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:280459f0a03cecbe8800786cdc23067a8fc64c0bd51dc614008d9c36e1659d7e"}, - {file = "coverage-7.4.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c0cdedd3500e0511eac1517bf560149764b7d8e65cb800d8bf1c63ebf39edd2"}, - {file = "coverage-7.4.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9a9babb9466fe1da12417a4aed923e90124a534736de6201794a3aea9d98484e"}, - {file = "coverage-7.4.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dec9de46a33cf2dd87a5254af095a409ea3bf952d85ad339751e7de6d962cde6"}, - {file = "coverage-7.4.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:16bae383a9cc5abab9bb05c10a3e5a52e0a788325dc9ba8499e821885928968c"}, - {file = "coverage-7.4.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:2c854ce44e1ee31bda4e318af1dbcfc929026d12c5ed030095ad98197eeeaed0"}, - {file = "coverage-7.4.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ce8c50520f57ec57aa21a63ea4f325c7b657386b3f02ccaedeccf9ebe27686e1"}, - {file = "coverage-7.4.3-cp38-cp38-win32.whl", hash = "sha256:708a3369dcf055c00ddeeaa2b20f0dd1ce664eeabde6623e516c5228b753654f"}, - {file = "coverage-7.4.3-cp38-cp38-win_amd64.whl", hash = "sha256:1bf25fbca0c8d121a3e92a2a0555c7e5bc981aee5c3fdaf4bb7809f410f696b9"}, - {file = "coverage-7.4.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3b253094dbe1b431d3a4ac2f053b6d7ede2664ac559705a704f621742e034f1f"}, - {file = "coverage-7.4.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:77fbfc5720cceac9c200054b9fab50cb2a7d79660609200ab83f5db96162d20c"}, - {file = "coverage-7.4.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6679060424faa9c11808598504c3ab472de4531c571ab2befa32f4971835788e"}, - {file = "coverage-7.4.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4af154d617c875b52651dd8dd17a31270c495082f3d55f6128e7629658d63765"}, - {file = "coverage-7.4.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8640f1fde5e1b8e3439fe482cdc2b0bb6c329f4bb161927c28d2e8879c6029ee"}, - {file = "coverage-7.4.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:69b9f6f66c0af29642e73a520b6fed25ff9fd69a25975ebe6acb297234eda501"}, - {file = "coverage-7.4.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0842571634f39016a6c03e9d4aba502be652a6e4455fadb73cd3a3a49173e38f"}, - {file = "coverage-7.4.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a78ed23b08e8ab524551f52953a8a05d61c3a760781762aac49f8de6eede8c45"}, - {file = "coverage-7.4.3-cp39-cp39-win32.whl", hash = "sha256:c0524de3ff096e15fcbfe8f056fdb4ea0bf497d584454f344d59fce069d3e6e9"}, - {file = "coverage-7.4.3-cp39-cp39-win_amd64.whl", hash = "sha256:0209a6369ccce576b43bb227dc8322d8ef9e323d089c6f3f26a597b09cb4d2aa"}, - {file = "coverage-7.4.3-pp38.pp39.pp310-none-any.whl", hash = "sha256:7cbde573904625509a3f37b6fecea974e363460b556a627c60dc2f47e2fffa51"}, - {file = "coverage-7.4.3.tar.gz", hash = "sha256:276f6077a5c61447a48d133ed13e759c09e62aff0dc84274a68dc18660104d52"}, + {file = "coverage-7.4.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e0be5efd5127542ef31f165de269f77560d6cdef525fffa446de6f7e9186cfb2"}, + {file = "coverage-7.4.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ccd341521be3d1b3daeb41960ae94a5e87abe2f46f17224ba5d6f2b8398016cf"}, + {file = "coverage-7.4.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09fa497a8ab37784fbb20ab699c246053ac294d13fc7eb40ec007a5043ec91f8"}, + {file = "coverage-7.4.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b1a93009cb80730c9bca5d6d4665494b725b6e8e157c1cb7f2db5b4b122ea562"}, + {file = "coverage-7.4.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:690db6517f09336559dc0b5f55342df62370a48f5469fabf502db2c6d1cffcd2"}, + {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:09c3255458533cb76ef55da8cc49ffab9e33f083739c8bd4f58e79fecfe288f7"}, + {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8ce1415194b4a6bd0cdcc3a1dfbf58b63f910dcb7330fe15bdff542c56949f87"}, + {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b91cbc4b195444e7e258ba27ac33769c41b94967919f10037e6355e998af255c"}, + {file = "coverage-7.4.4-cp310-cp310-win32.whl", hash = "sha256:598825b51b81c808cb6f078dcb972f96af96b078faa47af7dfcdf282835baa8d"}, + {file = "coverage-7.4.4-cp310-cp310-win_amd64.whl", hash = "sha256:09ef9199ed6653989ebbcaacc9b62b514bb63ea2f90256e71fea3ed74bd8ff6f"}, + {file = "coverage-7.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0f9f50e7ef2a71e2fae92774c99170eb8304e3fdf9c8c3c7ae9bab3e7229c5cf"}, + {file = "coverage-7.4.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:623512f8ba53c422fcfb2ce68362c97945095b864cda94a92edbaf5994201083"}, + {file = "coverage-7.4.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0513b9508b93da4e1716744ef6ebc507aff016ba115ffe8ecff744d1322a7b63"}, + {file = "coverage-7.4.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40209e141059b9370a2657c9b15607815359ab3ef9918f0196b6fccce8d3230f"}, + {file = "coverage-7.4.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a2b2b78c78293782fd3767d53e6474582f62443d0504b1554370bde86cc8227"}, + {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:73bfb9c09951125d06ee473bed216e2c3742f530fc5acc1383883125de76d9cd"}, + {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1f384c3cc76aeedce208643697fb3e8437604b512255de6d18dae3f27655a384"}, + {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:54eb8d1bf7cacfbf2a3186019bcf01d11c666bd495ed18717162f7eb1e9dd00b"}, + {file = "coverage-7.4.4-cp311-cp311-win32.whl", hash = "sha256:cac99918c7bba15302a2d81f0312c08054a3359eaa1929c7e4b26ebe41e9b286"}, + {file = "coverage-7.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:b14706df8b2de49869ae03a5ccbc211f4041750cd4a66f698df89d44f4bd30ec"}, + {file = "coverage-7.4.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:201bef2eea65e0e9c56343115ba3814e896afe6d36ffd37bab783261db430f76"}, + {file = "coverage-7.4.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41c9c5f3de16b903b610d09650e5e27adbfa7f500302718c9ffd1c12cf9d6818"}, + {file = "coverage-7.4.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d898fe162d26929b5960e4e138651f7427048e72c853607f2b200909794ed978"}, + {file = "coverage-7.4.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ea79bb50e805cd6ac058dfa3b5c8f6c040cb87fe83de10845857f5535d1db70"}, + {file = "coverage-7.4.4-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce4b94265ca988c3f8e479e741693d143026632672e3ff924f25fab50518dd51"}, + {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:00838a35b882694afda09f85e469c96367daa3f3f2b097d846a7216993d37f4c"}, + {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:fdfafb32984684eb03c2d83e1e51f64f0906b11e64482df3c5db936ce3839d48"}, + {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:69eb372f7e2ece89f14751fbcbe470295d73ed41ecd37ca36ed2eb47512a6ab9"}, + {file = "coverage-7.4.4-cp312-cp312-win32.whl", hash = "sha256:137eb07173141545e07403cca94ab625cc1cc6bc4c1e97b6e3846270e7e1fea0"}, + {file = "coverage-7.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:d71eec7d83298f1af3326ce0ff1d0ea83c7cb98f72b577097f9083b20bdaf05e"}, + {file = "coverage-7.4.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d5ae728ff3b5401cc320d792866987e7e7e880e6ebd24433b70a33b643bb0384"}, + {file = "coverage-7.4.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cc4f1358cb0c78edef3ed237ef2c86056206bb8d9140e73b6b89fbcfcbdd40e1"}, + {file = "coverage-7.4.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8130a2aa2acb8788e0b56938786c33c7c98562697bf9f4c7d6e8e5e3a0501e4a"}, + {file = "coverage-7.4.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf271892d13e43bc2b51e6908ec9a6a5094a4df1d8af0bfc360088ee6c684409"}, + {file = "coverage-7.4.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a4cdc86d54b5da0df6d3d3a2f0b710949286094c3a6700c21e9015932b81447e"}, + {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ae71e7ddb7a413dd60052e90528f2f65270aad4b509563af6d03d53e979feafd"}, + {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:38dd60d7bf242c4ed5b38e094baf6401faa114fc09e9e6632374388a404f98e7"}, + {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa5b1c1bfc28384f1f53b69a023d789f72b2e0ab1b3787aae16992a7ca21056c"}, + {file = "coverage-7.4.4-cp38-cp38-win32.whl", hash = "sha256:dfa8fe35a0bb90382837b238fff375de15f0dcdb9ae68ff85f7a63649c98527e"}, + {file = "coverage-7.4.4-cp38-cp38-win_amd64.whl", hash = "sha256:b2991665420a803495e0b90a79233c1433d6ed77ef282e8e152a324bbbc5e0c8"}, + {file = "coverage-7.4.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3b799445b9f7ee8bf299cfaed6f5b226c0037b74886a4e11515e569b36fe310d"}, + {file = "coverage-7.4.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b4d33f418f46362995f1e9d4f3a35a1b6322cb959c31d88ae56b0298e1c22357"}, + {file = "coverage-7.4.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aadacf9a2f407a4688d700e4ebab33a7e2e408f2ca04dbf4aef17585389eff3e"}, + {file = "coverage-7.4.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7c95949560050d04d46b919301826525597f07b33beba6187d04fa64d47ac82e"}, + {file = "coverage-7.4.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff7687ca3d7028d8a5f0ebae95a6e4827c5616b31a4ee1192bdfde697db110d4"}, + {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5fc1de20b2d4a061b3df27ab9b7c7111e9a710f10dc2b84d33a4ab25065994ec"}, + {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c74880fc64d4958159fbd537a091d2a585448a8f8508bf248d72112723974cbd"}, + {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:742a76a12aa45b44d236815d282b03cfb1de3b4323f3e4ec933acfae08e54ade"}, + {file = "coverage-7.4.4-cp39-cp39-win32.whl", hash = "sha256:d89d7b2974cae412400e88f35d86af72208e1ede1a541954af5d944a8ba46c57"}, + {file = "coverage-7.4.4-cp39-cp39-win_amd64.whl", hash = "sha256:9ca28a302acb19b6af89e90f33ee3e1906961f94b54ea37de6737b7ca9d8827c"}, + {file = "coverage-7.4.4-pp38.pp39.pp310-none-any.whl", hash = "sha256:b2c5edc4ac10a7ef6605a966c58929ec6c1bd0917fb8c15cb3363f65aa40e677"}, + {file = "coverage-7.4.4.tar.gz", hash = "sha256:c901df83d097649e257e803be22592aedfd5182f07b3cc87d640bbb9afd50f49"}, ] [package.dependencies] @@ -856,13 +856,13 @@ test-ui = ["calysto-bash"] [[package]] name = "markdown" -version = "3.5.2" +version = "3.6" description = "Python implementation of John Gruber's Markdown." optional = false python-versions = ">=3.8" files = [ - {file = "Markdown-3.5.2-py3-none-any.whl", hash = "sha256:d43323865d89fc0cb9b20c75fc8ad313af307cc087e84b657d9eec768eddeadd"}, - {file = "Markdown-3.5.2.tar.gz", hash = "sha256:e1ac7b3dc550ee80e602e71c1d168002f062e49f1b11e26a36264dafd4df2ef8"}, + {file = "Markdown-3.6-py3-none-any.whl", hash = "sha256:48f276f4d8cfb8ce6527c8f79e2ee29708508bf4d40aa410fbc3b4ee832c850f"}, + {file = "Markdown-3.6.tar.gz", hash = "sha256:ed4f41f6daecbeeb96e576ce414c41d2d876daa9a16cb35fa8ed8c2ddfad0224"}, ] [package.dependencies] @@ -1130,13 +1130,13 @@ pygments = ">2.12.0" [[package]] name = "mkdocs-material" -version = "9.5.13" +version = "9.5.14" description = "Documentation that simply works" optional = false python-versions = ">=3.8" files = [ - {file = "mkdocs_material-9.5.13-py3-none-any.whl", hash = "sha256:5cbe17fee4e3b4980c8420a04cc762d8dc052ef1e10532abd4fce88e5ea9ce6a"}, - {file = "mkdocs_material-9.5.13.tar.gz", hash = "sha256:d8e4caae576312a88fd2609b81cf43d233cdbe36860d67a68702b018b425bd87"}, + {file = "mkdocs_material-9.5.14-py3-none-any.whl", hash = "sha256:a45244ac221fda46ecf8337f00ec0e5cb5348ab9ffb203ca2a0c313b0d4dbc27"}, + {file = "mkdocs_material-9.5.14.tar.gz", hash = "sha256:2a1f8e67cda2587ab93ecea9ba42d0ca61d1d7b5fad8cf690eeaeb39dcd4b9af"}, ] [package.dependencies] @@ -1256,13 +1256,13 @@ files = [ [[package]] name = "nbclient" -version = "0.9.1" +version = "0.10.0" description = "A client library for executing notebooks. Formerly nbconvert's ExecutePreprocessor." optional = false python-versions = ">=3.8.0" files = [ - {file = "nbclient-0.9.1-py3-none-any.whl", hash = "sha256:2c50a866e8dd6c5f655de47d2e252c82d2ebe978574e760ac229f5950593a434"}, - {file = "nbclient-0.9.1.tar.gz", hash = "sha256:4f7b78c6c2a380e228f8a3bb469b847cb24e5b8ad6fda410691b5621e05ce5a2"}, + {file = "nbclient-0.10.0-py3-none-any.whl", hash = "sha256:f13e3529332a1f1f81d82a53210322476a168bb7090a0289c795fe9cc11c9d3f"}, + {file = "nbclient-0.10.0.tar.gz", hash = "sha256:4b3f1b7dba531e498449c4db4f53da339c91d449dc11e9af3a43b4eb5c5abb09"}, ] [package.dependencies] @@ -1316,13 +1316,13 @@ webpdf = ["playwright"] [[package]] name = "nbformat" -version = "5.10.2" +version = "5.10.3" description = "The Jupyter Notebook format" optional = false python-versions = ">=3.8" files = [ - {file = "nbformat-5.10.2-py3-none-any.whl", hash = "sha256:7381189a0d537586b3f18bae5dbad347d7dd0a7cf0276b09cdcd5c24d38edd99"}, - {file = "nbformat-5.10.2.tar.gz", hash = "sha256:c535b20a0d4310167bf4d12ad31eccfb0dc61e6392d6f8c570ab5b45a06a49a3"}, + {file = "nbformat-5.10.3-py3-none-any.whl", hash = "sha256:d9476ca28676799af85385f409b49d95e199951477a159a576ef2a675151e5e8"}, + {file = "nbformat-5.10.3.tar.gz", hash = "sha256:60ed5e910ef7c6264b87d644f276b1b49e24011930deef54605188ddeb211685"}, ] [package.dependencies] @@ -2004,13 +2004,13 @@ cffi = {version = "*", markers = "implementation_name == \"pypy\""} [[package]] name = "referencing" -version = "0.33.0" +version = "0.34.0" description = "JSON Referencing + Python" optional = false python-versions = ">=3.8" files = [ - {file = "referencing-0.33.0-py3-none-any.whl", hash = "sha256:39240f2ecc770258f28b642dd47fd74bc8b02484de54e1882b74b35ebd779bd5"}, - {file = "referencing-0.33.0.tar.gz", hash = "sha256:c775fedf74bc0f9189c2a3be1c12fd03e8c23f4d371dce795df44e06c5b412f7"}, + {file = "referencing-0.34.0-py3-none-any.whl", hash = "sha256:d53ae300ceddd3169f1ffa9caf2cb7b769e92657e4fafb23d34b93679116dfd4"}, + {file = "referencing-0.34.0.tar.gz", hash = "sha256:5773bd84ef41799a5a8ca72dc34590c041eb01bf9aa02632b4a973fb0181a844"}, ] [package.dependencies] @@ -2518,18 +2518,18 @@ viz = ["matplotlib", "nc-time-axis", "seaborn"] [[package]] name = "zipp" -version = "3.17.0" +version = "3.18.1" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, - {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, + {file = "zipp-3.18.1-py3-none-any.whl", hash = "sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b"}, + {file = "zipp-3.18.1.tar.gz", hash = "sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] [metadata] lock-version = "2.0" From 17b7e11c9cf41c0f8d19ab735ac6fafb603ba9af Mon Sep 17 00:00:00 2001 From: ncompare bot Date: Tue, 19 Mar 2024 14:04:00 +0000 Subject: [PATCH 008/107] /version 1.9.0a3 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 15f1397..8fe21ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ncompare" -version = "1.9.0a2" +version = "1.9.0a3" description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" From 21f85e78955f885fe79447f121e28d0439c7c4d0 Mon Sep 17 00:00:00 2001 From: danielfromearth Date: Tue, 19 Mar 2024 10:11:33 -0400 Subject: [PATCH 009/107] update codecov version in actions --- .github/workflows/reusable_run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable_run_tests.yml b/.github/workflows/reusable_run_tests.yml index 9945944..e6c2406 100644 --- a/.github/workflows/reusable_run_tests.yml +++ b/.github/workflows/reusable_run_tests.yml @@ -42,6 +42,6 @@ jobs: poetry run pytest --cov=ncompare --cov-report=xml:build/reports/coverage${{ matrix.python-version }}.xml --cov-report=html:build/reports/coverage${{ matrix.python-version }}.html --cov-report= tests/ - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v4.1.0 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 289cf8e2654cad09e5e60b9d4d03757dea8e8541 Mon Sep 17 00:00:00 2001 From: ncompare bot Date: Tue, 19 Mar 2024 14:14:01 +0000 Subject: [PATCH 010/107] /version 1.9.0a4 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8fe21ce..ae995be 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ncompare" -version = "1.9.0a3" +version = "1.9.0a4" description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" From 71753b12f8218c50d4b7052d49eda2c8e94b0317 Mon Sep 17 00:00:00 2001 From: danielfromearth Date: Tue, 19 Mar 2024 10:19:03 -0400 Subject: [PATCH 011/107] update codecov config in action --- .github/workflows/reusable_run_tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable_run_tests.yml b/.github/workflows/reusable_run_tests.yml index e6c2406..d048ff9 100644 --- a/.github/workflows/reusable_run_tests.yml +++ b/.github/workflows/reusable_run_tests.yml @@ -43,5 +43,7 @@ jobs: - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4.1.0 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + with: + verbose: true + token: ${{ secrets.CODECOV_TOKEN }} + fail_ci_if_error: true From ebd61c226089e7f636217aeaacad42ec0942fa93 Mon Sep 17 00:00:00 2001 From: danielfromearth Date: Tue, 19 Mar 2024 10:35:31 -0400 Subject: [PATCH 012/107] use 'with' syntax for codecov --- .github/workflows/reusable_run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable_run_tests.yml b/.github/workflows/reusable_run_tests.yml index d048ff9..d480d12 100644 --- a/.github/workflows/reusable_run_tests.yml +++ b/.github/workflows/reusable_run_tests.yml @@ -45,5 +45,5 @@ jobs: uses: codecov/codecov-action@v4.1.0 with: verbose: true - token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true + token: ${{ secrets.CODECOV_TOKEN }} # required From 0c708c982ffdb3490647a253c9c9ac0c8c62b7a0 Mon Sep 17 00:00:00 2001 From: danielfromearth Date: Tue, 19 Mar 2024 10:43:16 -0400 Subject: [PATCH 013/107] revert codecov-action to v3 until v4 fix, following https://github.com/oras-project/oras/issues/1291 --- .github/workflows/reusable_run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable_run_tests.yml b/.github/workflows/reusable_run_tests.yml index d480d12..4ba6d36 100644 --- a/.github/workflows/reusable_run_tests.yml +++ b/.github/workflows/reusable_run_tests.yml @@ -42,7 +42,7 @@ jobs: poetry run pytest --cov=ncompare --cov-report=xml:build/reports/coverage${{ matrix.python-version }}.xml --cov-report=html:build/reports/coverage${{ matrix.python-version }}.html --cov-report= tests/ - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v4.1.0 + uses: codecov/codecov-action@v3 with: verbose: true fail_ci_if_error: true From e3b2dfcbbb2f5936030b7b81acef5eae409f4a7d Mon Sep 17 00:00:00 2001 From: ncompare bot Date: Tue, 19 Mar 2024 14:45:09 +0000 Subject: [PATCH 014/107] /version 1.9.0a5 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ae995be..da5e8ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ncompare" -version = "1.9.0a4" +version = "1.9.0a5" description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" From 0a6110c8d632194b48222671e6b1aed31c752b90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 21:15:07 +0000 Subject: [PATCH 015/107] Bump codecov/codecov-action from 3 to 4 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/reusable_run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable_run_tests.yml b/.github/workflows/reusable_run_tests.yml index 4ba6d36..9ff204a 100644 --- a/.github/workflows/reusable_run_tests.yml +++ b/.github/workflows/reusable_run_tests.yml @@ -42,7 +42,7 @@ jobs: poetry run pytest --cov=ncompare --cov-report=xml:build/reports/coverage${{ matrix.python-version }}.xml --cov-report=html:build/reports/coverage${{ matrix.python-version }}.html --cov-report= tests/ - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: verbose: true fail_ci_if_error: true From cbc490e451d608575faab5a57bf124f6236e78cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 21:26:37 +0000 Subject: [PATCH 016/107] Bump ruff from 0.3.3 to 0.3.4 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.3.3 to 0.3.4. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.3.3...v0.3.4) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 38 +++++++++++++++++++------------------- pyproject.toml | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/poetry.lock b/poetry.lock index b0d8247..f881ec1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2250,28 +2250,28 @@ files = [ [[package]] name = "ruff" -version = "0.3.3" +version = "0.3.4" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.3.3-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:973a0e388b7bc2e9148c7f9be8b8c6ae7471b9be37e1cc732f8f44a6f6d7720d"}, - {file = "ruff-0.3.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:cfa60d23269d6e2031129b053fdb4e5a7b0637fc6c9c0586737b962b2f834493"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1eca7ff7a47043cf6ce5c7f45f603b09121a7cc047447744b029d1b719278eb5"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e7d3f6762217c1da954de24b4a1a70515630d29f71e268ec5000afe81377642d"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b24c19e8598916d9c6f5a5437671f55ee93c212a2c4c569605dc3842b6820386"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:5a6cbf216b69c7090f0fe4669501a27326c34e119068c1494f35aaf4cc683778"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:352e95ead6964974b234e16ba8a66dad102ec7bf8ac064a23f95371d8b198aab"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d6ab88c81c4040a817aa432484e838aaddf8bfd7ca70e4e615482757acb64f8"}, - {file = "ruff-0.3.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79bca3a03a759cc773fca69e0bdeac8abd1c13c31b798d5bb3c9da4a03144a9f"}, - {file = "ruff-0.3.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:2700a804d5336bcffe063fd789ca2c7b02b552d2e323a336700abb8ae9e6a3f8"}, - {file = "ruff-0.3.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:fd66469f1a18fdb9d32e22b79f486223052ddf057dc56dea0caaf1a47bdfaf4e"}, - {file = "ruff-0.3.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:45817af234605525cdf6317005923bf532514e1ea3d9270acf61ca2440691376"}, - {file = "ruff-0.3.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:0da458989ce0159555ef224d5b7c24d3d2e4bf4c300b85467b08c3261c6bc6a8"}, - {file = "ruff-0.3.3-py3-none-win32.whl", hash = "sha256:f2831ec6a580a97f1ea82ea1eda0401c3cdf512cf2045fa3c85e8ef109e87de0"}, - {file = "ruff-0.3.3-py3-none-win_amd64.whl", hash = "sha256:be90bcae57c24d9f9d023b12d627e958eb55f595428bafcb7fec0791ad25ddfc"}, - {file = "ruff-0.3.3-py3-none-win_arm64.whl", hash = "sha256:0171aab5fecdc54383993389710a3d1227f2da124d76a2784a7098e818f92d61"}, - {file = "ruff-0.3.3.tar.gz", hash = "sha256:38671be06f57a2f8aba957d9f701ea889aa5736be806f18c0cd03d6ff0cbca8d"}, + {file = "ruff-0.3.4-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:60c870a7d46efcbc8385d27ec07fe534ac32f3b251e4fc44b3cbfd9e09609ef4"}, + {file = "ruff-0.3.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:6fc14fa742e1d8f24910e1fff0bd5e26d395b0e0e04cc1b15c7c5e5fe5b4af91"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d3ee7880f653cc03749a3bfea720cf2a192e4f884925b0cf7eecce82f0ce5854"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cf133dd744f2470b347f602452a88e70dadfbe0fcfb5fd46e093d55da65f82f7"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3f3860057590e810c7ffea75669bdc6927bfd91e29b4baa9258fd48b540a4365"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:986f2377f7cf12efac1f515fc1a5b753c000ed1e0a6de96747cdf2da20a1b369"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fd98e85869603e65f554fdc5cddf0712e352fe6e61d29d5a6fe087ec82b76c"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:64abeed785dad51801b423fa51840b1764b35d6c461ea8caef9cf9e5e5ab34d9"}, + {file = "ruff-0.3.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df52972138318bc7546d92348a1ee58449bc3f9eaf0db278906eb511889c4b50"}, + {file = "ruff-0.3.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:98e98300056445ba2cc27d0b325fd044dc17fcc38e4e4d2c7711585bd0a958ed"}, + {file = "ruff-0.3.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:519cf6a0ebed244dce1dc8aecd3dc99add7a2ee15bb68cf19588bb5bf58e0488"}, + {file = "ruff-0.3.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:bb0acfb921030d00070539c038cd24bb1df73a2981e9f55942514af8b17be94e"}, + {file = "ruff-0.3.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:cf187a7e7098233d0d0c71175375c5162f880126c4c716fa28a8ac418dcf3378"}, + {file = "ruff-0.3.4-py3-none-win32.whl", hash = "sha256:af27ac187c0a331e8ef91d84bf1c3c6a5dea97e912a7560ac0cef25c526a4102"}, + {file = "ruff-0.3.4-py3-none-win_amd64.whl", hash = "sha256:de0d5069b165e5a32b3c6ffbb81c350b1e3d3483347196ffdf86dc0ef9e37dd6"}, + {file = "ruff-0.3.4-py3-none-win_arm64.whl", hash = "sha256:6810563cc08ad0096b57c717bd78aeac888a1bfd38654d9113cb3dc4d3f74232"}, + {file = "ruff-0.3.4.tar.gz", hash = "sha256:f0f4484c6541a99862b693e13a151435a279b271cff20e37101116a21e2a1ad1"}, ] [[package]] @@ -2534,4 +2534,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "8b0395c9bf88cdaef3b5b91a261eff4104da2dc61753f26383a8e1200c5f31ce" +content-hash = "1495c02b2d76f8d9adbacfab7d6b77ede2406160760b8fd3066e7105cdabda79" diff --git a/pyproject.toml b/pyproject.toml index da5e8ee..5f2b4bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ openpyxl = "^3.1.2" [tool.poetry.group.dev.dependencies] pytest = ">=7.4.2,<9.0.0" -ruff = ">=0.0.291,<0.3.4" +ruff = ">=0.0.291,<0.3.5" black = ">=23.9.1,<25.0.0" mypy = "^1.5.1" pytest-cov = "^4.1.0" From 1457d7ab67c87c502174a2a0fc14df2212ecb534 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 21:28:57 +0000 Subject: [PATCH 017/107] Bump mkdocs-material from 9.5.14 to 9.5.15 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.14 to 9.5.15. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.14...9.5.15) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index b0d8247..f1517a8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1130,13 +1130,13 @@ pygments = ">2.12.0" [[package]] name = "mkdocs-material" -version = "9.5.14" +version = "9.5.15" description = "Documentation that simply works" optional = false python-versions = ">=3.8" files = [ - {file = "mkdocs_material-9.5.14-py3-none-any.whl", hash = "sha256:a45244ac221fda46ecf8337f00ec0e5cb5348ab9ffb203ca2a0c313b0d4dbc27"}, - {file = "mkdocs_material-9.5.14.tar.gz", hash = "sha256:2a1f8e67cda2587ab93ecea9ba42d0ca61d1d7b5fad8cf690eeaeb39dcd4b9af"}, + {file = "mkdocs_material-9.5.15-py3-none-any.whl", hash = "sha256:e5c96dec3d19491de49ca643fc1dbb92b278e43cdb816c775bc47db77d9b62fb"}, + {file = "mkdocs_material-9.5.15.tar.gz", hash = "sha256:39f03cca45e82bf54eb7456b5a18bd252eabfdd67f237a229471484a0a4d4635"}, ] [package.dependencies] From a5fe9b00fb6b802b7e4af81efa34a01bba52cfdd Mon Sep 17 00:00:00 2001 From: ncompare bot Date: Mon, 25 Mar 2024 21:57:23 +0000 Subject: [PATCH 018/107] /version 1.9.0a6 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5f2b4bb..f04259a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ncompare" -version = "1.9.0a5" +version = "1.9.0a6" description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" From 5eaa1584b48ea46220065318f4806bc2378ab220 Mon Sep 17 00:00:00 2001 From: ncompare bot Date: Tue, 26 Mar 2024 13:12:15 +0000 Subject: [PATCH 019/107] /version 1.9.0a7 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f04259a..c444457 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ncompare" -version = "1.9.0a6" +version = "1.9.0a7" description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" From e9cc7964e464d7fa193e860f06bd278966f58735 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 21:35:13 +0000 Subject: [PATCH 020/107] Bump ruff from 0.3.4 to 0.3.5 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.3.4 to 0.3.5. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.3.4...v0.3.5) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 38 +++++++++++++++++++------------------- pyproject.toml | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/poetry.lock b/poetry.lock index 53f10fe..9d7609e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2250,28 +2250,28 @@ files = [ [[package]] name = "ruff" -version = "0.3.4" +version = "0.3.5" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.3.4-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:60c870a7d46efcbc8385d27ec07fe534ac32f3b251e4fc44b3cbfd9e09609ef4"}, - {file = "ruff-0.3.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:6fc14fa742e1d8f24910e1fff0bd5e26d395b0e0e04cc1b15c7c5e5fe5b4af91"}, - {file = "ruff-0.3.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d3ee7880f653cc03749a3bfea720cf2a192e4f884925b0cf7eecce82f0ce5854"}, - {file = "ruff-0.3.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cf133dd744f2470b347f602452a88e70dadfbe0fcfb5fd46e093d55da65f82f7"}, - {file = "ruff-0.3.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3f3860057590e810c7ffea75669bdc6927bfd91e29b4baa9258fd48b540a4365"}, - {file = "ruff-0.3.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:986f2377f7cf12efac1f515fc1a5b753c000ed1e0a6de96747cdf2da20a1b369"}, - {file = "ruff-0.3.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fd98e85869603e65f554fdc5cddf0712e352fe6e61d29d5a6fe087ec82b76c"}, - {file = "ruff-0.3.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:64abeed785dad51801b423fa51840b1764b35d6c461ea8caef9cf9e5e5ab34d9"}, - {file = "ruff-0.3.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df52972138318bc7546d92348a1ee58449bc3f9eaf0db278906eb511889c4b50"}, - {file = "ruff-0.3.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:98e98300056445ba2cc27d0b325fd044dc17fcc38e4e4d2c7711585bd0a958ed"}, - {file = "ruff-0.3.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:519cf6a0ebed244dce1dc8aecd3dc99add7a2ee15bb68cf19588bb5bf58e0488"}, - {file = "ruff-0.3.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:bb0acfb921030d00070539c038cd24bb1df73a2981e9f55942514af8b17be94e"}, - {file = "ruff-0.3.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:cf187a7e7098233d0d0c71175375c5162f880126c4c716fa28a8ac418dcf3378"}, - {file = "ruff-0.3.4-py3-none-win32.whl", hash = "sha256:af27ac187c0a331e8ef91d84bf1c3c6a5dea97e912a7560ac0cef25c526a4102"}, - {file = "ruff-0.3.4-py3-none-win_amd64.whl", hash = "sha256:de0d5069b165e5a32b3c6ffbb81c350b1e3d3483347196ffdf86dc0ef9e37dd6"}, - {file = "ruff-0.3.4-py3-none-win_arm64.whl", hash = "sha256:6810563cc08ad0096b57c717bd78aeac888a1bfd38654d9113cb3dc4d3f74232"}, - {file = "ruff-0.3.4.tar.gz", hash = "sha256:f0f4484c6541a99862b693e13a151435a279b271cff20e37101116a21e2a1ad1"}, + {file = "ruff-0.3.5-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:aef5bd3b89e657007e1be6b16553c8813b221ff6d92c7526b7e0227450981eac"}, + {file = "ruff-0.3.5-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:89b1e92b3bd9fca249153a97d23f29bed3992cff414b222fcd361d763fc53f12"}, + {file = "ruff-0.3.5-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e55771559c89272c3ebab23326dc23e7f813e492052391fe7950c1a5a139d89"}, + {file = "ruff-0.3.5-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dabc62195bf54b8a7876add6e789caae0268f34582333cda340497c886111c39"}, + {file = "ruff-0.3.5-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a05f3793ba25f194f395578579c546ca5d83e0195f992edc32e5907d142bfa3"}, + {file = "ruff-0.3.5-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:dfd3504e881082959b4160ab02f7a205f0fadc0a9619cc481982b6837b2fd4c0"}, + {file = "ruff-0.3.5-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:87258e0d4b04046cf1d6cc1c56fadbf7a880cc3de1f7294938e923234cf9e498"}, + {file = "ruff-0.3.5-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:712e71283fc7d9f95047ed5f793bc019b0b0a29849b14664a60fd66c23b96da1"}, + {file = "ruff-0.3.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a532a90b4a18d3f722c124c513ffb5e5eaff0cc4f6d3aa4bda38e691b8600c9f"}, + {file = "ruff-0.3.5-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:122de171a147c76ada00f76df533b54676f6e321e61bd8656ae54be326c10296"}, + {file = "ruff-0.3.5-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d80a6b18a6c3b6ed25b71b05eba183f37d9bc8b16ace9e3d700997f00b74660b"}, + {file = "ruff-0.3.5-py3-none-musllinux_1_2_i686.whl", hash = "sha256:a7b6e63194c68bca8e71f81de30cfa6f58ff70393cf45aab4c20f158227d5936"}, + {file = "ruff-0.3.5-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:a759d33a20c72f2dfa54dae6e85e1225b8e302e8ac655773aff22e542a300985"}, + {file = "ruff-0.3.5-py3-none-win32.whl", hash = "sha256:9d8605aa990045517c911726d21293ef4baa64f87265896e491a05461cae078d"}, + {file = "ruff-0.3.5-py3-none-win_amd64.whl", hash = "sha256:dc56bb16a63c1303bd47563c60482a1512721053d93231cf7e9e1c6954395a0e"}, + {file = "ruff-0.3.5-py3-none-win_arm64.whl", hash = "sha256:faeeae9905446b975dcf6d4499dc93439b131f1443ee264055c5716dd947af55"}, + {file = "ruff-0.3.5.tar.gz", hash = "sha256:a067daaeb1dc2baf9b82a32dae67d154d95212080c80435eb052d95da647763d"}, ] [[package]] @@ -2534,4 +2534,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "1495c02b2d76f8d9adbacfab7d6b77ede2406160760b8fd3066e7105cdabda79" +content-hash = "c95e39d20b902b465b2c5b0b484974513d7d98d6a048044be5caaf63f7753a30" diff --git a/pyproject.toml b/pyproject.toml index c444457..93e2e83 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ openpyxl = "^3.1.2" [tool.poetry.group.dev.dependencies] pytest = ">=7.4.2,<9.0.0" -ruff = ">=0.0.291,<0.3.5" +ruff = ">=0.0.291,<0.3.6" black = ">=23.9.1,<25.0.0" mypy = "^1.5.1" pytest-cov = "^4.1.0" From de55a48c4549b00495dd018686745dc84a30ce3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 21:37:00 +0000 Subject: [PATCH 021/107] Bump xarray from 2024.2.0 to 2024.3.0 Bumps [xarray](https://github.com/pydata/xarray) from 2024.2.0 to 2024.3.0. - [Release notes](https://github.com/pydata/xarray/releases) - [Changelog](https://github.com/pydata/xarray/blob/main/HOW_TO_RELEASE.md) - [Commits](https://github.com/pydata/xarray/compare/v2024.02.0...v2024.03.0) --- updated-dependencies: - dependency-name: xarray dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 53f10fe..501176b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2494,13 +2494,13 @@ files = [ [[package]] name = "xarray" -version = "2024.2.0" +version = "2024.3.0" description = "N-D labeled arrays and datasets in Python" optional = false python-versions = ">=3.9" files = [ - {file = "xarray-2024.2.0-py3-none-any.whl", hash = "sha256:a31a9b37e39bd5aeb098070a75d6dd4d59019eb339d735b86108b9e0cb391f94"}, - {file = "xarray-2024.2.0.tar.gz", hash = "sha256:a105f02791082c888ebe2622090beaff2e7b68571488d62fe6afdab35b4b717f"}, + {file = "xarray-2024.3.0-py3-none-any.whl", hash = "sha256:ca2bc4da2bf2e7879e15862a7a7c3fc76ad19f6a08931d030220cef39a29118d"}, + {file = "xarray-2024.3.0.tar.gz", hash = "sha256:5c1db19efdde61db7faedad8fc944f4e29698fb6fbd578d352668b63598bd1d8"}, ] [package.dependencies] From cc7d90788f798f146b0a7ef9a099516c3cd907f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:20:30 +0000 Subject: [PATCH 022/107] Bump pytest-cov from 4.1.0 to 5.0.0 Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 4.1.0 to 5.0.0. - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: pytest-cov dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- poetry.lock | 12 ++++++------ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index 9d7609e..af0be2a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1759,13 +1759,13 @@ testing = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygm [[package]] name = "pytest-cov" -version = "4.1.0" +version = "5.0.0" description = "Pytest plugin for measuring coverage." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"}, - {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"}, + {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"}, + {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"}, ] [package.dependencies] @@ -1773,7 +1773,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]} pytest = ">=4.6" [package.extras] -testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"] +testing = ["fields", "hunter", "process-tests", "pytest-xdist", "virtualenv"] [[package]] name = "python-dateutil" @@ -2534,4 +2534,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "c95e39d20b902b465b2c5b0b484974513d7d98d6a048044be5caaf63f7753a30" +content-hash = "4c69f907c01e978e5681c6603d3b28d16dcd8fd00a2d2f5a44f011e364b65702" diff --git a/pyproject.toml b/pyproject.toml index 93e2e83..b82afb3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ pytest = ">=7.4.2,<9.0.0" ruff = ">=0.0.291,<0.3.6" black = ">=23.9.1,<25.0.0" mypy = "^1.5.1" -pytest-cov = "^4.1.0" +pytest-cov = ">=4.1,<6.0" mkdocs = "^1.5.3" markdown-callouts = "^0.4.0" markdown-include = "^0.8.1" From 40c4113b2fffdefbd3a92b589f8c6a2f69ce597e Mon Sep 17 00:00:00 2001 From: Daniel Kaufman <114174502+danielfromearth@users.noreply.github.com> Date: Mon, 8 Apr 2024 13:36:32 -0400 Subject: [PATCH 023/107] Update reusable_run_tests.yml codecov token parameter --- .github/workflows/reusable_run_tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable_run_tests.yml b/.github/workflows/reusable_run_tests.yml index 9ff204a..8124694 100644 --- a/.github/workflows/reusable_run_tests.yml +++ b/.github/workflows/reusable_run_tests.yml @@ -43,7 +43,8 @@ jobs: - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: verbose: true fail_ci_if_error: true - token: ${{ secrets.CODECOV_TOKEN }} # required From 6c5b00c02e385d632f69c569756665df13a2da89 Mon Sep 17 00:00:00 2001 From: Daniel Kaufman <114174502+danielfromearth@users.noreply.github.com> Date: Mon, 8 Apr 2024 13:57:47 -0400 Subject: [PATCH 024/107] Update reusable_run_tests.yml again --- .github/workflows/reusable_run_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable_run_tests.yml b/.github/workflows/reusable_run_tests.yml index 8124694..68b0b53 100644 --- a/.github/workflows/reusable_run_tests.yml +++ b/.github/workflows/reusable_run_tests.yml @@ -43,8 +43,8 @@ jobs: - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: - verbose: true + token: ${{ secrets.CODECOV_TOKEN }} + files: coverage.xml fail_ci_if_error: true + verbose: true From 0c5f7f070497072c670fca7cb4a65d97a4b6ce25 Mon Sep 17 00:00:00 2001 From: Daniel Kaufman <114174502+danielfromearth@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:03:19 -0400 Subject: [PATCH 025/107] Update reusable_run_tests.yml to use codecov-action v3 --- .github/workflows/reusable_run_tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/reusable_run_tests.yml b/.github/workflows/reusable_run_tests.yml index 68b0b53..ac68ce4 100644 --- a/.github/workflows/reusable_run_tests.yml +++ b/.github/workflows/reusable_run_tests.yml @@ -42,9 +42,8 @@ jobs: poetry run pytest --cov=ncompare --cov-report=xml:build/reports/coverage${{ matrix.python-version }}.xml --cov-report=html:build/reports/coverage${{ matrix.python-version }}.html --cov-report= tests/ - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} - files: coverage.xml fail_ci_if_error: true verbose: true From 6447610758810573256224d1c0294e75519c6a75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:03:50 +0000 Subject: [PATCH 026/107] Bump mkdocstrings from 0.24.1 to 0.24.3 Bumps [mkdocstrings](https://github.com/mkdocstrings/mkdocstrings) from 0.24.1 to 0.24.3. - [Release notes](https://github.com/mkdocstrings/mkdocstrings/releases) - [Changelog](https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md) - [Commits](https://github.com/mkdocstrings/mkdocstrings/compare/0.24.1...0.24.3) --- updated-dependencies: - dependency-name: mkdocstrings dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index af0be2a..2251983 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1170,13 +1170,13 @@ files = [ [[package]] name = "mkdocstrings" -version = "0.24.1" +version = "0.24.3" description = "Automatic documentation from sources, for MkDocs." optional = false python-versions = ">=3.8" files = [ - {file = "mkdocstrings-0.24.1-py3-none-any.whl", hash = "sha256:b4206f9a2ca8a648e222d5a0ca1d36ba7dee53c88732818de183b536f9042b5d"}, - {file = "mkdocstrings-0.24.1.tar.gz", hash = "sha256:cc83f9a1c8724fc1be3c2fa071dd73d91ce902ef6a79710249ec8d0ee1064401"}, + {file = "mkdocstrings-0.24.3-py3-none-any.whl", hash = "sha256:5c9cf2a32958cd161d5428699b79c8b0988856b0d4a8c5baf8395fc1bf4087c3"}, + {file = "mkdocstrings-0.24.3.tar.gz", hash = "sha256:f327b234eb8d2551a306735436e157d0a22d45f79963c60a8b585d5f7a94c1d2"}, ] [package.dependencies] From 1db77575af984ec694e4c957af516647e71dc593 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:04:29 +0000 Subject: [PATCH 027/107] Bump mkdocs-material from 9.5.15 to 9.5.17 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.15 to 9.5.17. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.15...9.5.17) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index af0be2a..7b379c5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1130,13 +1130,13 @@ pygments = ">2.12.0" [[package]] name = "mkdocs-material" -version = "9.5.15" +version = "9.5.17" description = "Documentation that simply works" optional = false python-versions = ">=3.8" files = [ - {file = "mkdocs_material-9.5.15-py3-none-any.whl", hash = "sha256:e5c96dec3d19491de49ca643fc1dbb92b278e43cdb816c775bc47db77d9b62fb"}, - {file = "mkdocs_material-9.5.15.tar.gz", hash = "sha256:39f03cca45e82bf54eb7456b5a18bd252eabfdd67f237a229471484a0a4d4635"}, + {file = "mkdocs_material-9.5.17-py3-none-any.whl", hash = "sha256:14a2a60119a785e70e765dd033e6211367aca9fc70230e577c1cf6a326949571"}, + {file = "mkdocs_material-9.5.17.tar.gz", hash = "sha256:06ae1275a72db1989cf6209de9e9ecdfbcfdbc24c58353877b2bb927dbe413e4"}, ] [package.dependencies] From 00b03e996a0492b80df50a07bc6de2dd8617e58c Mon Sep 17 00:00:00 2001 From: Daniel Kaufman <114174502+danielfromearth@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:56:46 -0400 Subject: [PATCH 028/107] Update reusable_run_tests.yml --- .github/workflows/reusable_run_tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable_run_tests.yml b/.github/workflows/reusable_run_tests.yml index ac68ce4..dd0bf4e 100644 --- a/.github/workflows/reusable_run_tests.yml +++ b/.github/workflows/reusable_run_tests.yml @@ -39,11 +39,12 @@ jobs: - name: Run tests with coverage run: | - poetry run pytest --cov=ncompare --cov-report=xml:build/reports/coverage${{ matrix.python-version }}.xml --cov-report=html:build/reports/coverage${{ matrix.python-version }}.html --cov-report= tests/ + poetry run pytest --cov=ncompare --cov-report=xml:build/reports/coverage${{ matrix.python-version }}.xml - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} + directory: build/reports/ fail_ci_if_error: true verbose: true From c0eb7cf4c54fb60dc2d9de4a37e9d3318635899b Mon Sep 17 00:00:00 2001 From: Daniel Kaufman <114174502+danielfromearth@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:22:50 -0400 Subject: [PATCH 029/107] Create LICENSE --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 17ff8cc1d9707645b7f97a84bbc808264cdff330 Mon Sep 17 00:00:00 2001 From: danielfromearth Date: Thu, 11 Apr 2024 13:26:40 -0400 Subject: [PATCH 030/107] add SRA number to README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 2054e12..e2bee45 100644 --- a/README.md +++ b/README.md @@ -190,3 +190,6 @@ BASED ON, OR RESULTING FROM, RECIPIENT'S USE OF THE SUBJECT SOFTWARE, RECIPIENT THE UNITED STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT, TO THE EXTENT PERMITTED BY LAW. RECIPIENT'S SOLE REMEDY FOR ANY SUCH MATTER SHALL BE THE IMMEDIATE, UNILATERAL TERMINATION OF THIS AGREEMENT. + +--- +This package is NASA Software Release Authorization (SRA) # LAR-20274-1 From 3e651439206ec411d26540ce869697b38d11cdc6 Mon Sep 17 00:00:00 2001 From: danielfromearth Date: Thu, 11 Apr 2024 13:32:34 -0400 Subject: [PATCH 031/107] update license identifier in pyproject.toml --- poetry.lock | 132 ++++++++++++++++++++++++------------------------- pyproject.toml | 2 +- 2 files changed, 65 insertions(+), 69 deletions(-) diff --git a/poetry.lock b/poetry.lock index ad9ab78..994d2c6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -591,24 +591,24 @@ dev = ["flake8", "markdown", "twine", "wheel"] [[package]] name = "idna" -version = "3.6" +version = "3.7" description = "Internationalized Domain Names in Applications (IDNA)" optional = false python-versions = ">=3.5" files = [ - {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"}, - {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, + {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"}, + {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"}, ] [[package]] name = "importlib-metadata" -version = "7.0.2" +version = "7.1.0" description = "Read metadata from Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "importlib_metadata-7.0.2-py3-none-any.whl", hash = "sha256:f4bc4c0c070c490abf4ce96d715f68e95923320370efb66143df00199bb6c100"}, - {file = "importlib_metadata-7.0.2.tar.gz", hash = "sha256:198f568f3230878cb1b44fbd7975f87906c22336dba2e4a7f05278c281fbd792"}, + {file = "importlib_metadata-7.1.0-py3-none-any.whl", hash = "sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570"}, + {file = "importlib_metadata-7.1.0.tar.gz", hash = "sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2"}, ] [package.dependencies] @@ -617,7 +617,7 @@ zipp = ">=0.5" [package.extras] docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] perf = ["ipython"] -testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] [[package]] name = "iniconfig" @@ -632,13 +632,13 @@ files = [ [[package]] name = "ipykernel" -version = "6.29.3" +version = "6.29.4" description = "IPython Kernel for Jupyter" optional = false python-versions = ">=3.8" files = [ - {file = "ipykernel-6.29.3-py3-none-any.whl", hash = "sha256:5aa086a4175b0229d4eca211e181fb473ea78ffd9869af36ba7694c947302a21"}, - {file = "ipykernel-6.29.3.tar.gz", hash = "sha256:e14c250d1f9ea3989490225cc1a542781b095a18a19447fcf2b5eaf7d0ac5bd2"}, + {file = "ipykernel-6.29.4-py3-none-any.whl", hash = "sha256:1181e653d95c6808039c509ef8e67c4126b3b3af7781496c7cbfb5ed938a27da"}, + {file = "ipykernel-6.29.4.tar.gz", hash = "sha256:3d44070060f9475ac2092b760123fadf105d2e2493c24848b6691a7c4f42af5c"}, ] [package.dependencies] @@ -1111,13 +1111,12 @@ mkdocs = ">=1.1" [[package]] name = "mkdocs-jupyter" -version = "0.24.6" +version = "0.24.7" description = "Use Jupyter in mkdocs websites" optional = false -python-versions = ">=3.9" +python-versions = ">=3.8" files = [ - {file = "mkdocs_jupyter-0.24.6-py3-none-any.whl", hash = "sha256:56fb7ad796f2414a4143d54a966b805caf315c32413e97f85591623fa87dceca"}, - {file = "mkdocs_jupyter-0.24.6.tar.gz", hash = "sha256:89fcbe8a9523864d5416de1a60711640b6bc2972279d2adf46ed2776c2d9ff7c"}, + {file = "mkdocs_jupyter-0.24.7-py3-none-any.whl", hash = "sha256:893d04bea1e007479a46e4e72852cd4d280c4d358ce4a0445250f3f80c639723"}, ] [package.dependencies] @@ -1278,13 +1277,13 @@ test = ["flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "nbconvert (>= [[package]] name = "nbconvert" -version = "7.16.2" +version = "7.16.3" description = "Converting Jupyter Notebooks (.ipynb files) to other formats. Output formats include asciidoc, html, latex, markdown, pdf, py, rst, script. nbconvert can be used both as a Python library (`import nbconvert`) or as a command line tool (invoked as `jupyter nbconvert ...`)." optional = false python-versions = ">=3.8" files = [ - {file = "nbconvert-7.16.2-py3-none-any.whl", hash = "sha256:0c01c23981a8de0220255706822c40b751438e32467d6a686e26be08ba784382"}, - {file = "nbconvert-7.16.2.tar.gz", hash = "sha256:8310edd41e1c43947e4ecf16614c61469ebc024898eb808cce0999860fc9fb16"}, + {file = "nbconvert-7.16.3-py3-none-any.whl", hash = "sha256:ddeff14beeeedf3dd0bc506623e41e4507e551736de59df69a91f86700292b3b"}, + {file = "nbconvert-7.16.3.tar.gz", hash = "sha256:a6733b78ce3d47c3f85e504998495b07e6ea9cf9bf6ec1c98dda63ec6ad19142"}, ] [package.dependencies] @@ -1311,24 +1310,24 @@ docs = ["ipykernel", "ipython", "myst-parser", "nbsphinx (>=0.2.12)", "pydata-sp qtpdf = ["nbconvert[qtpng]"] qtpng = ["pyqtwebengine (>=5.15)"] serve = ["tornado (>=6.1)"] -test = ["flaky", "ipykernel", "ipywidgets (>=7.5)", "pytest"] +test = ["flaky", "ipykernel", "ipywidgets (>=7.5)", "pytest (>=7)"] webpdf = ["playwright"] [[package]] name = "nbformat" -version = "5.10.3" +version = "5.10.4" description = "The Jupyter Notebook format" optional = false python-versions = ">=3.8" files = [ - {file = "nbformat-5.10.3-py3-none-any.whl", hash = "sha256:d9476ca28676799af85385f409b49d95e199951477a159a576ef2a675151e5e8"}, - {file = "nbformat-5.10.3.tar.gz", hash = "sha256:60ed5e910ef7c6264b87d644f276b1b49e24011930deef54605188ddeb211685"}, + {file = "nbformat-5.10.4-py3-none-any.whl", hash = "sha256:3b48d6c8fbca4b299bf3982ea7db1af21580e4fec269ad087b9e81588891200b"}, + {file = "nbformat-5.10.4.tar.gz", hash = "sha256:322168b14f937a5d11362988ecac2a4952d3d8e3a2cbeb2319584631226d5b3a"}, ] [package.dependencies] -fastjsonschema = "*" +fastjsonschema = ">=2.15" jsonschema = ">=2.6" -jupyter-core = "*" +jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0" traitlets = ">=5.1" [package.extras] @@ -1472,47 +1471,44 @@ files = [ [[package]] name = "pandas" -version = "2.2.1" +version = "2.2.2" description = "Powerful data structures for data analysis, time series, and statistics" optional = false python-versions = ">=3.9" files = [ - {file = "pandas-2.2.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8df8612be9cd1c7797c93e1c5df861b2ddda0b48b08f2c3eaa0702cf88fb5f88"}, - {file = "pandas-2.2.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0f573ab277252ed9aaf38240f3b54cfc90fff8e5cab70411ee1d03f5d51f3944"}, - {file = "pandas-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f02a3a6c83df4026e55b63c1f06476c9aa3ed6af3d89b4f04ea656ccdaaaa359"}, - {file = "pandas-2.2.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c38ce92cb22a4bea4e3929429aa1067a454dcc9c335799af93ba9be21b6beb51"}, - {file = "pandas-2.2.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:c2ce852e1cf2509a69e98358e8458775f89599566ac3775e70419b98615f4b06"}, - {file = "pandas-2.2.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:53680dc9b2519cbf609c62db3ed7c0b499077c7fefda564e330286e619ff0dd9"}, - {file = "pandas-2.2.1-cp310-cp310-win_amd64.whl", hash = "sha256:94e714a1cca63e4f5939cdce5f29ba8d415d85166be3441165edd427dc9f6bc0"}, - {file = "pandas-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f821213d48f4ab353d20ebc24e4faf94ba40d76680642fb7ce2ea31a3ad94f9b"}, - {file = "pandas-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c70e00c2d894cb230e5c15e4b1e1e6b2b478e09cf27cc593a11ef955b9ecc81a"}, - {file = "pandas-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e97fbb5387c69209f134893abc788a6486dbf2f9e511070ca05eed4b930b1b02"}, - {file = "pandas-2.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101d0eb9c5361aa0146f500773395a03839a5e6ecde4d4b6ced88b7e5a1a6403"}, - {file = "pandas-2.2.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7d2ed41c319c9fb4fd454fe25372028dfa417aacb9790f68171b2e3f06eae8cd"}, - {file = "pandas-2.2.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:af5d3c00557d657c8773ef9ee702c61dd13b9d7426794c9dfeb1dc4a0bf0ebc7"}, - {file = "pandas-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:06cf591dbaefb6da9de8472535b185cba556d0ce2e6ed28e21d919704fef1a9e"}, - {file = "pandas-2.2.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:88ecb5c01bb9ca927ebc4098136038519aa5d66b44671861ffab754cae75102c"}, - {file = "pandas-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:04f6ec3baec203c13e3f8b139fb0f9f86cd8c0b94603ae3ae8ce9a422e9f5bee"}, - {file = "pandas-2.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a935a90a76c44fe170d01e90a3594beef9e9a6220021acfb26053d01426f7dc2"}, - {file = "pandas-2.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c391f594aae2fd9f679d419e9a4d5ba4bce5bb13f6a989195656e7dc4b95c8f0"}, - {file = "pandas-2.2.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9d1265545f579edf3f8f0cb6f89f234f5e44ba725a34d86535b1a1d38decbccc"}, - {file = "pandas-2.2.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:11940e9e3056576ac3244baef2fedade891977bcc1cb7e5cc8f8cc7d603edc89"}, - {file = "pandas-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:4acf681325ee1c7f950d058b05a820441075b0dd9a2adf5c4835b9bc056bf4fb"}, - {file = "pandas-2.2.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9bd8a40f47080825af4317d0340c656744f2bfdb6819f818e6ba3cd24c0e1397"}, - {file = "pandas-2.2.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:df0c37ebd19e11d089ceba66eba59a168242fc6b7155cba4ffffa6eccdfb8f16"}, - {file = "pandas-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:739cc70eaf17d57608639e74d63387b0d8594ce02f69e7a0b046f117974b3019"}, - {file = "pandas-2.2.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9d3558d263073ed95e46f4650becff0c5e1ffe0fc3a015de3c79283dfbdb3df"}, - {file = "pandas-2.2.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4aa1d8707812a658debf03824016bf5ea0d516afdea29b7dc14cf687bc4d4ec6"}, - {file = "pandas-2.2.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:76f27a809cda87e07f192f001d11adc2b930e93a2b0c4a236fde5429527423be"}, - {file = "pandas-2.2.1-cp39-cp39-win_amd64.whl", hash = "sha256:1ba21b1d5c0e43416218db63037dbe1a01fc101dc6e6024bcad08123e48004ab"}, - {file = "pandas-2.2.1.tar.gz", hash = "sha256:0ab90f87093c13f3e8fa45b48ba9f39181046e8f3317d3aadb2fffbb1b978572"}, + {file = "pandas-2.2.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:90c6fca2acf139569e74e8781709dccb6fe25940488755716d1d354d6bc58bce"}, + {file = "pandas-2.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4abfe0be0d7221be4f12552995e58723c7422c80a659da13ca382697de830c08"}, + {file = "pandas-2.2.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8635c16bf3d99040fdf3ca3db669a7250ddf49c55dc4aa8fe0ae0fa8d6dcc1f0"}, + {file = "pandas-2.2.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:40ae1dffb3967a52203105a077415a86044a2bea011b5f321c6aa64b379a3f51"}, + {file = "pandas-2.2.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8e5a0b00e1e56a842f922e7fae8ae4077aee4af0acb5ae3622bd4b4c30aedf99"}, + {file = "pandas-2.2.2-cp310-cp310-win_amd64.whl", hash = "sha256:ddf818e4e6c7c6f4f7c8a12709696d193976b591cc7dc50588d3d1a6b5dc8772"}, + {file = "pandas-2.2.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:696039430f7a562b74fa45f540aca068ea85fa34c244d0deee539cb6d70aa288"}, + {file = "pandas-2.2.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8e90497254aacacbc4ea6ae5e7a8cd75629d6ad2b30025a4a8b09aa4faf55151"}, + {file = "pandas-2.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:58b84b91b0b9f4bafac2a0ac55002280c094dfc6402402332c0913a59654ab2b"}, + {file = "pandas-2.2.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d2123dc9ad6a814bcdea0f099885276b31b24f7edf40f6cdbc0912672e22eee"}, + {file = "pandas-2.2.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:2925720037f06e89af896c70bca73459d7e6a4be96f9de79e2d440bd499fe0db"}, + {file = "pandas-2.2.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0cace394b6ea70c01ca1595f839cf193df35d1575986e484ad35c4aeae7266c1"}, + {file = "pandas-2.2.2-cp311-cp311-win_amd64.whl", hash = "sha256:873d13d177501a28b2756375d59816c365e42ed8417b41665f346289adc68d24"}, + {file = "pandas-2.2.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:9dfde2a0ddef507a631dc9dc4af6a9489d5e2e740e226ad426a05cabfbd7c8ef"}, + {file = "pandas-2.2.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1cb51fe389360f3b5a4d57dbd2848a5f033350336ca3b340d1c53a1fad33bcad"}, + {file = "pandas-2.2.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eee3a87076c0756de40b05c5e9a6069c035ba43e8dd71c379e68cab2c20f16ad"}, + {file = "pandas-2.2.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:3e374f59e440d4ab45ca2fffde54b81ac3834cf5ae2cdfa69c90bc03bde04d76"}, + {file = "pandas-2.2.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:43498c0bdb43d55cb162cdc8c06fac328ccb5d2eabe3cadeb3529ae6f0517c32"}, + {file = "pandas-2.2.2-cp312-cp312-win_amd64.whl", hash = "sha256:d187d355ecec3629624fccb01d104da7d7f391db0311145817525281e2804d23"}, + {file = "pandas-2.2.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0ca6377b8fca51815f382bd0b697a0814c8bda55115678cbc94c30aacbb6eff2"}, + {file = "pandas-2.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:001910ad31abc7bf06f49dcc903755d2f7f3a9186c0c040b827e522e9cef0863"}, + {file = "pandas-2.2.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66b479b0bd07204e37583c191535505410daa8df638fd8e75ae1b383851fe921"}, + {file = "pandas-2.2.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a77e9d1c386196879aa5eb712e77461aaee433e54c68cf253053a73b7e49c33a"}, + {file = "pandas-2.2.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:92fd6b027924a7e178ac202cfbe25e53368db90d56872d20ffae94b96c7acc57"}, + {file = "pandas-2.2.2-cp39-cp39-win_amd64.whl", hash = "sha256:640cef9aa381b60e296db324337a554aeeb883ead99dc8f6c18e81a93942f5f4"}, + {file = "pandas-2.2.2.tar.gz", hash = "sha256:9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54"}, ] [package.dependencies] numpy = [ - {version = ">=1.22.4,<2", markers = "python_version < \"3.11\""}, - {version = ">=1.23.2,<2", markers = "python_version == \"3.11\""}, - {version = ">=1.26.0,<2", markers = "python_version >= \"3.12\""}, + {version = ">=1.22.4", markers = "python_version < \"3.11\""}, + {version = ">=1.23.2", markers = "python_version == \"3.11\""}, + {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, ] python-dateutil = ">=2.8.2" pytz = ">=2020.1" @@ -1556,18 +1552,18 @@ files = [ [[package]] name = "parso" -version = "0.8.3" +version = "0.8.4" description = "A Python Parser" optional = false python-versions = ">=3.6" files = [ - {file = "parso-0.8.3-py2.py3-none-any.whl", hash = "sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75"}, - {file = "parso-0.8.3.tar.gz", hash = "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0"}, + {file = "parso-0.8.4-py2.py3-none-any.whl", hash = "sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18"}, + {file = "parso-0.8.4.tar.gz", hash = "sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d"}, ] [package.extras] -qa = ["flake8 (==3.8.3)", "mypy (==0.782)"] -testing = ["docopt", "pytest (<6.0.0)"] +qa = ["flake8 (==5.0.4)", "mypy (==0.971)", "types-setuptools (==67.2.0.1)"] +testing = ["docopt", "pytest"] [[package]] name = "pathspec" @@ -1693,13 +1689,13 @@ tests = ["pytest"] [[package]] name = "pycparser" -version = "2.21" +version = "2.22" description = "C parser in Python" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.8" files = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, + {file = "pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"}, + {file = "pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"}, ] [[package]] @@ -2392,13 +2388,13 @@ test = ["argcomplete (>=3.0.3)", "mypy (>=1.7.0)", "pre-commit", "pytest (>=7.0, [[package]] name = "typing-extensions" -version = "4.10.0" +version = "4.11.0" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.10.0-py3-none-any.whl", hash = "sha256:69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475"}, - {file = "typing_extensions-4.10.0.tar.gz", hash = "sha256:b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb"}, + {file = "typing_extensions-4.11.0-py3-none-any.whl", hash = "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"}, + {file = "typing_extensions-4.11.0.tar.gz", hash = "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0"}, ] [[package]] diff --git a/pyproject.toml b/pyproject.toml index b82afb3..889a41a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ description = "Compare the structure of two NetCDF files at the command line" authors = ["Daniel Kaufman "] readme = "README.md" repository = "https://github.com/nasa/ncompare" -license = "NASA-1.3" +license = "Apache-2.0" classifiers = [ "Environment :: Console", "Intended Audience :: Science/Research", From 4255cf39dbde4c7c46f671b96c0f0d40681aa043 Mon Sep 17 00:00:00 2001 From: danielfromearth Date: Thu, 11 Apr 2024 13:32:47 -0400 Subject: [PATCH 032/107] remove NOSA license file --- ...CDF_structural_comparison_tool_NOSA_1.3.pdf | Bin 174654 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 license/LAR-20274-1_ncompare_NetCDF_structural_comparison_tool_NOSA_1.3.pdf diff --git a/license/LAR-20274-1_ncompare_NetCDF_structural_comparison_tool_NOSA_1.3.pdf b/license/LAR-20274-1_ncompare_NetCDF_structural_comparison_tool_NOSA_1.3.pdf deleted file mode 100644 index b05d8edda690cd1dae08b4328db3a424d36dc265..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174654 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