From 82528ec45f4e7b29bb478fe31de538f4eb2b2f1c Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Thu, 16 Jul 2026 11:28:12 -0400 Subject: [PATCH] Update pyproject.toml to use [project] Also updates dependency specifiers to use ~= so dependabot / GitHub security doesn't get so confused about what version is actually used --- cumulus-api/pyproject.toml | 40 +++++++++++++++++---------------- destroy-cumulus/pyproject.toml | 27 ++++++++++++---------- remotezip-cli/pyproject.toml | 31 +++++++++++++------------ test-cnm/pyproject.toml | 29 +++++++++++++----------- test-event/pyproject.toml | 24 +++++++++++--------- trigger-s3-event/pyproject.toml | 29 +++++++++++++----------- 6 files changed, 99 insertions(+), 81 deletions(-) diff --git a/cumulus-api/pyproject.toml b/cumulus-api/pyproject.toml index 82561df..1b76606 100644 --- a/cumulus-api/pyproject.toml +++ b/cumulus-api/pyproject.toml @@ -1,30 +1,32 @@ [build-system] -requires = ["poetry-core"] +requires = ["poetry-core~=2.0"] build-backend = "poetry.core.masonry.api" -[tool.poetry] +[project] name = "cumulus-api" -version = "0.3.2" +version = "0.4.0" description = "" license = "Apache-2.0" -authors = ["Rohan Weeden ", "Matt Perry "] +authors = [ + { name = "Rohan Weeden", email = "reweeden@alaska.edu" }, + { name = "Matt Perry", email = "mperry37@alaska.edu" }, +] readme = "README.md" +requires-python = "~=3.9" +dependencies = [ + "boto3~=1.28", +] + +[project.optional-dependencies] +report = [ + "cumulus-report @ git+ssh://git@github.com:asfadmin/cumulus-report.git", + "dateparser~=1.2", + "sortedcontainers~=2.4", +] + +[tool.poetry] packages = [{include = "cumulus_api"}] -[tool.poetry.scripts] +[project.scripts] cumulus-api = "cumulus_api:main.main" cumulus = "cumulus_api:main.main" - -[tool.poetry.dependencies] -python = ">=3.9,<4" - -# Required -boto3 = "^1.28.76" - -# Optional dependencies, opted in with below extras. -cumulus-report = { git = "git@github.com:asfadmin/cumulus-report.git", optional = true} -dateparser = { version = "^1.2.0", optional = true } -sortedcontainers = { version = "^2.4.0", optional = true } - -[tool.poetry.extras] -report = ["cumulus-report", "dateparser", "sortedcontainers"] diff --git a/destroy-cumulus/pyproject.toml b/destroy-cumulus/pyproject.toml index 13236ef..bcb1f9f 100644 --- a/destroy-cumulus/pyproject.toml +++ b/destroy-cumulus/pyproject.toml @@ -1,33 +1,36 @@ [build-system] -requires = ["poetry-core"] +requires = ["poetry-core~=2.0"] build-backend = "poetry.core.masonry.api" -[tool.poetry] +[project] name = "destroy-cumulus" -version = "0.4.0" +version = "0.5.0" description = "" license = "Apache-2.0" -authors = ["Rohan Weeden "] +authors = [ + { name = "Rohan Weeden", email = "reweeden@alaska.edu" }, +] readme = "README.md" +requires-python = "~=3.9" +dependencies = [ + "boto3~=1.24", +] + +[tool.poetry] packages = [{include = "destroy_cumulus.py"}] -[tool.poetry.scripts] +[project.scripts] destroy-cumulus = "destroy_cumulus:main" decumulus = "destroy_cumulus:main" -[tool.poetry.dependencies] -python = ">=3.9,<4" - -boto3 = "^1.24.78" - [tool.poetry.group.dev.dependencies] -moto = {extras = ["all"], version = "^5.1.6"} +moto = {extras = ["all"], version = "~=5.1"} # openapi-schema-validator uses a private import from jsonpath and is therefore # not compatible across all versions. 0.6.1 has a patch for an API change in # jsonschema 4.19.1 # https://github.com/python-openapi/openapi-schema-validator/issues/131 openapi-schema-validator = ">=0.6.1" -pytest = "^8.3.4" +pytest = "~=8.3" [tool.pytest.ini_options] markers = [ diff --git a/remotezip-cli/pyproject.toml b/remotezip-cli/pyproject.toml index cc9df7c..a5a6364 100644 --- a/remotezip-cli/pyproject.toml +++ b/remotezip-cli/pyproject.toml @@ -1,26 +1,29 @@ [build-system] -requires = ["poetry-core"] +requires = ["poetry-core~=2.0"] build-backend = "poetry.core.masonry.api" -[tool.poetry] +[project] name = "remotezip-cli" -version = "0.2.1" +version = "0.3.0" description = "" license = "Apache-2.0" -authors = ["Rohan Weeden "] +authors = [ + { name = "Rohan Weeden", email = "reweeden@alaska.edu" }, +] readme = "README.md" +requires-python = "~=3.9" +dependencies = [ + "aws-requests-auth~=0.4.0", + "boto3~=1.24", + "humanize~=4.4", + "remotezip~=0.9.0", +] + +[tool.poetry] packages = [{include = "remotezip_cli.py"}] -[tool.poetry.scripts] +[project.scripts] rz = "remotezip_cli:main" -[tool.poetry.dependencies] -python = ">=3.9,<4" - -aws-requests-auth = "^0.4.3" -boto3 = "^1.24.76" -humanize = "^4.4.0" -remotezip = "^0.9.4" - [tool.poetry.group.dev.dependencies] -pytest = "^8.3.4" +pytest = "~=8.3" diff --git a/test-cnm/pyproject.toml b/test-cnm/pyproject.toml index ea0b0c0..06c16f9 100644 --- a/test-cnm/pyproject.toml +++ b/test-cnm/pyproject.toml @@ -1,26 +1,29 @@ [build-system] -requires = ["poetry-core"] +requires = ["poetry-core~=2.0"] build-backend = "poetry.core.masonry.api" -[tool.poetry] +[project] name = "test-cnm" -version = "0.9.1" +version = "0.10.0" description = "" license = "Apache-2.0" -authors = ["Rohan Weeden "] +authors = [ + { name = "Rohan Weeden", email = "reweeden@alaska.edu" }, +] readme = "README.md" +requires-python = "~=3.9" +dependencies = [ + "boto3~=1.28", + "tqdm~=4.67", +] + +[tool.poetry] packages = [{include = "test_cnm"}] -[tool.poetry.scripts] +[project.scripts] test-cnm = "test_cnm:main.main" tcnm = "test_cnm:main.main" -[tool.poetry.dependencies] -python = ">=3.9,<4" - -boto3 = "^1.28.76" -tqdm = "^4.67.1" - [tool.poetry.group.dev.dependencies] -moto = "^5.1.4" -pytest = "^8.3.4" +moto = "~=5.1" +pytest = "~=8.3" diff --git a/test-event/pyproject.toml b/test-event/pyproject.toml index 0f70ef9..46ef02e 100644 --- a/test-event/pyproject.toml +++ b/test-event/pyproject.toml @@ -1,21 +1,25 @@ [build-system] -requires = ["poetry-core"] +requires = ["poetry-core~=2.0"] build-backend = "poetry.core.masonry.api" -[tool.poetry] +[project] name = "test-event" -version = "0.1.0" +version = "0.2.0" description = "A helper tool for triggering event-based ingest" license = "Apache-2.0" -authors = ["McKade Sorensen "] +authors = [ + { name = "McKade Sorensen", email = "dmsorensen@alaska.edu" }, + { name = "Rohan Weeden", email = "reweeden@alaska.edu" }, +] readme = "README.md" +requires-python = "~=3.9" +dependencies = [ + "boto3~=1.28", +] + +[tool.poetry] packages = [{include = "test_event"}] -[tool.poetry.scripts] +[project.scripts] test-event = "test_event:main.main" tevent = "test_event:main.main" - -[tool.poetry.dependencies] -python = ">=3.9,<4" - -boto3 = "^1.28.76" diff --git a/trigger-s3-event/pyproject.toml b/trigger-s3-event/pyproject.toml index a8a9f85..b6180dc 100644 --- a/trigger-s3-event/pyproject.toml +++ b/trigger-s3-event/pyproject.toml @@ -1,26 +1,29 @@ [build-system] -requires = ["poetry-core"] +requires = ["poetry-core~=2.0"] build-backend = "poetry.core.masonry.api" -[tool.poetry] +[project] name = "trigger-s3-event" -version = "0.1.2" +version = "0.2.0" description = "" license = "Apache-2.0" -authors = ["Rohan Weeden "] +authors = [ + { name = "Rohan Weeden", email = "reweeden@alaska.edu" }, +] readme = "README.md" +requires-python = "~=3.9" +dependencies = [ + "boto3~=1.28", + "dateparser~=1.2", +] + +[tool.poetry] packages = [{include = "trigger_s3_event"}] -[tool.poetry.scripts] +[project.scripts] trigger-s3-event = "trigger_s3_event:main.main" s3event = "trigger_s3_event:main.main" -[tool.poetry.dependencies] -python = ">=3.9,<4" - -boto3 = "^1.28.76" -dateparser = "^1.2.0" - [tool.poetry.group.dev.dependencies] -moto = "^5.0.22" -pytest = "^8.3.4" +moto = "~=5.0" +pytest = "~=8.3"