Merge pull request #279 from mpsonntag/picks_1.3.4

[1.3.4] Installation fixes

LGTM

Author: achilleas-k

.gitignore

@@ -7,6 +7,7 @@ dist
 build
 eggs
 parts
+.cache
 
 # odml files
 *.odml

.travis.yml

@@ -25,28 +25,44 @@ matrix:
 #      env:
 #        - OSXENV=2.7
 
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash resources/install_osx_virtualenv.sh; fi
-
 install:
   - export PYVER=${TRAVIS_PYTHON_VERSION:0:1}
+  - if [ $PYVER = 3 ]; then
+      export PYCMD=python3;
+      export PIPCMD=pip3;
+    else
+      export PYCMD=python;
+      export PIPCMD=pip;
+    fi;
+
   - if [ $COVERALLS = 1 ]; then
-        pip install --upgrade coveralls;
+        $PIPCMD install --upgrade coveralls;
     fi;
+
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      which python;
-      source venv/bin/activate;
-      which python;
-    fi
-  - pip install lxml enum34 pyyaml
+      if [[ "$OSXENV" == "2.7" ]]; then
+        brew install python@2;
+        virtualenv venv -p python;
+        source venv/bin/activate;
+        export PYCMD=python;
+        export PIPCMD=pip;
+      else
+        brew upgrade python;
+        source venv/bin/activate;
+        export PYCMD=python3;
+        export PIPCMD=pip3;
+      fi;
+    fi;
+
+  - $PIPCMD install lxml enum34 pyyaml rdflib
 
 script:
-  - which python
-  - python setup.py build
+  - which $PYCMD
+  - $PYCMD setup.py build
   - if [ $COVERALLS = 1 ]; then
         coverage${PYVER} run --source=odml setup.py test && coverage${PYVER} report -m;
     else
-        python setup.py test;
+        $PYCMD setup.py test;
     fi;
 
 after_success:

MANIFEST.in

@@ -1,3 +1,3 @@
 include LICENSE
 include README.rst
-include odml.desktop
+include odml/info.json

README.rst

@@ -5,8 +5,17 @@
 .. image:: https://coveralls.io/repos/github/G-Node/python-odml/badge.svg?branch=master
     :target: https://coveralls.io/github/G-Node/python-odml?branch=master
 
-odML libraries and editor
-=========================
+odML (Open metaData Markup Language) core library
+=================================================
+
+The open metadata Markup Language is a file based format (XML, JSON, YAML) for storing
+metadata in an organised human- and machine-readable way. odML is an initiative to define
+and establish an open, flexible, and easy-to-use format to transport metadata.
+
+The Python-odML library can be easily installed via :code:`pip`. The source code is freely
+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
+documentation available on the `git-scm website <https://git-scm.com/>`_.
 
 Dependencies
 ------------
@@ -74,4 +83,5 @@ 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, feel free to join the `#gnode <http://webchat.freenode.net?channels=%23gnode>`_ IRC channel on freenode.
+If you have questions regarding the use of the library, feel free to join the
+`#gnode <http://webchat.freenode.net?channels=%23gnode>`_ IRC channel on freenode.

odml/info.json

@@ -0,0 +1,16 @@
+{
+  "VERSION": "1.3.4",
+  "FORMAT_VERSION": "1",
+  "AUTHOR": "Hagen Fritsch, Christian Kellner, Jan Grewe, Achilleas Koutsou, Michael Sonntag, Lyuba Zehl",
+  "COPYRIGHT": "(c) 2011-2018, German Neuroinformatics Node",
+  "CONTACT": "[email protected]",
+  "HOMEPAGE": "https://github.com/G-Node/python-odml",
+  "CLASSIFIERS": [
+    "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: BSD License",
+    "Development Status :: 5 - Production/Stable",
+    "Topic :: Scientific/Engineering",
+    "Intended Audience :: Science/Research"
+  ]
+}

odml/info.py

@@ -1,15 +1,15 @@
-VERSION = '1.3.3'
-FORMAT_VERSION = '1'
-AUTHOR = 'Hagen Fritsch, Christian Kellner, Jan Grewe, ' \
-          'Achilleas Koutsou, Michael Sonntag, Lyuba Zehl'
-COPYRIGHT = '(c) 2011-2017, German Neuroinformatics Node'
-CONTACT = '[email protected]'
-HOMEPAGE = 'https://github.com/G-Node/python-odml'
-CLASSIFIERS = [
-    'Programming Language :: Python :: 2',
-    'Programming Language :: Python :: 3',
-    'License :: OSI Approved :: BSD License',
-    'Development Status :: 5 - Production/Stable',
-    'Topic :: Scientific/Engineering',
-    'Intended Audience :: Science/Research'
-]
+import os
+import json
+
+here = os.path.dirname(__file__)
+
+with open(os.path.join(here, "info.json")) as infofile:
+    infodict = json.load(infofile)
+
+VERSION = infodict["VERSION"]
+FORMAT_VERSION = infodict["FORMAT_VERSION"]
+AUTHOR = infodict["AUTHOR"]
+COPYRIGHT = infodict["COPYRIGHT"]
+CONTACT = infodict["CONTACT"]
+HOMEPAGE = infodict["HOMEPAGE"]
+CLASSIFIERS = infodict["CLASSIFIERS"]

setup.py

@@ -1,9 +1,21 @@
+import json
+import os
 import sys
 try:
     from setuptools import setup
 except ImportError as ex:
     from distutils.core import setup
-from odml.info import AUTHOR, CONTACT, CLASSIFIERS, HOMEPAGE, VERSION
+
+with open(os.path.join("odml", "info.json")) as infofile:
+    infodict = json.load(infofile)
+
+VERSION = infodict["VERSION"]
+FORMAT_VERSION = infodict["FORMAT_VERSION"]
+AUTHOR = infodict["AUTHOR"]
+COPYRIGHT = infodict["COPYRIGHT"]
+CONTACT = infodict["CONTACT"]
+HOMEPAGE = infodict["HOMEPAGE"]
+CLASSIFIERS = infodict["CLASSIFIERS"]
 
 packages = [
     'odml',
@@ -27,6 +39,7 @@
     packages=packages,
     test_suite='test',
     install_requires=install_req,
+    include_package_data=True,
     long_description=description_text,
     classifiers=CLASSIFIERS,
     license="BSD"