python/argon2_cffi: move from argon2-cffi; update to 23.1.0

Marcel Telka

2023-08-16 f6ed71524c4b9b4baaf0afc9e3d312173de5dbb9

python/argon2_cffi: move from argon2-cffi; update to 23.1.0

 components/python/argon2-cffi/pkg5

File was deleted

 components/python/argon2_cffi/Makefile

File was renamed from components/python/argon2-cffi/Makefile
@@ -11,32 +11,30 @@

#
# This file was automatically generated using the following command:
#   $WS_TOOLS/python-integrate-project argon2-cffi
#   $WS_TOOLS/python-integrate-project argon2_cffi
#

BUILD_STYLE = pyproject

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME =        argon2-cffi
HUMAN_VERSION =            21.3.0
COMPONENT_SUMMARY =        argon2-cffi - The secure Argon2 password hashing algorithm.
COMPONENT_NAME =        argon2_cffi
HUMAN_VERSION =            23.1.0
COMPONENT_SUMMARY =        argon2_cffi - Argon2 for Python
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289/argon2-cffi-21.3.0.tar.gz
    https://files.pythonhosted.org/packages/31/fa/57ec2c6d16ecd2ba0cf15f3c7d1c3c2e7b5fcb83555ff56d7ab10888ec8f/argon2_cffi-23.1.0.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b
    sha256:879c3e79a2729ce768ebb7d36d4609e3a78a4ca2ec3a9f12286ca057e3d0db08
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE

include $(WS_MAKE_RULES)/common.mk

# Disable some plugins to get tests passed
PYTEST_ADDOPTS += -p no:black

# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/argon2-cffi-bindings
PYTHON_REQUIRED_PACKAGES += library/python/flit-core
PYTHON_REQUIRED_PACKAGES += library/python/hatch-fancy-pypi-readme
PYTHON_REQUIRED_PACKAGES += library/python/hatch-vcs
PYTHON_REQUIRED_PACKAGES += library/python/hatchling
PYTHON_REQUIRED_PACKAGES += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/coverage
TEST_REQUIRED_PACKAGES.python += library/python/hypothesis
TEST_REQUIRED_PACKAGES.python += library/python/pytest

 components/python/argon2_cffi/argon2_cffi-PYVER.p5m

File was renamed from components/python/argon2-cffi/argon2-cffi-PYVER.p5m
@@ -33,9 +33,9 @@
file path=usr/lib/python$(PYVER)/vendor-packages/argon2/low_level.py
file path=usr/lib/python$(PYVER)/vendor-packages/argon2/profiles.py
file path=usr/lib/python$(PYVER)/vendor-packages/argon2/py.typed
file path=usr/lib/python$(PYVER)/vendor-packages/argon2_cffi-$(HUMAN_VERSION).dist-info/LICENSE
file path=usr/lib/python$(PYVER)/vendor-packages/argon2_cffi-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/argon2_cffi-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/argon2_cffi-$(HUMAN_VERSION).dist-info/licenses/LICENSE

# python modules are unusable without python runtime binary
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \

 components/python/argon2_cffi/manifests/sample-manifest.p5m

File was renamed from components/python/argon2-cffi/manifests/sample-manifest.p5m
@@ -33,9 +33,9 @@
file path=usr/lib/python$(PYVER)/vendor-packages/argon2/low_level.py
file path=usr/lib/python$(PYVER)/vendor-packages/argon2/profiles.py
file path=usr/lib/python$(PYVER)/vendor-packages/argon2/py.typed
file path=usr/lib/python$(PYVER)/vendor-packages/argon2_cffi-$(HUMAN_VERSION).dist-info/LICENSE
file path=usr/lib/python$(PYVER)/vendor-packages/argon2_cffi-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/argon2_cffi-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/argon2_cffi-$(HUMAN_VERSION).dist-info/licenses/LICENSE

# python modules are unusable without python runtime binary
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \

 components/python/argon2_cffi/patches/01-enable-tests.patch

New file
@@ -0,0 +1,20 @@
--- argon2_cffi-23.1.0/tox.ini.orig
+++ argon2_cffi-23.1.0/tox.ini
@@ -16,14 +16,14 @@
 package = wheel
 wheel_build_env = .pkg
 extras =
-    tests: tests
+    tests
     mypy: typing
 pass_env =
     FORCE_COLOR
     NO_COLOR
 commands =
-    tests: pytest {posargs}
-    tests: python -Im argon2 -n 1 -t 1 -m 8 -p 1
+    pytest {posargs}
+    python -Im argon2 -n 1 -t 1 -m 8 -p 1
     mypy: mypy tests/typing
 
 

 components/python/argon2_cffi/pkg5

New file
@@ -0,0 +1,14 @@
{
    "dependencies": [
        "library/python/argon2-cffi-bindings-39",
        "library/python/hatch-fancy-pypi-readme-39",
        "library/python/hatch-vcs-39",
        "library/python/hatchling-39",
        "runtime/python-39"
    ],
    "fmris": [
        "library/python/argon2-cffi-39",
        "library/python/argon2-cffi"
    ],
    "name": "argon2_cffi"
}

 components/python/argon2_cffi/python-integrate-project.conf

