swh.loader.mercurial 3.6.1__tar.gz → 3.6.3__tar.gz

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: v0.3.3
+_commit: v0.3.5
 _src_path: https://gitlab.softwareheritage.org/swh/devel/swh-py-template.git
 description: Software Heritage Mercurial Loader
 distribution_name: swh-loader-mercurial
@@ -7,5 +7,5 @@ have_cli: true
 have_workers: false
 package_root: swh/loader/mercurial
 project_name: swh.loader.mercurial
-python_minimal_version: '3.7'
+python_minimal_version: '3.9'
 readme_format: rst

swh_loader_mercurial-3.6.3/.copyright-updater.yaml

@@ -0,0 +1,3 @@
+pattern: Copyright (C) {years}  The Software Heritage developers
+
+ignore_commits_before: 2026-01-24

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/.pre-commit-config.yaml

@@ -1,23 +1,23 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: check-json
       - id: check-yaml
 
   - repo: https://github.com/python/black
-    rev: 25.1.0
+    rev: 25.9.0
     hooks:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: isort
 
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
+    rev: 7.3.0
     hooks:
       - id: flake8
         additional_dependencies: [flake8-bugbear==24.12.12, flake8-pyproject]
@@ -51,3 +51,15 @@ repos:
         stages: [pre-push]
         language: python
         additional_dependencies: [twine, build]
+
+  - repo: https://github.com/nanoufo/copyright-hook
+    rev: v1.1.0
+    hooks:
+      - id: update-copyright
+        args: [--required]
+        files: ^.*\.py$
+        exclude: >
+          (?x)^(
+            .*__init__.py|
+            docs/conf.py
+          )$

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swh.loader.mercurial
-Version: 3.6.1
+Version: 3.6.3
 Summary: Software Heritage Mercurial Loader
 Author-email: Software Heritage developers <swh-devel@inria.fr>
 Project-URL: Homepage, https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial
@@ -21,29 +21,28 @@ Requires-Dist: click
 Requires-Dist: patool
 Requires-Dist: python-dateutil
 Requires-Dist: python-hglib
-Requires-Dist: mercurial
+Requires-Dist: mercurial>=7.2
 Requires-Dist: swh.model>=6.13.0
 Requires-Dist: swh.storage>=2.4.1
 Requires-Dist: swh.scheduler>=0.0.39
-Requires-Dist: swh.loader.core>=5.18.1
+Requires-Dist: swh.loader.core>=5.24.0
 Provides-Extra: testing
 Requires-Dist: click; extra == "testing"
 Requires-Dist: patool; extra == "testing"
 Requires-Dist: python-dateutil; extra == "testing"
 Requires-Dist: python-hglib; extra == "testing"
-Requires-Dist: mercurial; extra == "testing"
+Requires-Dist: mercurial>=7.2; extra == "testing"
 Requires-Dist: swh.model>=6.13.0; extra == "testing"
 Requires-Dist: swh.storage>=2.4.1; extra == "testing"
 Requires-Dist: swh.scheduler>=0.0.39; extra == "testing"
-Requires-Dist: swh.loader.core>=5.18.1; extra == "testing"
+Requires-Dist: swh.loader.core>=5.24.0; extra == "testing"
 Requires-Dist: celery-types; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
-Requires-Dist: swh.core[http]>=0.0.61; extra == "testing"
-Requires-Dist: swh.loader.core[testing]>=5.18.1; extra == "testing"
+Requires-Dist: swh.core[http]>=4.5.3; extra == "testing"
+Requires-Dist: swh.loader.core[testing]>=5.24.0; extra == "testing"
 Requires-Dist: swh.scheduler[pytest]>=3.1.0; extra == "testing"
 Requires-Dist: swh.storage[pytest]>=3.1.0; extra == "testing"
-Requires-Dist: types-click; extra == "testing"
 Requires-Dist: types-deprecated; extra == "testing"
 Requires-Dist: types-python-dateutil; extra == "testing"
 Dynamic: license-file

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/pyproject.toml

@@ -85,8 +85,8 @@ ignore = [
     "W503" # line break before binary operator <https://github.com/psf/black/issues/52>
 ]
 max-line-length = 88
