synodic-client 0.0.1.dev45__tar.gz → 0.0.1.dev47__tar.gz

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: synodic_client
-Version: 0.0.1.dev45
+Version: 0.0.1.dev47
 Author-Email: Synodic Software <contact@synodic.software>
 License: LGPL-3.0-or-later
 Project-URL: homepage, https://github.com/synodic/synodic-client
@@ -8,7 +8,7 @@ Project-URL: repository, https://github.com/synodic/synodic-client
 Requires-Python: <3.15,>=3.14
 Requires-Dist: pyside6>=6.10.2
 Requires-Dist: packaging>=26.0
-Requires-Dist: porringer>=0.2.1.dev72
+Requires-Dist: porringer>=0.2.1.dev73
 Requires-Dist: qasync>=0.28.0
 Requires-Dist: velopack>=0.0.1444.dev49733
 Requires-Dist: typer>=0.24.1

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/pyproject.toml

@@ -10,12 +10,12 @@ requires-python = ">=3.14, <3.15"
 dependencies = [
     "pyside6>=6.10.2",
     "packaging>=26.0",
-    "porringer>=0.2.1.dev72",
+    "porringer>=0.2.1.dev73",
     "qasync>=0.28.0",
     "velopack>=0.0.1444.dev49733",
     "typer>=0.24.1",
 ]
-version = "0.0.1.dev45"
+version = "0.0.1.dev47"
 
 [project.license]
 text = "LGPL-3.0-or-later"
