Merge pull request #31 from michaeltryby/dev

Working on install

Author: michaeltryby

epanet_python/output/setup.py

@@ -38,7 +38,7 @@
     ],
     namespace_packages=['epanet'],
     packages = {microlib_name},
-#    py_modules = ['output'],
+    py_modules = ['output'],
 #    include_package_data=True
     package_data = {microlib_name:['*epanet-output.dll', '*epanet-output.so']},
 

epanet_python/toolkit/setup.py

@@ -37,7 +37,7 @@
     ],
     namespace_packages = ['epanet'],
     packages = {microlib_name},
-#    py_modules = ['toolkit'],
+    py_modules = ['toolkit'],
 #    include_package_data=True
     package_data = {microlib_name:['*epanet2.dll', '*epanet2.so']},
 

setup.py

@@ -9,6 +9,7 @@
 from setuptools.command.develop import develop
 from setuptools.command.install import install
 
+
 import sys
 import subprocess
 
@@ -66,5 +67,6 @@ def run(self):
     cmdclass={
         'install': InstallCmd,
         'develop': DevelopCmd
-    },
+
+    }
 )

tox.ini

@@ -6,9 +6,10 @@ envlist = py36
 [testenv]
 whitelist_externals =
   swig
+skipsdist = True
+usedevelop = True
 deps =
   pytest
   numpy
 commands =
-  python -m pip install -e .
   python -m pytest --color=yes epanet_python -s