fix: adjust for new settings module

ir

Author: ytausch

tests_integration/README.md

@@ -59,7 +59,7 @@ overwrite the feedstock repository in the test environment. The `IntegrationTest
 with the test environment.
 
 2. A `router` object to define mock responses for specific HTTP requests. All web requests are intercepted by an HTTP proxy.
-Consult `tests_integration.lib.shared.TRANSPARENT_URLS` to define URLs that should not be intercepted.
+Consult `tests_integration.lib.shared.get_transparent_urls` to define URLs that should not be intercepted.
 
 3. A function `validate(helper: IntegrationTestHelper)` for validating the state after the bot has run.
 The `IntegrationTestHelper` provides convenience methods such as `assert_version_pr_present` to check for the presence

tests_integration/lib/shared.py

@@ -5,7 +5,7 @@
 
 from fastapi import APIRouter
 
-from conda_forge_tick.settings import GITHUB_RUNNER_DEBUG, GRAPH_REPO_DEFAULT_BRANCH
+from conda_forge_tick.settings import settings
 
 
 class GitHubAccount(StrEnum):
@@ -44,32 +44,14 @@ class GitHubAccount(StrEnum):
 
 FEEDSTOCK_SUFFIX = "-feedstock"
 
-TRANSPARENT_URLS = {
-    f"https://raw.githubusercontent.com/regro/cf-graph-countyfair/{GRAPH_REPO_DEFAULT_BRANCH}/mappings/pypi/name_mapping.yaml",
-    f"https://raw.githubusercontent.com/regro/cf-graph-countyfair/{GRAPH_REPO_DEFAULT_BRANCH}/mappings/pypi/grayskull_pypi_mapping.json",
-    "https://api.github.com/*",
-    "https://pypi.io/packages/source/*",
-    "https://pypi.org/packages/source/*",
-    "https://files.pythonhosted.org/packages/*",
-    "https://api.anaconda.org/package/conda-forge/conda-forge-pinning",
-    "https://api.anaconda.org/download/conda-forge/conda-forge-pinning/*",
-    "https://binstar-cio-packages-prod.s3.amazonaws.com/*",
-}
-"""
-Requests to those are forwarded to the actual upstream URLs in the tests.
-Use Unix filename patterns (provided by fnmatch) to specify wildcards:
-
-https://docs.python.org/3/library/fnmatch.html
-"""
-
 
 def setup_logging(default_level: int):
     """
     Set up the Python logging module.
     Uses the passed log level as the default level.
     If running within GitHub Actions and the workflow runs in debug mode, the log level is never set above DEBUG.
     """
-    if GITHUB_RUNNER_DEBUG and default_level > logging.DEBUG:
+    if settings().github_runner_debug and default_level > logging.DEBUG:
         level = logging.DEBUG
     else:
         level = default_level
@@ -84,6 +66,28 @@ def is_user_account(account: GitHubAccount) -> bool:
     return IS_USER_ACCOUNT[account]
 
 
+def get_transparent_urls() -> set[str]:
+    """
+    Returns URLs which should be forwarded to the actual upstream URLs in the tests.
+    Unix filename patterns (provided by fnmatch) are used to specify wildcards:
+    https://docs.python.org/3/library/fnmatch.html
+    """
+
+    # this is not a constant because the graph_repo_default_branch setting is dynamic
+    graph_repo_default_branch = settings().graph_repo_default_branch
+    return {
+        f"https://raw.githubusercontent.com/regro/cf-graph-countyfair/{graph_repo_default_branch}/mappings/pypi/name_mapping.yaml",
+        f"https://raw.githubusercontent.com/regro/cf-graph-countyfair/{graph_repo_default_branch}/mappings/pypi/grayskull_pypi_mapping.json",
+        "https://api.github.com/*",
+        "https://pypi.io/packages/source/*",
+        "https://pypi.org/packages/source/*",
+        "https://files.pythonhosted.org/packages/*",
+        "https://api.anaconda.org/package/conda-forge/conda-forge-pinning",
+        "https://api.anaconda.org/download/conda-forge/conda-forge-pinning/*",
+        "https://binstar-cio-packages-prod.s3.amazonaws.com/*",
+    }
+
+
 def get_global_router():
     """
     Returns the global FastAPI router to be included in all test scenarios.

tests_integration/mock_server_addon.py

@@ -19,17 +19,19 @@
 from tests_integration.collect_test_scenarios import get_test_scenario
 from tests_integration.lib.shared import (
     ENV_TEST_SCENARIO_ID,
-    TRANSPARENT_URLS,
     VIRTUAL_PROXY_HOSTNAME,
     VIRTUAL_PROXY_PORT,
     get_global_router,
+    get_transparent_urls,
 )
 
 LOGGER = logging.getLogger(__name__)
 
 
 def request(flow: HTTPFlow):
-    if any(fnmatch.fnmatch(flow.request.url, pattern) for pattern in TRANSPARENT_URLS):
+    if any(
+        fnmatch.fnmatch(flow.request.url, pattern) for pattern in get_transparent_urls()
+    ):
         return
     flow.request.path = f"/{flow.request.host}{flow.request.path}"
     flow.request.host = VIRTUAL_PROXY_HOSTNAME

tests_integration/step_prepare.py

@@ -10,7 +10,7 @@
 
 from github import Github
 
-from conda_forge_tick.settings import GRAPH_REPO_DEFAULT_BRANCH
+from conda_forge_tick.settings import settings
 from tests_integration.lib.integration_test_helper import IntegrationTestHelper
 from tests_integration.lib.shared import (
     FEEDSTOCK_SUFFIX,
@@ -41,7 +41,7 @@ def reset_cf_graph():
         GitHubAccount.REGRO_ORG,
         "cf-graph-countyfair",
         Path(__file__).parent / "resources" / "empty-graph",
-        branch=GRAPH_REPO_DEFAULT_BRANCH,
+        branch=settings().graph_repo_default_branch,
     )
 
 

tests_integration/test_integration.py

@@ -8,6 +8,7 @@
 import pytest
 from xprocess import ProcessStarter, XProcess
 
+from conda_forge_tick.settings import settings
 from tests_integration import setup_repositories
 from tests_integration.collect_test_scenarios import get_test_scenario
 from tests_integration.lib.shared import setup_logging
@@ -107,7 +108,7 @@ def in_fresh_cf_graph():
     with tempfile.TemporaryDirectory() as tmpdir_s:
         tmpdir = Path(tmpdir_s)
 
-        cf_graph_repo = os.environ["CF_TICK_GRAPH_GITHUB_BACKEND_REPO"]
+        cf_graph_repo = settings().graph_github_backend_repo
         subprocess.run(
             [
                 "git",