Merge pull request #110151 from dotlambda/ldaptor-tests

This commit is contained in:
Sandro 2021-01-20 14:39:25 +01:00 committed by GitHub
commit 0e21aef593
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions

View file

@ -3,12 +3,13 @@
, fetchPypi
, twisted
, passlib
, pycrypto
, pyopenssl
, pyparsing
, service-identity
, zope_interface
, isPy3k
, pythonAtLeast
, python
}:
buildPythonPackage rec {
@ -21,13 +22,15 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface
twisted passlib pyopenssl pyparsing service-identity zope_interface
];
disabled = isPy3k;
# https://github.com/twisted/ldaptor/pull/210
disabled = !isPy3k || pythonAtLeast "3.9";
# TypeError: None is neither bytes nor unicode
doCheck = false;
checkPhase = ''
${python.interpreter} -m twisted.trial ldaptor
'';
meta = {
description = "A Pure-Python Twisted library for LDAP";

View file

@ -1,9 +1,12 @@
{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }:
{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }:
buildPythonPackage rec {
pname = "privacyidea-ldap-proxy";
version = "0.6.1";
# https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50
disabled = isPy3k;
src = fetchFromGitHub {
owner = "privacyidea";
repo = pname;