Update test pip install

README.md

@@ -9,8 +9,8 @@ and [SciPy](https://www.scipy.org/) to perform mathematical operations with vizu
 still under development by researchers at the University of Southampton. For full documentation, 
 visit the [AmpScan website](https://ampscan.readthedocs.io/en/latest/).
 
-Installation
-------------
+Installing with Conda (Recommended)
+-----------------------------------
 
 AmpScan has a number of dependencies, we recommend using conda to deal with these. To create a new 
 environment to run AmpScan in:  
@@ -19,19 +19,36 @@ environment to run AmpScan in:
 
 ``conda install -c conda-forge vtk=8.1.0``
 
-For the most up to date version of AmpScan, clone directly from the gitlab repository into a virtual environment using:
+Installing with Pip
+-------------------
 
-``git clone https://git.soton.ac.uk/js22g12/AmpScan.git``
+AmpScan has a number of dependencies, namely; NumPy, SciPy, Matplotlib, PyQt and vtk. Before 
+installing, ensure you have the latest version of pip using:
 
-Navigate to the `AmpScan/` directory and run a pip install using:
+``python -m pip install --upgrade pip``
 
-``pip install -e .``
+Then install the dependencies using:
+
+``pip install numpy matplotlib scipy pyqt5 vtk==8.1.0``
+
+You can then install AmpScan from test PyPI using:
+
+``python -m pip install --index-url https://test.pypi.org/simple/ AmpScan``
 
-A pip installation is also available through test PyPI (not latest version) using:
+TODO: update to pip install (not test PyPI)
 
-``$ pip install --index-url https://test.pypi.org/simple/ AmpScan``
+Developer Install
+-----------------
 
+For the most up to date version of AmpScan, clone directly from the gitlab repository using:
+
+``git clone https://git.soton.ac.uk/js22g12/AmpScan.git``
+
+Navigate to the `AmpScan/` directory and run a pip install using:
+
+``pip install -e .``
 
-## How to acknowledge
+How to acknowledge
+------------------
 
 Find license [here](../LICENSE)

setup.py

@@ -14,7 +14,7 @@ def readme():
 
 
 setup(name='AmpScan',
-      version='0.4',
+      version='0.7',
       description=('Package for analysis of '
                    'surface scan data of residual limbs'),
       long_description=readme(),
@@ -22,7 +22,7 @@ setup(name='AmpScan',
       author_email='Joshua.Steer@soton.ac.uk',
       license='MIT',
       packages=['AmpScan'],
-      install_requires=['numpy', 'matplotlib', 'scipy', 'sphinxcontrib-napoleon'],
+      install_requires=['numpy', 'matplotlib', 'scipy', 'pyqt5', 'vtk==8.1.0'],
       package_data={},
       include_package_data=True,
       zip_safe=False,)