Merge pull request #28 from michaeltryby/dev

Reorganizes package layout and automates build

Author: michaeltryby

.gitignore

@@ -63,12 +63,14 @@ target/
 
 # Testing
 .pytest_cache/
-toolkit/tests/data/test.*
+epanet_python/toolkit/tests/data/test.*
+epanet_python/toolkit/tests/data/test_reopen.inp
 
 # Wrapped libraries
 *.h
 *.dll
 *.lib
+buildlib/
 
 # SWIG wrappers
 output.py

appveyor.yml

@@ -0,0 +1,17 @@
+
+
+environment:
+    matrix:
+        - PYTHON: "C:\\Python36-x64"
+
+install:
+    - choco install swig
+    - "%PYTHON%\\python.exe -m pip install wheel tox"
+
+
+build: off
+
+
+test_script:
+    - before_build.bat %APPVEYOR_BUILD_FOLDER%
+    - "%PYTHON%\\python.exe -m tox -v"

before_build.bat

@@ -0,0 +1,34 @@
+::
+::  before_build.bat - Prepares for epanet toolkit and output module builds
+::
+::  Date Created: 12/12/2018
+::
+::  Author: Michael E. Tryby
+::          US EPA - ORD/NRMRL
+::
+
+set PROJECT_PATH=%~1
+
+set TOOLKIT_PATH=\epanet_python\toolkit\epanet\toolkit
+set OUTPUT_PATH=\epanet_python\output\epanet\output
+
+
+mkdir buildlib
+cd buildlib
+git clone --branch=dev-swig-redux https://github.com/michaeltryby/EPANET.git
+cd epanet
+
+
+mkdir buildprod
+cd buildprod
+cmake -G"Visual Studio 14 2015 Win64" -DBUILD_TESTS=0 ..
+cmake --build . --config Release
+
+
+copy /Y .\bin\Release\epanet2.dll  %PROJECT_PATH%\%TOOLKIT_PATH%
+copy /Y .\lib\Release\epanet2.lib  %PROJECT_PATH%\%TOOLKIT_PATH%
+copy /Y ..\include\*.h  %PROJECT_PATH%\%TOOLKIT_PATH%
+
+copy /Y .\bin\Release\epanet-output.dll  %PROJECT_PATH%\%OUTPUT_PATH%
+copy /Y .\lib\Release\epanet-output.lib  %PROJECT_PATH%\%OUTPUT_PATH%
+copy /Y ..\tools\epanet-output\include\*.h  %PROJECT_PATH%\%OUTPUT_PATH%

output/epanet/output/__init__.py …_python/output/epanet/output/__init__.pyoutput/epanet/output/__init__.py renamed to epanet_python/output/epanet/output/__init__.py output/epanet/output/__init__.py renamed to epanet_python/output/epanet/output/__init__.py

@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# setup.py 
-# 
+# setup.py
+#
 # Created:    9/20/2017
 # Author:     Michael E. Tryby
 #             US EPA - ORD/NRMRL
-# 
+#
 # Setup up script for en_outputapi python extension
 #
 # Requires:
-#   Platform C language compiler   
+#   Platform C language compiler
 #   Python packages: numpy
 #
 
@@ -20,9 +20,12 @@
     from distutils.core import setup, Extension
     from distutils.command.build_ext import build_ext
 
+
+microlib_name = 'epanet.output'
+
 setup(
-    name = "epanet_output", 
-    version = "0.1.1-alpha",
+    name = microlib_name,
+    version = "0.1.2a0",
     ext_modules = [
         Extension("epanet.output._output",
             include_dirs = ['epanet/output'],
@@ -33,11 +36,11 @@
             language = 'C'
         )
     ],
-    packages = {'epanet.output'},  
-    py_modules = ['output'],
-    package_data = {'epanet.output':['*epanet-output.dll', '*epanet-output.so']}, 
- 
-    install_requires = [
-        'aenum'
-    ]
+    namespace_packages=['epanet'],
+    packages = {microlib_name},
+#    py_modules = ['output'],
+#    include_package_data=True
+    package_data = {microlib_name:['*epanet-output.dll', '*epanet-output.so']},
+
+#    install_requires = []
 )

