python-nss-ng 1.0.5__tar.gz → 1.1.0__tar.gz

python_nss_ng-1.1.0/.git_archival.txt

@@ -0,0 +1,4 @@
+node: ceb747232755bf570e5ceacb4e3a82f5d31ca085
+node-date: 2026-06-09T07:15:24-06:00
+describe-name: v1.1.0
+ref-names: grafted, HEAD, tag: v1.1.0, origin/main, origin/HEAD

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/CONTRIBUTING.md

@@ -51,7 +51,7 @@ See [QUICKSTART.md](QUICKSTART.md) for detailed setup instructions.
 
 ```bash
 # Clone the repository
-git clone https://github.com/ModeSevenIndustrialSolutions/python-nss-ng.git
+git clone https://github.com/lfreleng-actions/python-nss-ng.git
 cd python-nss-ng
 
 # Install system dependencies (Ubuntu/Debian)
@@ -342,7 +342,7 @@ Releases are handled automatically via `build-test-release.yaml`:
 
 ## Getting Help
 
-- **Issues:** [GitHub Issues](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/issues)
+- **Issues:** [GitHub Issues](https://github.com/lfreleng-actions/python-nss-ng/issues)
 - **Discussions:** Use GitHub Discussions for questions
 - **Email:** Maintainers listed in `pyproject.toml`
 

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-nss-ng
-Version: 1.0.5
+Version: 1.1.0
 Summary: Python bindings for Network Security Services (NSS) and Netscape Portable Runtime (NSPR)
 Keywords: nss,nspr,cryptography,ssl,tls,pki,x509,security
 Author-Email: John Dennis <jdennis@redhat.com>, Matthew Watkins <mwatkins@linuxfoundation.org>
@@ -26,8 +26,8 @@ Classifier: Topic :: Security :: Cryptography
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Project-URL: Homepage, http://www.mozilla.org/projects/security/pki/python-nss-ng
 Project-URL: Documentation, http://www.mozilla.org/projects/security/pki/python-nss-ng
-Project-URL: Repository, https://github.com/ModeSevenIndustrialSolutions/python-nss-ng
-Project-URL: Issues, https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/issues
+Project-URL: Repository, https://github.com/lfreleng-actions/python-nss-ng
+Project-URL: Issues, https://github.com/lfreleng-actions/python-nss-ng/issues
 Requires-Python: >=3.10
 Provides-Extra: test
 Requires-Dist: pytest>=9.0.2; extra == "test"
@@ -62,8 +62,8 @@ SPDX-FileCopyrightText: 2025 The Linux Foundation
 
 # python-nss-ng
 
-[![Platform Compatibility](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/actions/workflows/compatibility.yaml/badge.svg)](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/actions/workflows/compatibility.yaml)
-[![CI/CD Pipeline](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/actions/workflows/build-test.yaml/badge.svg)](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/actions/workflows/build-test.yaml)
+[![Platform Compatibility](https://github.com/lfreleng-actions/python-nss-ng/actions/workflows/compatibility.yaml/badge.svg)](https://github.com/lfreleng-actions/python-nss-ng/actions/workflows/compatibility.yaml)
+[![CI/CD Pipeline](https://github.com/lfreleng-actions/python-nss-ng/actions/workflows/build-test.yaml/badge.svg)](https://github.com/lfreleng-actions/python-nss-ng/actions/workflows/build-test.yaml)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
 [![License: MPL-2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
 
@@ -354,5 +354,5 @@ the NSS compatibility issues and modernize the C code are welcome!
 
 ## Support
 
-- **Issues**: [GitHub Issues](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/issues)
-- **Repository**: [GitHub Repository](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng)
+- **Issues**: [GitHub Issues](https://github.com/lfreleng-actions/python-nss-ng/issues)
+- **Repository**: [GitHub Repository](https://github.com/lfreleng-actions/python-nss-ng)

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/QUICKSTART.md

@@ -46,7 +46,7 @@ brew install nss nspr pkg-config
 curl -LsSf https://astral.sh/uv/install.sh | sh
 
 # Clone the repository
-git clone https://github.com/ModeSevenIndustrialSolutions/python-nss-ng.git
+git clone https://github.com/lfreleng-actions/python-nss-ng.git
 cd python-nss-ng
 
 # Create virtual environment and install dependencies
@@ -63,7 +63,7 @@ uv pip install -e ".[dev]"
 
 ```bash
 # Clone the repository
