From ba1ea4fee0802c276b5a281ede5c9488f03e0ddd Mon Sep 17 00:00:00 2001 From: Chris Holden Date: Thu, 24 Oct 2024 12:54:13 -0400 Subject: [PATCH] replace black/isort/flake8 with ruff --- Pipfile | 4 +- Pipfile.lock | 27 ++- alembic_migration/Makefile | 10 +- alembic_migration/Pipfile | 4 +- alembic_migration/Pipfile.lock | 144 +++-------- .../versions/1c8c38951d47_initiation.py | 1 + lambdas/date_generator/Makefile | 10 +- lambdas/date_generator/Pipfile | 4 +- lambdas/date_generator/Pipfile.lock | 126 ++-------- .../tests/test_date_generator_handler.py | 1 + lambdas/downloader/Makefile | 10 +- lambdas/downloader/Pipfile | 4 +- lambdas/downloader/Pipfile.lock | 144 +++-------- lambdas/downloader/handler.py | 3 +- .../tests/test_downloader_handler.py | 5 +- lambdas/link_fetcher/Makefile | 10 +- lambdas/link_fetcher/Pipfile | 4 +- lambdas/link_fetcher/Pipfile.lock | 136 +++-------- lambdas/link_fetcher/handler.py | 5 +- lambdas/link_fetcher/tests/conftest.py | 3 +- .../tests/test_link_fetcher_handler.py | 3 +- lambdas/mock_scihub_product_api/Makefile | 10 +- lambdas/mock_scihub_product_api/Pipfile | 4 +- lambdas/mock_scihub_product_api/Pipfile.lock | 126 ++-------- .../test_mock_scihub_product_api_handler.py | 1 + lambdas/mock_scihub_search_api/Makefile | 10 +- lambdas/mock_scihub_search_api/Pipfile | 4 +- lambdas/mock_scihub_search_api/Pipfile.lock | 126 ++-------- .../test_mock_scihub_search_api_handler.py | 1 + lambdas/requeuer/Makefile | 10 +- lambdas/requeuer/Pipfile | 4 +- lambdas/requeuer/Pipfile.lock | 224 ++++++------------ lambdas/requeuer/handler.py | 1 - lambdas/requeuer/tests/conftest.py | 1 - .../tests/test_requeue_missing_granules.py | 3 +- layers/db/Makefile | 10 +- layers/db/Pipfile | 4 +- layers/db/Pipfile.lock | 144 +++-------- 38 files changed, 387 insertions(+), 954 deletions(-) diff --git a/Pipfile b/Pipfile index e59842f5..8b89d962 100644 --- a/Pipfile +++ b/Pipfile @@ -6,9 +6,7 @@ name = "pypi" [packages] [dev-packages] -flake8 = "==7.1.1" -isort = "==5.13.2" -black = "==23.11.0" +ruff = "==0.7.1" [requires] python_version = "3.11" diff --git a/Pipfile.lock b/Pipfile.lock index d7c560c9..ea51e13f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "4b4b2f1875983717cbeba90c20d1651891c98f6399d97f2ad90f630dcbbe422f" + "sha256": "22080c3afd4085ea96217e2402860297ad2ec03fbb7cfe4bd2eb49945e48b35d" }, "pipfile-spec": 6, "requires": { @@ -123,6 +123,31 @@ ], "markers": "python_version >= '3.8'", "version": "==3.2.0" + }, + "ruff": { + "hashes": [ + "sha256:19aa200ec824c0f36d0c9114c8ec0087082021732979a359d6f3c390a6ff2a37", + "sha256:27c1c52a8d199a257ff1e5582d078eab7145129aa02721815ca8fa4f9612dc35", + "sha256:32f1e8a192e261366c702c5fb2ece9f68d26625f198a25c408861c16dc2dea9c", + "sha256:344cc2b0814047dc8c3a8ff2cd1f3d808bb23c6658db830d25147339d9bf9ea7", + "sha256:4316bbf69d5a859cc937890c7ac7a6551252b6a01b1d2c97e8fc96e45a7c8b4a", + "sha256:56aad830af8a9db644e80098fe4984a948e2b6fc2e73891538f43bbe478461b8", + "sha256:588a34e1ef2ea55b4ddfec26bbe76bc866e92523d8c6cdec5e8aceefeff02d99", + "sha256:658304f02f68d3a83c998ad8bf91f9b4f53e93e5412b8f2388359d55869727fd", + "sha256:699085bf05819588551b11751eff33e9ca58b1b86a6843e1b082a7de40da1565", + "sha256:79d3af9dca4c56043e738a4d6dd1e9444b6d6c10598ac52d146e331eb155a8ad", + "sha256:8422104078324ea250886954e48f1373a8fe7de59283d747c3a7eca050b4e378", + "sha256:94fc32f9cdf72dc75c451e5f072758b118ab8100727168a3df58502b43a599ca", + "sha256:985818742b833bffa543a84d1cc11b5e6871de1b4e0ac3060a59a2bae3969250", + "sha256:9d8a41d4aa2dad1575adb98a82870cf5db5f76b2938cf2206c22c940034a36f4", + "sha256:b517a2011333eb7ce2d402652ecaa0ac1a30c114fbbd55c6b8ee466a7f600ee9", + "sha256:c5c121b46abde94a505175524e51891f829414e093cd8326d6e741ecfc0a9112", + "sha256:cb1bc5ed9403daa7da05475d615739cc0212e861b7306f314379d958592aaa89", + "sha256:f38c41fcde1728736b4eb2b18850f6d1e3eedd9678c914dede554a70d5241307" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==0.7.1" } } } diff --git a/alembic_migration/Makefile b/alembic_migration/Makefile index a1e7ab60..7dce208c 100644 --- a/alembic_migration/Makefile +++ b/alembic_migration/Makefile @@ -7,13 +7,13 @@ install: pipenv install --dev lint: - pipenv run flake8 . - pipenv run isort --check-only --profile black . - pipenv run black --check --diff . + pipenv run ruff format --diff + pipenv run ruff check format: - pipenv run isort --profile black . - pipenv run black . + pipenv run ruff check --fix + pipenv run ruff check --select I --fix + pipenv run ruff format test: pipenv run pytest -s --cov=. --cov-report term-missing tests/ diff --git a/alembic_migration/Pipfile b/alembic_migration/Pipfile index 8a534fe5..d099c64a 100644 --- a/alembic_migration/Pipfile +++ b/alembic_migration/Pipfile @@ -12,15 +12,13 @@ sqlalchemy = "==1.4.0" [dev-packages] db = {editable = true, path = "./../layers/db"} -flake8 = "==7.1.1" -isort = "==5.13.2" -black = "==23.11.0" pytest = "==7.4.3" moto = "==5.0.17" psycopg2 = "==2.9.10" pytest-docker = "==2.0.1" assertpy = "==1.1" pytest-cov = "==4.1.0" +ruff = "==0.7.1" [requires] python_version = "3.11" diff --git a/alembic_migration/Pipfile.lock b/alembic_migration/Pipfile.lock index ac2790c8..d078246b 100644 --- a/alembic_migration/Pipfile.lock +++ b/alembic_migration/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "418a9a314d45547350d410877d377233e976518e4939c2bb7dd0151a9303deca" + "sha256": "3a0c02a88a70b1762cd50bc669a5323d2588c0ce3dce3fa0f5d212144e6efd0d" }, "pipfile-spec": 6, "requires": { @@ -36,11 +36,11 @@ }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "cfnresponse": { "hashes": [ @@ -147,11 +147,11 @@ }, "mako": { "hashes": [ - "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a", - "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc" + "sha256:9ec3a1583713479fae654f83ed9fa8c9a4c16b7bb0daba0e6bbebff50c0d983d", + "sha256:a91198468092a2f1a0de86ca92690fb0cfc43ca90ee17e15d93662b4c04b241a" ], "markers": "python_version >= '3.8'", - "version": "==1.3.5" + "version": "==1.3.6" }, "markupsafe": { "hashes": [ @@ -334,31 +334,6 @@ "markers": "python_version >= '3.7'", "version": "==24.2.0" }, - "black": { - "hashes": [ - "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4", - "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b", - "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f", - "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07", - "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187", - "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6", - "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05", - "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06", - "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e", - "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5", - "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244", - "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f", - "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221", - "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055", - "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479", - "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394", - "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911", - "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142" - ], - "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==23.11.0" - }, "boto3": { "hashes": [ "sha256:18416d07b41e6094101a44f8b881047dcec6b846dad0b9f83b9bbf2f0cd93d07", @@ -370,11 +345,11 @@ }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "certifi": { "hashes": [ @@ -568,14 +543,6 @@ "markers": "python_full_version >= '3.7.0'", "version": "==3.4.0" }, - "click": { - "hashes": [ - "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - ], - "markers": "python_version >= '3.7'", - "version": "==8.1.7" - }, "coverage": { "extras": [ "toml" @@ -684,15 +651,6 @@ "editable": true, "path": "./../layers/db" }, - "flake8": { - "hashes": [ - "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38", - "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.1'", - "version": "==7.1.1" - }, "greenlet": { "hashes": [ "sha256:0153404a4bb921f0ff1abeb5ce8a5131da56b953eda6e14b88dc6bbc04d2049e", @@ -788,15 +746,6 @@ "markers": "python_version >= '3.7'", "version": "==2.0.0" }, - "isort": { - "hashes": [ - "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109", - "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.0'", - "version": "==5.13.2" - }, "jinja2": { "hashes": [ "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369", @@ -880,14 +829,6 @@ "markers": "python_version >= '3.9'", "version": "==3.0.2" }, - "mccabe": { - "hashes": [ - "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", - "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e" - ], - "markers": "python_version >= '3.6'", - "version": "==0.7.0" - }, "moto": { "hashes": [ "sha256:165a291ac0b983f53a09f67f9841f72214c5a1b0c56392d88f7035a6a8718fca", @@ -897,14 +838,6 @@ "markers": "python_version >= '3.8'", "version": "==5.0.17" }, - "mypy-extensions": { - "hashes": [ - "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", - "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" - ], - "markers": "python_version >= '3.5'", - "version": "==1.0.0" - }, "packaging": { "hashes": [ "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", @@ -913,22 +846,6 @@ "markers": "python_version >= '3.8'", "version": "==24.1" }, - "pathspec": { - "hashes": [ - "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", - "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" - ], - "markers": "python_version >= '3.8'", - "version": "==0.12.1" - }, - "platformdirs": { - "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" - ], - "markers": "python_version >= '3.8'", - "version": "==4.3.6" - }, "pluggy": { "hashes": [ "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", @@ -953,14 +870,6 @@ "markers": "python_version >= '3.8'", "version": "==2.9.10" }, - "pycodestyle": { - "hashes": [ - "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3", - "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" - ], - "markers": "python_version >= '3.8'", - "version": "==2.12.1" - }, "pycparser": { "hashes": [ "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", @@ -969,14 +878,6 @@ "markers": "python_version >= '3.8'", "version": "==2.22" }, - "pyflakes": { - "hashes": [ - "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f", - "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a" - ], - "markers": "python_version >= '3.8'", - "version": "==3.2.0" - }, "pytest": { "hashes": [ "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac", @@ -1087,6 +988,31 @@ "markers": "python_version >= '3.8'", "version": "==0.25.3" }, + "ruff": { + "hashes": [ + "sha256:19aa200ec824c0f36d0c9114c8ec0087082021732979a359d6f3c390a6ff2a37", + "sha256:27c1c52a8d199a257ff1e5582d078eab7145129aa02721815ca8fa4f9612dc35", + "sha256:32f1e8a192e261366c702c5fb2ece9f68d26625f198a25c408861c16dc2dea9c", + "sha256:344cc2b0814047dc8c3a8ff2cd1f3d808bb23c6658db830d25147339d9bf9ea7", + "sha256:4316bbf69d5a859cc937890c7ac7a6551252b6a01b1d2c97e8fc96e45a7c8b4a", + "sha256:56aad830af8a9db644e80098fe4984a948e2b6fc2e73891538f43bbe478461b8", + "sha256:588a34e1ef2ea55b4ddfec26bbe76bc866e92523d8c6cdec5e8aceefeff02d99", + "sha256:658304f02f68d3a83c998ad8bf91f9b4f53e93e5412b8f2388359d55869727fd", + "sha256:699085bf05819588551b11751eff33e9ca58b1b86a6843e1b082a7de40da1565", + "sha256:79d3af9dca4c56043e738a4d6dd1e9444b6d6c10598ac52d146e331eb155a8ad", + "sha256:8422104078324ea250886954e48f1373a8fe7de59283d747c3a7eca050b4e378", + "sha256:94fc32f9cdf72dc75c451e5f072758b118ab8100727168a3df58502b43a599ca", + "sha256:985818742b833bffa543a84d1cc11b5e6871de1b4e0ac3060a59a2bae3969250", + "sha256:9d8a41d4aa2dad1575adb98a82870cf5db5f76b2938cf2206c22c940034a36f4", + "sha256:b517a2011333eb7ce2d402652ecaa0ac1a30c114fbbd55c6b8ee466a7f600ee9", + "sha256:c5c121b46abde94a505175524e51891f829414e093cd8326d6e741ecfc0a9112", + "sha256:cb1bc5ed9403daa7da05475d615739cc0212e861b7306f314379d958592aaa89", + "sha256:f38c41fcde1728736b4eb2b18850f6d1e3eedd9678c914dede554a70d5241307" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==0.7.1" + }, "s3transfer": { "hashes": [ "sha256:263ed587a5803c6c708d3ce44dc4dfedaab4c1a32e8329bab818933d79ddcf5d", diff --git a/alembic_migration/versions/1c8c38951d47_initiation.py b/alembic_migration/versions/1c8c38951d47_initiation.py index 2abb47ac..44f6f7d8 100644 --- a/alembic_migration/versions/1c8c38951d47_initiation.py +++ b/alembic_migration/versions/1c8c38951d47_initiation.py @@ -5,6 +5,7 @@ Create Date: 2021-01-14 12:30:09.347153 """ + from alembic import op from sqlalchemy import BigInteger, Boolean, Column, Date, DateTime, SmallInteger, String diff --git a/lambdas/date_generator/Makefile b/lambdas/date_generator/Makefile index 97f35c21..46c62f2e 100644 --- a/lambdas/date_generator/Makefile +++ b/lambdas/date_generator/Makefile @@ -7,13 +7,13 @@ install: pipenv install --dev lint: - pipenv run flake8 . - pipenv run isort --check-only --profile black . - pipenv run black --check --diff . + pipenv run ruff format --diff + pipenv run ruff check format: - pipenv run isort --profile black . - pipenv run black . + pipenv run ruff check --fix + pipenv run ruff check --select I --fix + pipenv run ruff format test: pipenv run pytest -s --cov=handler --cov-report term-missing tests/ diff --git a/lambdas/date_generator/Pipfile b/lambdas/date_generator/Pipfile index 34f8dc09..5f0d3938 100644 --- a/lambdas/date_generator/Pipfile +++ b/lambdas/date_generator/Pipfile @@ -6,13 +6,11 @@ name = "pypi" [packages] [dev-packages] -flake8 = "==7.1.1" -isort = "==5.13.2" -black = "==23.11.0" pytest = "==7.4.3" assertpy = "==1.1" freezegun = "==1.0.0" pytest-cov = "==4.1.0" +ruff = "==0.7.1" [requires] python_version = "3.11" diff --git a/lambdas/date_generator/Pipfile.lock b/lambdas/date_generator/Pipfile.lock index 2fc4eaba..f244ba52 100644 --- a/lambdas/date_generator/Pipfile.lock +++ b/lambdas/date_generator/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "fa9a3508b66ebd4aaf6181d67f23f78fb82e45c0a52bd7254f76e5ea78b26d85" + "sha256": "55adbc472181c2c3d772084eebab301141dd002759d3fb0e87201d1e89f23196" }, "pipfile-spec": 6, "requires": { @@ -24,39 +24,6 @@ "index": "pypi", "version": "==1.1" }, - "black": { - "hashes": [ - "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4", - "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b", - "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f", - "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07", - "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187", - "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6", - "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05", - "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06", - "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e", - "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5", - "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244", - "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f", - "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221", - "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055", - "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479", - "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394", - "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911", - "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142" - ], - "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==23.11.0" - }, - "click": { - "hashes": [ - "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - ], - "markers": "python_version >= '3.7'", - "version": "==8.1.7" - }, "coverage": { "extras": [ "toml" @@ -128,15 +95,6 @@ "markers": "python_version >= '3.9'", "version": "==7.6.4" }, - "flake8": { - "hashes": [ - "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38", - "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.1'", - "version": "==7.1.1" - }, "freezegun": { "hashes": [ "sha256:02b35de52f4699a78f6ac4518e4cd3390dddc43b0aeb978335a8f270a2d9668b", @@ -154,31 +112,6 @@ "markers": "python_version >= '3.7'", "version": "==2.0.0" }, - "isort": { - "hashes": [ - "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109", - "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.0'", - "version": "==5.13.2" - }, - "mccabe": { - "hashes": [ - "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", - "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e" - ], - "markers": "python_version >= '3.6'", - "version": "==0.7.0" - }, - "mypy-extensions": { - "hashes": [ - "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", - "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" - ], - "markers": "python_version >= '3.5'", - "version": "==1.0.0" - }, "packaging": { "hashes": [ "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", @@ -187,22 +120,6 @@ "markers": "python_version >= '3.8'", "version": "==24.1" }, - "pathspec": { - "hashes": [ - "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", - "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" - ], - "markers": "python_version >= '3.8'", - "version": "==0.12.1" - }, - "platformdirs": { - "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" - ], - "markers": "python_version >= '3.8'", - "version": "==4.3.6" - }, "pluggy": { "hashes": [ "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", @@ -211,22 +128,6 @@ "markers": "python_version >= '3.8'", "version": "==1.5.0" }, - "pycodestyle": { - "hashes": [ - "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3", - "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" - ], - "markers": "python_version >= '3.8'", - "version": "==2.12.1" - }, - "pyflakes": { - "hashes": [ - "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f", - "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a" - ], - "markers": "python_version >= '3.8'", - "version": "==3.2.0" - }, "pytest": { "hashes": [ "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac", @@ -253,6 +154,31 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==2.9.0.post0" }, + "ruff": { + "hashes": [ + "sha256:19aa200ec824c0f36d0c9114c8ec0087082021732979a359d6f3c390a6ff2a37", + "sha256:27c1c52a8d199a257ff1e5582d078eab7145129aa02721815ca8fa4f9612dc35", + "sha256:32f1e8a192e261366c702c5fb2ece9f68d26625f198a25c408861c16dc2dea9c", + "sha256:344cc2b0814047dc8c3a8ff2cd1f3d808bb23c6658db830d25147339d9bf9ea7", + "sha256:4316bbf69d5a859cc937890c7ac7a6551252b6a01b1d2c97e8fc96e45a7c8b4a", + "sha256:56aad830af8a9db644e80098fe4984a948e2b6fc2e73891538f43bbe478461b8", + "sha256:588a34e1ef2ea55b4ddfec26bbe76bc866e92523d8c6cdec5e8aceefeff02d99", + "sha256:658304f02f68d3a83c998ad8bf91f9b4f53e93e5412b8f2388359d55869727fd", + "sha256:699085bf05819588551b11751eff33e9ca58b1b86a6843e1b082a7de40da1565", + "sha256:79d3af9dca4c56043e738a4d6dd1e9444b6d6c10598ac52d146e331eb155a8ad", + "sha256:8422104078324ea250886954e48f1373a8fe7de59283d747c3a7eca050b4e378", + "sha256:94fc32f9cdf72dc75c451e5f072758b118ab8100727168a3df58502b43a599ca", + "sha256:985818742b833bffa543a84d1cc11b5e6871de1b4e0ac3060a59a2bae3969250", + "sha256:9d8a41d4aa2dad1575adb98a82870cf5db5f76b2938cf2206c22c940034a36f4", + "sha256:b517a2011333eb7ce2d402652ecaa0ac1a30c114fbbd55c6b8ee466a7f600ee9", + "sha256:c5c121b46abde94a505175524e51891f829414e093cd8326d6e741ecfc0a9112", + "sha256:cb1bc5ed9403daa7da05475d615739cc0212e861b7306f314379d958592aaa89", + "sha256:f38c41fcde1728736b4eb2b18850f6d1e3eedd9678c914dede554a70d5241307" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==0.7.1" + }, "six": { "hashes": [ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", diff --git a/lambdas/date_generator/tests/test_date_generator_handler.py b/lambdas/date_generator/tests/test_date_generator_handler.py index dd25a35e..09580294 100644 --- a/lambdas/date_generator/tests/test_date_generator_handler.py +++ b/lambdas/date_generator/tests/test_date_generator_handler.py @@ -2,6 +2,7 @@ from assertpy import assert_that from freezegun import freeze_time + from handler import get_dates, handler diff --git a/lambdas/downloader/Makefile b/lambdas/downloader/Makefile index 15cb8a24..e372dec0 100644 --- a/lambdas/downloader/Makefile +++ b/lambdas/downloader/Makefile @@ -7,13 +7,13 @@ install: pipenv install --dev lint: - pipenv run flake8 . - pipenv run isort --check-only --profile black . - pipenv run black --check --diff . + pipenv run ruff format --diff + pipenv run ruff check format: - pipenv run isort --profile black . - pipenv run black . + pipenv run ruff check --fix + pipenv run ruff check --select I --fix + pipenv run ruff format test: pipenv run pytest -v --cov=handler --cov-report term-missing tests/ diff --git a/lambdas/downloader/Pipfile b/lambdas/downloader/Pipfile index bd973199..6c5c864c 100644 --- a/lambdas/downloader/Pipfile +++ b/lambdas/downloader/Pipfile @@ -13,9 +13,6 @@ sqlalchemy = "==1.4.0" pytest = "==7.4.3" db = {editable = true, path = "./../../layers/db"} pytest-docker = "==2.0.1" -flake8 = "==7.1.1" -isort = "==5.13.2" -black = "==23.11.0" alembic = "==1.12.1" moto = "==5.0.17" psycopg2 = "==2.9.10" @@ -23,6 +20,7 @@ assertpy = "==1.1" responses = "==0.23.1" freezegun = "==1.0.0" pytest-cov = "==4.1.0" +ruff = "==0.7.1" [requires] python_version = "3.11" diff --git a/lambdas/downloader/Pipfile.lock b/lambdas/downloader/Pipfile.lock index 36660423..51d5a653 100644 --- a/lambdas/downloader/Pipfile.lock +++ b/lambdas/downloader/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "8d385e0547a227ce02a0529e27f763f87c5ad9038c10e06153be1ff886d49e8a" + "sha256": "e58efc825094313dd6dacac89c3e5f270f54cf3f9d550c871d75b84cd7f9c3ab" }, "pipfile-spec": 6, "requires": { @@ -38,11 +38,11 @@ }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "certifi": { "hashes": [ @@ -373,31 +373,6 @@ "markers": "python_version >= '3.7'", "version": "==24.2.0" }, - "black": { - "hashes": [ - "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4", - "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b", - "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f", - "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07", - "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187", - "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6", - "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05", - "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06", - "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e", - "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5", - "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244", - "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f", - "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221", - "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055", - "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479", - "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394", - "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911", - "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142" - ], - "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==23.11.0" - }, "boto3": { "hashes": [ "sha256:18416d07b41e6094101a44f8b881047dcec6b846dad0b9f83b9bbf2f0cd93d07", @@ -409,11 +384,11 @@ }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "certifi": { "hashes": [ @@ -607,14 +582,6 @@ "markers": "python_full_version >= '3.7.0'", "version": "==3.4.0" }, - "click": { - "hashes": [ - "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - ], - "markers": "python_version >= '3.7'", - "version": "==8.1.7" - }, "coverage": { "extras": [ "toml" @@ -723,15 +690,6 @@ "editable": true, "path": "./../../layers/db" }, - "flake8": { - "hashes": [ - "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38", - "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.1'", - "version": "==7.1.1" - }, "freezegun": { "hashes": [ "sha256:02b35de52f4699a78f6ac4518e4cd3390dddc43b0aeb978335a8f270a2d9668b", @@ -836,15 +794,6 @@ "markers": "python_version >= '3.7'", "version": "==2.0.0" }, - "isort": { - "hashes": [ - "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109", - "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.0'", - "version": "==5.13.2" - }, "jinja2": { "hashes": [ "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369", @@ -863,11 +812,11 @@ }, "mako": { "hashes": [ - "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a", - "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc" + "sha256:9ec3a1583713479fae654f83ed9fa8c9a4c16b7bb0daba0e6bbebff50c0d983d", + "sha256:a91198468092a2f1a0de86ca92690fb0cfc43ca90ee17e15d93662b4c04b241a" ], "markers": "python_version >= '3.8'", - "version": "==1.3.5" + "version": "==1.3.6" }, "markupsafe": { "hashes": [ @@ -936,14 +885,6 @@ "markers": "python_version >= '3.9'", "version": "==3.0.2" }, - "mccabe": { - "hashes": [ - "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", - "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e" - ], - "markers": "python_version >= '3.6'", - "version": "==0.7.0" - }, "moto": { "hashes": [ "sha256:165a291ac0b983f53a09f67f9841f72214c5a1b0c56392d88f7035a6a8718fca", @@ -953,14 +894,6 @@ "markers": "python_version >= '3.8'", "version": "==5.0.17" }, - "mypy-extensions": { - "hashes": [ - "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", - "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" - ], - "markers": "python_version >= '3.5'", - "version": "==1.0.0" - }, "packaging": { "hashes": [ "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", @@ -969,22 +902,6 @@ "markers": "python_version >= '3.8'", "version": "==24.1" }, - "pathspec": { - "hashes": [ - "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", - "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" - ], - "markers": "python_version >= '3.8'", - "version": "==0.12.1" - }, - "platformdirs": { - "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" - ], - "markers": "python_version >= '3.8'", - "version": "==4.3.6" - }, "pluggy": { "hashes": [ "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", @@ -1009,14 +926,6 @@ "markers": "python_version >= '3.8'", "version": "==2.9.10" }, - "pycodestyle": { - "hashes": [ - "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3", - "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" - ], - "markers": "python_version >= '3.8'", - "version": "==2.12.1" - }, "pycparser": { "hashes": [ "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", @@ -1025,14 +934,6 @@ "markers": "python_version >= '3.8'", "version": "==2.22" }, - "pyflakes": { - "hashes": [ - "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f", - "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a" - ], - "markers": "python_version >= '3.8'", - "version": "==3.2.0" - }, "pytest": { "hashes": [ "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac", @@ -1145,6 +1046,31 @@ "markers": "python_version >= '3.7'", "version": "==0.23.1" }, + "ruff": { + "hashes": [ + "sha256:19aa200ec824c0f36d0c9114c8ec0087082021732979a359d6f3c390a6ff2a37", + "sha256:27c1c52a8d199a257ff1e5582d078eab7145129aa02721815ca8fa4f9612dc35", + "sha256:32f1e8a192e261366c702c5fb2ece9f68d26625f198a25c408861c16dc2dea9c", + "sha256:344cc2b0814047dc8c3a8ff2cd1f3d808bb23c6658db830d25147339d9bf9ea7", + "sha256:4316bbf69d5a859cc937890c7ac7a6551252b6a01b1d2c97e8fc96e45a7c8b4a", + "sha256:56aad830af8a9db644e80098fe4984a948e2b6fc2e73891538f43bbe478461b8", + "sha256:588a34e1ef2ea55b4ddfec26bbe76bc866e92523d8c6cdec5e8aceefeff02d99", + "sha256:658304f02f68d3a83c998ad8bf91f9b4f53e93e5412b8f2388359d55869727fd", + "sha256:699085bf05819588551b11751eff33e9ca58b1b86a6843e1b082a7de40da1565", + "sha256:79d3af9dca4c56043e738a4d6dd1e9444b6d6c10598ac52d146e331eb155a8ad", + "sha256:8422104078324ea250886954e48f1373a8fe7de59283d747c3a7eca050b4e378", + "sha256:94fc32f9cdf72dc75c451e5f072758b118ab8100727168a3df58502b43a599ca", + "sha256:985818742b833bffa543a84d1cc11b5e6871de1b4e0ac3060a59a2bae3969250", + "sha256:9d8a41d4aa2dad1575adb98a82870cf5db5f76b2938cf2206c22c940034a36f4", + "sha256:b517a2011333eb7ce2d402652ecaa0ac1a30c114fbbd55c6b8ee466a7f600ee9", + "sha256:c5c121b46abde94a505175524e51891f829414e093cd8326d6e741ecfc0a9112", + "sha256:cb1bc5ed9403daa7da05475d615739cc0212e861b7306f314379d958592aaa89", + "sha256:f38c41fcde1728736b4eb2b18850f6d1e3eedd9678c914dede554a70d5241307" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==0.7.1" + }, "s3transfer": { "hashes": [ "sha256:263ed587a5803c6c708d3ce44dc4dfedaab4c1a32e8329bab818933d79ddcf5d", diff --git a/lambdas/downloader/handler.py b/lambdas/downloader/handler.py index 2c712c13..50d8f7b8 100644 --- a/lambdas/downloader/handler.py +++ b/lambdas/downloader/handler.py @@ -11,6 +11,8 @@ from db.models.granule import Granule from db.models.status import Status from db.session import get_session, get_session_maker +from sqlalchemy.exc import SQLAlchemyError + from exceptions import ( ChecksumRetrievalException, CopernicusTokenNotRetrievedException, @@ -22,7 +24,6 @@ GranuleNotFoundException, RetryLimitReachedException, ) -from sqlalchemy.exc import SQLAlchemyError if TYPE_CHECKING: from mypy_boto3_s3.client import S3Client diff --git a/lambdas/downloader/tests/test_downloader_handler.py b/lambdas/downloader/tests/test_downloader_handler.py index 0fc17212..a1bb604b 100644 --- a/lambdas/downloader/tests/test_downloader_handler.py +++ b/lambdas/downloader/tests/test_downloader_handler.py @@ -9,6 +9,9 @@ from botocore.client import ClientError from db.models.granule import Granule from db.models.status import Status +from freezegun import freeze_time +from responses import matchers + from exceptions import ( ChecksumRetrievalException, FailedToDownloadFileException, @@ -19,7 +22,6 @@ GranuleNotFoundException, RetryLimitReachedException, ) -from freezegun import freeze_time from handler import ( download_file, generate_aws_checksum, @@ -30,7 +32,6 @@ increase_retry_count, update_last_file_downloaded_time, ) -from responses import matchers download_url = "http://zipper.dataspace.copernicus.eu/odata/v1/Products(test-id)/$value" checksum_url = "https://catalogue.dataspace.copernicus.eu/odata/v1/Products?$filter=Id eq 'test-id'" diff --git a/lambdas/link_fetcher/Makefile b/lambdas/link_fetcher/Makefile index 15cb8a24..e372dec0 100644 --- a/lambdas/link_fetcher/Makefile +++ b/lambdas/link_fetcher/Makefile @@ -7,13 +7,13 @@ install: pipenv install --dev lint: - pipenv run flake8 . - pipenv run isort --check-only --profile black . - pipenv run black --check --diff . + pipenv run ruff format --diff + pipenv run ruff check format: - pipenv run isort --profile black . - pipenv run black . + pipenv run ruff check --fix + pipenv run ruff check --select I --fix + pipenv run ruff format test: pipenv run pytest -v --cov=handler --cov-report term-missing tests/ diff --git a/lambdas/link_fetcher/Pipfile b/lambdas/link_fetcher/Pipfile index 975f5ae0..9bb9bd47 100644 --- a/lambdas/link_fetcher/Pipfile +++ b/lambdas/link_fetcher/Pipfile @@ -12,9 +12,6 @@ sqlalchemy = "==1.4.0" [dev-packages] boto3-stubs = {version = "==1.17.10.0", extras = ["sqs"]} -flake8 = "==7.1.1" -isort = "==5.13.2" -black = "==23.11.0" freezegun = "==1.0.0" assertpy = "==1.1" pytest = "==7.4.3" @@ -28,6 +25,7 @@ pytest-cov = "==4.1.0" mypy = "==1.6.0" types-requests = "==2.31.0" types-humanfriendly = "*" +ruff = "==0.7.1" [requires] python_version = "3.11" diff --git a/lambdas/link_fetcher/Pipfile.lock b/lambdas/link_fetcher/Pipfile.lock index 1bb4a78a..cbd0adf1 100644 --- a/lambdas/link_fetcher/Pipfile.lock +++ b/lambdas/link_fetcher/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "e7052c123b2fbde4d0b4f7e032a1c4f90c21c40b95a5faa4b03ba51455b2fa61" + "sha256": "72bdce1436bedb770bbee36ae3ac0b7906c80706726f6a408592f7b945935dfc" }, "pipfile-spec": 6, "requires": { @@ -27,11 +27,11 @@ }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "certifi": { "hashes": [ @@ -373,31 +373,6 @@ "markers": "python_version >= '3.7'", "version": "==24.2.0" }, - "black": { - "hashes": [ - "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4", - "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b", - "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f", - "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07", - "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187", - "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6", - "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05", - "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06", - "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e", - "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5", - "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244", - "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f", - "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221", - "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055", - "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479", - "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394", - "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911", - "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142" - ], - "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==23.11.0" - }, "boto3": { "hashes": [ "sha256:18416d07b41e6094101a44f8b881047dcec6b846dad0b9f83b9bbf2f0cd93d07", @@ -420,11 +395,11 @@ }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "certifi": { "hashes": [ @@ -618,14 +593,6 @@ "markers": "python_full_version >= '3.7.0'", "version": "==3.4.0" }, - "click": { - "hashes": [ - "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - ], - "markers": "python_version >= '3.7'", - "version": "==8.1.7" - }, "coverage": { "extras": [ "toml" @@ -734,15 +701,6 @@ "editable": true, "path": "./../../layers/db" }, - "flake8": { - "hashes": [ - "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38", - "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.1'", - "version": "==7.1.1" - }, "freezegun": { "hashes": [ "sha256:02b35de52f4699a78f6ac4518e4cd3390dddc43b0aeb978335a8f270a2d9668b", @@ -847,15 +805,6 @@ "markers": "python_version >= '3.7'", "version": "==2.0.0" }, - "isort": { - "hashes": [ - "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109", - "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.0'", - "version": "==5.13.2" - }, "jinja2": { "hashes": [ "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369", @@ -874,11 +823,11 @@ }, "mako": { "hashes": [ - "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a", - "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc" + "sha256:9ec3a1583713479fae654f83ed9fa8c9a4c16b7bb0daba0e6bbebff50c0d983d", + "sha256:a91198468092a2f1a0de86ca92690fb0cfc43ca90ee17e15d93662b4c04b241a" ], "markers": "python_version >= '3.8'", - "version": "==1.3.5" + "version": "==1.3.6" }, "markupsafe": { "hashes": [ @@ -947,14 +896,6 @@ "markers": "python_version >= '3.9'", "version": "==3.0.2" }, - "mccabe": { - "hashes": [ - "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", - "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e" - ], - "markers": "python_version >= '3.6'", - "version": "==0.7.0" - }, "moto": { "hashes": [ "sha256:165a291ac0b983f53a09f67f9841f72214c5a1b0c56392d88f7035a6a8718fca", @@ -1021,22 +962,6 @@ "markers": "python_version >= '3.8'", "version": "==24.1" }, - "pathspec": { - "hashes": [ - "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", - "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" - ], - "markers": "python_version >= '3.8'", - "version": "==0.12.1" - }, - "platformdirs": { - "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" - ], - "markers": "python_version >= '3.8'", - "version": "==4.3.6" - }, "pluggy": { "hashes": [ "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", @@ -1061,14 +986,6 @@ "markers": "python_version >= '3.8'", "version": "==2.9.10" }, - "pycodestyle": { - "hashes": [ - "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3", - "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" - ], - "markers": "python_version >= '3.8'", - "version": "==2.12.1" - }, "pycparser": { "hashes": [ "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", @@ -1077,14 +994,6 @@ "markers": "python_version >= '3.8'", "version": "==2.22" }, - "pyflakes": { - "hashes": [ - "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f", - "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a" - ], - "markers": "python_version >= '3.8'", - "version": "==3.2.0" - }, "pytest": { "hashes": [ "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac", @@ -1197,6 +1106,31 @@ "markers": "python_version >= '3.7'", "version": "==0.23.1" }, + "ruff": { + "hashes": [ + "sha256:19aa200ec824c0f36d0c9114c8ec0087082021732979a359d6f3c390a6ff2a37", + "sha256:27c1c52a8d199a257ff1e5582d078eab7145129aa02721815ca8fa4f9612dc35", + "sha256:32f1e8a192e261366c702c5fb2ece9f68d26625f198a25c408861c16dc2dea9c", + "sha256:344cc2b0814047dc8c3a8ff2cd1f3d808bb23c6658db830d25147339d9bf9ea7", + "sha256:4316bbf69d5a859cc937890c7ac7a6551252b6a01b1d2c97e8fc96e45a7c8b4a", + "sha256:56aad830af8a9db644e80098fe4984a948e2b6fc2e73891538f43bbe478461b8", + "sha256:588a34e1ef2ea55b4ddfec26bbe76bc866e92523d8c6cdec5e8aceefeff02d99", + "sha256:658304f02f68d3a83c998ad8bf91f9b4f53e93e5412b8f2388359d55869727fd", + "sha256:699085bf05819588551b11751eff33e9ca58b1b86a6843e1b082a7de40da1565", + "sha256:79d3af9dca4c56043e738a4d6dd1e9444b6d6c10598ac52d146e331eb155a8ad", + "sha256:8422104078324ea250886954e48f1373a8fe7de59283d747c3a7eca050b4e378", + "sha256:94fc32f9cdf72dc75c451e5f072758b118ab8100727168a3df58502b43a599ca", + "sha256:985818742b833bffa543a84d1cc11b5e6871de1b4e0ac3060a59a2bae3969250", + "sha256:9d8a41d4aa2dad1575adb98a82870cf5db5f76b2938cf2206c22c940034a36f4", + "sha256:b517a2011333eb7ce2d402652ecaa0ac1a30c114fbbd55c6b8ee466a7f600ee9", + "sha256:c5c121b46abde94a505175524e51891f829414e093cd8326d6e741ecfc0a9112", + "sha256:cb1bc5ed9403daa7da05475d615739cc0212e861b7306f314379d958592aaa89", + "sha256:f38c41fcde1728736b4eb2b18850f6d1e3eedd9678c914dede554a70d5241307" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==0.7.1" + }, "s3transfer": { "hashes": [ "sha256:263ed587a5803c6c708d3ce44dc4dfedaab4c1a32e8329bab818933d79ddcf5d", diff --git a/lambdas/link_fetcher/handler.py b/lambdas/link_fetcher/handler.py index 69292ee8..09b2f87d 100644 --- a/lambdas/link_fetcher/handler.py +++ b/lambdas/link_fetcher/handler.py @@ -54,8 +54,7 @@ class SearchResult: class Context(Protocol): - def get_remaining_time_in_millis(self) -> int: - ... + def get_remaining_time_in_millis(self) -> int: ... class HandlerResult(TypedDict): @@ -341,7 +340,7 @@ def create_search_result(search_item: Mapping[str, Any]) -> SearchResult: def get_page_for_query_and_total_results( - query_params: Mapping[str, Any] + query_params: Mapping[str, Any], ) -> Tuple[Sequence[SearchResult], int]: """ Takes a set of query parameters and retrieves the search results that match that diff --git a/lambdas/link_fetcher/tests/conftest.py b/lambdas/link_fetcher/tests/conftest.py index 07e97122..c82f9368 100644 --- a/lambdas/link_fetcher/tests/conftest.py +++ b/lambdas/link_fetcher/tests/conftest.py @@ -12,13 +12,14 @@ import pytest import responses from _pytest.monkeypatch import MonkeyPatch -from handler import SEARCH_URL, SearchResult from moto import mock_aws from sqlalchemy import create_engine from sqlalchemy.engine import Engine, Transaction, url from sqlalchemy.exc import OperationalError from sqlalchemy.orm import Session +from handler import SEARCH_URL, SearchResult + UNIT_TEST_DIR = pathlib.Path(__file__).parent diff --git a/lambdas/link_fetcher/tests/test_link_fetcher_handler.py b/lambdas/link_fetcher/tests/test_link_fetcher_handler.py index 6b74a2a5..5b54ef25 100644 --- a/lambdas/link_fetcher/tests/test_link_fetcher_handler.py +++ b/lambdas/link_fetcher/tests/test_link_fetcher_handler.py @@ -11,6 +11,8 @@ from db.models.granule_count import GranuleCount from db.models.status import Status from freezegun import freeze_time +from sqlalchemy.orm import Session + from handler import ( MIN_REMAINING_MILLIS, SEARCH_URL, @@ -28,7 +30,6 @@ update_last_fetched_link_time, update_total_results, ) -from sqlalchemy.orm import Session def test_that_link_fetcher_handler_correctly_loads_allowed_tiles(): diff --git a/lambdas/mock_scihub_product_api/Makefile b/lambdas/mock_scihub_product_api/Makefile index 97f35c21..46c62f2e 100644 --- a/lambdas/mock_scihub_product_api/Makefile +++ b/lambdas/mock_scihub_product_api/Makefile @@ -7,13 +7,13 @@ install: pipenv install --dev lint: - pipenv run flake8 . - pipenv run isort --check-only --profile black . - pipenv run black --check --diff . + pipenv run ruff format --diff + pipenv run ruff check format: - pipenv run isort --profile black . - pipenv run black . + pipenv run ruff check --fix + pipenv run ruff check --select I --fix + pipenv run ruff format test: pipenv run pytest -s --cov=handler --cov-report term-missing tests/ diff --git a/lambdas/mock_scihub_product_api/Pipfile b/lambdas/mock_scihub_product_api/Pipfile index 3935529d..37ce41d8 100644 --- a/lambdas/mock_scihub_product_api/Pipfile +++ b/lambdas/mock_scihub_product_api/Pipfile @@ -6,12 +6,10 @@ name = "pypi" [packages] [dev-packages] -flake8 = "==7.1.1" -isort = "==5.13.2" -black = "==23.11.0" pytest = "==7.4.3" assertpy = "==1.1" pytest-cov = "==4.1.0" +ruff = "==0.7.1" [requires] python_version = "3.11" diff --git a/lambdas/mock_scihub_product_api/Pipfile.lock b/lambdas/mock_scihub_product_api/Pipfile.lock index 8450da0b..c77b8305 100644 --- a/lambdas/mock_scihub_product_api/Pipfile.lock +++ b/lambdas/mock_scihub_product_api/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "7bcc1b068c39d77c6ffb2695a9ccf25ff6872cdc0a6d8864ac6b3072b566f0b9" + "sha256": "15584c322fb9206cb505e724e354934a54e4ceab9c66c148beca07ca4574626b" }, "pipfile-spec": 6, "requires": { @@ -24,39 +24,6 @@ "index": "pypi", "version": "==1.1" }, - "black": { - "hashes": [ - "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4", - "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b", - "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f", - "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07", - "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187", - "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6", - "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05", - "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06", - "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e", - "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5", - "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244", - "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f", - "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221", - "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055", - "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479", - "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394", - "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911", - "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142" - ], - "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==23.11.0" - }, - "click": { - "hashes": [ - "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - ], - "markers": "python_version >= '3.7'", - "version": "==8.1.7" - }, "coverage": { "extras": [ "toml" @@ -128,15 +95,6 @@ "markers": "python_version >= '3.9'", "version": "==7.6.4" }, - "flake8": { - "hashes": [ - "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38", - "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.1'", - "version": "==7.1.1" - }, "iniconfig": { "hashes": [ "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", @@ -145,31 +103,6 @@ "markers": "python_version >= '3.7'", "version": "==2.0.0" }, - "isort": { - "hashes": [ - "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109", - "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.0'", - "version": "==5.13.2" - }, - "mccabe": { - "hashes": [ - "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", - "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e" - ], - "markers": "python_version >= '3.6'", - "version": "==0.7.0" - }, - "mypy-extensions": { - "hashes": [ - "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", - "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" - ], - "markers": "python_version >= '3.5'", - "version": "==1.0.0" - }, "packaging": { "hashes": [ "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", @@ -178,22 +111,6 @@ "markers": "python_version >= '3.8'", "version": "==24.1" }, - "pathspec": { - "hashes": [ - "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", - "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" - ], - "markers": "python_version >= '3.8'", - "version": "==0.12.1" - }, - "platformdirs": { - "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" - ], - "markers": "python_version >= '3.8'", - "version": "==4.3.6" - }, "pluggy": { "hashes": [ "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", @@ -202,22 +119,6 @@ "markers": "python_version >= '3.8'", "version": "==1.5.0" }, - "pycodestyle": { - "hashes": [ - "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3", - "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" - ], - "markers": "python_version >= '3.8'", - "version": "==2.12.1" - }, - "pyflakes": { - "hashes": [ - "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f", - "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a" - ], - "markers": "python_version >= '3.8'", - "version": "==3.2.0" - }, "pytest": { "hashes": [ "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac", @@ -235,6 +136,31 @@ "index": "pypi", "markers": "python_version >= '3.7'", "version": "==4.1.0" + }, + "ruff": { + "hashes": [ + "sha256:19aa200ec824c0f36d0c9114c8ec0087082021732979a359d6f3c390a6ff2a37", + "sha256:27c1c52a8d199a257ff1e5582d078eab7145129aa02721815ca8fa4f9612dc35", + "sha256:32f1e8a192e261366c702c5fb2ece9f68d26625f198a25c408861c16dc2dea9c", + "sha256:344cc2b0814047dc8c3a8ff2cd1f3d808bb23c6658db830d25147339d9bf9ea7", + "sha256:4316bbf69d5a859cc937890c7ac7a6551252b6a01b1d2c97e8fc96e45a7c8b4a", + "sha256:56aad830af8a9db644e80098fe4984a948e2b6fc2e73891538f43bbe478461b8", + "sha256:588a34e1ef2ea55b4ddfec26bbe76bc866e92523d8c6cdec5e8aceefeff02d99", + "sha256:658304f02f68d3a83c998ad8bf91f9b4f53e93e5412b8f2388359d55869727fd", + "sha256:699085bf05819588551b11751eff33e9ca58b1b86a6843e1b082a7de40da1565", + "sha256:79d3af9dca4c56043e738a4d6dd1e9444b6d6c10598ac52d146e331eb155a8ad", + "sha256:8422104078324ea250886954e48f1373a8fe7de59283d747c3a7eca050b4e378", + "sha256:94fc32f9cdf72dc75c451e5f072758b118ab8100727168a3df58502b43a599ca", + "sha256:985818742b833bffa543a84d1cc11b5e6871de1b4e0ac3060a59a2bae3969250", + "sha256:9d8a41d4aa2dad1575adb98a82870cf5db5f76b2938cf2206c22c940034a36f4", + "sha256:b517a2011333eb7ce2d402652ecaa0ac1a30c114fbbd55c6b8ee466a7f600ee9", + "sha256:c5c121b46abde94a505175524e51891f829414e093cd8326d6e741ecfc0a9112", + "sha256:cb1bc5ed9403daa7da05475d615739cc0212e861b7306f314379d958592aaa89", + "sha256:f38c41fcde1728736b4eb2b18850f6d1e3eedd9678c914dede554a70d5241307" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==0.7.1" } } } diff --git a/lambdas/mock_scihub_product_api/tests/test_mock_scihub_product_api_handler.py b/lambdas/mock_scihub_product_api/tests/test_mock_scihub_product_api_handler.py index 1c055361..f23c6e7a 100644 --- a/lambdas/mock_scihub_product_api/tests/test_mock_scihub_product_api_handler.py +++ b/lambdas/mock_scihub_product_api/tests/test_mock_scihub_product_api_handler.py @@ -4,6 +4,7 @@ import zipfile from assertpy import assert_that + from handler import handler diff --git a/lambdas/mock_scihub_search_api/Makefile b/lambdas/mock_scihub_search_api/Makefile index 97f35c21..46c62f2e 100644 --- a/lambdas/mock_scihub_search_api/Makefile +++ b/lambdas/mock_scihub_search_api/Makefile @@ -7,13 +7,13 @@ install: pipenv install --dev lint: - pipenv run flake8 . - pipenv run isort --check-only --profile black . - pipenv run black --check --diff . + pipenv run ruff format --diff + pipenv run ruff check format: - pipenv run isort --profile black . - pipenv run black . + pipenv run ruff check --fix + pipenv run ruff check --select I --fix + pipenv run ruff format test: pipenv run pytest -s --cov=handler --cov-report term-missing tests/ diff --git a/lambdas/mock_scihub_search_api/Pipfile b/lambdas/mock_scihub_search_api/Pipfile index 34f8dc09..5f0d3938 100644 --- a/lambdas/mock_scihub_search_api/Pipfile +++ b/lambdas/mock_scihub_search_api/Pipfile @@ -6,13 +6,11 @@ name = "pypi" [packages] [dev-packages] -flake8 = "==7.1.1" -isort = "==5.13.2" -black = "==23.11.0" pytest = "==7.4.3" assertpy = "==1.1" freezegun = "==1.0.0" pytest-cov = "==4.1.0" +ruff = "==0.7.1" [requires] python_version = "3.11" diff --git a/lambdas/mock_scihub_search_api/Pipfile.lock b/lambdas/mock_scihub_search_api/Pipfile.lock index 2fc4eaba..f244ba52 100644 --- a/lambdas/mock_scihub_search_api/Pipfile.lock +++ b/lambdas/mock_scihub_search_api/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "fa9a3508b66ebd4aaf6181d67f23f78fb82e45c0a52bd7254f76e5ea78b26d85" + "sha256": "55adbc472181c2c3d772084eebab301141dd002759d3fb0e87201d1e89f23196" }, "pipfile-spec": 6, "requires": { @@ -24,39 +24,6 @@ "index": "pypi", "version": "==1.1" }, - "black": { - "hashes": [ - "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4", - "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b", - "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f", - "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07", - "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187", - "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6", - "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05", - "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06", - "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e", - "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5", - "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244", - "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f", - "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221", - "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055", - "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479", - "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394", - "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911", - "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142" - ], - "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==23.11.0" - }, - "click": { - "hashes": [ - "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - ], - "markers": "python_version >= '3.7'", - "version": "==8.1.7" - }, "coverage": { "extras": [ "toml" @@ -128,15 +95,6 @@ "markers": "python_version >= '3.9'", "version": "==7.6.4" }, - "flake8": { - "hashes": [ - "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38", - "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.1'", - "version": "==7.1.1" - }, "freezegun": { "hashes": [ "sha256:02b35de52f4699a78f6ac4518e4cd3390dddc43b0aeb978335a8f270a2d9668b", @@ -154,31 +112,6 @@ "markers": "python_version >= '3.7'", "version": "==2.0.0" }, - "isort": { - "hashes": [ - "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109", - "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.0'", - "version": "==5.13.2" - }, - "mccabe": { - "hashes": [ - "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", - "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e" - ], - "markers": "python_version >= '3.6'", - "version": "==0.7.0" - }, - "mypy-extensions": { - "hashes": [ - "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", - "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" - ], - "markers": "python_version >= '3.5'", - "version": "==1.0.0" - }, "packaging": { "hashes": [ "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", @@ -187,22 +120,6 @@ "markers": "python_version >= '3.8'", "version": "==24.1" }, - "pathspec": { - "hashes": [ - "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", - "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" - ], - "markers": "python_version >= '3.8'", - "version": "==0.12.1" - }, - "platformdirs": { - "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" - ], - "markers": "python_version >= '3.8'", - "version": "==4.3.6" - }, "pluggy": { "hashes": [ "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", @@ -211,22 +128,6 @@ "markers": "python_version >= '3.8'", "version": "==1.5.0" }, - "pycodestyle": { - "hashes": [ - "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3", - "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" - ], - "markers": "python_version >= '3.8'", - "version": "==2.12.1" - }, - "pyflakes": { - "hashes": [ - "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f", - "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a" - ], - "markers": "python_version >= '3.8'", - "version": "==3.2.0" - }, "pytest": { "hashes": [ "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac", @@ -253,6 +154,31 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==2.9.0.post0" }, + "ruff": { + "hashes": [ + "sha256:19aa200ec824c0f36d0c9114c8ec0087082021732979a359d6f3c390a6ff2a37", + "sha256:27c1c52a8d199a257ff1e5582d078eab7145129aa02721815ca8fa4f9612dc35", + "sha256:32f1e8a192e261366c702c5fb2ece9f68d26625f198a25c408861c16dc2dea9c", + "sha256:344cc2b0814047dc8c3a8ff2cd1f3d808bb23c6658db830d25147339d9bf9ea7", + "sha256:4316bbf69d5a859cc937890c7ac7a6551252b6a01b1d2c97e8fc96e45a7c8b4a", + "sha256:56aad830af8a9db644e80098fe4984a948e2b6fc2e73891538f43bbe478461b8", + "sha256:588a34e1ef2ea55b4ddfec26bbe76bc866e92523d8c6cdec5e8aceefeff02d99", + "sha256:658304f02f68d3a83c998ad8bf91f9b4f53e93e5412b8f2388359d55869727fd", + "sha256:699085bf05819588551b11751eff33e9ca58b1b86a6843e1b082a7de40da1565", + "sha256:79d3af9dca4c56043e738a4d6dd1e9444b6d6c10598ac52d146e331eb155a8ad", + "sha256:8422104078324ea250886954e48f1373a8fe7de59283d747c3a7eca050b4e378", + "sha256:94fc32f9cdf72dc75c451e5f072758b118ab8100727168a3df58502b43a599ca", + "sha256:985818742b833bffa543a84d1cc11b5e6871de1b4e0ac3060a59a2bae3969250", + "sha256:9d8a41d4aa2dad1575adb98a82870cf5db5f76b2938cf2206c22c940034a36f4", + "sha256:b517a2011333eb7ce2d402652ecaa0ac1a30c114fbbd55c6b8ee466a7f600ee9", + "sha256:c5c121b46abde94a505175524e51891f829414e093cd8326d6e741ecfc0a9112", + "sha256:cb1bc5ed9403daa7da05475d615739cc0212e861b7306f314379d958592aaa89", + "sha256:f38c41fcde1728736b4eb2b18850f6d1e3eedd9678c914dede554a70d5241307" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==0.7.1" + }, "six": { "hashes": [ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", diff --git a/lambdas/mock_scihub_search_api/tests/test_mock_scihub_search_api_handler.py b/lambdas/mock_scihub_search_api/tests/test_mock_scihub_search_api_handler.py index 687c189a..7f468021 100644 --- a/lambdas/mock_scihub_search_api/tests/test_mock_scihub_search_api_handler.py +++ b/lambdas/mock_scihub_search_api/tests/test_mock_scihub_search_api_handler.py @@ -2,6 +2,7 @@ from assertpy import assert_that from freezegun import freeze_time + from handler import handler diff --git a/lambdas/requeuer/Makefile b/lambdas/requeuer/Makefile index ef6bb421..e372dec0 100644 --- a/lambdas/requeuer/Makefile +++ b/lambdas/requeuer/Makefile @@ -7,13 +7,13 @@ install: pipenv install --dev lint: - pipenv run flake8 . - pipenv run isort --check-only --profile black . - pipenv run black --check --diff . + pipenv run ruff format --diff + pipenv run ruff check format: - pipenv run isort --profile black *.py tests/ - pipenv run black *.py tests/ + pipenv run ruff check --fix + pipenv run ruff check --select I --fix + pipenv run ruff format test: pipenv run pytest -v --cov=handler --cov-report term-missing tests/ diff --git a/lambdas/requeuer/Pipfile b/lambdas/requeuer/Pipfile index 87548070..1ba25f6b 100644 --- a/lambdas/requeuer/Pipfile +++ b/lambdas/requeuer/Pipfile @@ -9,17 +9,15 @@ iso8601 = "*" [dev-packages] alembic = "*" -black = "*" boto3-stubs = {extras = ["lambda", "sqs", "secretsmanager"], version = "*"} db = {editable = true, path = "./../../layers/db"} -flake8 = "==7.1.1" -isort = "==5.13.2" moto = "==5.0.17" mypy = "*" psycopg2 = "==2.9.10" pytest = "*" pytest-cov = "*" pytest-docker = "*" +ruff = "==0.7.1" [requires] python_version = "3.11" diff --git a/lambdas/requeuer/Pipfile.lock b/lambdas/requeuer/Pipfile.lock index 310c2ef7..26e699c6 100644 --- a/lambdas/requeuer/Pipfile.lock +++ b/lambdas/requeuer/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "674589086a52bbdba6e981eb9c0568a70431eb183940c61f26e3adbbd8316915" + "sha256": "8a91f65b2cbab84cd0afb3d6cf4603e42c2448136145b065532a7b5fe0f7ea73" }, "pipfile-spec": 6, "requires": { @@ -27,11 +27,11 @@ }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "iso8601": { "hashes": [ @@ -101,35 +101,6 @@ "markers": "python_version >= '3.7'", "version": "==24.2.0" }, - "black": { - "hashes": [ - "sha256:14b3502784f09ce2443830e3133dacf2c0110d45191ed470ecb04d0f5f6fcb0f", - "sha256:17374989640fbca88b6a448129cd1745c5eb8d9547b464f281b251dd00155ccd", - "sha256:1c536fcf674217e87b8cc3657b81809d3c085d7bf3ef262ead700da345bfa6ea", - "sha256:1cbacacb19e922a1d75ef2b6ccaefcd6e93a2c05ede32f06a21386a04cedb981", - "sha256:1f93102e0c5bb3907451063e08b9876dbeac810e7da5a8bfb7aeb5a9ef89066b", - "sha256:2cd9c95431d94adc56600710f8813ee27eea544dd118d45896bb734e9d7a0dc7", - "sha256:30d2c30dc5139211dda799758559d1b049f7f14c580c409d6ad925b74a4208a8", - "sha256:394d4ddc64782e51153eadcaaca95144ac4c35e27ef9b0a42e121ae7e57a9175", - "sha256:3bb2b7a1f7b685f85b11fed1ef10f8a9148bceb49853e47a294a3dd963c1dd7d", - "sha256:4007b1393d902b48b36958a216c20c4482f601569d19ed1df294a496eb366392", - "sha256:5a2221696a8224e335c28816a9d331a6c2ae15a2ee34ec857dcf3e45dbfa99ad", - "sha256:63f626344343083322233f175aaf372d326de8436f5928c042639a4afbbf1d3f", - "sha256:649fff99a20bd06c6f727d2a27f401331dc0cc861fb69cde910fe95b01b5928f", - "sha256:680359d932801c76d2e9c9068d05c6b107f2584b2a5b88831c83962eb9984c1b", - "sha256:846ea64c97afe3bc677b761787993be4991810ecc7a4a937816dd6bddedc4875", - "sha256:b5e39e0fae001df40f95bd8cc36b9165c5e2ea88900167bddf258bacef9bbdc3", - "sha256:ccfa1d0cb6200857f1923b602f978386a3a2758a65b52e0950299ea014be6800", - "sha256:d37d422772111794b26757c5b55a3eade028aa3fde43121ab7b673d050949d65", - "sha256:ddacb691cdcdf77b96f549cf9591701d8db36b2f19519373d60d31746068dbf2", - "sha256:e6668650ea4b685440857138e5fe40cde4d652633b1bdffc62933d0db4ed9812", - "sha256:f9da3333530dbcecc1be13e69c250ed8dfa67f43c4005fb537bb426e19200d50", - "sha256:fe4d6476887de70546212c99ac9bd803d90b42fc4767f058a0baa895013fbb3e" - ], - "index": "pypi", - "markers": "python_version >= '3.9'", - "version": "==24.10.0" - }, "boto3": { "hashes": [ "sha256:18416d07b41e6094101a44f8b881047dcec6b846dad0b9f83b9bbf2f0cd93d07", @@ -146,27 +117,27 @@ "sqs" ], "hashes": [ - "sha256:7ddd315be0739cff7dccde67dd0ba5d419b7c74fab43fba6abcaf0c45607e383", - "sha256:d4530f60e149e159971ffe3916cb5095d4b7a2f6c57908ac1f60d8ca669d6dd6" + "sha256:5b2887214d0953e7e6d5aeb4276e3b9e3cc3fb7375ef39a9da8aaa0c3e48b223", + "sha256:a5bddda9eaa277b615d9e394f42f51d97e6652166db6810f645cc52a4f4efccb" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.46" }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "botocore-stubs": { "hashes": [ - "sha256:1e5f2f99db44d9655ee231ce4d4a7d7cea1a263184e897c8b9446020f4fd1a44", - "sha256:94b2a0254f8d49c1b8bb3b3fd614ef2acab64a60e0e9e384b577b07b0f548304" + "sha256:397f78e5c9ed951fbb576cc0c544e29b626bd7a3742d463c015c0cc71e1d292c", + "sha256:f1ef0cd7c263f02f5ad3583f3ab99106e519b0d04d94f84c64c6afe146f83dff" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "certifi": { "hashes": [ @@ -360,14 +331,6 @@ "markers": "python_full_version >= '3.7.0'", "version": "==3.4.0" }, - "click": { - "hashes": [ - "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - ], - "markers": "python_version >= '3.7'", - "version": "==8.1.7" - }, "coverage": { "extras": [ "toml" @@ -476,15 +439,6 @@ "editable": true, "path": "./../../layers/db" }, - "flake8": { - "hashes": [ - "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38", - "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.1'", - "version": "==7.1.1" - }, "greenlet": { "hashes": [ "sha256:0153404a4bb921f0ff1abeb5ce8a5131da56b953eda6e14b88dc6bbc04d2049e", @@ -580,15 +534,6 @@ "markers": "python_version >= '3.7'", "version": "==2.0.0" }, - "isort": { - "hashes": [ - "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109", - "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.0'", - "version": "==5.13.2" - }, "jinja2": { "hashes": [ "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369", @@ -607,11 +552,11 @@ }, "mako": { "hashes": [ - "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a", - "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc" + "sha256:9ec3a1583713479fae654f83ed9fa8c9a4c16b7bb0daba0e6bbebff50c0d983d", + "sha256:a91198468092a2f1a0de86ca92690fb0cfc43ca90ee17e15d93662b4c04b241a" ], "markers": "python_version >= '3.8'", - "version": "==1.3.5" + "version": "==1.3.6" }, "markupsafe": { "hashes": [ @@ -680,14 +625,6 @@ "markers": "python_version >= '3.9'", "version": "==3.0.2" }, - "mccabe": { - "hashes": [ - "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", - "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e" - ], - "markers": "python_version >= '3.6'", - "version": "==0.7.0" - }, "moto": { "hashes": [ "sha256:165a291ac0b983f53a09f67f9841f72214c5a1b0c56392d88f7035a6a8718fca", @@ -699,42 +636,42 @@ }, "mypy": { "hashes": [ - "sha256:02dcfe270c6ea13338210908f8cadc8d31af0f04cee8ca996438fe6a97b4ec66", - "sha256:0dcc1e843d58f444fce19da4cce5bd35c282d4bde232acdeca8279523087088a", - "sha256:0e6fe449223fa59fbee351db32283838a8fee8059e0028e9e6494a03802b4004", - "sha256:1230048fec1380faf240be6385e709c8570604d2d27ec6ca7e573e3bc09c3735", - "sha256:186e0c8346efc027ee1f9acf5ca734425fc4f7dc2b60144f0fbe27cc19dc7931", - "sha256:19bf51f87a295e7ab2894f1d8167622b063492d754e69c3c2fed6563268cb42a", - "sha256:20db6eb1ca3d1de8ece00033b12f793f1ea9da767334b7e8c626a4872090cf02", - "sha256:389e307e333879c571029d5b93932cf838b811d3f5395ed1ad05086b52148fb0", - "sha256:3d7d4371829184e22fda4015278fbfdef0327a4b955a483012bd2d423a788801", - "sha256:427878aa54f2e2c5d8db31fa9010c599ed9f994b3b49e64ae9cd9990c40bd635", - "sha256:4ee5932370ccf7ebf83f79d1c157a5929d7ea36313027b0d70a488493dc1b179", - "sha256:5fcde63ea2c9f69d6be859a1e6dd35955e87fa81de95bc240143cf00de1f7f81", - "sha256:673ba1140a478b50e6d265c03391702fa11a5c5aff3f54d69a62a48da32cb811", - "sha256:8135ffec02121a75f75dc97c81af7c14aa4ae0dda277132cfcd6abcd21551bfd", - "sha256:843826966f1d65925e8b50d2b483065c51fc16dc5d72647e0236aae51dc8d77e", - "sha256:94b2048a95a21f7a9ebc9fbd075a4fcd310410d078aa0228dbbad7f71335e042", - "sha256:96af62050971c5241afb4701c15189ea9507db89ad07794a4ee7b4e092dc0627", - "sha256:9fb83a7be97c498176fb7486cafbb81decccaef1ac339d837c377b0ce3743a7f", - "sha256:9fe20f89da41a95e14c34b1ddb09c80262edcc295ad891f22cc4b60013e8f78d", - "sha256:a5a437c9102a6a252d9e3a63edc191a3aed5f2fcb786d614722ee3f4472e33f6", - "sha256:a7b76fa83260824300cc4834a3ab93180db19876bce59af921467fd03e692810", - "sha256:b16fe09f9c741d85a2e3b14a5257a27a4f4886c171d562bc5a5e90d8591906b8", - "sha256:b947097fae68004b8328c55161ac9db7d3566abfef72d9d41b47a021c2fba6b1", - "sha256:ce561a09e3bb9863ab77edf29ae3a50e65685ad74bba1431278185b7e5d5486e", - "sha256:d34167d43613ffb1d6c6cdc0cc043bb106cac0aa5d6a4171f77ab92a3c758bcc", - "sha256:d54d840f6c052929f4a3d2aab2066af0f45a020b085fe0e40d4583db52aab4e4", - "sha256:d90da248f4c2dba6c44ddcfea94bb361e491962f05f41990ff24dbd09969ce20", - "sha256:dc6e2a2195a290a7fd5bac3e60b586d77fc88e986eba7feced8b778c373f9afe", - "sha256:de5b2a8988b4e1269a98beaf0e7cc71b510d050dce80c343b53b4955fff45f19", - "sha256:e10ba7de5c616e44ad21005fa13450cd0de7caaa303a626147d45307492e4f2d", - "sha256:f59f1dfbf497d473201356966e353ef09d4daec48caeacc0254db8ef633a28a5", - "sha256:f5b3936f7a6d0e8280c9bdef94c7ce4847f5cdfc258fbb2c29a8c1711e8bb96d" + "sha256:0246bcb1b5de7f08f2826451abd947bf656945209b140d16ed317f65a17dc7dc", + "sha256:0291a61b6fbf3e6673e3405cfcc0e7650bebc7939659fdca2702958038bd835e", + "sha256:0730d1c6a2739d4511dc4253f8274cdd140c55c32dfb0a4cf8b7a43f40abfa6f", + "sha256:07de989f89786f62b937851295ed62e51774722e5444a27cecca993fc3f9cd74", + "sha256:100fac22ce82925f676a734af0db922ecfea991e1d7ec0ceb1e115ebe501301a", + "sha256:164f28cb9d6367439031f4c81e84d3ccaa1e19232d9d05d37cb0bd880d3f93c2", + "sha256:20c7ee0bc0d5a9595c46f38beb04201f2620065a93755704e141fcac9f59db2b", + "sha256:3790ded76f0b34bc9c8ba4def8f919dd6a46db0f5a6610fb994fe8efdd447f73", + "sha256:39bb21c69a5d6342f4ce526e4584bc5c197fd20a60d14a8624d8743fffb9472e", + "sha256:3ddb5b9bf82e05cc9a627e84707b528e5c7caaa1c55c69e175abb15a761cec2d", + "sha256:3e38b980e5681f28f033f3be86b099a247b13c491f14bb8b1e1e134d23bb599d", + "sha256:4bde84334fbe19bad704b3f5b78c4abd35ff1026f8ba72b29de70dda0916beb6", + "sha256:51f869f4b6b538229c1d1bcc1dd7d119817206e2bc54e8e374b3dfa202defcca", + "sha256:581665e6f3a8a9078f28d5502f4c334c0c8d802ef55ea0e7276a6e409bc0d82d", + "sha256:5c7051a3461ae84dfb5dd15eff5094640c61c5f22257c8b766794e6dd85e72d5", + "sha256:5d5092efb8516d08440e36626f0153b5006d4088c1d663d88bf79625af3d1d62", + "sha256:6607e0f1dd1fb7f0aca14d936d13fd19eba5e17e1cd2a14f808fa5f8f6d8f60a", + "sha256:7029881ec6ffb8bc233a4fa364736789582c738217b133f1b55967115288a2bc", + "sha256:7b2353a44d2179846a096e25691d54d59904559f4232519d420d64da6828a3a7", + "sha256:7bcb0bb7f42a978bb323a7c88f1081d1b5dee77ca86f4100735a6f541299d8fb", + "sha256:7bfd8836970d33c2105562650656b6846149374dc8ed77d98424b40b09340ba7", + "sha256:7f5b7deae912cf8b77e990b9280f170381fdfbddf61b4ef80927edd813163732", + "sha256:8a21be69bd26fa81b1f80a61ee7ab05b076c674d9b18fb56239d72e21d9f4c80", + "sha256:9c250883f9fd81d212e0952c92dbfcc96fc237f4b7c92f56ac81fd48460b3e5a", + "sha256:9f73dba9ec77acb86457a8fc04b5239822df0c14a082564737833d2963677dbc", + "sha256:a0affb3a79a256b4183ba09811e3577c5163ed06685e4d4b46429a271ba174d2", + "sha256:a4c1bfcdbce96ff5d96fc9b08e3831acb30dc44ab02671eca5953eadad07d6d0", + "sha256:a6789be98a2017c912ae6ccb77ea553bbaf13d27605d2ca20a76dfbced631b24", + "sha256:a7b44178c9760ce1a43f544e595d35ed61ac2c3de306599fa59b38a6048e1aa7", + "sha256:bde31fc887c213e223bbfc34328070996061b0833b0a4cfec53745ed61f3519b", + "sha256:c5fc54dbb712ff5e5a0fca797e6e0aa25726c7e72c6a5850cfd2adbc1eb0a372", + "sha256:de2904956dac40ced10931ac967ae63c5089bd498542194b436eb097a9f77bc8" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==1.12.1" + "version": "==1.13.0" }, "mypy-boto3-lambda": { "hashes": [ @@ -773,22 +710,6 @@ "markers": "python_version >= '3.8'", "version": "==24.1" }, - "pathspec": { - "hashes": [ - "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", - "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" - ], - "markers": "python_version >= '3.8'", - "version": "==0.12.1" - }, - "platformdirs": { - "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" - ], - "markers": "python_version >= '3.8'", - "version": "==4.3.6" - }, "pluggy": { "hashes": [ "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", @@ -813,14 +734,6 @@ "markers": "python_version >= '3.8'", "version": "==2.9.10" }, - "pycodestyle": { - "hashes": [ - "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3", - "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" - ], - "markers": "python_version >= '3.8'", - "version": "==2.12.1" - }, "pycparser": { "hashes": [ "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", @@ -829,14 +742,6 @@ "markers": "python_version >= '3.8'", "version": "==2.22" }, - "pyflakes": { - "hashes": [ - "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f", - "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a" - ], - "markers": "python_version >= '3.8'", - "version": "==3.2.0" - }, "pytest": { "hashes": [ "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181", @@ -947,6 +852,31 @@ "markers": "python_version >= '3.8'", "version": "==0.25.3" }, + "ruff": { + "hashes": [ + "sha256:19aa200ec824c0f36d0c9114c8ec0087082021732979a359d6f3c390a6ff2a37", + "sha256:27c1c52a8d199a257ff1e5582d078eab7145129aa02721815ca8fa4f9612dc35", + "sha256:32f1e8a192e261366c702c5fb2ece9f68d26625f198a25c408861c16dc2dea9c", + "sha256:344cc2b0814047dc8c3a8ff2cd1f3d808bb23c6658db830d25147339d9bf9ea7", + "sha256:4316bbf69d5a859cc937890c7ac7a6551252b6a01b1d2c97e8fc96e45a7c8b4a", + "sha256:56aad830af8a9db644e80098fe4984a948e2b6fc2e73891538f43bbe478461b8", + "sha256:588a34e1ef2ea55b4ddfec26bbe76bc866e92523d8c6cdec5e8aceefeff02d99", + "sha256:658304f02f68d3a83c998ad8bf91f9b4f53e93e5412b8f2388359d55869727fd", + "sha256:699085bf05819588551b11751eff33e9ca58b1b86a6843e1b082a7de40da1565", + "sha256:79d3af9dca4c56043e738a4d6dd1e9444b6d6c10598ac52d146e331eb155a8ad", + "sha256:8422104078324ea250886954e48f1373a8fe7de59283d747c3a7eca050b4e378", + "sha256:94fc32f9cdf72dc75c451e5f072758b118ab8100727168a3df58502b43a599ca", + "sha256:985818742b833bffa543a84d1cc11b5e6871de1b4e0ac3060a59a2bae3969250", + "sha256:9d8a41d4aa2dad1575adb98a82870cf5db5f76b2938cf2206c22c940034a36f4", + "sha256:b517a2011333eb7ce2d402652ecaa0ac1a30c114fbbd55c6b8ee466a7f600ee9", + "sha256:c5c121b46abde94a505175524e51891f829414e093cd8326d6e741ecfc0a9112", + "sha256:cb1bc5ed9403daa7da05475d615739cc0212e861b7306f314379d958592aaa89", + "sha256:f38c41fcde1728736b4eb2b18850f6d1e3eedd9678c914dede554a70d5241307" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==0.7.1" + }, "s3transfer": { "hashes": [ "sha256:263ed587a5803c6c708d3ce44dc4dfedaab4c1a32e8329bab818933d79ddcf5d", @@ -1005,11 +935,11 @@ }, "types-awscrt": { "hashes": [ - "sha256:67a660c90bad360c339f6a79310cc17094d12472042c7ca5a41450aaf5fc9a54", - "sha256:b2c196bbd3226bab42d80fae13c34548de9ddc195f5a366d79c15d18e5897aa9" + "sha256:3fd1edeac923d1956c0e907c973fb83bda465beae7f054716b371b293f9b5fdc", + "sha256:517d9d06f19cf58d778ca90ad01e52e0489466bf70dcf78c7f47f74fdf151a60" ], "markers": "python_version >= '3.8'", - "version": "==0.22.0" + "version": "==0.23.0" }, "types-s3transfer": { "hashes": [ diff --git a/lambdas/requeuer/handler.py b/lambdas/requeuer/handler.py index 2f9af7c1..3f9ce514 100644 --- a/lambdas/requeuer/handler.py +++ b/lambdas/requeuer/handler.py @@ -3,7 +3,6 @@ import datetime import json import os -from re import T from typing import TYPE_CHECKING, Any, Callable, Mapping, Sequence, TypedDict import iso8601 diff --git a/lambdas/requeuer/tests/conftest.py b/lambdas/requeuer/tests/conftest.py index 47bbc22c..bcca6a6b 100644 --- a/lambdas/requeuer/tests/conftest.py +++ b/lambdas/requeuer/tests/conftest.py @@ -1,7 +1,6 @@ import json import os import pathlib -from contextlib import contextmanager from typing import cast import alembic.command diff --git a/lambdas/requeuer/tests/test_requeue_missing_granules.py b/lambdas/requeuer/tests/test_requeue_missing_granules.py index bb77639f..8d51d15c 100644 --- a/lambdas/requeuer/tests/test_requeue_missing_granules.py +++ b/lambdas/requeuer/tests/test_requeue_missing_granules.py @@ -3,11 +3,12 @@ import pytest from db.models.granule import Granule -from handler import Response, _handler from mypy_boto3_sqs.client import SQSClient from mypy_boto3_sqs.service_resource import Queue from sqlalchemy.orm import Session # type: ignore +from handler import Response, _handler + def test_missing_dry_run_raises( db_session: Session, diff --git a/layers/db/Makefile b/layers/db/Makefile index fe455c22..faa362b6 100644 --- a/layers/db/Makefile +++ b/layers/db/Makefile @@ -7,13 +7,13 @@ install: pipenv install --dev lint: - pipenv run flake8 . - pipenv run isort --check-only --profile black . - pipenv run black --check --diff . + pipenv run ruff format --diff + pipenv run ruff check format: - pipenv run isort --profile black . - pipenv run black . + pipenv run ruff check --fix + pipenv run ruff check --select I --fix + pipenv run ruff format test: pipenv run pytest -s --cov=db --cov-report term-missing db/tests/ diff --git a/layers/db/Pipfile b/layers/db/Pipfile index 3a9f6742..807c20d5 100644 --- a/layers/db/Pipfile +++ b/layers/db/Pipfile @@ -11,13 +11,11 @@ sqlalchemy = "==1.4.0" [dev-packages] assertpy = "==1.1" -black = "==23.11.0" -flake8 = "==7.1.1" -isort = "==5.13.2" moto = "==5.0.17" pytest = "==7.4.3" pytest-cov = "==4.1.0" pytest-docker = "==2.0.1" +ruff = "==0.7.1" [requires] python_version = "3.11" diff --git a/layers/db/Pipfile.lock b/layers/db/Pipfile.lock index 6c04e696..4e80233c 100644 --- a/layers/db/Pipfile.lock +++ b/layers/db/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "dbb61d3af70d17f44a7f0d1e2560c956934efa704c631f81aa0cf5ff9fe16124" + "sha256": "59e1dc3e89005c855a74ff4d0106784b64ee76342f5504f833eb50f9d088c3cb" }, "pipfile-spec": 6, "requires": { @@ -36,11 +36,11 @@ }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "greenlet": { "hashes": [ @@ -131,11 +131,11 @@ }, "mako": { "hashes": [ - "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a", - "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc" + "sha256:9ec3a1583713479fae654f83ed9fa8c9a4c16b7bb0daba0e6bbebff50c0d983d", + "sha256:a91198468092a2f1a0de86ca92690fb0cfc43ca90ee17e15d93662b4c04b241a" ], "markers": "python_version >= '3.8'", - "version": "==1.3.5" + "version": "==1.3.6" }, "markupsafe": { "hashes": [ @@ -376,31 +376,6 @@ "markers": "python_version >= '3.7'", "version": "==24.2.0" }, - "black": { - "hashes": [ - "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4", - "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b", - "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f", - "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07", - "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187", - "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6", - "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05", - "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06", - "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e", - "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5", - "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244", - "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f", - "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221", - "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055", - "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479", - "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394", - "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911", - "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142" - ], - "index": "pypi", - "markers": "python_version >= '3.8'", - "version": "==23.11.0" - }, "boto3": { "hashes": [ "sha256:18416d07b41e6094101a44f8b881047dcec6b846dad0b9f83b9bbf2f0cd93d07", @@ -412,11 +387,11 @@ }, "botocore": { "hashes": [ - "sha256:9a898bfdd6b0027fee2018711192c15c2716bf6a7096b1168bd8a896df3664a1", - "sha256:e07e170975721c94ec1e3bf71a484552ad63e2499f769dd14f9f37375b4993fd" + "sha256:05f4493119a96799ff84d43e78691efac3177e1aec8840cca99511de940e342a", + "sha256:f8f703463d3cd8b6abe2bedc443a7ab29f0e2ff1588a2e83164b108748645547" ], "markers": "python_version >= '3.8'", - "version": "==1.35.45" + "version": "==1.35.47" }, "certifi": { "hashes": [ @@ -610,14 +585,6 @@ "markers": "python_full_version >= '3.7.0'", "version": "==3.4.0" }, - "click": { - "hashes": [ - "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", - "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - ], - "markers": "python_version >= '3.7'", - "version": "==8.1.7" - }, "coverage": { "extras": [ "toml" @@ -722,15 +689,6 @@ "markers": "python_version >= '3.7'", "version": "==43.0.3" }, - "flake8": { - "hashes": [ - "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38", - "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.1'", - "version": "==7.1.1" - }, "idna": { "hashes": [ "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", @@ -747,15 +705,6 @@ "markers": "python_version >= '3.7'", "version": "==2.0.0" }, - "isort": { - "hashes": [ - "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109", - "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6" - ], - "index": "pypi", - "markers": "python_full_version >= '3.8.0'", - "version": "==5.13.2" - }, "jinja2": { "hashes": [ "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369", @@ -839,14 +788,6 @@ "markers": "python_version >= '3.9'", "version": "==3.0.2" }, - "mccabe": { - "hashes": [ - "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", - "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e" - ], - "markers": "python_version >= '3.6'", - "version": "==0.7.0" - }, "moto": { "hashes": [ "sha256:165a291ac0b983f53a09f67f9841f72214c5a1b0c56392d88f7035a6a8718fca", @@ -856,14 +797,6 @@ "markers": "python_version >= '3.8'", "version": "==5.0.17" }, - "mypy-extensions": { - "hashes": [ - "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", - "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782" - ], - "markers": "python_version >= '3.5'", - "version": "==1.0.0" - }, "packaging": { "hashes": [ "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", @@ -872,22 +805,6 @@ "markers": "python_version >= '3.8'", "version": "==24.1" }, - "pathspec": { - "hashes": [ - "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", - "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712" - ], - "markers": "python_version >= '3.8'", - "version": "==0.12.1" - }, - "platformdirs": { - "hashes": [ - "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", - "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb" - ], - "markers": "python_version >= '3.8'", - "version": "==4.3.6" - }, "pluggy": { "hashes": [ "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", @@ -896,14 +813,6 @@ "markers": "python_version >= '3.8'", "version": "==1.5.0" }, - "pycodestyle": { - "hashes": [ - "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3", - "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" - ], - "markers": "python_version >= '3.8'", - "version": "==2.12.1" - }, "pycparser": { "hashes": [ "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", @@ -912,14 +821,6 @@ "markers": "python_version >= '3.8'", "version": "==2.22" }, - "pyflakes": { - "hashes": [ - "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f", - "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a" - ], - "markers": "python_version >= '3.8'", - "version": "==3.2.0" - }, "pytest": { "hashes": [ "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac", @@ -1030,6 +931,31 @@ "markers": "python_version >= '3.8'", "version": "==0.25.3" }, + "ruff": { + "hashes": [ + "sha256:19aa200ec824c0f36d0c9114c8ec0087082021732979a359d6f3c390a6ff2a37", + "sha256:27c1c52a8d199a257ff1e5582d078eab7145129aa02721815ca8fa4f9612dc35", + "sha256:32f1e8a192e261366c702c5fb2ece9f68d26625f198a25c408861c16dc2dea9c", + "sha256:344cc2b0814047dc8c3a8ff2cd1f3d808bb23c6658db830d25147339d9bf9ea7", + "sha256:4316bbf69d5a859cc937890c7ac7a6551252b6a01b1d2c97e8fc96e45a7c8b4a", + "sha256:56aad830af8a9db644e80098fe4984a948e2b6fc2e73891538f43bbe478461b8", + "sha256:588a34e1ef2ea55b4ddfec26bbe76bc866e92523d8c6cdec5e8aceefeff02d99", + "sha256:658304f02f68d3a83c998ad8bf91f9b4f53e93e5412b8f2388359d55869727fd", + "sha256:699085bf05819588551b11751eff33e9ca58b1b86a6843e1b082a7de40da1565", + "sha256:79d3af9dca4c56043e738a4d6dd1e9444b6d6c10598ac52d146e331eb155a8ad", + "sha256:8422104078324ea250886954e48f1373a8fe7de59283d747c3a7eca050b4e378", + "sha256:94fc32f9cdf72dc75c451e5f072758b118ab8100727168a3df58502b43a599ca", + "sha256:985818742b833bffa543a84d1cc11b5e6871de1b4e0ac3060a59a2bae3969250", + "sha256:9d8a41d4aa2dad1575adb98a82870cf5db5f76b2938cf2206c22c940034a36f4", + "sha256:b517a2011333eb7ce2d402652ecaa0ac1a30c114fbbd55c6b8ee466a7f600ee9", + "sha256:c5c121b46abde94a505175524e51891f829414e093cd8326d6e741ecfc0a9112", + "sha256:cb1bc5ed9403daa7da05475d615739cc0212e861b7306f314379d958592aaa89", + "sha256:f38c41fcde1728736b4eb2b18850f6d1e3eedd9678c914dede554a70d5241307" + ], + "index": "pypi", + "markers": "python_version >= '3.7'", + "version": "==0.7.1" + }, "s3transfer": { "hashes": [ "sha256:263ed587a5803c6c708d3ce44dc4dfedaab4c1a32e8329bab818933d79ddcf5d",