diff --git a/mypy.ini b/mypy.ini index da53e716..b5e02744 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,63 +1,60 @@ [mypy] namespace_packages = True # due to the conditional import logic on swh.journal, in some cases a specific # type: ignore is needed, in other it isn't... warn_unused_ignores = False -# support for sqlalchemy magic: see https://github.com/dropbox/sqlalchemy-stubs -plugins = sqlmypy - # 3rd party libraries without stubs (yet) [mypy-cassandra.*] ignore_missing_imports = True [mypy-confluent_kafka.*] ignore_missing_imports = True [mypy-deprecated.*] ignore_missing_imports = True # only shipped indirectly via hypothesis [mypy-django.*] ignore_missing_imports = True [mypy-iso8601.*] ignore_missing_imports = True [mypy-msgpack.*] ignore_missing_imports = True [mypy-multiprocessing.util] ignore_missing_imports = True [mypy-pkg_resources.*] ignore_missing_imports = True [mypy-psycopg2.*] ignore_missing_imports = True [mypy-pytest.*] ignore_missing_imports = True [mypy-pytest_cov.*] ignore_missing_imports = True [mypy-pytest_kafka.*] ignore_missing_imports = True [mypy-systemd.daemon.*] ignore_missing_imports = True [mypy-tenacity.*] ignore_missing_imports = True # temporary work-around for landing typing support in spite of the current # journal<->storage dependency loop [mypy-swh.journal.*] ignore_missing_imports = True [mypy-pytest_postgresql.*] ignore_missing_imports = True diff --git a/requirements-test.txt b/requirements-test.txt index 07dc055f..c6a0316d 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,10 +1,9 @@ hypothesis >= 3.11.0 pytest pytest-mock -sqlalchemy-stubs # pytz is in fact a dep of swh.model[testing] and should not be necessary, but # the dep on swh.model in the main requirements-swh.txt file shadows this one # adding the [testing] extra. swh.model[testing] >= 0.0.50 pytz pytest-xdist diff --git a/setup.py b/setup.py index a980a6ba..c5263a3d 100755 --- a/setup.py +++ b/setup.py @@ -1,75 +1,74 @@ #!/usr/bin/env python3 # Copyright (C) 2015-2020 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(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.storage", description="Software Heritage storage manager", 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/DSTO/", setup_requires=["setuptools-scm"], packages=find_packages(), use_scm_version=True, scripts=["bin/swh-storage-add-dir",], entry_points=""" [swh.cli.subcommands] storage=swh.storage.cli """, install_requires=parse_requirements() + parse_requirements("swh"), extras_require={ "testing": (parse_requirements("test") + parse_requirements("swh-journal")), - "schemata": ["SQLAlchemy"], "journal": parse_requirements("swh-journal"), }, include_package_data=True, 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-storage", "Documentation": "https://docs.softwareheritage.org/devel/swh-storage/", }, )