Update package files

Author: RJMW

MANIFEST.in

@@ -7,7 +7,7 @@ include tests/data/*.*
 include tests/data/MTBLS79_subset/*.*
 include tests/data/MTBLS79_subset/mzml/*.*
 include tests/data/MTBLS79_subset/raw/*.*
-include tests/data/test_results/*.*
+include tests/test_results/*.*
 include dimspy/portals/ThermoRawFileReader_3_0_41/Libraries/*.XML
 include dimspy/portals/ThermoRawFileReader_3_0_41/Libraries/*.dll
 include dimspy/portals/ThermoRawFileReader_3_0_41/License/RawFileRdr_License_Agreement_RevA.doc

README.rst

@@ -2,74 +2,53 @@ DIMSpy
 ======
 |Version| |Py versions| |Git| |Bioconda| |Build Status (Travis)| |Build Status (AppVeyor)| |License| |RTD doc|
 
-DIMSpy is a Python Package to process Direct-Infusion Mass Spectrometry (DIMS) data
+Python package to process direct-infusion mass spectrometry-based metabolomics and lipidomics data
 
 - **Documentation:** https://computational-metabolomics.github.io/dimspy
 - **Source:** https://github.com/computational-metabolomics/dimspy
 - **Bug reports:** https://github.com/computational-metabolomics/dimspy/issues
 
 Installation
---------
+------------
+See the `Installation page <https://computational-metabolomics.github.io/dimspy/introduction.html#installation>`__ of
+the `online documentation <https://computational-metabolomics.github.io/dimspy/>`__.
 
-Conda_
-~~~~~~~
-
-1. Install Conda_ (For example: `Miniconda Python distribution <http://conda.pydata.org/miniconda.html>`__).
-2. Run the following commands to install DIMSpy.
-
-Linux-64 and OSx
-
-::
-
-    $ conda create -n dimspy python=2.7 numpy=1.13.0 scipy=0.19.1 pymzml=0.7.8 pythonnet=2.3.0 h5py=2.7.0 fastcluster=1.1.23 -c conda-forge -c bioconda
-    $ source activate dimspy  
-    $ pip install git+https://github.com/computational-metabolomics/dimspy.git
-
-Windows-64
-
-::
-
-    $ conda create -n dimspy python=2.7 numpy=1.13.0 scipy=0.19.1 fastcluster=1.1.23 h5py==2.7.0 -c conda-forge -c bioconda
-    $ activate dimspy
-    $ pip install pythonnet==2.3.0 pymzml==0.7.8
-    $ pip install git+https://github.com/computational-metabolomics/dimspy.git
-
-
-Usage
-------
 
 Command line
-~~~~~~~~~~~~~
-
+------------
 ::
 
-    $ python -m dimspy --help
+    $ dimspy --help
+
 
 Bugs
 ----
-
 Please report any bugs that you find `here <https://github.com/computational-metabolomics/dimspy/issues>`_.
 Or fork the repository on `GitHub <https://github.com/computational-metabolomics/dimspy/>`_
 and create a pull request (PR). We welcome all contributions, and we
 will help you to make the PR if you are new to `git` (see `CONTRIBUTING.rst`).
 
+
+Developers & Contributors
+-------------------------
+ - Ralf J. M. Weber ([email protected]) - [University of Birmingham (UK)](http://www.birmingham.ac.uk/index.aspx)
+ - Jiarui (Albert) Zhou ([email protected]) - [University of Birmingham (UK)](http://www.birmingham.ac.uk/index.aspx)
+ - Thomas N. Lawson ([email protected]) - [University of Birmingham (UK)](http://www.birmingham.ac.uk/index.aspx)
+
+
 License
 -------
-
 Released under the GNU General Public License v3.0 (see `LICENSE` file)::
 
-   Copyright (C) 2017 DIMSpy Developers
-   Ralf J.M. Weber <[email protected]>
-   Jiarui (Albert) Zhou <[email protected] >
-   
-   
+
+
 
 .. |Build Status (Travis)| image:: https://img.shields.io/travis/computational-metabolomics/dimspy.svg?style=flat&maxAge=3600&label=Travis-CI
    :target: https://travis-ci.org/computational-metabolomics/dimspy
 
 .. |Build Status (AppVeyor)| image:: https://img.shields.io/appveyor/ci/RJMW/dimspy.svg?style=flat&maxAge=3600&label=AppVeyor
    :target: https://ci.appveyor.com/project/RJMW/dimspy/branch/master
-   
+
 .. |Py versions| image:: https://img.shields.io/pypi/pyversions/dimspy.svg?style=flat&maxAge=3600
    :target: https://pypi.python.org/pypi/dimspy/
 
@@ -87,6 +66,3 @@ Released under the GNU General Public License v3.0 (see `LICENSE` file)::
 
 .. |RTD doc| image:: https://img.shields.io/badge/documentation-RTD-71B360.svg?style=flat&maxAge=3600
    :target: https://computational-metabolomics.github.io/dimspy/
-
-.. _pip: https://pip.pypa.io/
-.. _Conda: http://conda.pydata.org/docs/

setup.py

@@ -3,8 +3,6 @@
 import setuptools
 import sys
 import dimspy
-import os
-import unittest
 
 
 def main():
@@ -14,14 +12,14 @@ def main():
 
     setuptools.setup(name="dimspy",
         version=dimspy.__version__,
-        description="Python package to process DIMS data",
+        description="Python package for data processing of direct-infusion mass spectrometry-based metabolomics and lipidomics data",
         long_description=open('README.rst').read(),
         author="Ralf Weber, Albert Zhou",
         author_email="[email protected], [email protected] ",
         url="https://github.com/computational-metabolomics/dimspy",
         license="GPLv3",
         platforms=['Windows, UNIX'],
-        keywords=['Metabolomics', 'Mass spectrometry', 'Data Processing', 'Direct-Infusion Mass Spectrometry'],
+        keywords=['Metabolomics', 'Lipidomics', 'Mass spectrometry', 'Data Processing', 'Direct-Infusion Mass Spectrometry'],
         packages=setuptools.find_packages(),
         test_suite='tests.suite',
         install_requires=open('requirements.txt').read().splitlines(),