Update to pyproject.toml, bump version to 0.5.1

Author: rbrich

.github/workflows/python-app.yml

@@ -29,7 +29,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install --no-install-recommends -y wamerican
         python -m pip install --upgrade pip
-        pip install flake8 twine wheel tox
+        pip install flake8 twine wheel tox build
         pip install -r requirements.txt
 
     - name: Lint with flake8

Makefile

@@ -8,7 +8,7 @@ build: dist/keybox-$(VERSION).tar.gz
 zipapp: $(BUILD)/keybox.pyz
 
 dist/keybox-$(VERSION).tar.gz:
-	python3 setup.py sdist bdist_wheel
+	python3 -m build
 
 $(BUILD)/keybox.pyz: keybox
 	rm -rf $(ZIPAPP)
@@ -20,16 +20,16 @@ cryptoref: cryptoref/cryptoref.pyx
 	python3 setup.py build_ext --inplace
 
 test:
-	python3 setup.py pytest
+	python3 -m pytest
 
 .coverage: keybox tests .coveragerc
-	coverage run setup.py pytest
+	python3 -m coverage run -m pytest
 
 cov: .coverage
-	coverage report --show-missing --fail-under=70
+	python3 -m coverage report --show-missing --fail-under=70
 
 htmlcov: .coverage
-	coverage html --show-contexts
+	python3 -m coverage html --show-contexts
 	open htmlcov/index.html
 
 check: build

README.rst

@@ -50,9 +50,11 @@ That's it. PIP should pull in the required dependencies.
 From source / Git repo
 ``````````````````````
 
-Alternatively, install from source::
+Alternatively, install from source using ``build`` tool::
+
+    # pip3 install --upgrade build
+    python3 -m build
 
-    python3 setup.py install
 
 The package can also run without installation, directly from source tree root::
 

VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

pyproject.toml

@@ -0,0 +1,28 @@
+[project]
+name = "keybox"
+description = "Simple password manager. Stores secrets in encrypted tab-delimited table."
+readme = "README.rst"
+authors = [{name="Radek Brich", email="[email protected]"}]
+license = "MIT"
+license-files = ["LICENSE"]
+urls = {github="https://github.com/rbrich/keybox"}
+requires-python = ">=3.9"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Intended Audience :: End Users/Desktop",
+    "Topic :: Utilities",
+    ]
+
+dependencies = ["pynacl", "prompt_toolkit", "blessed", "pyperclip"]
+optional-dependencies = {tester=["pytest", "argon2-cffi"]}
+
+dynamic = ["version"]
+
+[project.scripts]
+keybox = "keybox.main:main"
+
+[build-system]
+requires = ["setuptools", "wheel", "cython"]
+build-backend = "setuptools.build_meta"

setup.cfg

@@ -1,5 +1,10 @@
+[metadata]
+version = file: VERSION
+
+[options]
+packages = keybox, keybox.backend
+include_package_data = True
+zip_safe = True
+
 [flake8]
 max-line-length = 100
-
-[tool:pytest]
-testpaths = tests

setup.py

@@ -1,35 +1,7 @@
 #!/usr/bin/env python3
 
-from setuptools import setup
-from pathlib import Path
-
-try:
-    from Cython.Build import cythonize
-except ImportError:
-    def cythonize(*_args):
-        return []
-
-setup_dir = Path(__file__).parent
+from setuptools import setup, Extension
 
 setup(
-    name='keybox',
-    version=(setup_dir / 'VERSION').read_text().strip(),
-    description='Simple password manager. Stores secrets in encrypted tab-delimited table.',
-    long_description=(setup_dir / "README.rst").read_text(),
-    long_description_content_type='text/x-rst',
-    author='Radek Brich',
-    author_email='[email protected]',
-    license='MIT',
-    url='https://github.com/rbrich/keybox',
-    packages=['keybox', 'keybox.backend'],
-    include_package_data=True,
-    entry_points={
-        'console_scripts': [
-            'keybox = keybox.main:main',
-        ],
-    },
-    ext_modules=cythonize('cryptoref/cryptoref.pyx'),
-    setup_requires=['pytest-runner', 'Cython'],
-    install_requires=['pynacl', 'prompt_toolkit', 'blessed', 'pyperclip'],
-    tests_require=['pytest', 'argon2-cffi'],
+    ext_modules=[Extension(name="cryptoref", sources=["cryptoref/cryptoref.pyx"])]
 )

tests/test_shell.py

@@ -65,7 +65,7 @@ def dummy(*_args, **_kwargs):
     monkeypatch.setattr(ShellUI, '_input', feed_input, raising=True)
     monkeypatch.setattr(BaseUI, '_input', feed_input, raising=True)
     monkeypatch.setattr(BaseUI, '_input_pass', feed_input, raising=True)
-    monkeypatch.setattr(BaseUI, '_copy', expect_copy, raising=True)
+    monkeypatch.setattr(BaseUI, '_copy_secret', expect_copy, raising=True)
     monkeypatch.setattr(BaseInput, '__init__', dummy, raising=True)
     monkeypatch.setattr(BaseInput, 'input', feed_input, raising=True)
     monkeypatch.setattr(BaseInput, 'cancel', raise_timeout, raising=True)