[389-ds-base] branch master updated (9e4b381 -> 4e8bf06)

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

vashirov pushed a change to branch master
in repository 389-ds-base.

from  9e4b381   Ticket 3 lib389 - python 3 compat for paged results test
       new  4e8bf06   Issue 49451 - Add environment markers to lib389 dependencies

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Summary of changes:
 src/lib389/requirements.txt | 4 +++-
 src/lib389/setup.py         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

[389-ds-base] 01/01: Issue 49451 - Add environment markers to lib389 dependencies

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

vashirov pushed a commit to branch master
in repository 389-ds-base.

commit 4e8bf06a0f2089fc60e8e3d8416da1445c9fb1f6
Author: Viktor Ashirov 
Date:   Tue Nov 14 00:11:13 2017 +0100

Issue 49451 - Add environment markers to lib389 dependencies

Bug Description:
    lib389 should be installable both on python2 and python3.
    Currently it can be installed using python3 only because
    of the python3-only dependencies.

Fix Description:
    Use PEP-508 environment markers for setup.py and requirements.txt.

https://pagure.io/389-ds-base/issue/49451

Reviewed by: wibrown (Thanks!)
---
 src/lib389/requirements.txt | 4 +++-
 src/lib389/setup.py         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/lib389/requirements.txt b/src/lib389/requirements.txt
index 3309121..9a96216 100644
--- a/src/lib389/requirements.txt
+++ b/src/lib389/requirements.txt
@@ -1,6 +1,8 @@
 pyasn1
 pyasn1-modules
-pyldap
 pytest
 python-dateutil
 six
+enum34;python_version=="2.7"
+python-ldap;python_version=="2.7"
+pyldap;python_version>="3.4"
diff --git a/src/lib389/setup.py b/src/lib389/setup.py
index e7ebbf4..0765f62 100644
--- a/src/lib389/setup.py
+++ b/src/lib389/setup.py
@@ -69,9 +69,11 @@ setup(
     install_requires=[
         'pyasn1',
         'pyasn1-modules',
-        'pyldap',
         'pytest',
         'python-dateutil',
         'six',
+        'enum34;python_version=="2.7"',
+        'python-ldap;python_version=="2.7"',
+        'pyldap;python_version>="3.4"',
         ],
 )