swh.loader.mercurial 3.4.3__tar.gz → 3.5.0__tar.gz

swh.loader.mercurial-3.5.0/.copier-answers.yml

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

swh.loader.mercurial-3.5.0/.gitignore

@@ -0,0 +1,16 @@
+*.egg-info/
+*.pyc
+.coverage
+.eggs/
+.hypothesis
+.mypy_cache
+.tox
+__pycache__
+build/
+dist/
+# these are symlinks created by a hook in swh-docs' main sphinx conf.py
+docs/README.rst
+docs/README.md
+# this should be a symlink for people who want to build the sphinx doc
+# without using tox, generally created by the swh-env/bin/update script
+docs/Makefile.sphinx

{swh.loader.mercurial-3.4.3 → swh.loader.mercurial-3.5.0}/.pre-commit-config.yaml

@@ -1,13 +1,23 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: check-json
       - id: check-yaml
 
+  - repo: https://github.com/python/black
+    rev: 23.1.0
+    hooks:
+      - id: black
+
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+
   - repo: https://github.com/pycqa/flake8
-    rev: 5.0.4
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies: [flake8-bugbear==22.9.23]
@@ -18,6 +28,9 @@ repos:
       - id: codespell
         name: Check source code spelling
         stages: [commit]
+      - id: codespell
+        name: Check commit message spelling
+        stages: [commit-msg]
 
   - repo: local
     hooks:
@@ -29,12 +42,3 @@ repos:
         language: system
         types: [python]
 
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.11.5
-    hooks:
-      - id: isort
-
-  - repo: https://github.com/python/black
-    rev: 22.10.0
-    hooks:
-      - id: black

{swh.loader.mercurial-3.4.3 → swh.loader.mercurial-3.5.0}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: swh.loader.mercurial
-Version: 3.4.3
+Version: 3.5.0
 Summary: Software Heritage Mercurial Loader
-Home-page: https://forge.softwareheritage.org/diffusion/DLDHG/
-Author: Software Heritage developers
-Author-email: swh-devel@inria.fr
-Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest
+Author-email: Software Heritage developers <swh-devel@inria.fr>
+Project-URL: Homepage, https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial
+Project-URL: Bug Reports, https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial/-/issues
 Project-URL: Funding, https://www.softwareheritage.org/donate
-Project-URL: Source, https://forge.softwareheritage.org/source/swh-loader-mercurial
 Project-URL: Documentation, https://docs.softwareheritage.org/devel/swh-loader-mercurial/
+Project-URL: Source, https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial.git
 Classifier: Programming Language :: Python :: 3
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
@@ -28,6 +27,15 @@ Requires-Dist: swh.storage>=0.37.0
 Requires-Dist: swh.scheduler>=0.0.39
 Requires-Dist: swh.loader.core>=5.0.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: swh.model>=2.6.1; extra == "testing"
+Requires-Dist: swh.storage>=0.37.0; extra == "testing"
+Requires-Dist: swh.scheduler>=0.0.39; extra == "testing"
+Requires-Dist: swh.loader.core>=5.0.0; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
 Requires-Dist: swh.core[http]>=0.0.61; extra == "testing"

swh.loader.mercurial-3.5.0/docs/Makefile

@@ -0,0 +1 @@
+include Makefile.sphinx

{swh.loader.mercurial-3.4.3 → swh.loader.mercurial-3.5.0}/mypy.ini

@@ -1,7 +1,9 @@
 [mypy]
 namespace_packages = True
 warn_unused_ignores = True
-
+explicit_package_bases = True
+# ^ Needed for mypy to detect py.typed from swh packages installed
+# in editable mode
 
 # 3rd party libraries without stubs (yet)
 

swh.loader.mercurial-3.5.0/pyproject.toml