-git clone https://github.com/ModeSevenIndustrialSolutions/python-nss-ng.git
+git clone https://github.com/lfreleng-actions/python-nss-ng.git
 cd python-nss-ng
 
 # Create virtual environment
@@ -230,7 +230,7 @@ python-nss-ng/
 ## Getting Help
 
 - **Documentation**: Check README.md and doc/ directory
-- **Issues**: <https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/issues>
+- **Issues**: <https://github.com/lfreleng-actions/python-nss-ng/issues>
 - **TODO List**: See TODO.md for current tasks
 - **Contributing**: See CONTRIBUTING.md for guidelines
 

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/README.md

@@ -5,8 +5,8 @@ SPDX-FileCopyrightText: 2025 The Linux Foundation
 
 # python-nss-ng
 
-[![Platform Compatibility](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/actions/workflows/compatibility.yaml/badge.svg)](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/actions/workflows/compatibility.yaml)
-[![CI/CD Pipeline](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/actions/workflows/build-test.yaml/badge.svg)](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/actions/workflows/build-test.yaml)
+[![Platform Compatibility](https://github.com/lfreleng-actions/python-nss-ng/actions/workflows/compatibility.yaml/badge.svg)](https://github.com/lfreleng-actions/python-nss-ng/actions/workflows/compatibility.yaml)
+[![CI/CD Pipeline](https://github.com/lfreleng-actions/python-nss-ng/actions/workflows/build-test.yaml/badge.svg)](https://github.com/lfreleng-actions/python-nss-ng/actions/workflows/build-test.yaml)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
 [![License: MPL-2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
 
@@ -297,5 +297,5 @@ the NSS compatibility issues and modernize the C code are welcome!
 
 ## Support
 
-- **Issues**: [GitHub Issues](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/issues)
-- **Repository**: [GitHub Repository](https://github.com/ModeSevenIndustrialSolutions/python-nss-ng)
+- **Issues**: [GitHub Issues](https://github.com/lfreleng-actions/python-nss-ng/issues)
+- **Repository**: [GitHub Repository](https://github.com/lfreleng-actions/python-nss-ng)

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/REUSE.toml

@@ -22,6 +22,7 @@ SPDX-FileCopyrightText = "2025 The Linux Foundation"
 [[annotations]]
 path = [
          "pyrightconfig.json",
+         ".git_archival.txt",
          "scripts/README.md",
          "doc/ChangeLog",
 ]

python_nss_ng-1.1.0/_version.txt

@@ -0,0 +1 @@
+1.1.0

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/meson.build

@@ -4,7 +4,14 @@
 project(
   'python-nss-ng',
   'c',
-  version: '0.1.0',
+  # Dynamic versioning: the version is derived from the most recent
+  # `v*` git tag (or, for builds from an sdist, the baked-in
+  # `_version.txt`). See scripts/meson-version.py for the resolution
+  # logic and `meson.add_dist_script` below for the sdist fallback.
+  version: run_command(
+    'scripts/meson-version.py',
+    check: true,
+  ).stdout().strip(),
   license: 'MPL-2.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later',
   default_options: [
     'warning_level=2',
@@ -13,6 +20,12 @@ project(
   meson_version: '>=1.2.0',
 )
 
+# Bake the resolved version into the source distribution so that wheels
+# built from the sdist (which has no `.git`) can recover the correct
+# version. The script writes `$MESON_DIST_ROOT/_version.txt`, which
+# scripts/meson-version.py reads back as its fallback.
+meson.add_dist_script('scripts/meson-version.py', '--bake-dist')
+
 # Import Python module
 py = import('python').find_installation(pure: false)
 

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/mutants/pyproject.toml

@@ -85,8 +85,8 @@ dev = [
 [project.urls]
 Homepage = "http://www.mozilla.org/projects/security/pki/python-nss-ng"
 Documentation = "http://www.mozilla.org/projects/security/pki/python-nss-ng"
-Repository = "https://github.com/ModeSevenIndustrialSolutions/python-nss-ng"
-Issues = "https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/issues"
+Repository = "https://github.com/lfreleng-actions/python-nss-ng"
+Issues = "https://github.com/lfreleng-actions/python-nss-ng/issues"
 
 [tool.meson-python.args]
 # Meson build arguments can be specified here if needed

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/pyproject.toml

@@ -11,7 +11,7 @@ build-backend = "mesonpy"
 
 [project]
 name = "python-nss-ng"
-version = "1.0.5"
+dynamic = ["version"]
 description = "Python bindings for Network Security Services (NSS) and Netscape Portable Runtime (NSPR)"
 readme = "README.md"
 license = "MPL-2.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later"
@@ -85,8 +85,8 @@ dev = [
 [project.urls]
 Homepage = "http://www.mozilla.org/projects/security/pki/python-nss-ng"
 Documentation = "http://www.mozilla.org/projects/security/pki/python-nss-ng"
-Repository = "https://github.com/ModeSevenIndustrialSolutions/python-nss-ng"
-Issues = "https://github.com/ModeSevenIndustrialSolutions/python-nss-ng/issues"
+Repository = "https://github.com/lfreleng-actions/python-nss-ng"
+Issues = "https://github.com/lfreleng-actions/python-nss-ng/issues"
 
 [tool.meson-python.args]
 # Meson build arguments can be specified here if needed
@@ -248,6 +248,8 @@ ignore = [
     "UP032",  # use f-string instead of format
 ]
 "test/setup_certs.py" = ["S603", "S607"]  # Allow subprocess calls in cert setup
+# Build-time version helper that shells out to the trusted `git` binary.
+"scripts/meson-version.py" = ["S603", "S607"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["nss"]

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/pyrightconfig.json

@@ -1,7 +1,8 @@
 {
   "include": [
     "src",
-    "test"
+    "test",
+    "scripts"
   ],
   "exclude": [
     "**/node_modules",
@@ -49,6 +50,10 @@
       "extraPaths": [
         "src"
       ]
+    },
+    {
+      "root": "scripts",
+      "pythonVersion": "3.10"
     }
   ]
 }

python_nss_ng-1.1.0/scripts/meson-version.py

@@ -0,0 +1,164 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: MPL-2.0
+# SPDX-FileCopyrightText: 2026 The Linux Foundation
+"""Resolve the project version for meson-python dynamic versioning.
+
+``meson-python`` has no native SCM/git versioning: when ``version`` is
+listed in ``[project].dynamic`` it reads the version from the meson
+``project()`` call. This helper supplies that value, derived from git,
+so the version is driven entirely by the pushed tag.
+
+Resolution order:
+
+1. ``$PYTHON_NSS_NG_VERSION`` -- an explicit override for downstream
+   packagers building from a context where neither git nor an sdist is
+   available (e.g. a manually patched tree).
+2. ``git describe`` against the surrounding work tree. This covers local
+   development and CI wheel/sdist builds, where ``.git`` is present.
+3. A frozen ``_version.txt`` baked into the sdist at ``meson dist`` time.
+   Wheels built from the PyPI source distribution have no ``.git``, so
+   the baked file is what lets them resolve the correct version.
+4. ``.git_archival.txt`` substituted by ``git archive`` (export-subst).
+   GitHub's auto-generated source tarballs are ``git archive`` output:
+   they have no ``.git`` and no baked ``_version.txt``, but do carry the
+   tag via this file, letting distro packagers build the real version.
+5. As a last resort, in a git work tree with no reachable tag (a shallow
+   CI checkout), a non-publishable ``0.0.0+g<sha>`` dev version.
+
+Modes:
+
+* default -- print the resolved version on stdout for ``run_command()``
+  in ``meson.build``.
+* ``--bake-dist`` -- write the resolved version to
+  ``$MESON_DIST_ROOT/_version.txt`` during ``meson dist`` so the sdist
+  carries a git-independent fallback.
+"""
+
+from __future__ import annotations
+
+import os
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+# scripts/meson-version.py -> repository (or unpacked sdist) root
+ROOT = Path(__file__).resolve().parent.parent
+FALLBACK = ROOT / "_version.txt"
+ARCHIVAL = ROOT / ".git_archival.txt"
+ENV_OVERRIDE = "PYTHON_NSS_NG_VERSION"
+
+
+def _from_env() -> str | None:
+    """Return an explicit version override from the environment, if set."""
+    return os.environ.get(ENV_OVERRIDE, "").strip() or None
+
+
+def _from_git_archival() -> str | None:
+    """Resolve the version from a ``git archive`` ``.git_archival.txt``.
+
+    The ``describe-name`` field is substituted by ``git archive`` via the
+    ``export-subst`` attribute. In a plain checkout the placeholder is not
+    expanded (it still reads ``$Format:...$``), so such values are ignored.
+    """
+    if not ARCHIVAL.is_file():
+        return None
+    describe = None
+    for line in ARCHIVAL.read_text(encoding="utf-8").splitlines():
+        if line.startswith("describe-name:"):
+            describe = line.split(":", 1)[1].strip()
+            break
+    if not describe or describe.startswith("$Format:"):
+        return None
+    return _to_pep440(describe)
+
+
+def _run_git(args: list[str]) -> str | None:
+    """Run a git command in ROOT, returning stripped stdout or None."""
+    try:
+        result = subprocess.run(
+            ["git", *args],
+            cwd=ROOT,
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+    except (OSError, subprocess.CalledProcessError):
+        return None
+    return result.stdout.strip() or None
+
+
+def _git_describes_this_tree() -> bool:
+    """True only when ROOT is the top of a real git work tree.
+
+    Guards against an unpacked sdist that happens to live inside an
+    unrelated parent git repository (e.g. a build temp dir), which would
+    otherwise yield a bogus version from the wrong project.
+    """
+    top = _run_git(["rev-parse", "--show-toplevel"])
+    return top is not None and Path(top).resolve() == ROOT
+
+
+def _to_pep440(describe: str) -> str:
+    """Convert ``git describe`` output to a PEP 440 version string."""
+    # Drop the conventional leading "v" (v1.0.6 -> 1.0.6).
+    text = describe.lstrip("vV")
+    # Exact tag (no trailing -<distance>-g<sha>): use it verbatim.
+    match = re.fullmatch(r"(?P<tag>.+?)-(?P<distance>\d+)-g(?P<sha>[0-9a-f]+)", text)
+    if match is None:
+        return text
+    # Commits after the tag: PEP 440 post-release with a local segment,
+    # e.g. 1.0.6.post3+g1a2b3c4. Local-segment versions are intentionally
+    # not publishable to PyPI; only exact tags produce clean versions.
+    return f"{match.group('tag')}.post{match.group('distance')}+g{match.group('sha')}"
+
+
+def resolve_version() -> str:
+    """Resolve the project version from git or the baked fallback file."""
+    env_version = _from_env()
+    if env_version:
+        return env_version
+    in_git_tree = _git_describes_this_tree()
+    if in_git_tree:
+        describe = _run_git(["describe", "--tags", "--match", "v[0-9]*"])
+        if describe:
+            return _to_pep440(describe)
+    if FALLBACK.is_file():
+        return FALLBACK.read_text(encoding="utf-8").strip()
+    archival = _from_git_archival()
+    if archival:
+        return archival
+    if in_git_tree:
+        # A git work tree with no reachable v* tag -- typically a shallow
+        # CI checkout (fetch-depth: 1) that did not fetch tags, as used by
+        # the test/audit/SBOM jobs that reinstall from source. Emit a
+        # non-publishable dev version built from the short commit SHA so
+        # those non-release builds still succeed. The local-version
+        # segment ('+g...') is rejected by PyPI, so it can never be
+        # mistaken for or published as a real release; release builds
+        # check out the tag and take the branch above instead.
+        sha = _run_git(["rev-parse", "--short", "HEAD"])
+        if sha:
+            return f"0.0.0+g{sha}"
+    sys.exit(
+        f"meson-version: cannot resolve version: set ${ENV_OVERRIDE}, or "
+        "build from a git checkout, an sdist, or a git archive"
+    )
+
+
+def main(argv: list[str]) -> int:
+    version = resolve_version()
+    if "--bake-dist" in argv:
+        dist_root = os.environ.get("MESON_DIST_ROOT")
+        if not dist_root:
+            sys.exit("meson-version: --bake-dist requires MESON_DIST_ROOT")
+        target = Path(dist_root) / "_version.txt"
+        target.write_text(version + "\n", encoding="utf-8")
+        print(f"meson-version: baked {version} into {target}")
+        return 0
+    print(version)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main(sys.argv[1:]))

{python_nss_ng-1.0.5 → python_nss_ng-1.1.0}/src/__init__.py

@@ -5,6 +5,8 @@
 # SPDX-FileCopyrightText: Copyright (c) 2010-2025 python-nss-ng contributors
 
 import sys
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import version as _pkg_version
 
 # Platform support check - only Linux and macOS are supported
 if sys.platform.startswith("win"):
@@ -312,4 +314,10 @@ To be added
 
 """
 
-__version__ = "1.0.1"
+try:
+    __version__ = _pkg_version("python-nss-ng")
+except PackageNotFoundError:  # pragma: no cover - running from an uninstalled tree
+    # Importing from a source checkout that was never installed (e.g.
+    # building the docs in-tree). The real version is resolved from the
+    # git tag at build time; fall back to a clearly-non-release marker.
+    __version__ = "0.0.0+unknown"