diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index b04866a54607..5e70f24eedda 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonOlder, - pythonAtLeast, fetchFromGitHub, # build-system setuptools, @@ -30,17 +29,16 @@ buildPythonPackage rec { pname = "certomancer"; - version = "0.12.0"; + version = "0.12.3"; pyproject = true; - # https://github.com/MatthiasValvekens/certomancer/issues/12 - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "certomancer"; rev = "refs/tags/v${version}"; - hash = "sha256-c2Fq4YTHQvhxuZrpKQYZvqHIMfubbkeKV4rctELLeJU="; + hash = "sha256-2BjLoGUWU0RaWVI9JA3s/Hf5aVtmv8hn+fB2jkWdQNY="; }; build-system = [ @@ -75,11 +73,6 @@ buildPythonPackage rec { requests ] ++ lib.flatten (builtins.attrValues optional-dependencies); - disabledTests = [ - # pyhanko_certvalidator.errors.DisallowedAlgorithmError - "test_validate" - ]; - pythonImportsCheck = [ "certomancer" ]; meta = { diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index d721bb46d2a6..4d8fa08d8e0c 100644 --- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyhanko-certvalidator"; - version = "0.26.3"; + version = "0.26.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,17 +26,12 @@ buildPythonPackage rec { owner = "MatthiasValvekens"; repo = "certvalidator"; rev = "refs/tags/v${version}"; - hash = "sha256-uUmsWiN182g+kxrCny7UNLDHdAdqKk64w6vnjmGBNjM="; + hash = "sha256-+/3n+v/8Tpqt7UoOrBi4S84N6Jioay7e2j+SvKJeoLA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace ', "pytest-runner",' "" - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ asn1crypto cryptography oscrypto @@ -51,26 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # Requests - "tests/test_crl_client.py" - ]; - - disabledTests = [ - # Look for nonexisting certificates - "test_basic_certificate_validator_tls" - # Failed to fetch OCSP response from http://ocsp.digicert.com - "test_fetch_ocsp_aiohttp" - "test_fetch_ocsp_requests" - "test_fetch_ocsp_err_requests" - # Unable to build a validation path for the certificate "%s" - no issuer matching "%s" was found - "test_revocation_mode_hard_aiohttp_autofetch" - # The path could not be validated because no revocation information could be found for intermediate certificate 1 - "test_revocation_mode_hard" - # ValueError: Hash algorithm not known for ed448 - "test_ed" - ]; - pythonImportsCheck = [ "pyhanko_certvalidator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index 30b7533e7de4..ab7898a73fd9 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -39,18 +39,22 @@ buildPythonPackage rec { pname = "pyhanko"; - version = "0.25.1"; + version = "0.25.3"; pyproject = true; src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "pyHanko"; rev = "refs/tags/v${version}"; - hash = "sha256-keWAiqwaMZYh92B0mlR4+jjxBKLOAJ9Kgc0l0GiIQbc="; + hash = "sha256-HJkCQ5YDVr17gtY4PW89ep7GwFdP21/ruBEKm7j3+Qo="; }; build-system = [ setuptools ]; + pythonRelaxDeps = [ + "cryptography" + ]; + dependencies = [ asn1crypto click