@@ -0,0 +1,60 @@
+[project]
+name = "swh.loader.mercurial"
+authors = [
+    {name="Software Heritage developers", email="swh-devel@inria.fr"},
+]
+
+description = "Software Heritage Mercurial Loader"
+readme = {file = "README.rst", content-type = "text/x-rst"}
+requires-python = ">=3.7"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Operating System :: OS Independent",
+    "Development Status :: 4 - Beta",
+]
+dynamic = ["version", "dependencies", "optional-dependencies"]
+
+[tool.setuptools.packages.find]
+include = ["swh.*"]
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt", "requirements-swh.txt"]}
+
+[tool.setuptools.dynamic.optional-dependencies]
+testing = {file = ["requirements.txt", "requirements-swh.txt", "requirements-test.txt"]}
+
+[project.entry-points."console_scripts"]
+"swh-hg-identify" = "swh.loader.mercurial.identify:main"
+
+[project.entry-points."swh.workers"]
+"loader.mercurial" = "swh.loader.mercurial:register"
+"loader.mercurial-checkout" = "swh.loader.mercurial:register_checkout"
+
+[project.urls]
+"Homepage" = "https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial"
+"Bug Reports" = "https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial/-/issues"
+"Funding" = "https://www.softwareheritage.org/donate"
+"Documentation" = "https://docs.softwareheritage.org/devel/swh-loader-mercurial/"
+"Source" = "https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial.git"
+
+[build-system]
+requires = ["setuptools", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+fallback_version = "0.0.1"
+
+[tool.black]
+target-version = ['py37']
+
+[tool.isort]
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+ensure_newline_before_comments = true
+line_length = 88
+force_sort_within_sections = true
+known_first_party = ['swh']

swh.loader.mercurial-3.5.0/pytest.ini

@@ -0,0 +1,8 @@
+[pytest]
+norecursedirs = build docs .*
+asyncio_mode = strict
+addopts =
+    --import-mode=importlib
+    # Drop this when these fixtures aren't imported automatically anymore
+    -p no:pytest_swh_scheduler
+    -p no:pytest_swh_storage

{swh.loader.mercurial-3.4.3 → swh.loader.mercurial-3.5.0}/swh.loader.mercurial.egg-info/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: swh.loader.mercurial
-Version: 3.4.3
+Version: 3.5.0
 Summary: Software Heritage Mercurial Loader
-Home-page: https://forge.softwareheritage.org/diffusion/DLDHG/
-Author: Software Heritage developers
-Author-email: swh-devel@inria.fr
-Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest
+Author-email: Software Heritage developers <swh-devel@inria.fr>
+Project-URL: Homepage, https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial
+Project-URL: Bug Reports, https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial/-/issues
 Project-URL: Funding, https://www.softwareheritage.org/donate
-Project-URL: Source, https://forge.softwareheritage.org/source/swh-loader-mercurial
 Project-URL: Documentation, https://docs.softwareheritage.org/devel/swh-loader-mercurial/
+Project-URL: Source, https://gitlab.softwareheritage.org/swh/devel/swh-loader-mercurial.git
 Classifier: Programming Language :: Python :: 3
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
@@ -28,6 +27,15 @@ Requires-Dist: swh.storage>=0.37.0
 Requires-Dist: swh.scheduler>=0.0.39
 Requires-Dist: swh.loader.core>=5.0.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: swh.model>=2.6.1; extra == "testing"
+Requires-Dist: swh.storage>=0.37.0; extra == "testing"
+Requires-Dist: swh.scheduler>=0.0.39; extra == "testing"
+Requires-Dist: swh.loader.core>=5.0.0; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
 Requires-Dist: swh.core[http]>=0.0.61; extra == "testing"

{swh.loader.mercurial-3.4.3 → swh.loader.mercurial-3.5.0}/swh.loader.mercurial.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+.copier-answers.yml
 .git-blame-ignore-revs
 .gitignore
 .pre-commit-config.yaml
@@ -5,7 +6,6 @@ AUTHORS
 CODE_OF_CONDUCT.md
 CONTRIBUTORS
 LICENSE
-MANIFEST.in
 Makefile
 README.rst
 conftest.py
@@ -16,7 +16,6 @@ requirements-swh.txt
 requirements-test.txt
 requirements.txt
 setup.cfg
-setup.py
 tox.ini
 docs/.gitignore
 docs/Makefile
@@ -24,14 +23,12 @@ docs/conf.py
 docs/index.rst
 docs/_static/.placeholder
 docs/_templates/.placeholder
-swh/__init__.py
 swh.loader.mercurial.egg-info/PKG-INFO
 swh.loader.mercurial.egg-info/SOURCES.txt
 swh.loader.mercurial.egg-info/dependency_links.txt
 swh.loader.mercurial.egg-info/entry_points.txt
 swh.loader.mercurial.egg-info/requires.txt
 swh.loader.mercurial.egg-info/top_level.txt
-swh/loader/__init__.py
 swh/loader/mercurial/__init__.py
 swh/loader/mercurial/archive_extract.py
 swh/loader/mercurial/converters.py

{swh.loader.mercurial-3.4.3 → swh.loader.mercurial-3.5.0}/swh.loader.mercurial.egg-info/requires.txt

@@ -9,6 +9,15 @@ swh.scheduler>=0.0.39
 swh.loader.core>=5.0.0
 
 [testing]
+click
+patool
+python-dateutil
+python-hglib
+mercurial
+swh.model>=2.6.1
+swh.storage>=0.37.0
+swh.scheduler>=0.0.39
+swh.loader.core>=5.0.0
 pytest
 pytest-mock
 swh.core[http]>=0.0.61

{swh.loader.mercurial-3.4.3 → swh.loader.mercurial-3.5.0}/tox.ini

@@ -1,7 +1,10 @@
 [tox]
-requires =
-  tox>4
-envlist=black,flake8,mypy,py3
+minversion = 4
+envlist =
+  black
+  flake8
+  mypy
+  py3
 
 [testenv]
 extras =
@@ -11,14 +14,20 @@ deps =
   swh.scheduler[testing]
   swh.storage[testing]
 commands =
-  pytest --cov={envsitepackagesdir}/swh/loader/mercurial \
+  pytest --doctest-modules \
+         --rootdir {envsitepackagesdir} \
+         --cov={envsitepackagesdir}/swh/loader/mercurial \
+         --cov-branch \
          {envsitepackagesdir}/swh/loader/mercurial \
-         --cov-branch {posargs}
+         {posargs}
+# --rootdir (with --import-mode from pytest.ini) are required to make tests
+# that depends on the test file to be a proper submodule of the swh namespace
+# after migration to PEP420 (implicit namespace).
 
 [testenv:black]
 skip_install = true
 deps =
-  black==22.10.0
+  black==23.1.0
 commands =
   {envpython} -m black --check swh
 
@@ -47,27 +56,11 @@ allowlist_externals = make
 extras =
   testing
 deps =
-  # fetch and install swh-docs in develop mode
-  -e git+https://gitlab.softwareheritage.org/swh/devel/swh-docs.git\#egg=swh.docs
+  # fetch and install swh-docs
+  git+https://gitlab.softwareheritage.org/swh/devel/swh-docs.git\#egg=swh.docs
 setenv =
   SWH_PACKAGE_DOC_TOX_BUILD = 1
   # turn warnings into errors
   SPHINXOPTS = -W
 commands =
-  make -I ../.tox/sphinx/src/swh-docs/swh/ -C docs
-
-# build documentation only inside swh-environment using local state
-# of swh-docs package
-[testenv:sphinx-dev]
-allowlist_externals = make
-extras =
-  testing
-deps =
-  # install swh-docs in develop mode
-  -e ../swh-docs
-setenv =
-  SWH_PACKAGE_DOC_TOX_BUILD = 1
-  # turn warnings into errors
-  SPHINXOPTS = -W
-commands =
-  make -I ../.tox/sphinx-dev/src/swh-docs/swh/ -C docs
+  make -I {env_dir}/share/swh-docs -C docs

swh.loader.mercurial-3.4.3/.gitignore

@@ -1,13 +0,0 @@
-*.pyc
-*.sw?
-*~
-/.coverage
-/.coverage.*
-.eggs/
-__pycache__
-*.egg-info/
-version.txt
-build/
-dist/
-.tox/
-.mypy_cache/

swh.loader.mercurial-3.4.3/MANIFEST.in

@@ -1,6 +0,0 @@
-include Makefile
-include requirements*.txt
-include version.txt
-include conftest.py
-recursive-include swh/loader/mercurial/tests/data *
-recursive-include swh py.typed

swh.loader.mercurial-3.4.3/docs/Makefile

@@ -1 +0,0 @@
-include ../../swh-docs/Makefile.sphinx

swh.loader.mercurial-3.4.3/pyproject.toml

@@ -1,11 +0,0 @@
-[tool.black]
-target-version = ['py37']
-
-[tool.isort]
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = 0
-use_parentheses = true
-ensure_newline_before_comments = true
-line_length = 88
-force_sort_within_sections = true

swh.loader.mercurial-3.4.3/pytest.ini

@@ -1,7 +0,0 @@
-[pytest]
-# Drop this when these fixtures aren't imported automatically anymore
-addopts = -p no:pytest_swh_scheduler -p no:pytest_swh_storage
-
-norecursedirs = build docs .*
-
-asyncio_mode = strict

swh.loader.mercurial-3.4.3/setup.py

@@ -1,74 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (C) 2015-2021  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
-
-from io import open
-from os import path
-
-from setuptools import find_packages, setup
-
-here = path.abspath(path.dirname(__file__))
-
-# Get the long description from the README file
-with open(path.join(here, "README.rst"), encoding="utf-8") as f:
-    long_description = f.read()
-
-
-def parse_requirements(name=None):
-    if name:
-        reqf = "requirements-%s.txt" % name
-    else:
-        reqf = "requirements.txt"
-
-    requirements = []
-    if not path.exists(reqf):
-        return requirements
-
-    with open(reqf) as f:
-        for line in f.readlines():
-            line = line.strip()
-            if not line or line.startswith("#"):
-                continue
-            requirements.append(line)
-    return requirements
-
-
-setup(
-    name="swh.loader.mercurial",
-    description="Software Heritage Mercurial Loader",
-    long_description=long_description,
-    long_description_content_type="text/x-rst",
-    python_requires=">=3.7",
-    author="Software Heritage developers",
-    author_email="swh-devel@inria.fr",
-    url="https://forge.softwareheritage.org/diffusion/DLDHG/",
-    packages=find_packages(),
-    scripts=[],
-    install_requires=parse_requirements() + parse_requirements("swh"),
-    setup_requires=["setuptools-scm"],
-    use_scm_version=True,
-    extras_require={"testing": parse_requirements("test")},
-    include_package_data=True,
-    entry_points="""
-        [swh.workers]
-        loader.mercurial=swh.loader.mercurial:register
-        loader.mercurial-checkout=swh.loader.mercurial:register_checkout
-        [console_scripts]
-        swh-hg-identify=swh.loader.mercurial.identify:main
-    """,
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-        "Operating System :: OS Independent",
-        "Development Status :: 4 - Beta",
-    ],
-    project_urls={
-        "Bug Reports": "https://forge.softwareheritage.org/maniphest",
-        "Funding": "https://www.softwareheritage.org/donate",
-        "Source": ("https://forge.softwareheritage.org/source/swh-loader-mercurial"),
-        "Documentation": "https://docs.softwareheritage.org/devel/swh-loader-mercurial/",  # NoQA: B950
-    },
-)

swh.loader.mercurial-3.4.3/swh/__init__.py

@@ -1,3 +0,0 @@
-from pkgutil import extend_path
-
-__path__ = extend_path(__path__, __name__)

swh.loader.mercurial-3.4.3/swh/loader/__init__.py

@@ -1,3 +0,0 @@
-from pkgutil import extend_path
-
-__path__ = extend_path(__path__, __name__)