Skip to content

Commit 85c37eb

Browse files
committed
Complete the main merge: adopt setuptools packaging, drop hatch remnants
The previous merge commit was pushed with unresolved conflict markers in pyproject.toml. Resolve to main's setuptools auto-discovery (which finds deepagents_plugin without registration) and regenerate the lock.
1 parent 1c83ca1 commit 85c37eb

2 files changed

Lines changed: 313 additions & 70 deletions

File tree

pyproject.toml

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -116,62 +116,8 @@ constraint-dependencies = [
116116
"yarl!=1.24.0",
117117
]
118118

119-
<<<<<<< HEAD
120-
[tool.hatch.metadata]
121-
allow-direct-references = true
122-
123-
[tool.hatch.build.targets.sdist]
124-
include = ["./**/*.py"]
125-
exclude = ["lambda_worker/**"]
126-
127-
[tool.hatch.build.targets.wheel]
128-
include = ["./**/*.py"]
129-
exclude = ["lambda_worker/**"]
130-
packages = [
131-
"activity_worker",
132-
"bedrock",
133-
"cloud_export_to_parquet",
134-
"context_propagation",
135-
"custom_converter",
136-
"custom_decorator",
137-
"custom_metric",
138-
"deepagents_plugin",
139-
"dsl",
140-
"encryption",
141-
"external_storage",
142-
"external_storage_redis",
143-
"gevent_async",
144-
"hello",
145-
"langfuse_tracing",
146-
"langgraph_plugin",
147-
"langsmith_tracing",
148-
"message_passing",
149-
"nexus",
150-
"open_telemetry",
151-
"patching",
152-
"polling",
153-
"prometheus",
154-
"pydantic_converter",
155-
"pydantic_converter_v1",
156-
"pyproject.toml",
157-
"replay",
158-
"schedules",
159-
"sentry",
160-
"sleep_for_days",
161-
"strands_plugin",
162-
"tests",
163-
"trio_async",
164-
"updatable_timer",
165-
"worker_specific_task_queues",
166-
"worker_versioning",
167-
]
168-
169-
[tool.hatch.build.targets.wheel.sources]
170-
"./**/*.py" = "**/*.py"
171-
=======
172119
[tool.setuptools.packages.find]
173120
exclude = ["lambda_worker*"]
174-
>>>>>>> origin/main
175121

176122
[build-system]
177123
requires = ["setuptools>=77"]

0 commit comments

Comments
 (0)