Skip to content

Commit f93b9f6

Browse files
Tomkessclaude
andcommitted
Merge master (#1816) into integration/eval-rebuild
#1816 landed on master, so master now carries the hand-rolled per-evaluator failure tail that #1846's _outcome.py refactor replaced here. Twelve source files conflicted on exactly that: ours is the centralised form of theirs, so ours wins everywhere. The structural guards in test_agentic_runner.py are what confirm it -- they accept raise_agentic_failure() as one of the three ways a kind can attach its records, and every multi-run kind still passes. test_agentic_runner.py conflicted the usual way, ours a superset of master's. Verified by AST rather than by reading: nothing defined on master is missing here, and no definition is duplicated. One defect the merge introduced silently, with no conflict to mark it: test_trace_linker.py's _EVALUATE_FUNCS gained duplicate entries for anomaly_detection, dashboard_summary and forecasting. Git auto-merged two versions of a growing list by appending both. pytest refused to collect the file over duplicate parametrize ids, which is the only reason it surfaced -- a list of tuples has no syntax error to trip over. 1771 passed, 2 skipped. The 16 fewer than before are precisely the 4 duplicate entries times the 4 tests parametrized over that list. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2 parents cbf04c1 + 8168136 commit f93b9f6

16 files changed

Lines changed: 66 additions & 47 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
python_dateutil >= 2.5.3
22
setuptools >= 21.0.0
3-
urllib3 ~= 2.6.1
3+
urllib3 ~= 2.8

‎.openapi-generator/custom_templates/setup.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ VERSION = "{{packageVersion}}"
1919
# http://pypi.python.org/pypi/setuptools
2020

2121
REQUIRES = [
22-
"urllib3 >= 2.6.1",
22+
"urllib3 >= 2.8.0",
2323
"python-dateutil",
2424
{{#asyncio}}
2525
"aiohttp >= 3.0.0",
@@ -41,7 +41,7 @@ setup(
4141
author_email="{{infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}",
4242
url="{{packageUrl}}",
4343
keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"],
44-
python_requires=">=3.6",
44+
python_requires=">=3.10",
4545
install_requires=REQUIRES,
4646
packages=find_packages(exclude=["test", "tests"]),
4747
include_package_data=True,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
python_dateutil >= 2.5.3
22
setuptools >= 21.0.0
3-
urllib3 ~= 2.6.1
3+
urllib3 ~= 2.8

‎gooddata-api-client/setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# http://pypi.python.org/pypi/setuptools
2626

2727
REQUIRES = [
28-
"urllib3 >= 2.6.1",
28+
"urllib3 >= 2.8.0",
2929
"python-dateutil",
3030
]
3131

@@ -37,7 +37,7 @@
3737
author_email="support@gooddata.com",
3838
url="",
3939
keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI definition"],
40-
python_requires=">=3.6",
40+
python_requires=">=3.10",
4141
install_requires=REQUIRES,
4242
packages=find_packages(exclude=["test", "tests"]),
4343
include_package_data=True,

‎packages/gooddata-dbt/pyproject.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,6 @@ source = [
5959
[build-system]
6060
requires = ["hatchling"]
6161
build-backend = "hatchling.build"
62+
63+
[tool.pytest]
64+
strict = true

‎packages/gooddata-eval/pyproject.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,6 @@ allowed-unresolved-imports = ["openai.**", "gooddata_api_client.**"]
7171
[build-system]
7272
requires = ["hatchling"]
7373
build-backend = "hatchling.build"
74+
75+
[tool.pytest]
76+
strict = true

‎packages/gooddata-eval/tests/test_trace_linker.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@ def test_run_trace_link_inline_runs_the_task_on_the_calling_thread():
123123
("anomaly_detection", "evaluate_agentic_anomaly_detection"),
124124
("dashboard_summary", "evaluate_agentic_dashboard_summary"),
125125
("forecasting", "evaluate_agentic_forecasting"),
126-
("dashboard_summary", "evaluate_agentic_dashboard_summary"),
127-
("anomaly_detection", "evaluate_agentic_anomaly_detection"),
128-
("forecasting", "evaluate_agentic_forecasting"),
129-
("anomaly_detection", "evaluate_agentic_anomaly_detection"),
130126
("what_if", "evaluate_agentic_what_if"),
131127
]
132128

‎packages/gooddata-fdw/pyproject.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ test = [
5454
"pytest-json-report==1.5.0",
5555
"vcrpy~=8.3.0",
5656
# TODO - Bump the version together with bumping the version of openapi generator
57-
"urllib3~=2.7.0",
57+
"urllib3~=2.8",
5858
"pyyaml",
5959
"tests_support",
6060
]
@@ -77,3 +77,6 @@ source = [
7777
[build-system]
7878
requires = ["hatchling"]
7979
build-backend = "hatchling.build"
80+
81+
[tool.pytest]
82+
strict = true

‎packages/gooddata-flexconnect/pyproject.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,6 @@ source = [
7979
[build-system]
8080
requires = ["hatchling"]
8181
build-backend = "hatchling.build"
82+
83+
[tool.pytest]
84+
strict = true

‎packages/gooddata-flight-server/pyproject.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@ source = [
8686
[build-system]
8787
requires = ["hatchling"]
8888
build-backend = "hatchling.build"
89+
90+
[tool.pytest]
91+
strict = true

0 commit comments

Comments
 (0)