diff --git a/MANIFEST.in b/MANIFEST.in index 08ebc95..e7c46fc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ include Makefile include requirements.txt +include requirements-swh.txt include version.txt diff --git a/debian/changelog b/debian/changelog index c6cbb11..78fe0c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ - (0.0.1-1) unstable; urgency=low +swh-loader-mercurial (0.0.1-1) unstable; urgency=low - * + * Initial package - -- AUTHOR-NAME + -- Antoine R. Dumont (@ardumont) Tue, 19 Dec 2017 10:45:24 +0200 diff --git a/debian/control b/debian/control index 461af9b..c8cc294 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,23 @@ -Source: +Source: swh-loader-mercurial Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python (>= 2), python3-all, python3-nose, python3-setuptools, - python3-swh.core, - python3-swh.storage, + python3-swh.core (>= 0.0.36~), + python3-swh.storage (>= 0.0.95~), python3-vcversioner Standards-Version: 3.9.6 -Homepage: https://forge.softwareheritage.org/diffusion// +Homepage: https://forge.softwareheritage.org/source/swh-loader-mercurial/ -Package: python3- +Package: python3-swh.loader.mercurial Architecture: all -Depends: ${misc:Depends}, ${python3:Depends} -Description: Software Heritage +Depends: python3-swh.core (>= 0.0.36~), + python3-swh.storage (>= 0.0.95~), + ${misc:Depends}, ${python3:Depends} +Description: Software Heritage Mercurial Loader + Module in charge of loading hg/mercurial repositories into + swh storage. diff --git a/requirements-swh.txt b/requirements-swh.txt index 2d1bbce..14bd1b1 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1 +1,2 @@ -# Add here internal Software Heritage dependencies, one per line. +swh.core >= 0.0.36 +swh.storage >= 0.0.95 diff --git a/setup.py b/setup.py index 450e1fb..db89a38 100644 --- a/setup.py +++ b/setup.py @@ -1,30 +1,28 @@ from setuptools import setup, find_packages def parse_requirements(): requirements = [] for reqf in ('requirements.txt', 'requirements-swh.txt'): 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 -# Edit this part to match your module -# full sample: https://forge.softwareheritage.org/diffusion/DCORE/browse/master/setup.py setup( - name='swh.', - description='Software Heritage ', + name='swh.loader.mercurial', + description='Software Heritage Mercurial Loader', author='Software Heritage developers', author_email='swh-devel@inria.fr', - url='https://forge.softwareheritage.org/diffusion/', + url='https://forge.softwareheritage.org/diffusion/DLDHG/', packages=find_packages(), # packages's modules scripts=[], # scripts to package install_requires=parse_requirements(), setup_requires=['vcversioner'], vcversioner={}, include_package_data=True, ) diff --git a/swh/loader/__init__.py b/swh/loader/__init__.py index 69e3be5..e69de29 100644 --- a/swh/loader/__init__.py +++ b/swh/loader/__init__.py @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/swh/loader/mercurial/__init__.py b/swh/loader/mercurial/__init__.py new file mode 100644 index 0000000..e69de29