File was renamed from components/python/argon2-cffi/python-integrate-project.conf
@@ -13,6 +13,4 @@
# Copyright 2023 Marcel Telka
#

%include-3%
# Disable some plugins to get tests passed
PYTEST_ADDOPTS += -p no:black
%patch% 01-enable-tests.patch

 components/python/argon2_cffi/test/results-all.master

File was renamed from components/python/argon2-cffi/test/results-all.master
@@ -9,10 +9,8 @@
configfile: pyproject.toml
testpaths: tests
asyncio: mode=strict
collecting ... collected 73 items
collecting ... collected 74 items

tests/__init__.py::mypy PASSED
tests/__init__.py::mypy-status PASSED
tests/test_legacy.py::TestHash::test_hash_defaults PASSED
tests/test_legacy.py::TestHash::test_hash_fast PASSED
tests/test_legacy.py::TestHash::test_hash_nul_bytes PASSED
@@ -31,7 +29,6 @@
tests/test_legacy.py::TestVerify::test_success[Type.I-$argon2i$v=19$m=65536,t=2,p=4$c29tZXNhbHQ$IMit9qkFULCMA/ViizL57cnTLOa5DiVM9eMwpAvPwr4] PASSED
tests/test_legacy.py::TestVerify::test_success[Type.ID-$argon2id$v=19$m=65536,t=2,p=4$c29tZXNhbHQ$GpZ3sK/oH9p7VIiV56G/64Zo/8GaUw434IimaPqxwCo] PASSED
tests/test_legacy.py::TestVerify::test_wrong_arg_type PASSED
tests/test_legacy.py::mypy PASSED
tests/test_low_level.py::TestHash::test_hash_fast[hash_secret] PASSED
tests/test_low_level.py::TestHash::test_hash_fast[hash_secret_raw] PASSED
tests/test_low_level.py::TestHash::test_hash_nul_bytes PASSED
@@ -54,14 +51,19 @@
tests/test_low_level.py::TestVerify::test_success[Type.I-$argon2i$v=19$m=65536,t=2,p=4$c29tZXNhbHQ$IMit9qkFULCMA/ViizL57cnTLOa5DiVM9eMwpAvPwr4] PASSED
tests/test_low_level.py::TestVerify::test_success[Type.ID-$argon2id$v=19$m=65536,t=2,p=4$c29tZXNhbHQ$GpZ3sK/oH9p7VIiV56G/64Zo/8GaUw434IimaPqxwCo] PASSED
tests/test_low_level.py::TestVerify::test_wrong_arg_type PASSED
tests/test_low_level.py::mypy PASSED
tests/test_low_level.py::test_argument_ranges PASSED
tests/test_low_level.py::test_core PASSED
tests/test_packaging.py::TestLegacyMetadataHack::test_description PASSED
tests/test_packaging.py::TestLegacyMetadataHack::test_does_not_exist PASSED
tests/test_packaging.py::TestLegacyMetadataHack::test_email PASSED
tests/test_packaging.py::TestLegacyMetadataHack::test_uri PASSED
tests/test_packaging.py::TestLegacyMetadataHack::test_version PASSED
tests/test_password_hasher.py::TestEnsureBytes::test_is_bytes PASSED
tests/test_password_hasher.py::TestEnsureBytes::test_is_str PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_check PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_check_needs_rehash_no PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_check_needs_rehash_yes PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_custom_salt PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_hash[p\xe4ssword0] PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_hash[p\xe4ssword1] PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_hash_verify[p\xe4ssword0] PASSED
@@ -70,7 +72,7 @@
tests/test_password_hasher.py::TestPasswordHasher::test_verify_agility[p\xe4ssword0] PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_verify_agility[p\xe4ssword1] PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_verify_invalid_hash PASSED
tests/test_password_hasher.py::mypy PASSED
tests/test_password_hasher.py::TestPasswordHasher::test_verify_invalid_hash_error PASSED
tests/test_utils.py::TestCheckTypes::test_fail PASSED
tests/test_utils.py::TestCheckTypes::test_success PASSED
tests/test_utils.py::TestExtractParameters::test_invalid_hash[$argon2id$v=19$m=65536,t=2$c29tZXNhbHQ$GpZ3sK/oH9p7VIiV56G/64Zo/8GaUw434IimaPqxwCo] PASSED
@@ -82,16 +84,10 @@
tests/test_utils.py::TestParameters::test_eq PASSED
tests/test_utils.py::TestParameters::test_eq_wrong_type PASSED
tests/test_utils.py::TestParameters::test_repr PASSED
tests/test_utils.py::mypy PASSED
tests/test_utils.py::test_decoded_str_len PASSED

6 files skipped due to complete coverage.

===================================== mypy =====================================

Success: no issues found in 5 source files
======== 73 passed ========
py$(PYV): commands[1]> python -m argon2 -n 1 -t 1 -m 8 -p 1
======== 74 passed ========
py$(PYV): commands[1]> python -Im argon2 -n 1 -t 1 -m 8 -p 1
Running Argon2id 1 times with:
hash_len: 32 bytes
memory_cost: 8 KiB