python310Packages.pysaml2: 7.2.1 -> 7.4.1

This commit is contained in:
Sandro Jäckel 2023-02-28 17:34:32 +01:00 committed by Martin Weinelt
parent 86b4a95fe4
commit 294cb16d78
2 changed files with 16 additions and 15 deletions

View File

@ -5,7 +5,7 @@
, fetchFromGitHub
, fetchPypi
, importlib-resources
, mock
, poetry-core
, pyasn1
, pymongo
, pyopenssl
@ -16,7 +16,6 @@
, requests
, responses
, setuptools
, six
, substituteAll
, xmlschema
, xmlsec
@ -33,18 +32,22 @@ let
});
in buildPythonPackage rec {
pname = "pysaml2";
version = "7.2.1";
format = "setuptools";
version = "7.4.1";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "IdentityPython";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lnaizwbtBYdKx1puizah+UWsw54NVW6UhEw/eStl1WI=";
sha256 = "sha256-QHAbm6u5oH3O7MEVFE+sW98raquv89KJ8gonk3Yyu/0=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
cryptography
defusedxml
@ -53,14 +56,12 @@ in buildPythonPackage rec {
pytz
requests
setuptools
six
xmlschema
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
];
nativeCheckInputs = [
mock
pyasn1
pymongo3
pytestCheckHook

View File

@ -6,12 +6,12 @@ index 59fe2dee..0c24fbcc 100644
:return: full name of the xmlsec1 binary found. If no binaries are
found then an exception is raised.
"""
- if os.name == 'posix':
- bin_name = ['xmlsec1']
- elif os.name == 'nt':
- bin_name = ['xmlsec.exe', 'xmlsec1.exe']
- if os.name == "posix":
- bin_name = ["xmlsec1"]
- elif os.name == "nt":
- bin_name = ["xmlsec.exe", "xmlsec1.exe"]
- else: # Default !?
- bin_name = ['xmlsec1']
- bin_name = ["xmlsec1"]
-
- if paths:
- for bname in bin_name:
@ -23,7 +23,7 @@ index 59fe2dee..0c24fbcc 100644
- except OSError:
- pass
-
- for path in os.environ['PATH'].split(os.pathsep):
- for path in os.environ["PATH"].split(os.pathsep):
- for bname in bin_name:
- fil = os.path.join(path, bname)
- try:
@ -32,7 +32,7 @@ index 59fe2dee..0c24fbcc 100644
- except OSError:
- pass
-
- raise SigverError('Cannot find {binary}'.format(binary=bin_name))
- raise SigverError(f"Cannot find {bin_name}")
+ return '@xmlsec@/bin/xmlsec1'