diff --git a/PKG-INFO b/PKG-INFO index 3092465..da6c59e 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,29 +1,29 @@ Metadata-Version: 2.1 Name: swh.loader.core -Version: 0.0.52 +Version: 0.0.53 Summary: Software Heritage Base Loader Home-page: https://forge.softwareheritage.org/diffusion/DLDBASE Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest Project-URL: Funding, https://www.softwareheritage.org/donate Project-URL: Source, https://forge.softwareheritage.org/source/swh-loader-core Description: SWH-loader-core =============== The Software Heritage Core Loader is a low-level loading utilities and helpers used by other loaders. The main entry points are classes: - :class:`swh.loader.core.loader.SWHLoader` for stateful loaders - :class:`swh.loader.core.loader.SWHStatelessLoader` for stateless loaders Platform: UNKNOWN Classifier: Programming Language :: Python :: 3 Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3) Classifier: Operating System :: OS Independent Classifier: Development Status :: 5 - Production/Stable Description-Content-Type: text/markdown Provides-Extra: testing diff --git a/setup.py b/setup.py index ea49659..880adfc 100755 --- a/setup.py +++ b/setup.py @@ -1,69 +1,69 @@ #!/usr/bin/env python3 # Copyright (C) 2015-2018 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 setuptools import setup, find_packages from os import path from io import open here = path.abspath(path.dirname(__file__)) # Get the long description from the README file with open(path.join(here, 'README.md'), 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.core', description='Software Heritage Base Loader', long_description=long_description, long_description_content_type='text/markdown', author='Software Heritage developers', author_email='swh-devel@inria.fr', url='https://forge.softwareheritage.org/diffusion/DLDBASE', packages=find_packages(), # packages's modules scripts=[], # scripts to package install_requires=parse_requirements() + parse_requirements('swh'), setup_requires=['vcversioner'], extras_require={'testing': parse_requirements('test')}, vcversioner={}, include_package_data=True, - entrypoints=''' + entry_points=''' [swh.workers] loader.package=swh.loader.package:register ''', classifiers=[ "Programming Language :: Python :: 3", "Intended Audience :: Developers", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Operating System :: OS Independent", "Development Status :: 5 - Production/Stable", ], project_urls={ 'Bug Reports': 'https://forge.softwareheritage.org/maniphest', 'Funding': 'https://www.softwareheritage.org/donate', 'Source': 'https://forge.softwareheritage.org/source/swh-loader-core', }, ) diff --git a/swh.loader.core.egg-info/PKG-INFO b/swh.loader.core.egg-info/PKG-INFO index 3092465..da6c59e 100644 --- a/swh.loader.core.egg-info/PKG-INFO +++ b/swh.loader.core.egg-info/PKG-INFO @@ -1,29 +1,29 @@ Metadata-Version: 2.1 Name: swh.loader.core -Version: 0.0.52 +Version: 0.0.53 Summary: Software Heritage Base Loader Home-page: https://forge.softwareheritage.org/diffusion/DLDBASE Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest Project-URL: Funding, https://www.softwareheritage.org/donate Project-URL: Source, https://forge.softwareheritage.org/source/swh-loader-core Description: SWH-loader-core =============== The Software Heritage Core Loader is a low-level loading utilities and helpers used by other loaders. The main entry points are classes: - :class:`swh.loader.core.loader.SWHLoader` for stateful loaders - :class:`swh.loader.core.loader.SWHStatelessLoader` for stateless loaders Platform: UNKNOWN Classifier: Programming Language :: Python :: 3 Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3) Classifier: Operating System :: OS Independent Classifier: Development Status :: 5 - Production/Stable Description-Content-Type: text/markdown Provides-Extra: testing diff --git a/swh.loader.core.egg-info/SOURCES.txt b/swh.loader.core.egg-info/SOURCES.txt index 7ac66b6..eada764 100644 --- a/swh.loader.core.egg-info/SOURCES.txt +++ b/swh.loader.core.egg-info/SOURCES.txt @@ -1,82 +1,83 @@ MANIFEST.in Makefile README.md requirements-swh.txt requirements.txt setup.py version.txt swh/__init__.py swh.loader.core.egg-info/PKG-INFO swh.loader.core.egg-info/SOURCES.txt swh.loader.core.egg-info/dependency_links.txt +swh.loader.core.egg-info/entry_points.txt swh.loader.core.egg-info/requires.txt swh.loader.core.egg-info/top_level.txt swh/loader/__init__.py swh/loader/core/__init__.py swh/loader/core/converters.py swh/loader/core/loader.py swh/loader/core/py.typed swh/loader/core/queue.py swh/loader/core/utils.py swh/loader/core/tests/__init__.py swh/loader/core/tests/test_converters.py swh/loader/core/tests/test_loader.py swh/loader/core/tests/test_queue.py swh/loader/core/tests/test_tests.py swh/loader/core/tests/test_utils.py swh/loader/package/__init__.py swh/loader/package/archive.py swh/loader/package/debian.py swh/loader/package/deposit.py swh/loader/package/loader.py swh/loader/package/npm.py swh/loader/package/pypi.py swh/loader/package/tasks.py swh/loader/package/utils.py swh/loader/package/tests/__init__.py swh/loader/package/tests/common.py swh/loader/package/tests/conftest.py swh/loader/package/tests/test_archive.py swh/loader/package/tests/test_common.py swh/loader/package/tests/test_conftest.py swh/loader/package/tests/test_debian.py swh/loader/package/tests/test_deposit.py swh/loader/package/tests/test_npm.py swh/loader/package/tests/test_pypi.py swh/loader/package/tests/test_tasks.py swh/loader/package/tests/test_utils.py swh/loader/package/tests/data/http_deb.debian.org/debian_pool_contrib_c_cicero_cicero_0.7.2-3.diff.gz swh/loader/package/tests/data/http_deb.debian.org/debian_pool_contrib_c_cicero_cicero_0.7.2-3.dsc swh/loader/package/tests/data/http_deb.debian.org/debian_pool_contrib_c_cicero_cicero_0.7.2-4.diff.gz swh/loader/package/tests/data/http_deb.debian.org/debian_pool_contrib_c_cicero_cicero_0.7.2-4.dsc swh/loader/package/tests/data/http_deb.debian.org/debian_pool_contrib_c_cicero_cicero_0.7.2.orig.tar.gz swh/loader/package/tests/data/http_deb.debian.org/onefile.txt swh/loader/package/tests/data/https_deposit.softwareheritage.org/1_private_666_meta swh/loader/package/tests/data/https_deposit.softwareheritage.org/1_private_666_raw swh/loader/package/tests/data/https_deposit.softwareheritage.org/hello_2.10.json swh/loader/package/tests/data/https_deposit.softwareheritage.org/hello_2.10.orig.tar.gz swh/loader/package/tests/data/https_files.pythonhosted.org/0805nexter-1.1.0.tar.gz swh/loader/package/tests/data/https_files.pythonhosted.org/0805nexter-1.1.0.zip swh/loader/package/tests/data/https_files.pythonhosted.org/0805nexter-1.2.0.zip swh/loader/package/tests/data/https_files.pythonhosted.org/0805nexter-1.3.0.zip swh/loader/package/tests/data/https_files.pythonhosted.org/0805nexter-1.4.0.zip swh/loader/package/tests/data/https_files.pythonhosted.org/nexter-1.1.0.tar.gz swh/loader/package/tests/data/https_files.pythonhosted.org/nexter-1.1.0.zip swh/loader/package/tests/data/https_files.pythonhosted.org/packages_70_97_c49fb8ec24a7aaab54c3dbfbb5a6ca1431419d9ee0f6c363d9ad01d2b8b1_0805nexter-1.3.0.zip swh/loader/package/tests/data/https_files.pythonhosted.org/packages_c4_a0_4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4_0805nexter-1.2.0.zip swh/loader/package/tests/data/https_files.pythonhosted.org/packages_c4_a0_4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4_0805nexter-1.2.0.zip_visit1 swh/loader/package/tests/data/https_files.pythonhosted.org/packages_ec_65_c0116953c9a3f47de89e71964d6c7b0c783b01f29fa3390584dbf3046b4d_0805nexter-1.1.0.zip swh/loader/package/tests/data/https_files.pythonhosted.org/packages_ec_65_c0116953c9a3f47de89e71964d6c7b0c783b01f29fa3390584dbf3046b4d_0805nexter-1.1.0.zip_visit1 swh/loader/package/tests/data/https_ftp.gnu.org/gnu_8sync_8sync-0.1.0.tar.gz swh/loader/package/tests/data/https_ftp.gnu.org/gnu_8sync_8sync-0.2.0.tar.gz swh/loader/package/tests/data/https_pypi.org/pypi_0805nexter_json swh/loader/package/tests/data/https_pypi.org/pypi_0805nexter_json_visit1 swh/loader/package/tests/data/https_pypi.org/pypi_nexter_json swh/loader/package/tests/data/https_registry.npmjs.org/org_-_org-0.0.2.tgz swh/loader/package/tests/data/https_registry.npmjs.org/org_-_org-0.0.3.tgz swh/loader/package/tests/data/https_registry.npmjs.org/org_-_org-0.0.4.tgz swh/loader/package/tests/data/https_registry.npmjs.org/org_-_org-0.0.5.tgz swh/loader/package/tests/data/https_registry.npmjs.org/org_-_org-0.1.0.tgz swh/loader/package/tests/data/https_registry.npmjs.org/org_-_org-0.2.0.tgz swh/loader/package/tests/data/https_replicate.npmjs.com/org swh/loader/package/tests/data/https_replicate.npmjs.com/org_visit1 \ No newline at end of file diff --git a/swh.loader.core.egg-info/entry_points.txt b/swh.loader.core.egg-info/entry_points.txt new file mode 100644 index 0000000..cdbe065 --- /dev/null +++ b/swh.loader.core.egg-info/entry_points.txt @@ -0,0 +1,4 @@ + + [swh.workers] + loader.package=swh.loader.package:register + \ No newline at end of file diff --git a/swh/loader/package/tasks.py b/swh/loader/package/tasks.py index 9e3e646..e6941d7 100644 --- a/swh/loader/package/tasks.py +++ b/swh/loader/package/tasks.py @@ -1,38 +1,43 @@ # Copyright (C) 2019 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 celery import shared_task from swh.loader.package.debian import DebianLoader from swh.loader.package.deposit import DepositLoader from swh.loader.package.npm import NpmLoader from swh.loader.package.pypi import PyPILoader from swh.loader.package.archive import ArchiveLoader @shared_task(name=__name__ + '.LoadArchive') def load_archive(url=None, artifacts=None, identity_artifact_keys=None): + """Load archive's artifacts (e.g gnu, etc...)""" return ArchiveLoader(url, artifacts, identity_artifact_keys=identity_artifact_keys).load() @shared_task(name=__name__ + '.LoadDebian') def load_deb(*, url, date, packages): + """Load Debian package""" return DebianLoader(url, date, packages).load() @shared_task(name=__name__ + '.LoadDeposit') def load_deposit(*, url, deposit_id): + """Load Deposit artifacts""" return DepositLoader(url, deposit_id).load() @shared_task(name=__name__ + '.LoadNpm') def load_npm(*, package_name, package_url, package_metadata_url): + """Load Npm package""" return NpmLoader(package_name, package_url, package_metadata_url).load() @shared_task(name=__name__ + '.LoadPyPI') def load_pypi(*, url=None): + """Load PyPI package""" return PyPILoader(url).load() diff --git a/version.txt b/version.txt index 842d284..2ca85ee 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.0.52-0-g4399d6c \ No newline at end of file +v0.0.53-0-g35c9b33 \ No newline at end of file