Skip to content
This repository was archived by the owner on Jul 29, 2026. It is now read-only.

Resolve merge conflicts for UCNS backend PR #109

Merged
erinepshovel-code merged 2 commits into from
Jun 26, 2026
Merged

Resolve merge conflicts for UCNS backend PR #109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfc6c64
Resolve backend merge conflicts
erinepshovel-code Jun 26, 2026
9294c26
Merge branch 'codex/examine-skill-lib-and-create-new-backend-salmqv' …
erinepshovel-code Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/tests/test_backend_contracts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def test_backend_src_path_is_self_contained(tmp_path):
result = subprocess.run(
[sys.executable, "-c", code],
cwd=tmp_path,
env={**os.environ, "PYTHONPATH": str(Path(__file__).resolve().parents[1] / "src")},

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Remove the duplicate env keyword

This new env= argument duplicates the existing env=env just below it, so Python raises SyntaxError: keyword argument repeated: env while importing this test module. In any environment that runs or even collects backend/tests/test_backend_contracts.py, the backend test suite now fails before executing any tests; keep only one env argument.

Useful? React with 👍 / 👎.

env=env,
text=True,
capture_output=True,
Expand Down
Loading