Commit 4b9fbfa7 authored by Stavros Sachtouris's avatar Stavros Sachtouris
Browse files

Merge branch 'develop' into feature-output

parents 8fa6ef6a ad090323
......@@ -26,7 +26,7 @@ except ImportError:
stderr.write("`objpool` package is required to build kamaki docs.\n")
#exit()
path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..'))
path.insert(0, os.path.join(os.path.abspath(os.path.dirname(__file__)), '..'))
# -- General configuration ---------------------------------------------------
......
......@@ -35,16 +35,20 @@
from setuptools import setup
from sys import version_info
import collections
import kamaki
optional = ['ansicolors',
'progress>=1.0.2']
requires = ['objpool',
'ordereddict',
'argparse']
if not hasattr(collections, "OrderedDict"): # Python 2.6
requires.append("ordereddict")
setup(
name='kamaki',
version=kamaki.__version__,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment