diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 923be8e..0000000 --- a/.coveragerc +++ /dev/null @@ -1,2 +0,0 @@ -[coverage:report] -show_missing = true diff --git a/MANIFEST.in b/MANIFEST.in index d2dc745..977da58 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,8 +9,6 @@ include contributing.md include CONTRIBUTORS.txt include COPYRIGHT.txt include LICENSE.txt -include .coveragerc -include pytest.ini include tox.ini rtd.txt diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..b272bcb --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,84 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "zodburi" +version = "3.0dev0" +dynamic = ["readme"] +description="Construct ZODB storage instances from URIs." +keywords = [ + "zodb", + "zodbconn", +] +authors = [ + {name = "Chris Rossi", email = "pylons-discuss@googlegroups.com"}, +] +classifiers = [ + "Intended Audience :: Developers", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", + "License :: Repoze Public License", +] +requires-python = ">=3.8" +dependencies = [ + "ZODB", + "ZConfig", + "ZEO" +] + +[project.entry-points.'zodburi.resolvers'] +zeo = "zodburi.resolvers:client_storage_resolver" +file = "zodburi.resolvers:file_storage_resolver" +zconfig = "zodburi.resolvers:zconfig_resolver" +memory = "zodburi.resolvers:mapping_storage_resolver" +demo = "zodburi.resolvers:demo_storage_resolver" + +[project.urls] +Homepage = "https://docs.pylonsproject.org/projects/zodburi/en/latest/" +Repository = "https://github.com/Pylons/zodburi" +Issues = "https://github.com/Pylons/zodburi/issues" +Changelog = "https://github.com/Pylons/zodburi/blob/master/CHANGES.rst" + +[project.optional-dependencies] +testing = [ + "pytest", + "pytest-cov", + "check-manifest", +] +docs = [ + "Sphinx", + "pylons-sphinx-themes", +] + +[tool.setuptools] +packages = ["zodburi"] + +[tool.setuptools.dynamic] +readme = {file = ["README.rst", "CHANGES.rst"]} + +[tool.pytest.ini_options] +addopts = [ + "-l", + "--strict", +] +norecursedirs = [ + "lib", + "include", + ".tox", + ".git", +] +python_files = "test_*.py" +filterwarnings = [ + "ignore::DeprecationWarning:pkg_resources", +] + +[tool.coverage.report] +show_missing = true diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 7accbf9..0000000 --- a/pytest.ini +++ /dev/null @@ -1,7 +0,0 @@ -[pytest] -addopts = -l --strict -norecursedirs = lib include .tox .git -python_files = test_*.py -filterwarnings = - ignore::DeprecationWarning:pkg_resources - diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 3745877..0000000 --- a/setup.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[easy_install] -zip_ok = false - -[nosetests] -match=^test -where=zodburi -nocapture=1 -cover-package=zodburi -cover-erase=1 - -[aliases] -dev = develop easy_install zodburi[testing] -docs = develop easy_install zodburi[docs] diff --git a/setup.py b/setup.py index 1434d69..6068493 100644 --- a/setup.py +++ b/setup.py @@ -1,68 +1,3 @@ -import os - from setuptools import setup -from setuptools import find_packages - -here = os.path.abspath(os.path.dirname(__file__)) - -try: - with open(os.path.join(here, 'README.rst')) as f: - README = f.read() -except OSError: - README = '' - -try: - with open(os.path.join(here, 'CHANGES.rst')) as f: - CHANGES = f.read() -except OSError: - CHANGES = '' - -requires = ['ZODB', 'ZConfig', 'ZEO'] -tests_require = requires + ['mock'] -testing_extras = tests_require + ['nose', 'coverage'] -docs_extras = tests_require + [ - 'Sphinx >= 1.8.1', - 'repoze.sphinx.autointerface', - 'pylons-sphinx-themes >= 1.0.10', -] -setup(name='zodburi', - version='2.6.1dev0', - description=('Construct ZODB storage instances from URIs.'), - long_description=README + '\n\n' + CHANGES, - classifiers=[ - "Intended Audience :: Developers", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", - "License :: Repoze Public License", - ], - keywords='zodb zodbconn', - author="Chris Rossi", - author_email="pylons-discuss@googlegroups.com", - url="https://pylonsproject.org/", - license="BSD-derived (http://www.repoze.org/LICENSE.txt)", - packages=find_packages(), - include_package_data=True, - zip_safe=False, - python_requires='>=3.8', - install_requires = requires, - entry_points="""\ - [zodburi.resolvers] - zeo = zodburi.resolvers:client_storage_resolver - file = zodburi.resolvers:file_storage_resolver - zconfig = zodburi.resolvers:zconfig_resolver - memory = zodburi.resolvers:mapping_storage_resolver - demo = zodburi.resolvers:demo_storage_resolver - """, - extras_require = { - 'testing': testing_extras, - 'docs': docs_extras, - }, - ) +setup() diff --git a/tox.ini b/tox.ini index c41add5..3c3abbc 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ commands = py.test -q deps = pytest - mock ZODB==5.* ZEO==5.* @@ -29,7 +28,7 @@ deps = [testenv:docs] basepython = - python3.11 + python3.12 commands = sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html deps =