From c1b9fbddd1ae47c2da77f8d2ac147675f608137b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@gmail.com>
Date: Wed, 25 Apr 2018 09:42:45 +0200
Subject: [PATCH] Fixed requirements handling.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not depend on pip internal parsing of requirements.txt, reference
setup.py from requirements instead. Same for requirements_dev.txt, but
now use the extras_require and reference the 'testing' feature
dependencies.

See: https://caremad.io/posts/2013/07/setup-vs-requirement/
See: https://stackoverflow.com/a/27271396


Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com>
---
 requirements-dev.txt | 12 +++---------
 requirements.txt     |  6 +++++-
 setup.py             | 19 ++++++++++---------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 44fb82a..128cbdc 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,10 +1,4 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
+# Development environment dependencies
 
-py >= 1.4
-
-hacking
-
-pytest
-pytest-cov
+# Install testing dependencies from setup.py
+.[testing]
diff --git a/requirements.txt b/requirements.txt
index 65223c1..e662ec9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,6 @@
+# Package dependencies
+
 setuptools
-six
+
+# Include package dependencies from setup.py
+.
diff --git a/setup.py b/setup.py
index 3c1e086..3608eca 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,6 @@ import subprocess
 import sys
 import warnings
 
-from pip.req import parse_requirements
 from setuptools import setup, find_packages, Command
 from setuptools.command.test import test as TestCommand
 
@@ -124,12 +123,12 @@ class PreRelease(Command):
             raise RuntimeError(
                 "Current version of the package is equal or lower than the already published ones (PyPi). Increse version to be able to pass prerelease stage.")
 
+install_requires = [ 'six' ]
 
-def get_requirements(*path):
-    req_path = os.path.join(*path)
-    reqs = parse_requirements(req_path, session=False)
-    return [str(ir.req) for ir in reqs]
-
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+tests_require = [ 'py >= 1.4', 'hacking', 'pytest', 'pytest-cov' ]
 
 setup(
     name=NAME,
@@ -137,10 +136,12 @@ setup(
     cmdclass={'test': PyTest, 'release': Release, 'prerelease': PreRelease},
     packages=find_packages(exclude=['tests']),
     include_package_data=True,
-    tests_require=get_requirements(base_path, 'requirements-dev.txt'),
+    tests_require=tests_require,
     setup_requires=['setuptools'],
-    install_requires=get_requirements(base_path, 'requirements.txt'),
-
+    install_requires=install_requires,
+    extras_require={
+        'testing': tests_require
+    },
     license='BSD',
     description="WSDL parsing services package for Web Services for Python. see" + url,
     long_description=open("README.rst").read(),