+extend-exclude = ["build/"]
 
 [tool.pytest.ini_options]
 norecursedirs = "build docs .*"
-asyncio_mode = "strict"
 consider_namespace_packages = true

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/requirements-swh.txt

@@ -1,4 +1,4 @@
 swh.model >= 6.13.0
 swh.storage >= 2.4.1
 swh.scheduler >= 0.0.39
-swh.loader.core >= 5.18.1
+swh.loader.core >= 5.24.0

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/requirements-test.txt

@@ -1,10 +1,9 @@
 celery-types
 pytest
 pytest-mock
-swh.core[http] >= 0.0.61
-swh.loader.core[testing] >= 5.18.1
+swh.core[http] >= 4.5.3
+swh.loader.core[testing] >= 5.24.0
 swh.scheduler[pytest] >= 3.1.0
 swh.storage[pytest] >= 3.1.0
-types-click
 types-deprecated
 types-python-dateutil

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/requirements.txt

@@ -5,4 +5,4 @@ click
 patool
 python-dateutil
 python-hglib
-mercurial
+mercurial >= 7.2

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/swh/loader/mercurial/directory.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2023 The Software Heritage developers
+# Copyright (C) 2023  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -95,7 +95,7 @@ class HgCheckoutLoader(BaseDirectoryLoader):
                 ),
                 branch_name: SnapshotBranch(
                     target_type=SnapshotTargetType.DIRECTORY,
-                    target=self.directory.hash,
+                    target=self.directory.id,
                 ),
             }
         )

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/swh/loader/mercurial/hgutil.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2023  The Software Heritage developers
+# Copyright (C) 2020-2026  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -9,11 +9,13 @@ from functools import partial
 from typing import Dict, List, Mapping, NewType, Optional, Set
 
 # The internal Mercurial API is not guaranteed to be stable.
-from mercurial import bookmarks, context, error, hg, smartset, util
+from mercurial import bookmarks, context, error, hg, initialization, smartset, util
 import mercurial.ui
 
 from swh.loader.core.utils import clone_with_timeout
 
+initialization.init()
+
 NULLID = mercurial.node.nullid
 HgNodeId = NewType("HgNodeId", bytes)
 Repository = hg.localrepo
@@ -57,10 +59,11 @@ def branching_info(repo: hg.localrepo, ignored: Set[int]) -> BranchingInfo:
     branch_closed_heads = defaultdict(list)
     all_bookmarks = bookmarks.listbookmarks(repo)
 
-    for branch_name, heads in repo.branchmap().items():
+    branchmap = repo.branchmap()
+    for branch_name in branchmap:
         # Sort the heads by node id since it's stable and doesn't depend on local
         # topology like cloning order.
-        for head in sorted(heads):
+        for head in sorted(branchmap.branchheads(branch_name, closed=True)):
             head = repo[head]
             if head.rev() in ignored:
                 # This revision or one of its ancestors is corrupted, ignore it

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/swh/loader/mercurial/tests/test_directory.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2023  The Software Heritage developers
+# Copyright (C) 2023-2025  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -8,7 +8,7 @@ from pathlib import Path
 
 import pytest
 
-from swh.loader.core.nar import Nar
+from swh.core.nar import Nar, NarHashAlgo
 from swh.loader.exception import NotFound
 from swh.loader.mercurial.directory import HgCheckoutLoader, clone_repository
 from swh.loader.mercurial.hgutil import repository
@@ -22,7 +22,7 @@ from swh.model.hashutil import hash_to_bytes
 
 
 def compute_nar_hash_for_ref(
-    repo_url: str, ref: str, hash_name: str = "sha256", temp_dir: str = "/tmp"
+    repo_url: str, ref: str, hash_name: NarHashAlgo = "sha256", temp_dir: str = "/tmp"
 ) -> str:
     """Compute the nar from a hg checked out by hg."""
     tmp_path = Path(os.path.join(temp_dir, "compute-nar"))

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/swh.loader.mercurial.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swh.loader.mercurial
-Version: 3.6.1
+Version: 3.6.3
 Summary: Software Heritage Mercurial Loader
 Author-email: Software Heritage developers <swh-devel@inria.fr>
 Project-URL: Homepage, https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial
