G-Node · jgrewe · Jan 15, 2017 · Jan 15, 2017 · Jan 15, 2017 · Jan 15, 2017
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,4 @@
+include LICENSE INSTALL
+include README.rst
+include odml.desktop
+recursive-include images *
diff --git a/README.md b/README.md
diff --git a/README.rst b/README.rst
@@ -0,0 +1,69 @@
+odML libraries and editor
+=========================
+
+The Python-odML library (including the odML-Editor) is available on
+`GitHub <https://github.com/G-Node/python-odml>`_. If you are not familiar with
+the version control system **git**, but still want to use it, have a look at
+the documentaion available on the `git-scm website <https://git-scm.com/>`_.
+
+Dependencies
+------------
+
+* Python 2.7.
+* Python packages:
+
+    * Enum (version 0.4.4)
+    * lxml (version 3.7.2)
+
+* The following packages are required to install the lxml Python package on Ubuntu:
+
+    * libxml2-dev
+    * libxslt1-dev
+    * lib32z1-dev
+
+
+Installation
+------------
+
+The simplest way to install Python-odML is from PyPI using the pip tool::
+
+  $ pip install odml
+
+On Ubuntu, the pip package manager is available in the repositories as :code:`python-pip`.
+
+If this method is used, the appropriate Python dependencies (enum and lxml) are downloaded and installed automatically.
+
+
+Building from source
+--------------------
+
+To download the Python-odML library please either use git and clone the
+repository from GitHub::
+
+  $ cd /home/usr/toolbox/
+  $ git clone https://github.com/G-Node/python-odml.git
+
+If you don't want to use git download the ZIP file also provided on
+GitHub to your computer (e.g. as above on your home directory under a "toolbox"
+folder).
+
+To install the Python-odML library, enter the corresponding directory and run::
+
+  $ cd /home/usr/toolbox/python-odml/
+  $ python setup.py install
+
+
+Documentation
+-------------
+
+`Documentation <https://g-node.github.io/python-odml>`_
+
+Bugs & Questions
+----------------
+
+Should you find a behaviour that is likely a bug, please file a bug report at
+`the github bug tracker <https://github.com/G-Node/python-odml/issues>`_.
+
+If you have questions regarding the use of the library or the editor, ask
+the question on `Stack Overflow <http://stackoverflow.com/>`_, be sure to tag
+it with :code:`odml` and we'll do our best to quickly solve the problem.
diff --git a/setup.py b/setup.py
@@ -36,19 +36,19 @@
     kwargs['scripts'] = ['odml-gui']
 
 setup(name='odML',
-      version='1.1',
+      version='1.2.1',
       description='open metadata Markup Language',
       author='Hagen Fritsch',
       author_email='[email protected]',
       url='http://www.g-node.org/projects/odml',
       packages=packages,
-      test_suite = 'test',
+      test_suite='test',
       options={
           'py2exe': {
               'packages': 'odml',
               'includes': 'cairo, pango, pangocairo, atk, gobject, gio, lxml, gzip, enum34',
           }
       },
+      install_requires=["enum", "lxml"],
       **kwargs
-)
-
+      )