Skip to content

Commit

Permalink
Merge pull request #724 from opensafely-core/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
rebkwok authored Dec 19, 2024
2 parents 24fa0f3 + 4c8e384 commit 6f747f1
Show file tree
Hide file tree
Showing 6 changed files with 495 additions and 503 deletions.
3 changes: 2 additions & 1 deletion airlock/visibility.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from collections.abc import Sequence
from dataclasses import dataclass
from typing import Protocol, Sequence
from typing import Protocol

from airlock.enums import (
RequestFileDecision,
Expand Down
409 changes: 202 additions & 207 deletions requirements.dev.txt

Large diffs are not rendered by default.

577 changes: 286 additions & 291 deletions requirements.prod.txt

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions services/tracing.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import os
from functools import wraps
from inspect import Parameter, signature
from typing import Dict

from opentelemetry import trace
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
Expand Down Expand Up @@ -70,8 +69,8 @@ def instrument(
*,
span_name: str = "",
record_exception: bool = True,
attributes: Dict[str, str] = None,
func_attributes: Dict[str, str] = None,
attributes: dict[str, str] = None,
func_attributes: dict[str, str] = None,
existing_tracer: trace.Tracer = None,
):
"""
Expand Down
1 change: 0 additions & 1 deletion tests/functional/test_code_pages.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ def test_code_from_workspace(live_server, page, context):

# manifest.json itself doesn't have a manifest entry, so code button not displayed
page.goto(live_server.url + "/workspaces/view/test-dir1/metadata/manifest.json")
page.locator("#file-button-more").click()
expect(more_button).to_be_visible()
more_button.click()
expect(code_button).not_to_be_visible()
Expand Down
3 changes: 3 additions & 0 deletions tests/functional/test_docs_screenshots.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ def do_review(screenshot=True):
"more_dropdown_el_request_file.png",
extra={"x": -180, "width": 180, "height": 160},
)
# Close the more dropdown and unfocus
page.keyboard.press("Escape")
more_locator.blur()

# Click to open the context modal
page.locator("button[data-modal=group-context]").click()
Expand Down

0 comments on commit 6f747f1

Please sign in to comment.