Merge pull request #41 from michaeltryby/dev

Building wheels for py36 and py37 on build worker

Author: michaeltryby

appveyor.yml

@@ -3,6 +3,10 @@
 environment:
   passphrase:
     secure: En1qcj1/l2B3Nov+vOHlfRrFZk00bg1HPRouD64Gzfw=
+  CIBW_SKIP: cp27-* cp34-* cp35-* *-win32
+  CIBW_BEFORE_BUILD: pip install six
+  CIBW_TEST_COMMAND: pytest {project}\\tests
+  CIBW_TEST_REQUIRES: pytest numpy
   matrix:
     - PYTHON: "C:\\Python36-x64"
 
@@ -18,5 +22,19 @@ build: off
 
 
 test_script:
-    - before_build.bat %APPVEYOR_BUILD_FOLDER%
+    - before_build.bat
     - "%PYTHON%\\python.exe -m tox -v"
+
+after_test:
+    - "%PYTHON%\\python.exe -m pip install cibuildwheel==0.10.1"
+    - "%PYTHON%\\python.exe -m cibuildwheel --output-dir wheelhouse .\\epanet_python\\output"
+    - "%PYTHON%\\python.exe -m cibuildwheel --output-dir wheelhouse .\\epanet_python\\toolkit"
+
+artifacts:
+    - path: "wheelhouse\\*.whl"
+      name: Wheels
+
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - C:\projects\epanet-python\.tox -> tox.ini

before_build.bat

@@ -6,8 +6,20 @@
 ::  Author: Michael E. Tryby
 ::          US EPA - ORD/NRMRL
 ::
+:: Requires:
+::     CMake
+::     Visual Studio 2015
+::     SWIG
+::
+:: Note:
+::     This script must be located at the root of the project folder
+:      in order to work correctly.
+::
 
-set PROJECT_PATH=%~1
+
+:: Determine project path and strip trailing \ from path
+set "PROJECT_PATH=%~dp0"
+IF %PROJECT_PATH:~-1%==\ set "PROJECT_PATH=%PROJECT_PATH:~0,-1%"
 
 set TOOLKIT_PATH=\epanet_python\toolkit\epanet\toolkit
 set OUTPUT_PATH=\epanet_python\output\epanet\output
@@ -32,3 +44,14 @@ 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%
+
+
+:: Generate swig wrappers
+cd %PROJECT_PATH%\%TOOLKIT_PATH%
+swig -python -py3 toolkit.i
+cd %PROJECT_PATH%\%OUTPUT_PATH%
+swig -python -py3 output.i
+
+
+:: Return to project root
+cd %PROJECT_PATH%

epanet_python/output/epanet/output/__init__.py

@@ -2,7 +2,7 @@
 
 #
 #  __init__.py - EPANET output package
-# 
+#
 #  Date Created: August 15, 2018
 #
 #  Author:     Michael E. Tryby
@@ -19,7 +19,7 @@
 __credits__ = "Maurizio Cingi"
 __license__ = "CC0 1.0 Universal"
 
-__version__ = "0.1.1"
+__version__ = "0.2.0"
 __date__ = "August 15, 2018"
 
 __maintainer__ = "Michael Tryby"
@@ -29,7 +29,7 @@
 
 from enum import Enum, auto
 
-from epanet.output import output as oapi 
+from epanet.output import output as oapi
 
 
 class Units(Enum):
@@ -41,107 +41,107 @@ class Units(Enum):
     HEADLOSS  = auto()
     RX_RATE   = auto()
     UNITLESS  = auto()
-    NONE      = auto() 
+    NONE      = auto()
 
 class RxUnits(Enum):
-    MGH       = auto() 
+    MGH       = auto()
     UGH       = auto()
 
 
 class OutputMetadata():
     '''
     Simple attribute name and unit lookup.
     '''
