Skip to content

Commit 13aa729

Browse files
committed
Use BROKER_URL in priority
1 parent ecea7f2 commit 13aa729

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

examples/package_installation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def handle_endtag(self, tag: str) -> None:
7575
if tag == "title":
7676
self.in_title = False
7777

78-
resp = requests.get(url, timeout=10)
78+
resp = requests.get(url, timeout=5.0)
7979
parser = TitleParser()
8080
parser.feed(resp.text)
8181
return parser.title.strip()
@@ -134,7 +134,7 @@ async def main() -> None:
134134

135135
# Simple package (import name == pip name)
136136
print("--- requests (auto-detected) ---")
137-
title = await fetch_title.run("http://example.com")
137+
title = await fetch_title.run("https://example.com")
138138
print(f" Page title: {title}")
139139

140140
# Mismatched package names

offwork/__main__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,14 @@ async def _cmd_run_async(args: argparse.Namespace) -> None:
363363
print(f"Error: script not found: {script}", file=sys.stderr)
364364
sys.exit(1)
365365

366+
print(f"== Running: {script.relative_to(Path.cwd())} - venv: ...", end="", file=sys.stderr, flush=True)
366367
extras = _collect_extras(args, script)
367368
detected = _detect_script_packages(str(script))
368369

369370
async with temp_venv(install_offwork=True, extras=extras) as venv:
371+
print("\b"*3 + f"{venv.venv_dir}", file=sys.stderr, flush=True)
370372
if detected:
371-
print(f"Installing detected dependencies: {', '.join(detected)}", file=sys.stderr)
373+
print(f"== Installing dependencies: {', '.join(detected)}", file=sys.stderr)
372374
await venv.pip_install(*detected, extra_args=["--quiet"])
373375

374376
script_args = list(args.script_args or [])

offwork/_venv.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ async def temp_venv(
123123
def _cleanup() -> None:
124124
if os.path.isdir(tmpdir):
125125
logger.info("Cleaning up temporary venv at %s", tmpdir)
126-
print(f"Cleaning up temporary venv at {tmpdir}...", file=sys.stderr)
127126
shutil.rmtree(tmpdir, ignore_errors=True)
128127

129128
# Safety net: atexit ensures cleanup even if the context manager is
@@ -143,8 +142,7 @@ def _sigterm_handler(signum: int, frame: FrameType | None) -> None:
143142

144143
try:
145144
venv_dir = Path(tmpdir) / "venv"
146-
logger.info("Creating temporary venv at %s", venv_dir)
147-
print("Creating temporary virtual environment...", file=sys.stderr)
145+
logger.info("Creating temporary venv: %s", venv_dir)
148146
loop = asyncio.get_running_loop()
149147
await loop.run_in_executor(
150148
None, lambda: venv.create(str(venv_dir), with_pip=True)
@@ -164,7 +162,6 @@ def _sigterm_handler(signum: int, frame: FrameType | None) -> None:
164162
spec = "offwork"
165163
if extras:
166164
spec += f"[{','.join(extras)}]"
167-
print("Installing offwork into temporary venv...", file=sys.stderr)
168165
await tv.pip_install(spec, extra_args=["--quiet"])
169166

170167
yield tv

offwork/worker/remote.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@
4444

4545

4646
def _resolve_url(url: str | None) -> str:
47-
"""Return *url* if given, otherwise read from the environment variable."""
47+
"""Return BROKER_URL, then url, then OFFWORK_BACKEND env var."""
48+
broker_url = os.environ.get("BROKER_URL")
49+
if broker_url:
50+
return broker_url
4851
if url is not None:
4952
return url
5053
env_url = os.environ.get(_ENV_VAR)

0 commit comments

Comments
 (0)