diff --git a/setup.cfg b/setup.cfg index 9b9fcc4..1a5e6bf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,3 @@ -[aliases] -dists = clean --all sdist bdist_wheel - [metadata] name = molecule-podman url = https://github.com/ansible-community/molecule-podman @@ -20,7 +17,7 @@ author_email = info@ansible.com maintainer = Ansible by Red Hat maintainer_email = info@ansible.com license = MIT -license_file = LICENSE +license_files = LICENSE classifiers = Development Status :: 5 - Production/Stable @@ -44,6 +41,9 @@ classifiers = Topic :: System :: Systems Administration Topic :: Utilities + + Typing :: Typed + keywords = ansible podman @@ -56,14 +56,11 @@ python_requires = >=3.8 package_dir = = src packages = find: -include_package_data = True +# Do not use include_package_data as we mention them explicitely. +# see https://setuptools.pypa.io/en/latest/userguide/datafiles.html +# include_package_data = True zip_safe = False -# These are required during `setup.py` run: -setup_requires = - setuptools_scm >= 1.15.0 - setuptools_scm_git_archive >= 1.0 - # These are required in actual runtime: install_requires = ansible-compat >= 2.2.0 @@ -85,6 +82,14 @@ docs = molecule.driver = podman = molecule_podman.driver:Podman +[options.package_data] +* = + *.j2 + *.json + *.yaml + *.yml + py.typed + [options.packages.find] where = src diff --git a/setup.py b/setup.py deleted file mode 100644 index 7977820..0000000 --- a/setup.py +++ /dev/null @@ -1,37 +0,0 @@ -#! /usr/bin/env python -# Copyright (c) 2019 Red Hat, Inc. -# Copyright (c) 2015-2018 Cisco Systems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -"""Molecule distribution package setuptools installer.""" - -import site -import sys - -import setuptools - -# See https://github.com/pypa/pip/issues/7953 -site.ENABLE_USER_SITE = "--user" in sys.argv[1:] - - -if __name__ == "__main__": - setuptools.setup( - use_scm_version={"local_scheme": "no-local-version"}, - setup_requires=["setuptools_scm[toml]>=3.5.0"], - ) diff --git a/src/molecule_podman/py.typed b/src/molecule_podman/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/tox.ini b/tox.ini index b57287f..05f1924 100644 --- a/tox.ini +++ b/tox.ini @@ -119,7 +119,7 @@ usedevelop = false skip_install = true deps = collective.checkdocs >= 0.2 - pep517 >= 0.8.2 + build >= 0.7.0 pip >= 20.2.2 toml >= 0.10.1 twine >= 3.2.0 # pyup: ignore @@ -127,10 +127,8 @@ setenv = commands_pre = commands = rm -rfv {toxinidir}/dist/ - python -m pep517.build \ - --source \ - --binary \ - --out-dir {toxinidir}/dist/ \ + python -m build \ + --outdir {toxinidir}/dist/ \ {toxinidir} # metadata validation sh -c "python -m twine check {toxinidir}/dist/*"