diff --git a/README.md b/README.md index 08b97d8..e9097bc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -swh-py-template +swh-counters =============== -Python module template, used as skeleton to create new modules. - +Next generation counters for swh objects diff --git a/setup.py b/setup.py index ad4122d..d977e95 100755 --- a/setup.py +++ b/setup.py @@ -1,75 +1,72 @@ #!/usr/bin/env python3 # Copyright (C) 2019-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.md"), encoding="utf-8") as f: long_description = f.read() def parse_requirements(*names): requirements = [] for name in names: if name: reqf = "requirements-%s.txt" % name else: reqf = "requirements.txt" 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 -# Edit this part to match your module. -# Full sample: -# https://forge.softwareheritage.org/diffusion/DCORE/browse/master/setup.py setup( - name="swh.", # example: swh.loader.pypi - description="Software Heritage ", + name="swh.counters", + description="Software Heritage Next gen counters", long_description=long_description, long_description_content_type="text/markdown", python_requires=">=3.7", author="Software Heritage developers", author_email="swh-devel@inria.fr", - url="https://forge.softwareheritage.org/diffusion/", + url="https://forge.softwareheritage.org/source/swh-counters", packages=find_packages(), # packages's modules install_requires=parse_requirements(None, "swh"), tests_require=parse_requirements("test"), setup_requires=["setuptools-scm"], use_scm_version=True, extras_require={"testing": parse_requirements("test")}, include_package_data=True, - entry_points=""" - [swh.cli.subcommands] - =swh..cli - """, + # entry_points=""" + # [swh.cli.subcommands] + # =swh..cli + # """, classifiers=[ "Programming Language :: Python :: 3", "Intended Audience :: Developers", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Operating System :: OS Independent", "Development Status :: 3 - Alpha", ], project_urls={ "Bug Reports": "https://forge.softwareheritage.org/maniphest", "Funding": "https://www.softwareheritage.org/donate", - "Source": "https://forge.softwareheritage.org/source/swh-", - "Documentation": "https://docs.softwareheritage.org/devel/swh-/", + "Source": "https://forge.softwareheritage.org/source/swh-counters", + "Documentation": "https://docs.softwareheritage.org/devel/swh-counters/", }, ) diff --git a/swh/foo/__init__.py b/swh/counters/__init__.py similarity index 100% rename from swh/foo/__init__.py rename to swh/counters/__init__.py diff --git a/swh/foo/cli.py b/swh/counters/cli.py similarity index 100% rename from swh/foo/cli.py rename to swh/counters/cli.py diff --git a/swh/foo/py.typed b/swh/counters/py.typed similarity index 100% rename from swh/foo/py.typed rename to swh/counters/py.typed diff --git a/swh/foo/tests/__init__.py b/swh/counters/tests/__init__.py similarity index 100% rename from swh/foo/tests/__init__.py rename to swh/counters/tests/__init__.py diff --git a/swh/foo/tests/test_nothing.py b/swh/counters/tests/test_nothing.py similarity index 100% rename from swh/foo/tests/test_nothing.py rename to swh/counters/tests/test_nothing.py diff --git a/swh/foo/bar.py b/swh/foo/bar.py deleted file mode 100644 index a86df5d..0000000 --- a/swh/foo/bar.py +++ /dev/null @@ -1,4 +0,0 @@ -# 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 diff --git a/tox.ini b/tox.ini index a22e0b2..1f15fb0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,35 +1,36 @@ [tox] envlist=black,flake8,mypy,py3 [testenv] extras = testing deps = pytest-cov + dev: pdbpp commands = pytest --doctest-modules \ - {envsitepackagesdir}/swh/foo \ - --cov={envsitepackagesdir}/swh/foo \ + {envsitepackagesdir}/swh/counters \ + --cov={envsitepackagesdir}/swh/counters \ --cov-branch {posargs} [testenv:black] skip_install = true deps = black==19.10b0 commands = {envpython} -m black --check swh [testenv:flake8] skip_install = true deps = flake8 commands = {envpython} -m flake8 [testenv:mypy] extras = testing deps = mypy commands = mypy swh