Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/fromager/packagesettings/_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ def _gitlab_provider(
raise ValueError(f"Empty path in {self.project_url}")
return resolver.GitLabTagProvider(
project_path=self.project_url.path.lstrip("/"),
server_url=f"https://{self.project_url.host}:{self.project_url.port}",
server_url=f"https://{self.project_url.host}:{self.project_url.port or 443}",
constraints=ctx.constraints,
matcher=self._get_matcher(ctx),
req_type=req_type,
Expand Down
14 changes: 14 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,20 @@ def testdata_context(
return ctx


def _configure_package(ctx: context.WorkContext, yaml_str: str) -> None:
"""Apply one package setting to the test context."""
ps = packagesettings.PackageSettings.from_string("pkg", yaml_str)
ctx.settings._package_settings[ps.name] = ps


def _source_yaml(provider: str) -> str:
"""Return package settings that select a configured source provider."""
yaml_str = f"source:\n provider: {provider}\n"
if provider == "hook-prebuilt":
yaml_str += " index_url: https://index.test/simple\n"
return yaml_str


def make_sbom_ctx(
tmp_path: pathlib.Path,
sbom_settings: SbomSettings | None = None,
Expand Down
15 changes: 1 addition & 14 deletions tests/test_bootstrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import pytest
import requests.exceptions
from conftest import _configure_package, _source_yaml
from packaging.requirements import Requirement
from packaging.utils import canonicalize_name
from packaging.version import Version
Expand Down Expand Up @@ -48,20 +49,6 @@
from fromager.requirements_file import RequirementType, SourceType


def _configure_package(ctx: WorkContext, yaml_str: str) -> None:
"""Apply one package setting to the test context."""
ps = PackageSettings.from_string("pkg", yaml_str)
ctx.settings._package_settings[ps.name] = ps


def _source_yaml(provider: str) -> str:
"""Return package settings that select a configured source provider."""
yaml_str = f"source:\n provider: {provider}\n"
if provider == "hook-prebuilt":
yaml_str += " index_url: https://index.test/simple\n"
return yaml_str


def test_phase_subclass_without_phase_attribute_raises() -> None:
"""Concrete Phase subclass missing 'phase' raises TypeError at class definition."""
with pytest.raises(TypeError, match="must define the 'phase' class attribute"):
Expand Down
15 changes: 1 addition & 14 deletions tests/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import pytest
import requests_mock
from click.testing import CliRunner
from conftest import _configure_package, _source_yaml
from packaging.requirements import Requirement
from packaging.version import Version

Expand All @@ -20,20 +21,6 @@
from fromager.log import requirement_ctxvar


def _configure_package(ctx: WorkContext, yaml_str: str) -> None:
"""Apply one package setting to the test context."""
ps = packagesettings.PackageSettings.from_string("pkg", yaml_str)
ctx.settings._package_settings[ps.name] = ps


def _source_yaml(provider: str) -> str:
"""Return package settings that select a configured source provider."""
yaml_str = f"source:\n provider: {provider}\n"
if provider == "hook-prebuilt":
yaml_str += " index_url: https://index.test/simple\n"
return yaml_str


@pytest.mark.parametrize("provider", ["pypi-prebuilt", "hook-prebuilt"])
def test_build_order_replay_uses_configured_download(
tmp_context: WorkContext, provider: str
Expand Down
28 changes: 28 additions & 0 deletions tests/test_list_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,34 @@ def test_list_versions_source_min_release_age(
assert status_by_version["1.3.2"] == "available"


def test_list_versions_source_inherits_global_min_release_age(
cli_runner: CliRunner,
tmp_path: pathlib.Path,
monkeypatch: pytest.MonkeyPatch,
) -> None:
"""A source config without min_release_age inherits the global cooldown."""
_freeze_cooldown_bootstrap_time(monkeypatch)

settings_dir = tmp_path / "settings"
_write_source_settings(settings_dir)

# No source override, so the global value (3 days) applies: 2.0.0 is
# 2 days old and blocked, while 1.3.2 is 11 days old and available.
result = _invoke_with_source_settings(
cli_runner,
settings_dir,
extra_args=["--format", "json"],
min_release_age=3,
)
assert result.exit_code == 0
status_by_version = {
row["version"]: row["cooldown"]
for row in json.loads(_extract_json_from_output(result.stdout))
}
assert status_by_version["2.0.0"] == "blocked"
assert status_by_version["1.3.2"] == "available"


def test_list_versions_source_min_release_age_zero(
cli_runner: CliRunner,
tmp_path: pathlib.Path,
Expand Down
4 changes: 2 additions & 2 deletions tests/test_packagesettings_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ def test_resolver_provider(self, tmp_context: WorkContext) -> None:
p = r.resolver_provider(tmp_context, _REQ, _REQ_TYPE)
assert isinstance(p, resolver.GitLabTagProvider)
assert p.project_path == "python-wheel-build/fromager"
assert "gitlab.test" in p.server_url
assert p.server_url == "https://gitlab.test:443"
assert p.override_download_url is None

@mock.patch("fromager.downloads.download_url")
Expand Down Expand Up @@ -807,7 +807,7 @@ def test_resolver_provider(self, tmp_context: WorkContext) -> None:
p = r.resolver_provider(tmp_context, _REQ, _REQ_TYPE)
assert isinstance(p, resolver.GitLabTagProvider)
assert p.project_path == "python-wheel-build/fromager"
assert "gitlab.test" in p.server_url
assert p.server_url == "https://gitlab.test:443"
assert p.override_download_url == (
"git+https://gitlab.test/python-wheel-build/fromager@{tagname}"
)
Expand Down
16 changes: 1 addition & 15 deletions tests/test_wheels.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from unittest.mock import Mock, patch

import pytest
from conftest import make_sbom_ctx
from conftest import _configure_package, _source_yaml, make_sbom_ctx
from packaging.requirements import Requirement
from packaging.tags import Tag
from packaging.version import Version
Expand All @@ -22,20 +22,6 @@
from fromager.packagesettings import SbomSettings, Settings, SettingsFile, WheelSettings


def _configure_package(ctx: context.WorkContext, yaml_str: str) -> None:
"""Apply one package setting to the test context."""
ps = packagesettings.PackageSettings.from_string("pkg", yaml_str)
ctx.settings._package_settings[ps.name] = ps


def _source_yaml(provider: str) -> str:
"""Return package settings that select a configured source provider."""
yaml_str = f"source:\n provider: {provider}\n"
if provider == "hook-prebuilt":
yaml_str += " index_url: https://index.test/simple\n"
return yaml_str


@pytest.mark.parametrize("provider", ["pypi-prebuilt", "hook-prebuilt"])
def test_configured_prebuilt_download_uses_resolver_default(
tmp_context: context.WorkContext, provider: str
Expand Down