Skip to content

Commit 381878f

Browse files
committed
Merge remote-tracking branch 'origin/main' into adamtheturtle/vumark-api-test
2 parents 9409d2e + bef9e65 commit 381878f

2 files changed

Lines changed: 4 additions & 18 deletions

File tree

admin/create_secrets_files.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,12 @@
1313
import vws_web_tools
1414
from dotenv import load_dotenv
1515
from selenium.common.exceptions import TimeoutException
16-
from tenacity import (
17-
retry,
18-
retry_if_exception_type,
19-
stop_after_attempt,
20-
wait_exponential,
21-
)
2216

2317
if TYPE_CHECKING:
2418
from selenium.webdriver.remote.webdriver import WebDriver
2519
from vws_web_tools import DatabaseDict, VuMarkDatabaseDict
2620

2721

28-
RETRY_ON_TIMEOUT = retry(
29-
retry=retry_if_exception_type(exception_types=TimeoutException),
30-
stop=stop_after_attempt(max_attempt_number=3),
31-
wait=wait_exponential(multiplier=2, min=5, max=30),
32-
reraise=True,
33-
)
34-
35-
3622
def _create_and_get_database_details(
3723
driver: "WebDriver",
3824
email_address: str,
@@ -58,7 +44,7 @@ def _create_and_get_database_details(
5844
license_name=license_name,
5945
)
6046

61-
return RETRY_ON_TIMEOUT(vws_web_tools.get_database_details)(
47+
return vws_web_tools.get_database_details(
6248
driver=driver,
6349
database_name=database_name,
6450
)
@@ -77,7 +63,7 @@ def _create_and_get_vumark_details(
7763
database_name=vumark_database_name,
7864
)
7965

80-
return RETRY_ON_TIMEOUT(vws_web_tools.get_vumark_database_details)(
66+
return vws_web_tools.get_vumark_database_details(
8167
driver=driver,
8268
database_name=vumark_database_name,
8369
)

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ optional-dependencies.dev = [
7878
"pytest-xdist==3.8.0",
7979
"python-dotenv==1.2.1",
8080
"pyyaml==6.0.3",
81-
"requests-mock-flask==2026.1.12",
81+
"requests-mock-flask==2026.2.16",
8282
"ruff==0.15.1",
8383
# We add shellcheck-py not only for shell scripts and shell code blocks,
8484
# but also because having it installed means that ``actionlint-py`` will
@@ -104,7 +104,7 @@ optional-dependencies.dev = [
104104
"vulture==2.14",
105105
"vws-python==2026.2.15",
106106
"vws-test-fixtures==2023.3.5",
107-
"vws-web-tools==2026.2.16.1",
107+
"vws-web-tools==2026.2.17",
108108
"yamlfix==1.19.1",
109109
"zizmor==1.22.0",
110110
]

0 commit comments

Comments
 (0)