-    
+
     _unit_labels_us_ = {
         Units.HYD_HEAD:       "ft",
         Units.VELOCITY:       "ft/sec",
-        Units.HEADLOSS:       "ft/1000ft", 
+        Units.HEADLOSS:       "ft/1000ft",
         Units.UNITLESS:       "unitless",
         Units.NONE:           "",
-        
+
         RxUnits.MGH:          "mg/hr",
         RxUnits.UGH:          "ug/hr",
-        
+
         oapi.FlowUnits.CFS:   "cu ft/s",
         oapi.FlowUnits.GPM:   "gal/min",
         oapi.FlowUnits.MGD:   "M gal/day",
         oapi.FlowUnits.IMGD:  "M Imp gal/day",
         oapi.FlowUnits.AFD:   "ac ft/day",
-    
-        oapi.PressUnits.PSI:  "psi", 
-    
-        oapi.QualUnits.NONE:  "", 
+
+        oapi.PressUnits.PSI:  "psi",
+
+        oapi.QualUnits.NONE:  "",
         oapi.QualUnits.MGL:   "mg/L",
         oapi.QualUnits.UGL:   "ug/L",
-        oapi.QualUnits.HOURS: "hrs", 
+        oapi.QualUnits.HOURS: "hrs",
         oapi.QualUnits.PRCNT: "%"}
 
     _unit_labels_si_ = {
         Units.HYD_HEAD:       "m",
         Units.VELOCITY:       "m/sec",
-        Units.HEADLOSS:       "m/Km", 
+        Units.HEADLOSS:       "m/Km",
         Units.UNITLESS:       "unitless",
         Units.NONE:           "",
-    
+
         RxUnits.MGH:          "mg/hr",
         RxUnits.UGH:          "ug/hr",
-        
+
         oapi.FlowUnits.LPS:   "L/sec",
         oapi.FlowUnits.LPM:   "L/min",
         oapi.FlowUnits.MLD:   "M L/day",
         oapi.FlowUnits.CMH:   "cu m/hr",
         oapi.FlowUnits.CMD:   "cu m/day",
-    
+
         oapi.PressUnits.MTR:  "meters",
         oapi.PressUnits.KPA:  "kPa",
-    
-        oapi.QualUnits.NONE:  "", 
+
+        oapi.QualUnits.NONE:  "",
         oapi.QualUnits.MGL:   "mg/L",
         oapi.QualUnits.UGL:   "ug/L",
-        oapi.QualUnits.HOURS: "hrs", 
+        oapi.QualUnits.HOURS: "hrs",
         oapi.QualUnits.PRCNT: "%"}
 
-               
+
     def __init__(self, output_handle):
-        
+
         self.units = list()
         # If outputhandle not initialized use default settings
