From ff6f429af6cec522ce2029691e237083c2826375 Mon Sep 17 00:00:00 2001
From: Tommy Yu <tommy.yu@auckland.ac.nz>
Date: Thu, 14 Jun 2018 16:05:02 +1200
Subject: [PATCH] Correctly simplify the installation process.

---
 README.rst       |  4 ++++
 requirements.txt |  5 +++--
 setup.py         | 18 +++++-------------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/README.rst b/README.rst
index bde688f5..a7064a53 100644
--- a/README.rst
+++ b/README.rst
@@ -2,3 +2,7 @@ Scaffold Maker
 ==============
 
 Anatomical scaffold generator using OpenCMISS-Zinc.
+
+For the interim, install with the following command::
+
+    pip install -r requirements.txt
diff --git a/requirements.txt b/requirements.txt
index 7add27c7..ac24e783 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
-git+https://github.com/OpenCMISS-Bindings/opencmiss.utils.git
-git+https://github.com/OpenCMISS-Bindings/ZincPythonTools.git
+-e git+https://github.com/OpenCMISS-Bindings/opencmiss.utils.git#egg=opencmiss.utils
+-e git+https://github.com/OpenCMISS-Bindings/ZincPythonTools.git#egg=ZincPythonTools
+-e .
diff --git a/setup.py b/setup.py
index 54f86993..92dc44c7 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,6 @@
 # List all of your Python package dependencies in the
 # requirements.txt file
 
-
 def readfile(filename, split=False):
     with io.open(filename, encoding="utf-8") as stream:
         if split:
@@ -18,19 +17,13 @@ def readfile(filename, split=False):
 readme = readfile("README.rst", split=True)[3:]  # skip title
 # For requirements not hosted on PyPi place listings
 # into the 'requirements.txt' file.
-requires = []  # minimal requirements listing
+requires = [
+    # minimal requirements listing
+    'opencmiss.utils',
+    'ZincPythonTools',
+]
 source_license = readfile("LICENSE")
 
-
-class InstallCommand(install):
-
-    def run(self):
-        install.run(self)
-        # Automatically install requirements from requirements.txt
-        import subprocess
-        subprocess.call(['pip', 'install', '-r', os.path.join(SETUP_DIR, 'requirements.txt')])
-
-
 setup(name='scaffoldmaker',
     version='0.1.1',
     description='',
@@ -40,7 +33,6 @@ def run(self):
       "License :: OSI Approved :: Apache Software License",
       "Programming Language :: Python",
     ],
-    cmdclass={'install': InstallCommand,},
     author='Richard Christie',
     author_email='',
     url='',