8 files changed, 92 insertions, 58 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..2c16909
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,22 @@
+# Changelog
+
+## [1.1.0](https://github.com/blackm0re/etoolkit/tree/1.1.0) (2022-03-14)
+
+[Full Changelog](https://github.com/blackm0re/etoolkit/compare/1.0.0...1.1.0)
+
+**Changes:**
+
+- a master password can now be set using the *ETOOLKIT_MASTER_PASSWORD* env. variable
+
+- a new parameter *-P* / *--master-password-prompt* can be used in order to force password prompt
+
+- improved tests
+
+- use *setuptools* instead of the deprecated *distutils*
+
+
+# [1.0.0](https://github.com/blackm0re/etoolkit/tree/1.0.0) (2021-12-23)
+
+**Changes:**
+
+- Initial release
diff --git a/README.md b/README.md
index 218ea7c..d558c36 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,12 @@ for processes that were not spawned by that same *etoolkit* session.
 ### Gentoo
 
    ```bash
+   # add sgs' custom repository using app-eselect/eselect-repository
+   eselect repository add sgs
+
+   # ... or using layman (obsolete)
    layman -a sgs
+
    emerge dev-python/etoolkit
    ```
 
@@ -285,7 +290,11 @@ bottom of your bash startup file:
    complete -W '$(compgen -W "$(etoolkit -l)")' etoolkit
    ```
 
-A complete bash completion script for *etoolkit* can be found here: [https://github.com/blackm0re/etoolkit/blob/master/completion/etoolkit.bash](https://github.com/blackm0re/etoolkit/blob/master/completion/etoolkit.bash)
+A complete bash completion script for *etoolkit* can be found here:
+[https://github.com/blackm0re/etoolkit/blob/master/completion/etoolkit.bash](https://github.com/blackm0re/etoolkit/blob/master/completion/etoolkit.bash)
+
+
+## [Changelog](https://github.com/blackm0re/etoolkit/blob/master/CHANGELOG.md)
 
 
 ## Support and contributing
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..1173069
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,15 @@
+[build-system]
+requires = [
+    "setuptools>=51",
+    "wheel"
+]
+
+build-backend = "setuptools.build_meta"
+
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+addopts = "-s"
+testpaths = [
+    "tests"
+]
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..c218df8
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,44 @@
+[metadata]
+name = etoolkit
+version = attr: etoolkit.__version__
+author = attr: etoolkit.__author__
+author_email = sgs@pichove.org
+description = A simple toolkit for setting environment variables in a flexible way
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/blackm0re/etoolkit
+
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Environment :: Console
+    Intended Audience :: Developers
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Operating System :: POSIX
+    Topic :: Security :: Cryptography
+
+project_urls =
+    Bug Tracker = https://github.com/blackm0re/etoolkit/issues
+    Source = https://github.com/blackm0re/etoolkit
+
+[options]
+package_dir =
+    = src
+packages = find:
+python_requires = >=3.7
+
+install_requires =
+    cryptography>=3.2
+
+[options.packages.find]
+where = src
+
+[options.entry_points]
+console_scripts =
+    etoolkit = etoolkit.__main__:main
diff --git a/setup.py b/setup.py
deleted file mode 100644
index b4681c3..0000000
--- a/setup.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import setuptools
-
-import etoolkit
-
-with open('README.md', 'r', encoding='utf-8') as fh:
-    long_description = fh.read()
-
-
-setuptools.setup(
-    name='etoolkit',
-    version=etoolkit.__version__,
-    author=etoolkit.__author__,
-    author_email='sgs@pichove.org',
-    description=(
-        'A simple toolkit for setting environment variables in a flexible way'
-    ),
-    license=etoolkit.__license__,
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='https://github.com/blackm0re/etoolkit',
-    packages=setuptools.find_packages(),
-    exclude_package_data={'': ['.gitignore']},
-    entry_points={
-        'console_scripts': [
-            'etoolkit=etoolkit.__main__:main',
-        ],
-    },
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'Intended Audience :: System Administrators',
-        (
-            'License :: OSI Approved :: GNU General Public License v3 or later'
-            ' (GPLv3+)'
-        ),
-        'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: Implementation',
-        'Operating System :: POSIX',
-        'Topic :: Security :: Cryptography',
-    ],
-    keywords='unix environment security cryptography',
-    project_urls={
-        'Bug Reports': 'https://github.com/blackm0re/etoolkit/issues',
-        'Source': 'https://github.com/blackm0re/etoolkit',
-    },
-    install_requires=["cryptography>=3.2"],
-    python_requires='>=3.7',
-)
diff --git a/etoolkit/__init__.py b/src/etoolkit/__init__.py
index df53a55..e2925ef 100644
--- a/etoolkit/__init__.py
+++ b/src/etoolkit/__init__.py
@@ -17,7 +17,7 @@
 from .etoolkit import EtoolkitInstance, EtoolkitInstanceError
 
 __author__ = 'Simeon Simeonov'
-__version__ = '1.1.0-rc1'
+__version__ = '1.1.0'
 __license__ = 'GPL3'
 
 
diff --git a/etoolkit/__main__.py b/src/etoolkit/__main__.py
index 603bb2e..603bb2e 100644
--- a/etoolkit/__main__.py
+++ b/src/etoolkit/__main__.py
diff --git a/etoolkit/etoolkit.py b/src/etoolkit/etoolkit.py
index d8221a5..d8221a5 100755
--- a/etoolkit/etoolkit.py
+++ b/src/etoolkit/etoolkit.py