@@ -102,8 +102,6 @@ replace-imports-with-any = [
 
 [tool.pdm.version]
 source = "scm"
-write_to = "synodic_client/_version.py"
-write_template = "__version__ = '{}'\n"
 
 [tool.pdm.resolution]
 allow-prereleases = true

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/synodic_client/application/qt.py

@@ -28,7 +28,6 @@ from synodic_client.resolution import (
     ResolvedConfig,
     resolve_config,
     resolve_update_config,
-    resolve_version,
 )
 from synodic_client.updater import initialize_velopack
 
@@ -52,7 +51,7 @@ def _init_services(logger: logging.Logger) -> tuple[Client, API, ResolvedConfig]
 
     logger.info(
         'Synodic Client v%s started (channel: %s, source: %s, cached_projects: %d)',
-        resolve_version(client),
+        client.version,
         update_config.channel.name,
         update_config.repo_url,
         len(cached_dirs),

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/synodic_client/application/screen/settings.py

@@ -27,7 +27,6 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 
-from synodic_client._version import __version__
 from synodic_client.application.icon import app_icon
 from synodic_client.application.screen.card import CardFrame
 from synodic_client.application.theme import SETTINGS_WINDOW_MIN_SIZE, UPDATE_STATUS_CHECKING_STYLE
@@ -58,16 +57,19 @@ class SettingsWindow(QMainWindow):
     def __init__(
         self,
         config: ResolvedConfig,
+        version: str = '',
         parent: QWidget | None = None,
     ) -> None:
         """Initialise the settings window.
 
         Args:
             config: The current resolved configuration snapshot.
+            version: The application version string to display.
             parent: Optional parent widget.
         """
         super().__init__(parent)
         self._config = config
+        self._version = version
         self.setWindowTitle('Synodic Settings')
         self.setMinimumSize(*SETTINGS_WINDOW_MIN_SIZE)
         self.setWindowIcon(app_icon())
@@ -93,7 +95,7 @@ class SettingsWindow(QMainWindow):
         layout.addWidget(self._build_advanced_section())
         layout.addStretch()
 
-        version_label = QLabel(f'Version {__version__}')
+        version_label = QLabel(f'Version {self._version}')
         version_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
         version_label.setStyleSheet('color: rgba(255, 255, 255, 0.4); font-size: 11px;')
         layout.addWidget(version_label)

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/synodic_client/application/screen/tray.py

@@ -69,7 +69,10 @@ class TrayScreen:
         self._build_menu(app, window)
 
         # Settings window (created once, shown/hidden on demand)
-        self._settings_window = SettingsWindow(self._resolve_config())
+        self._settings_window = SettingsWindow(
+            self._resolve_config(),
+            version=str(self._client.version),
+        )
         self._settings_window.settings_changed.connect(self._on_settings_changed)
 
         # MainWindow gear button → open settings

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/synodic_client/client.py

@@ -25,11 +25,21 @@ class Client:
 
     @property
     def version(self) -> Version:
-        """Extracts the version from the installed client.
+        """Return the best-known application version.
+
+        When a Velopack-installed updater is available the authoritative
+        version comes from the native binary manifest.  Otherwise, the
+        Python package metadata version (``importlib.metadata``) is used.
 
         Returns:
-            The version data
+            The resolved version.
         """
+        if self._updater is not None:
+            try:
+                if self._updater.is_installed:
+                    return self._updater.current_version
+            except Exception:
+                logger.debug('Failed to query Velopack version, falling back', exc_info=True)
         try:
             return Version(importlib.metadata.version(self.distribution))
         except importlib.metadata.PackageNotFoundError:

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/synodic_client/resolution.py

@@ -18,8 +18,6 @@ import logging
 import sys
 from dataclasses import dataclass
 
-from packaging.version import Version
-
 from synodic_client.config import (
     UserConfig,
     load_build_config,
@@ -210,36 +208,6 @@ def resolve_update_config(config: ResolvedConfig) -> UpdateConfig:
     )
 
 
-def resolve_version(client: object) -> Version:
-    """Return the best-known application version.
-
-    When a Velopack-installed ``Updater`` is available the authoritative
-    version comes from the native binary manifest.  Otherwise, the
-    Python package metadata version (``importlib.metadata``) is used.
-
-    Accepts ``Client`` (or any object with ``.updater`` and ``.version``
-    attributes) so that :mod:`resolution` does not need a hard import
-    of :class:`~synodic_client.client.Client` — avoiding a tighter
-    coupling than necessary.
-
-    Args:
-        client: The application service facade (typically a
-            :class:`~synodic_client.client.Client` instance).
-
-    Returns:
-        The resolved :class:`~packaging.version.Version`.
-    """
-    updater = getattr(client, 'updater', None)
-    if updater is not None:
-        try:
-            if updater.is_installed:
-                return updater.current_version
-        except Exception:
-            logger.debug('Failed to query Velopack version, falling back', exc_info=True)
-
-    return getattr(client, 'version', Version('0.0.0'))
-
-
 def resolve_enabled_plugins(
     config: ResolvedConfig,
     all_plugin_names: list[str],

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/synodic_client/updater.py

@@ -32,6 +32,40 @@ GITHUB_REPO_URL = 'https://github.com/synodic/synodic-client'
 _DEV_RELEASE_TAG = 'dev'
 
 
+def pep440_to_semver(version_string: str) -> str:
+    """Convert a PEP 440 version string to a SemVer string for Velopack.
+
+    Velopack requires strict SemVer (``MAJOR.MINOR.PATCH[-pre.N]``) while
+    Python tooling produces PEP 440 (e.g. ``0.1.dev47+g799543c``).  This
+    function bridges the two:
+
+    * Normalises the base to three components (``0.1`` → ``0.1.0``).
+    * Converts ``.devN`` to ``-dev.N``.
+    * Strips local segments (``+g…``).
+    * Stable versions pass through unchanged (``1.0.0`` → ``1.0.0``).
+
+    Examples::
+
+        >>> pep440_to_semver('0.1.dev47+g799543c')
+        '0.1.0-dev.47'
+        >>> pep440_to_semver('0.1.1.dev3')
+        '0.1.1-dev.3'
+        >>> pep440_to_semver('1.0.0')
+        '1.0.0'
+
+    Args:
+        version_string: A PEP 440 version string.
+
+    Returns:
+        A SemVer-compatible version string.
+    """
+    v = Version(version_string)
+    base = f'{v.major}.{v.minor}.{v.micro}'
+    if v.dev is not None:
+        return f'{base}-dev.{v.dev}'
+    return base
+
+
 def github_release_asset_url(repo_url: str, channel: UpdateChannel) -> str:
     """Convert a GitHub repository URL into a release-asset download URL.
 

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/tests/unit/qt/test_settings.py

@@ -32,10 +32,10 @@ def _make_config(**overrides: Any) -> ResolvedConfig:
     return ResolvedConfig(**defaults)
 
 
-def _make_window(config: ResolvedConfig | None = None) -> SettingsWindow:
+def _make_window(config: ResolvedConfig | None = None, version: str = '0.0.0.test') -> SettingsWindow:
     """Create a ``SettingsWindow`` without showing it."""
     cfg = config or _make_config()
-    window = SettingsWindow(cfg)
+    window = SettingsWindow(cfg, version=version)
     return window
 
 
@@ -60,6 +60,12 @@ class TestSettingsWindowConstruction:
         assert window.minimumWidth() == SETTINGS_WINDOW_MIN_SIZE[0]
         assert window.minimumHeight() == SETTINGS_WINDOW_MIN_SIZE[1]
 
+    @staticmethod
+    def test_version_label_displays_passed_version() -> None:
+        """Version label shows the version string passed to the constructor."""
+        window = _make_window(version='1.2.3.dev42')
+        assert window._version == '1.2.3.dev42'
+
 
 # ---------------------------------------------------------------------------
 # sync_from_config

synodic_client-0.0.1.dev47/tests/unit/test_client_version.py

@@ -0,0 +1,98 @@
+"""Tests for Client.version property behavior."""
+
+import importlib.metadata
+from unittest.mock import MagicMock, PropertyMock, patch
+
+from packaging.version import Version
+
+from synodic_client.client import Client
+
+
+class TestClientVersion:
+    """Tests for Client.version property."""
+
+    @staticmethod
+    def test_version_from_metadata() -> None:
+        """Verify version is retrieved from importlib.metadata when available."""
+        client = Client()
+
+        with patch.object(importlib.metadata, 'version', return_value='1.2.3'):
+            version = client.version
+
+        assert version == Version('1.2.3')
+
+    @staticmethod
+    def test_version_is_version_object() -> None:
+        """Verify version property returns a Version object."""
+        client = Client()
+        version = client.version
+
+        assert isinstance(version, Version)
+
+    @staticmethod
+    def test_version_dev_format() -> None:
+        """Verify dev versions are parsed correctly."""
+        client = Client()
+        dev_version = '1.0.0.dev5+gabcdef1'
+        expected = Version(dev_version)
+
+        with patch.object(importlib.metadata, 'version', return_value=dev_version):
+            version = client.version
+
+        assert version == expected
+        assert version.dev == expected.dev
+        assert version.local == expected.local
+
+
+class TestClientVersionResolution:
+    """Verify Client.version prefers Velopack when available."""
+
+    @staticmethod
+    def test_returns_velopack_version_when_installed() -> None:
+        """Velopack version is preferred when an installed updater exists."""
+        mock_updater = MagicMock()
+        mock_updater.is_installed = True
+        mock_updater.current_version = Version('5.6.7')
+
+        client = Client()
+        client._updater = mock_updater
+
+        assert client.version == Version('5.6.7')
+
+    @staticmethod
+    def test_falls_back_when_not_installed() -> None:
+        """Metadata version is used when the updater is not Velopack-installed."""
+        mock_updater = MagicMock()
+        mock_updater.is_installed = False
+
+        client = Client()
+        client._updater = mock_updater
+
+        with patch.object(importlib.metadata, 'version', return_value='1.0.0.dev1'):
+            version = client.version
+
+        assert version == Version('1.0.0.dev1')
+
+    @staticmethod
+    def test_falls_back_when_no_updater() -> None:
+        """Metadata version is used when the updater has not been initialized."""
+        client = Client()
+
+        with patch.object(importlib.metadata, 'version', return_value='2.3.4'):
+            version = client.version
+
+        assert version == Version('2.3.4')
+
+    @staticmethod
+    def test_falls_back_on_exception() -> None:
+        """Graceful fallback when querying the updater raises an exception."""
+        mock_updater = MagicMock()
+        type(mock_updater).is_installed = PropertyMock(side_effect=RuntimeError('boom'))
+
+        client = Client()
+        client._updater = mock_updater
+
+        with patch.object(importlib.metadata, 'version', return_value='3.0.0'):
+            version = client.version
+
+        assert version == Version('3.0.0')

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/tests/unit/test_resolution.py

@@ -2,9 +2,7 @@
 
 from pathlib import Path
 from typing import Any
-from unittest.mock import MagicMock, PropertyMock, patch
-
-from packaging.version import Version
+from unittest.mock import patch
 
 from synodic_client.config import BuildConfig, UserConfig
 from synodic_client.resolution import (
@@ -13,7 +11,6 @@ from synodic_client.resolution import (
     resolve_config,
     resolve_enabled_plugins,
     resolve_update_config,
-    resolve_version,
     seed_user_config_from_build,
     update_user_config,
 )
@@ -425,58 +422,3 @@ class TestResolveUpdateConfig:
         result = resolve_update_config(config)
         assert result.auto_update_interval_minutes == 0
         assert result.tool_update_interval_minutes == 0
-
-
-# ---------------------------------------------------------------------------
-# resolve_version
-# ---------------------------------------------------------------------------
-
-
-class TestResolveVersion:
-    """Tests for resolve_version."""
-
-    @staticmethod
-    def test_returns_velopack_version_when_installed() -> None:
-        """Verify the Velopack version is preferred when a manager is present."""
-        mock_updater = MagicMock()
-        mock_updater.is_installed = True
-        mock_updater.current_version = Version('5.6.7')
-
-        mock_client = MagicMock()
-        mock_client.updater = mock_updater
-        mock_client.version = Version('1.0.0.dev1')
-
-        assert resolve_version(mock_client) == Version('5.6.7')
-
-    @staticmethod
-    def test_falls_back_when_not_installed() -> None:
-        """Verify importlib.metadata version is used when not Velopack-installed."""
-        mock_updater = MagicMock()
-        mock_updater.is_installed = False
-
-        mock_client = MagicMock()
-        mock_client.updater = mock_updater
-        mock_client.version = Version('1.0.0.dev1')
-
-        assert resolve_version(mock_client) == Version('1.0.0.dev1')
-
-    @staticmethod
-    def test_falls_back_when_no_updater() -> None:
-        """Verify importlib.metadata version is used when updater is None."""
-        mock_client = MagicMock()
-        mock_client.updater = None
-        mock_client.version = Version('2.3.4')
-
-        assert resolve_version(mock_client) == Version('2.3.4')
-
-    @staticmethod
-    def test_falls_back_on_exception() -> None:
-        """Verify graceful fallback when querying the updater raises."""
-        mock_updater = MagicMock()
-        type(mock_updater).is_installed = PropertyMock(side_effect=RuntimeError('boom'))
-
-        mock_client = MagicMock()
-        mock_client.updater = mock_updater
-        mock_client.version = Version('3.0.0')
-
-        assert resolve_version(mock_client) == Version('3.0.0')

{synodic_client-0.0.1.dev45 → synodic_client-0.0.1.dev47}/tests/unit/test_updater.py

@@ -16,6 +16,7 @@ from synodic_client.updater import (
     UpdateState,
     github_release_asset_url,
     initialize_velopack,
+    pep440_to_semver,
     platform_suffix,
 )
 
@@ -528,3 +529,43 @@ class TestGetVelopackManager:
 
         assert updater._current_version == Version('9.8.7')
         assert updater.current_version == Version('9.8.7')
+
+
+class TestPep440ToSemver:
+    """Tests for pep440_to_semver conversion."""
+
+    @staticmethod
+    def test_dev_version_two_part_base() -> None:
+        """PDM SCM 2-part base normalises to 3-part SemVer."""
+        assert pep440_to_semver('0.1.dev47+g799543c') == '0.1.0-dev.47'
+
+    @staticmethod
+    def test_dev_version_three_part_base() -> None:
+        """Three-part dev version converts correctly."""
+        assert pep440_to_semver('0.1.1.dev3') == '0.1.1-dev.3'
+
+    @staticmethod
+    def test_stable_version() -> None:
+        """Stable version passes through unchanged."""
+        assert pep440_to_semver('1.0.0') == '1.0.0'
+
+    @staticmethod
+    def test_stable_version_two_part() -> None:
+        """Two-part stable normalises to three-part."""
+        assert pep440_to_semver('1.0') == '1.0.0'
+
+    @staticmethod
+    def test_dev_zero() -> None:
+        """Dev release number zero is preserved."""
+        assert pep440_to_semver('0.1.0.dev0') == '0.1.0-dev.0'
+
+    @staticmethod
+    def test_local_segment_stripped() -> None:
+        """Local segment (+gXXXXXXX) is stripped."""
+        assert pep440_to_semver('1.2.3.dev10+gabcdef1') == '1.2.3-dev.10'
+
+    @staticmethod
+    def test_semver_input_passthrough() -> None:
+        """SemVer-style pre-release input is normalised via PEP 440."""
+        # packaging.version.Version normalises '0.1.0-dev.5' to '0.1.0.dev5'
+        assert pep440_to_semver('0.1.0-dev.5') == '0.1.0-dev.5'

synodic_client-0.0.1.dev45/synodic_client/_version.py

@@ -1 +0,0 @@
-__version__ = '0.0.1.dev45'

synodic_client-0.0.1.dev45/tests/unit/test_client_version.py

@@ -1,44 +0,0 @@
-"""Tests for Client.version property behavior."""
-
-import importlib.metadata
-from unittest.mock import patch
-
-from packaging.version import Version
-
-from synodic_client.client import Client
-
-
-class TestClientVersion:
-    """Tests for Client.version property."""
-
-    @staticmethod
-    def test_version_from_metadata() -> None:
-        """Verify version is retrieved from importlib.metadata when available."""
-        client = Client()
-
-        with patch.object(importlib.metadata, 'version', return_value='1.2.3'):
-            version = client.version
-
-        assert version == Version('1.2.3')
-
-    @staticmethod
-    def test_version_is_version_object() -> None:
-        """Verify version property returns a Version object."""
-        client = Client()
-        version = client.version
-
-        assert isinstance(version, Version)
-
-    @staticmethod
-    def test_version_dev_format() -> None:
-        """Verify dev versions are parsed correctly."""
-        client = Client()
-        dev_version = '1.0.0.dev5+gabcdef1'
-        expected = Version(dev_version)
-
-        with patch.object(importlib.metadata, 'version', return_value=dev_version):
-            version = client.version
-
-        assert version == expected
-        assert version.dev == expected.dev
-        assert version.local == expected.local