diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..fed528d --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index bd23b87..e25209c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,8 +1,36 @@ -[aliases] -distribute = register sdist bdist_wheel upload -dev = develop easy_install diceware[tests] -docs = develop easy_install diceware[docs] -test = pytest - -[bdist_wheel] -universal = 1 +[meatadata] + name="diceware" + version=version["version"] + author="Uli Fouquet" + author_email="uli@gnufix.de" + description= "Passphrases you will remember." + license="GPL 3.0" + keywords="diceware password passphrase" + url="https://github.com/ulif/diceware/" + packages='diceware' + +[options] +packages = find_namespace: +package_dir = + = . +include_package_data = True + +[options.packages.find] +where = . + +# [options] +# packages = find_namespace: +# package_dir = +# = diceware +# # include_package_data = True + +# [options.packages.find] +# where = diceware + +[options.package_data] +diceware.wordlists = + *.txt + +[options.entry_points] +console_scripts = + diceware = diceware:main diff --git a/setup.py b/setup.py index 492caa4..a4f49f9 100644 --- a/setup.py +++ b/setup.py @@ -1,84 +1,2 @@ -import os -from setuptools import setup - - -def read(*parts): - with open(os.path.join(os.path.dirname(__file__), *parts)) as fp: - return fp.read() - - -version = {} -exec(read("diceware", "__about__.py"), version) - - -setup_requires = [ - 'pytest_runner', - ] - -install_requires = [ - 'setuptools', - ] - -tests_require = [ - # See tox.ini - 'pytest >=2.8.3', - 'coverage', - ] - -docs_require = [ - 'Sphinx', - 'sphinx_rtd_theme', - ] - -setup( - name="diceware", - version=version["version"], - author="Uli Fouquet", - author_email="uli@gnufix.de", - description=( - "Passphrases you will remember."), - license="GPL 3.0", - keywords="diceware password passphrase", - url="https://github.com/ulif/diceware/", - py_modules=[], - packages=['diceware', ], - namespace_packages=[], - long_description=read('README.rst') + '\n\n\n' + read('CHANGES.rst'), - classifiers=[ - "Development Status :: 3 - Alpha", - "Environment :: Console", - "Intended Audience :: End Users/Desktop", - "Intended Audience :: System Administrators", - "Topic :: Utilities", - "Topic :: Security :: Cryptography", - ( - "License :: OSI Approved :: " - "GNU General Public License v3 or later (GPLv3+)"), - "Operating System :: POSIX :: Linux", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", - ], - include_package_data=True, - zip_safe=False, - setup_requires=setup_requires, - install_requires=install_requires, - tests_require=tests_require, - extras_require=dict( - tests=tests_require, - docs=docs_require, - ), - entry_points={ - 'console_scripts': [ - 'diceware = diceware:main', - ], - }, -) +import setuptools +setuptools.setup()