output/epanet/output/output.i …net_python/output/epanet/output/output.ioutput/epanet/output/output.i renamed to epanet_python/output/epanet/output/output.i output/epanet/output/output.i renamed to epanet_python/output/epanet/output/output.i

@@ -1,37 +1,38 @@
-
+import os
 
 import pytest
 import numpy as np
 
 from epanet.output import OutputMetadata
 from epanet.output import output as oapi
 
-from data import OUTPUT_FILE_EXAMPLE1
 
+DATA_PATH = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
+OUTPUT_FILE_EXAMPLE1 = os.path.join(DATA_PATH, 'net1.out')
 
 
 @pytest.fixture()
-def handle(request):    
+def handle(request):
     _handle = oapi.init()
     oapi.open(_handle, OUTPUT_FILE_EXAMPLE1)
-    
+
     def close():
         oapi.close(_handle)
-    
-    request.addfinalizer(close)    
-    return _handle    
+
+    request.addfinalizer(close)
+    return _handle
 
 
 def test_outputmetadata_handle(handle):
-    
+
     om = OutputMetadata(handle)
-        
+
     ref = {
         oapi.NodeAttribute.DEMAND:      ("Demand",          "gal/min"),
         oapi.NodeAttribute.HEAD:        ("Head",            "ft"),
         oapi.NodeAttribute.PRESSURE:    ("Pressure",        "psi"),
         oapi.NodeAttribute.QUALITY:     ("Quality",         "mg/L"),
-         
+
         oapi.LinkAttribute.FLOW:        ("Flow",            "gal/min"),
         oapi.LinkAttribute.VELOCITY:    ("Velocity",        "ft/sec"),
         oapi.LinkAttribute.HEADLOSS:    ("Unit Headloss",   "ft/1000ft"),
@@ -40,18 +41,18 @@ def test_outputmetadata_handle(handle):
         oapi.LinkAttribute.SETTING:     ("Setting",         ""),
         oapi.LinkAttribute.RX_RATE:     ("Reaction Rate",   "mg/hr"),
         oapi.LinkAttribute.FRCTN_FCTR:  ("Friction Factor", "unitless")}
-    
+
     for attr in oapi.NodeAttribute:
         temp = om.get_attribute_metadata(attr)
         assert temp == ref[attr]
-                
+
     for attr in oapi.LinkAttribute:
         temp = om.get_attribute_metadata(attr)
         assert temp == ref[attr]
 
 
 def test_getnodeSeries(handle):
-    
+
     ref_array = np.array(
         [119.25731,
         120.45029,
@@ -63,37 +64,37 @@ def test_getnodeSeries(handle):
         122.90379,
         123.40434,
         123.81807])
-    
+
     array = oapi.getnodeseries(handle, 2, oapi.NodeAttribute.PRESSURE, 0, 10)
     assert len(array) == 10
-    
+
     assert np.allclose(array, ref_array)
-        
-        
+
+
 def test_getlinkseries(handle):
     pass
 
 def test_getnodeattribute(handle):
-    ref_array = np.array([ 1., 0.44407997, 0.43766347, 0.42827705, 0.41342604, 
+    ref_array = np.array([ 1., 0.44407997, 0.43766347, 0.42827705, 0.41342604,
         0.42804748, 0.44152543, 0.40502965, 0.38635802, 1., 0.96745253])
 
     array = oapi.getnodeattribute(handle, 1, oapi.NodeAttribute.QUALITY)
     assert len(array) == 11
     assert np.allclose(array, ref_array)
- 
+
 
 def test_getlinkattribute(handle):
-    ref_array = np.array([ 1848.58117676, 1220.42736816, 130.11161804, 
-        187.68930054, 119.88839722, 40.46448898, -748.58111572, 478.15377808, 
+    ref_array = np.array([ 1848.58117676, 1220.42736816, 130.11161804,
+        187.68930054, 119.88839722, 40.46448898, -748.58111572, 478.15377808,
         191.73458862, 30.11160851, 140.4644928, 59.53551483, 1848.58117676])
-    
+
     array = oapi.getlinkattribute(handle, 1, oapi.LinkAttribute.FLOW)
-    assert len(array) == 13             
+    assert len(array) == 13
     assert np.allclose(array, ref_array)
 
 
 def test_getnoderesult(handle):
     pass
 
 def test_getlinkresult(handle):
-    pass
+    pass