From 128d3215027c50fa583b92b0f365a9a7f8575ee7 Mon Sep 17 00:00:00 2001
From: Viktor Ashirov <vashirov@redhat.com>
Date: Thu, 19 Oct 2017 15:38:14 +0200
Subject: [PATCH] Issue 49409 - Update lib389 requirements

Bug Description:
requirements.txt and setup.py are out of date.

Fix Description:
Add required dependencies, update tox.ini.
Remove setup.cfg because it's not needed anymore (we use our own spec
file instead of one generated by bdist_rpm).

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

Reviewed by: ???
---
 src/lib389/requirements.txt |  7 ++-----
 src/lib389/setup.cfg        |  3 ---
 src/lib389/setup.py         | 15 +++++++++++++--
 src/lib389/tox.ini          |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100644 src/lib389/setup.cfg

diff --git a/src/lib389/requirements.txt b/src/lib389/requirements.txt
index f2089389f..3309121d7 100644
--- a/src/lib389/requirements.txt
+++ b/src/lib389/requirements.txt
@@ -1,9 +1,6 @@
-python-ldap
-wheel
-nose
 pyasn1
 pyasn1-modules
-six
+pyldap
 pytest
 python-dateutil
-enum34
+six
diff --git a/src/lib389/setup.cfg b/src/lib389/setup.cfg
deleted file mode 100644
index b4982056c..000000000
--- a/src/lib389/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[bdist_rpm]
-requires=python-ldap
-
diff --git a/src/lib389/setup.py b/src/lib389/setup.py
index 2053c986f..e7ebbf45d 100644
--- a/src/lib389/setup.py
+++ b/src/lib389/setup.py
@@ -42,8 +42,12 @@ setup(
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 2 :: Only',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Quality Assurance',
         'Topic :: Software Development :: Testing'],
@@ -62,5 +66,12 @@ setup(
             ]),
     ],
 
-    install_requires=['pyldap'],
+    install_requires=[
+        'pyasn1',
+        'pyasn1-modules',
+        'pyldap',
+        'pytest',
+        'python-dateutil',
+        'six',
+        ],
 )
diff --git a/src/lib389/tox.ini b/src/lib389/tox.ini
index 23c3b5c3f..c1da3c86e 100644
--- a/src/lib389/tox.ini
+++ b/src/lib389/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34
+envlist = py27, py34, py35, py36
 
 [testenv]
 deps = -rrequirements.txt
-- 
2.14.2