-        if output_handle == None: 
-            self.units = [oapi.FlowUnits.GPM.value, 
-                          oapi.PressUnits.PSI.value, 
+        if output_handle == None:
+            self.units = [oapi.FlowUnits.GPM.value,
+                          oapi.PressUnits.PSI.value,
                           oapi.QualUnits.NONE.value]
         # Else quary the output api for unit settings
         else:
-            for u in oapi.Units:    
+            for u in oapi.Units:
                 self.units.append(oapi.getunits(output_handle, u))
-        
-        # Convert unit settings to enums        
+
+        # Convert unit settings to enums
         self._flow = oapi.FlowUnits(self.units[0])
         self._press = oapi.PressUnits(self.units[1])
         self._qual = oapi.QualUnits(self.units[2])
-        
+
         # Determine unit system from flow setting
         if self._flow.value <= oapi.FlowUnits.AFD.value:
             self._unit_labels = type(self)._unit_labels_us_
         else:
-            self._unit_labels = type(self)._unit_labels_si_    
-        
+            self._unit_labels = type(self)._unit_labels_si_
+
         # Determine mass units from quality settings
         if self._qual == oapi.QualUnits.MGL:
             self._rx_rate = RxUnits.MGH
         elif self._qual == oapi.QualUnits.UGL:
             self._rx_rate = RxUnits.UGH
         else:
-            self._rx_rate = Units.NONE          
+            self._rx_rate = Units.NONE
 
 
         self._metadata = {
             oapi.NodeAttribute.DEMAND:      ("Demand",          self._unit_labels[self._flow]),
             oapi.NodeAttribute.HEAD:        ("Head",            self._unit_labels[Units.HYD_HEAD]),
             oapi.NodeAttribute.PRESSURE:    ("Pressure",        self._unit_labels[self._press]),
             oapi.NodeAttribute.QUALITY:     ("Quality",         self._unit_labels[self._qual]),
-         
+
             oapi.LinkAttribute.FLOW:        ("Flow",            self._unit_labels[self._flow]),
             oapi.LinkAttribute.VELOCITY:    ("Velocity",        self._unit_labels[Units.VELOCITY]),
             oapi.LinkAttribute.HEADLOSS:    ("Unit Headloss",   self._unit_labels[Units.HEADLOSS]),
@@ -152,7 +152,7 @@ def __init__(self, output_handle):
             oapi.LinkAttribute.FRCTN_FCTR:  ("Friction Factor", self._unit_labels[Units.UNITLESS])
         }
 
-        
+
     def get_attribute_metadata(self, attribute):
         '''
         Takes an attribute enum and returns a tuple with name and units.

epanet_python/output/setup.py

@@ -24,23 +24,24 @@
 microlib_name = 'epanet.output'
 
 setup(
-    name = microlib_name,
-    version = "0.1.2a0",
+    name = 'epanet.output',
+    version = "0.2.0.dev0",
     ext_modules = [
         Extension("epanet.output._output",
+            sources = ['epanet/output/output_wrap.c'],
             include_dirs = ['epanet/output'],
             libraries = ['epanet-output'],
             library_dirs = ['epanet/output'],
-            sources = ['epanet/output/output.i'],
-            swig_opts=['-py3'],
             language = 'C'
         )
     ],
+
+    # tox can't find swmm module at test time unless namespace is declared
     namespace_packages=['epanet'],
-    packages = {microlib_name},
+
+    packages = {'epanet.output'},
     py_modules = ['output'],
-#    include_package_data=True
-    package_data = {microlib_name:['*epanet-output.dll', '*epanet-output.so']},
+    package_data = {'epanet.output':['*epanet-output.dll', '*epanet-output.so']},
 
-#    install_requires = []
+    zip_safe=False,
 )

epanet_python/toolkit/setup.py

@@ -8,36 +8,33 @@
 #
 # Requires:
 #   Platform C language compiler
-#   SWIG
 #
 
-try:
-    from setuptools import setup, Extension
-    from setuptools.command.build_ext import build_ext
-except ImportError:
-    from distutils.core import setup, Extension
-    from distutils.command.build_ext import build_ext
 
+from setuptools import setup, Extension
+from setuptools.command.build_ext import build_ext
 
-microlib_name = 'epanet.toolkit'
 
 setup(
-    name = microlib_name,
-    version = "0.0.3a0",
+    name = 'epanet.toolkit',
+    version = "0.2.0.dev0",
     ext_modules = [
         Extension("epanet.toolkit._toolkit",
-            sources = ['epanet/toolkit/toolkit.i'],
-            swig_opts = ['-py3'],
+            sources = ['epanet/toolkit/toolkit_wrap.c'],
             include_dirs = ['epanet/toolkit'],
             library_dirs = ['epanet/toolkit'],
             libraries = ['epanet_py'],
             language = 'C'
         )
     ],
+
+    # tox can't find epanet module at test time unless namespace is declared
     namespace_packages = ['epanet'],
-    packages = {microlib_name},
+
+    packages = {'epanet.toolkit'},
     py_modules = ['toolkit'],
-#    include_package_data=True
-    package_data = {microlib_name:['*epanet_py.dll', '*epanet_py.so']},
+    package_data = {'epanet.toolkit':['*epanet_py.dll', '*epanet_py.so']},
+
+    zip_safe=False
 
 )

setup.py

@@ -56,19 +56,21 @@ def run(self):
 
 setup(
     name=PACKAGE_NAME,
-    version="0.2.0a",
+    version="0.3.0.dev0",
+
+    cmdclass={
+        'install': InstallCmd,
+        'develop': DevelopCmd
+    },
+
     author="Michael Tryby",
     author_email="Michael [email protected]",
     description="epanet_python - SWIG generated python wrappers for epanet libraries",
     license="CC0",
     classifiers=[
         'Private :: Do Not Upload to pypi server',
     ],
-    cmdclass={
-        'install': InstallCmd,
-        'develop': DevelopCmd
 
-    },
     setup_requires=["pytest-runner"],
-    tests_require=["pytest"]
+    tests_require=["pytest", 'numpy']
 )

tox.ini

@@ -14,5 +14,5 @@ deps =
   PyYAML
   coveralls
 commands =
-  coverage run --source=epanet_python setup.py test
+  coverage run --source epanet_python --omit */tests/test_*.py setup.py test
   coveralls