From 0433e813700053ed1c82fad33e8e28f5c8ab7d37 Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 18:38:42 +0100 Subject: [PATCH 01/11] Add a basic `pyproject.toml` in favor of pep 517 --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 pyproject.toml 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" From 761c6759a3fb8155072d601474cc531720a3af86 Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 19:02:03 +0100 Subject: [PATCH 02/11] wip: quick and dirty --- setup.cfg | 39 +++++++++++++++++++++----- setup.py | 84 ------------------------------------------------------- 2 files changed, 32 insertions(+), 91 deletions(-) delete mode 100644 setup.py diff --git a/setup.cfg b/setup.cfg index bd23b87..9b301f2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,8 +1,33 @@ -[aliases] -distribute = register sdist bdist_wheel upload -dev = develop easy_install diceware[tests] -docs = develop easy_install diceware[docs] -test = pytest +[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' + classifiers= + "Development Status :: 3 - Alpha" + "Environment :: Console" + "Intended Audience :: End Users/Desktop" + "Intended Audience :: System Administrators" + "Topic :: Utilities" + "Topic :: Security :: Cryptography" + "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" -[bdist_wheel] -universal = 1 +[options.entry_points] +console_scripts = + diceware = diceware:main diff --git a/setup.py b/setup.py deleted file mode 100644 index 492caa4..0000000 --- a/setup.py +++ /dev/null @@ -1,84 +0,0 @@ -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', - ], - }, -) From 7468854a3485f11c9f9f2c5a1beff4a882a700c4 Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 19:07:01 +0100 Subject: [PATCH 03/11] src: add setup.py --- setup.py | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..492caa4 --- /dev/null +++ b/setup.py @@ -0,0 +1,84 @@ +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', + ], + }, +) From 448c4bcb0850507533de0e481e18bc24385c825d Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 19:13:07 +0100 Subject: [PATCH 04/11] src: minimal setup.py; rm noise form setup.cfg --- setup.cfg | 19 ------------ setup.py | 86 ++----------------------------------------------------- 2 files changed, 2 insertions(+), 103 deletions(-) diff --git a/setup.cfg b/setup.cfg index 9b301f2..eb2ee65 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,25 +8,6 @@ keywords="diceware password passphrase" url="https://github.com/ulif/diceware/" packages='diceware' - classifiers= - "Development Status :: 3 - Alpha" - "Environment :: Console" - "Intended Audience :: End Users/Desktop" - "Intended Audience :: System Administrators" - "Topic :: Utilities" - "Topic :: Security :: Cryptography" - "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" [options.entry_points] console_scripts = 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() From 485010309477ab2ebbb3fffb272bb7385726d09e Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 19:30:13 +0100 Subject: [PATCH 05/11] wip: add setup.cfg `options.package_data` tbl --- setup.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.cfg b/setup.cfg index eb2ee65..c660857 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,3 +12,7 @@ [options.entry_points] console_scripts = diceware = diceware:main + +[options.package_data] +diceware/wordlists = + *.txt From b801b7e6b95a31d6d30f469d391f13750d1c2a2d Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 19:38:21 +0100 Subject: [PATCH 06/11] wip: package_data try out --- setup.cfg | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index c660857..63e4142 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,10 +9,19 @@ url="https://github.com/ulif/diceware/" packages='diceware' -[options.entry_points] -console_scripts = - diceware = diceware:main +[options] +packages = find_namespace: +package_dir = + = src +# include_package_data = True + +[options.packages.find] +where = src [options.package_data] -diceware/wordlists = +diceware.wordlists = *.txt + +[options.entry_points] +console_scripts = + diceware = diceware:main From c14e88d9a634fffc0a2752884cf3ac9f31e8cb0b Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 19:40:54 +0100 Subject: [PATCH 07/11] wip: try and err saga --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 63e4142..2b88e03 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,11 +12,11 @@ [options] packages = find_namespace: package_dir = - = src + = diceware # include_package_data = True [options.packages.find] -where = src +where = diceware [options.package_data] diceware.wordlists = From a6caf913fdc6347352966609ccbff0615c559e52 Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 19:43:48 +0100 Subject: [PATCH 08/11] wip: try and err --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 2b88e03..cc8cd25 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,7 +19,7 @@ package_dir = where = diceware [options.package_data] -diceware.wordlists = +wordlists = *.txt [options.entry_points] From 5d09a1dd81cfdf212842949575b279ed1934dc4d Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 19:55:33 +0100 Subject: [PATCH 09/11] wip: try and err --- setup.cfg | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index cc8cd25..d751a59 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,14 +13,23 @@ packages = find_namespace: package_dir = = diceware -# include_package_data = True +include_package_data = True [options.packages.find] where = diceware -[options.package_data] -wordlists = - *.txt +# [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 = From 69f879ebf1dcbad06e3f61e2d1e4d6bee14e2566 Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 20:00:25 +0100 Subject: [PATCH 10/11] wip: try and err --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index d751a59..6827cae 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,11 +12,11 @@ [options] packages = find_namespace: package_dir = - = diceware + = . include_package_data = True [options.packages.find] -where = diceware +where = . # [options] # packages = find_namespace: From f22c4c3a34a8de99ac94ba8c692802cf70046532 Mon Sep 17 00:00:00 2001 From: netzego Date: Fri, 3 Nov 2023 20:06:02 +0100 Subject: [PATCH 11/11] wip: try and err --- setup.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 6827cae..e25209c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,9 +27,9 @@ where = . # [options.packages.find] # where = diceware -# [options.package_data] -# diceware.wordlists = -# *.txt +[options.package_data] +diceware.wordlists = + *.txt [options.entry_points] console_scripts =