From f24e5fa9716a40b48e400d9cb6e2a38a830cf071 Mon Sep 17 00:00:00 2001 From: Dan Guido Date: Fri, 8 Aug 2025 17:18:54 -0700 Subject: [PATCH] Revert "refactor: standardize packaging across all components" This reverts commit 1efa75836f04fdd73efed52930285883e1ddc885. --- common/pyproject.toml | 11 +++-------- fuzzer/pyproject.toml | 11 +++-------- orchestrator/pyproject.toml | 11 +++-------- patcher/pyproject.toml | 11 +++-------- program-model/pyproject.toml | 11 +++-------- seed-gen/pyproject.toml | 11 +++-------- 6 files changed, 18 insertions(+), 48 deletions(-) diff --git a/common/pyproject.toml b/common/pyproject.toml index a47269fb..64a8a73b 100644 --- a/common/pyproject.toml +++ b/common/pyproject.toml @@ -1,10 +1,9 @@ [project] name = "common" version = "0.1.0" -description = "Shared utilities and components for Buttercup CRS" -authors = [{ name = "Trail of Bits", email = "opensource@trailofbits.com" }] -license = "AGPL-3.0" -requires-python = ">=3.12,<3.13" +description = "" +authors = [{ name = "Trail of Bits", email = "opensource@trailofbits" }] +requires-python = ">=3.10,<3.13" dependencies = [ "protobuf (>=3.20, <=3.20.3)", "pydantic-settings>=2.7.1", @@ -20,10 +19,6 @@ dependencies = [ "langchain-text-splitters ~= 0.3.7", # implicit dep of openlit if you instrument langchain ] -[project.urls] -Repository = "https://github.com/trailofbits/buttercup" -Issues = "https://github.com/trailofbits/buttercup/issues" - [project.scripts] buttercup-util = "buttercup.common.util_cli:main" buttercup-challenge-task = "buttercup.common.challenge_task_cli:main" diff --git a/fuzzer/pyproject.toml b/fuzzer/pyproject.toml index a409fa8e..dd9fbf40 100644 --- a/fuzzer/pyproject.toml +++ b/fuzzer/pyproject.toml @@ -1,10 +1,9 @@ [project] name = "fuzzing-infra" version = "0.1.0" -description = "Automated vulnerability discovery through intelligent fuzzing" -authors = [{ name = "Trail of Bits", email = "opensource@trailofbits.com" }] -license = "AGPL-3.0" -requires-python = ">=3.12,<3.13" +description = "" +authors = [{ name = "Trail of Bits", email = "opensource@trailofbits" }] +requires-python = ">=3.10,<3.13" dependencies = [ "protobuf (>=3.20, <=3.20.3)", "redis (>=5.2.1,<6.0.0)", @@ -15,10 +14,6 @@ dependencies = [ "lxml>=5.3.1", ] -[project.urls] -Repository = "https://github.com/trailofbits/buttercup" -Issues = "https://github.com/trailofbits/buttercup/issues" - [project.scripts] buttercup-fuzzer-builder = "buttercup.fuzzing_infra.builder_bot:main" buttercup-fuzzer = "buttercup.fuzzing_infra.fuzzer_bot:main" diff --git a/orchestrator/pyproject.toml b/orchestrator/pyproject.toml index f4e5093a..a946af81 100644 --- a/orchestrator/pyproject.toml +++ b/orchestrator/pyproject.toml @@ -1,10 +1,9 @@ [project] name = "orchestrator" version = "0.5.0" -description = "Central coordination and task management for Buttercup CRS" +description = "Buttercup orchestrator" readme = "README.md" authors = [{ name = "Trail of Bits", email = "opensource@trailofbits.com" }] -license = "AGPL-3.0" requires-python = ">=3.12,<3.13" dependencies = [ "argon2-cffi>=21.0.0", @@ -23,10 +22,6 @@ dependencies = [ "uvicorn>=0.34.0", ] -[project.urls] -Repository = "https://github.com/trailofbits/buttercup" -Issues = "https://github.com/trailofbits/buttercup/issues" - [project.scripts] buttercup-task-server = "buttercup.orchestrator.task_server.__cli__:main" buttercup-task-downloader = "buttercup.orchestrator.downloader.__cli__:main" @@ -37,8 +32,8 @@ buttercup-scratch-cleaner = "buttercup.orchestrator.scratch_cleaner.__cli__:main buttercup-ui = "buttercup.orchestrator.ui.__cli__:main" -[dependency-groups] -dev = [ +[project.optional-dependencies] +tests = [ "flake8>=7.1.1", "mypy>=1.15.0", "pytest>=8.3.4", diff --git a/patcher/pyproject.toml b/patcher/pyproject.toml index b5ab02fd..988d9e71 100644 --- a/patcher/pyproject.toml +++ b/patcher/pyproject.toml @@ -1,10 +1,9 @@ [project] name = "patcher" version = "0.1.0" -description = "LLM-powered automated patch generation for vulnerabilities" +description = "Buttercup patcher" readme = "README.md" authors = [{ name = "Trail of Bits", email = "opensource@trailofbits.com" }] -license = "AGPL-3.0" requires-python = ">=3.12,<3.13" dependencies = [ "common", @@ -19,15 +18,11 @@ dependencies = [ "unidiff>=0.7.5", ] -[project.urls] -Repository = "https://github.com/trailofbits/buttercup" -Issues = "https://github.com/trailofbits/buttercup/issues" - [project.scripts] buttercup-patcher = "buttercup.patcher.__cli__:main" -[dependency-groups] -dev = [ +[project.optional-dependencies] +tests = [ "flake8>=7.1.1", "mypy>=1.15.0", "pytest>=8.3.4", diff --git a/program-model/pyproject.toml b/program-model/pyproject.toml index 901fa32e..dc41ed76 100644 --- a/program-model/pyproject.toml +++ b/program-model/pyproject.toml @@ -1,11 +1,10 @@ [project] name = "program-model" version = "0.1.0" -description = "Semantic code analysis using CodeQuery and Tree-sitter" +description = "Buttercup contextualizer" readme = "README.md" -authors = [{ name = "Trail of Bits", email = "opensource@trailofbits.com" }] -license = "AGPL-3.0" -requires-python = ">=3.12,<3.13" +authors = [{ name = "Trail of Bits", email = "opensource@trailofbits" }] +requires-python = ">=3.10,<3.13" dependencies = [ "common", "protobuf (>=3.20, <=3.20.3)", @@ -14,10 +13,6 @@ dependencies = [ "rapidfuzz ~= 3.12.2", ] -[project.urls] -Repository = "https://github.com/trailofbits/buttercup" -Issues = "https://github.com/trailofbits/buttercup/issues" - [project.scripts] buttercup-program-model = "buttercup.program_model.__cli__:main" diff --git a/seed-gen/pyproject.toml b/seed-gen/pyproject.toml index c1d5aa1d..00bcc9ce 100644 --- a/seed-gen/pyproject.toml +++ b/seed-gen/pyproject.toml @@ -1,12 +1,11 @@ [project] name = "seed-gen" version = "0.1.0" -description = "Intelligent test case generation for fuzzing" +description = "LLM seed generation and vulnerability discovery" readme = "README.md" authors = [ { name = "Trail of Bits", email = "opensource@trailofbits.com" }, ] -license = "AGPL-3.0" dependencies = [ "redis ~= 5.2.1", "common", @@ -31,11 +30,7 @@ packages = ["src/buttercup"] requires = ["hatchling"] build-backend = "hatchling.build" -[project.urls] -Repository = "https://github.com/trailofbits/buttercup" -Issues = "https://github.com/trailofbits/buttercup/issues" - -[dependency-groups] +[project.optional-dependencies] dev = [ "mypy ~= 1.15.0", "pytest ~= 8.3.4", @@ -72,7 +67,7 @@ warn_unused_configs = true warn_unused_ignores = true [tool.ruff] -line-length = 120 +line-length = 100 include = ["src/**/*.py", "test/**/*.py", "eval/**/*.py"] [tool.ruff.lint]