@@ -21,29 +21,28 @@ Requires-Dist: click
 Requires-Dist: patool
 Requires-Dist: python-dateutil
 Requires-Dist: python-hglib
-Requires-Dist: mercurial
+Requires-Dist: mercurial>=7.2
 Requires-Dist: swh.model>=6.13.0
 Requires-Dist: swh.storage>=2.4.1
 Requires-Dist: swh.scheduler>=0.0.39
-Requires-Dist: swh.loader.core>=5.18.1
+Requires-Dist: swh.loader.core>=5.24.0
 Provides-Extra: testing
 Requires-Dist: click; extra == "testing"
 Requires-Dist: patool; extra == "testing"
 Requires-Dist: python-dateutil; extra == "testing"
 Requires-Dist: python-hglib; extra == "testing"
-Requires-Dist: mercurial; extra == "testing"
+Requires-Dist: mercurial>=7.2; extra == "testing"
 Requires-Dist: swh.model>=6.13.0; extra == "testing"
 Requires-Dist: swh.storage>=2.4.1; extra == "testing"
 Requires-Dist: swh.scheduler>=0.0.39; extra == "testing"
-Requires-Dist: swh.loader.core>=5.18.1; extra == "testing"
+Requires-Dist: swh.loader.core>=5.24.0; extra == "testing"
 Requires-Dist: celery-types; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
-Requires-Dist: swh.core[http]>=0.0.61; extra == "testing"
-Requires-Dist: swh.loader.core[testing]>=5.18.1; extra == "testing"
+Requires-Dist: swh.core[http]>=4.5.3; extra == "testing"
+Requires-Dist: swh.loader.core[testing]>=5.24.0; extra == "testing"
 Requires-Dist: swh.scheduler[pytest]>=3.1.0; extra == "testing"
 Requires-Dist: swh.storage[pytest]>=3.1.0; extra == "testing"
-Requires-Dist: types-click; extra == "testing"
 Requires-Dist: types-deprecated; extra == "testing"
 Requires-Dist: types-python-dateutil; extra == "testing"
 Dynamic: license-file

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/swh.loader.mercurial.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 .copier-answers.yml
+.copyright-updater.yaml
 .git-blame-ignore-revs
 .gitignore
 .pre-commit-config.yaml

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/swh.loader.mercurial.egg-info/requires.txt

@@ -2,29 +2,28 @@ click
 patool
 python-dateutil
 python-hglib
-mercurial
+mercurial>=7.2
 swh.model>=6.13.0
 swh.storage>=2.4.1
 swh.scheduler>=0.0.39
-swh.loader.core>=5.18.1
+swh.loader.core>=5.24.0
 
 [testing]
 click
 patool
 python-dateutil
 python-hglib
-mercurial
+mercurial>=7.2
 swh.model>=6.13.0
 swh.storage>=2.4.1
 swh.scheduler>=0.0.39
-swh.loader.core>=5.18.1
+swh.loader.core>=5.24.0
 celery-types
 pytest
 pytest-mock
-swh.core[http]>=0.0.61
-swh.loader.core[testing]>=5.18.1
+swh.core[http]>=4.5.3
+swh.loader.core[testing]>=5.24.0
 swh.scheduler[pytest]>=3.1.0
 swh.storage[pytest]>=3.1.0
-types-click
 types-deprecated
 types-python-dateutil

{swh_loader_mercurial-3.6.1 → swh_loader_mercurial-3.6.3}/tox.ini

@@ -24,17 +24,17 @@ commands =
 [testenv:black]
 skip_install = true
 deps =
-  black==25.1.0
+  black==25.9.0
 commands =
   {envpython} -m black --check swh
 
 [testenv:flake8]
 skip_install = true
 deps =
-  flake8==7.1.1
+  flake8==7.3.0
   flake8-bugbear==24.12.12
   flake8-pyproject==1.2.3
-  pycodestyle==2.12.1
+  pycodestyle==2.14.0
 
 commands =
   {envpython} -m flake8
@@ -43,7 +43,7 @@ commands =
 extras =
   testing
 deps =
-  mypy==1.15.0
+  mypy==1.18.2
 commands =
   mypy swh