Build wheels on Appveyor for py36 py37 (#30)

michaeltryby · web-flow · commit c229e470e1ee · 2019-02-15T12:36:23.000-05:00
* Omitting tests from coverage

* Adding  py37 to tox.ini

* Running tests on py37

* Rolling back changes, configuring cache

* Adding .tox to appveyor cache

* Experimenting with cibuildwheel

* Experimenting with cibuildwheel

* More xp

* Adding python -version

* before-build now returns to project root dir before exiting

* Skipping py27 and win32 builds

* Trying to get cibuildwheel to run under py35

* Increase logging level

* Build verbosity 3

* Adding six to setup_requires

* Adding six to install

* installing six with CIBW_BEFORE_BUILD

* Targeting py36 and py37

* Skipping 32-bit builds

* Building microlibs

* running tests on wheels

* running tests

* Omitting top level namespace directory

* Tests require numpy

* Adding output.py module file to package data

* Trying to get module file to add

* So tired of this not working

* reworking setup.py for native namespace package

* Trying custom build_py command

* SWIG wrapper generation moved to before-build.bat

* Working on setup

* Updating comments

* Commenting on cibuildwheel for now

* bumping version, configuring cibuildwheel to run after tests pass

* configuring cibuildwheel run after test

* swmm_python doesn't declare a namespace package

* Tweaking setup so tests load in tox

* Getting tox test and cibuildwheel to both work

* Another try

* Switching to Py36-x64

* pytest==4.2.0

* Rolling back appveyor.yml

* Adding py35 to cibuildwheel

* cibuildwheel configured for py36 and py37
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,6 +3,11 @@
 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"
 
@@ -17,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 .\\swmm_python\\output"
+    - "%PYTHON%\\python.exe -m cibuildwheel --output-dir wheelhouse .\\swmm_python\\toolkit"
+
+artifacts:
+    - path: "wheelhouse\\*.whl"
+      name: Wheels
+
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - C:\projects\swmm-python\.tox -> tox.ini
diff --git a/before_build.bat b/before_build.bat
@@ -6,29 +6,55 @@
 ::  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
 
-set TOOLKIT_PATH=\swmm_python\toolkit\swmm\toolkit
-set OUTPUT_PATH=\swmm_python\output\swmm\output
+:: 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=swmm_python\toolkit\swmm\toolkit"
+set "OUTPUT_PATH=swmm_python\output\swmm\output"
 
+
+:: Clone the project
 mkdir buildlib
 cd buildlib
 git clone --branch=feature-wrapper https://github.com/michaeltryby/Stormwater-Management-Model.git swmm
-cd swmm 
+cd swmm
 
 
+:: Build the project
 mkdir buildprod
 cd buildprod
 cmake -G"Visual Studio 14 2015 Win64" -DBUILD_TESTS=0 ..
 cmake --build . --config Release
 
 
+:: Copy files required for python package build
 copy /Y .\bin\Release\swmm5.dll  %PROJECT_PATH%\%TOOLKIT_PATH%
 copy /Y .\lib\Release\swmm5.lib  %PROJECT_PATH%\%TOOLKIT_PATH%
 copy /Y ..\include\*.h  %PROJECT_PATH%\%TOOLKIT_PATH%
 
 copy /Y .\bin\Release\swmm-output.dll  %PROJECT_PATH%\%OUTPUT_PATH%
 copy /Y .\lib\Release\swmm-output.lib  %PROJECT_PATH%\%OUTPUT_PATH%
 copy /Y ..\tools\swmm-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%
diff --git a/setup.py b/setup.py
@@ -23,8 +23,7 @@
 
 def install_microlibs(sources, develop=False):
     """ Use pip to install all microlibraries.  """
-    print("installing all microlibs in {} mode".format(
-              "development" if develop else "normal"))
+    print("installing all microlibs in {} mode".format("development" if develop else "normal"))
     wd = pathlib.Path.cwd()
     for k, v in iteritems(sources):
         try:
@@ -56,18 +55,26 @@ 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 Tryby@epa.gov",
     description="swmm_python - SWIG generated python wrappers for swmm libraries",
     license="CC0",
     classifiers=[
         'Private :: Do Not Upload to pypi server',
     ],
-    cmdclass={
-        'install': InstallCmd,
-        'develop': DevelopCmd
-    },
-    setup_requires=["pytest-runner"],
-    tests_require=["pytest"]
+
+    setup_requires=[
+        'pytest-runner'
+    ],
+    tests_require=[
+        'pytest==4.2.0',
+        'numpy'
+    ]
 )
diff --git a/swmm_python/output/setup.py b/swmm_python/output/setup.py
@@ -9,37 +9,34 @@
 #
 # 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 = 'swmm.output'
 
 setup(
-    name = microlib_name,
-    version = "0.3.0-dev",
+    name = 'swmm.output',
+    version = "0.4.0.dev0",
 
     ext_modules = [
         Extension("swmm.output._output",
+            sources = ['swmm/output/output_wrap.c'],
             include_dirs = ['swmm/output/'],
             libraries = ['swmm-output'],
             library_dirs = ['swmm/output/'],
-            sources = ['swmm/output/output.i'],
-            swig_opts=['-py3'],
             language='C'
         )
     ],
-    namespace_packages=['swmm'],
-    packages = [microlib_name],
+    # tox can't find swmm module at test time unless namespace is declared
+    namespace_packages = ['swmm'],
+
+    packages = ['swmm.output'],
     py_modules = ['output'],
-    package_data = {microlib_name:['*swmm-output.dll', '*swmm-output.so']},
+    package_data = {'swmm.output':['./*swmm-output.dll', './*swmm-output.so']},
+
+    zip_safe=False,
 
     install_requires = [
         'aenum'
diff --git a/swmm_python/output/swmm/output/__init__.py b/swmm_python/output/swmm/output/__init__.py
@@ -2,7 +2,7 @@
 
 #
 #  __init__.py - SWMM output package
-# 
+#
 #  Date Created: August 9, 2018
 #
 #  Author:     Michael E. Tryby
@@ -27,28 +27,28 @@
 __status  = "Development"
 
 
-from enum import Enum, auto
+from enum import Enum
 from aenum import extend_enum
 from itertools import islice
 
 from swmm.output import output as oapi
 
 
 class Units(Enum):
-    RAIN_INT   = auto()
-    SNOW_DEPTH = auto()
-    EVAP_RATE  = auto()
-    INFIL_RATE = auto()
-    FLOW_RATE  = auto()
-    ELEV       = auto()
-    PERCENT    = auto()
-    CONCEN     = auto()
-    HEAD       = auto()
-    VOLUME     = auto()
-    VELOCITY   = auto()
-    TEMP       = auto()
-    UNITLESS   = auto()
-    NONE       = auto()
+    RAIN_INT   = 1
+    SNOW_DEPTH = 2
+    EVAP_RATE  = 3
+    INFIL_RATE = 4
+    FLOW_RATE  = 5
+    ELEV       = 6
+    PERCENT    = 7
+    CONCEN     = 8
+    HEAD       = 9
+    VOLUME     = 10
+    VELOCITY   = 11
+    TEMP       = 12
+    UNITLESS   = 13
+    NONE       = 14
 
 
 class OutputMetadata:
@@ -91,11 +91,11 @@ class OutputMetadata:
         Units.VELOCITY:       "m/sec",
         Units.TEMP:           "deg C",
         Units.UNITLESS:       "unitless",
-        Units.NONE:           "", 
+        Units.NONE:           "",
 
         oapi.FlowUnits.CMS:   "cu m/sec",
         oapi.FlowUnits.LPS:   "L/sec",
-        oapi.FlowUnits.MLD:   "M L/day", 
+        oapi.FlowUnits.MLD:   "M L/day",
 
         oapi.ConcUnits.MG:    "mg/L",
         oapi.ConcUnits.UG:    "ug/L",
@@ -106,21 +106,21 @@ class OutputMetadata:
 
     def _build_pollut_metadata(self, output_handle):
         '''
-        Builds metadata for pollutant attributes at runtime. 
-        '''            
+        Builds metadata for pollutant attributes at runtime.
+        '''
         # Get number of pollutants
         n = oapi.getprojectsize(output_handle)[oapi.ElementType.POLLUT]
 
         if n > 0:
-            
+
             pollut_name = []
             pollut_units = []
-            
+
             # Get pollutant names
             for i in range(0, n):
-                pollut_name.append(oapi.getelementname(output_handle, 
+                pollut_name.append(oapi.getelementname(output_handle,
                                                        oapi.ElementType.POLLUT, i))
-            # Get pollutant units            
+            # Get pollutant units
             for u in oapi.getunits(output_handle)[2:]:
                 pollut_units.append(oapi.ConcUnits(u))
 
@@ -130,32 +130,32 @@ def _build_pollut_metadata(self, output_handle):
                 extend_enum(oapi.SubcatchAttribute, symbolic_name, 8 + i)
                 extend_enum(oapi.NodeAttribute, symbolic_name, 6 + i)
                 extend_enum(oapi.LinkAttribute, symbolic_name, 5 + i)
-               
+
             # Update metadata dictionary with pollutant metadata
             for i, attr in enumerate(islice(oapi.SubcatchAttribute, 8, None)):
-                self._metadata[attr] = (pollut_name[i], self._unit_labels[pollut_units[i]]) 
-        
+                self._metadata[attr] = (pollut_name[i], self._unit_labels[pollut_units[i]])
+
             for i, attr in enumerate(islice(oapi.NodeAttribute, 6, None)):
-                self._metadata[attr] = (pollut_name[i], self._unit_labels[pollut_units[i]]) 
-        
+                self._metadata[attr] = (pollut_name[i], self._unit_labels[pollut_units[i]])
+
             for i, attr in enumerate(islice(oapi.LinkAttribute, 5, None)):
-                self._metadata[attr] = (pollut_name[i], self._unit_labels[pollut_units[i]]) 
-        
+                self._metadata[attr] = (pollut_name[i], self._unit_labels[pollut_units[i]])
+
 
     def __init__(self, output_handle):
         # Get units from binary output file
         self.units = oapi.getunits(output_handle)
-        
+
         # Determine prevailing unit system
         self._unit_system = oapi.UnitSystem(self.units[0])
         if self._unit_system == oapi.UnitSystem.US:
             self._unit_labels = type(self)._unit_labels_us_
         else:
             self._unit_labels = type(self)._unit_labels_si_
-        
-        # Set user flow units        
+
+        # Set user flow units
         self._flow = oapi.FlowUnits(self.units[1])
-        
+
         self._metadata = {
             oapi.SubcatchAttribute.RAINFALL:           ("Rainfall",                self._unit_labels[Units.RAIN_INT]),
             oapi.SubcatchAttribute.SNOW_DEPTH:         ("Snow Depth",              self._unit_labels[Units.SNOW_DEPTH]),
@@ -197,7 +197,7 @@ def __init__(self, output_handle):
             oapi.SystemAttribute.VOLUME_STORED:        ("Volume Stored",           self._unit_labels[Units.VOLUME]),
             oapi.SystemAttribute.EVAP_RATE:            ("Evaporation Rate",        self._unit_labels[Units.EVAP_RATE])
         }
-        
+
         self._build_pollut_metadata(output_handle)
 
 
@@ -206,20 +206,20 @@ def get_attribute_metadata(self, attribute):
         Takes an attribute enum and returns the name and units in a tuple.
         '''
         return self._metadata[attribute]
-        
-        
+
+
 # Units of Measurement
 #
-# Units                  US Customary                           SI Metric    
+# Units                  US Customary                           SI Metric
 #    AREA_SUBCATCH          acres                 ac               hectares            ha
 #    AREA_STOR              square feet           sq ft            square meters       sq m
 #    AREA_POND              square feet           sq ft            square meters       sq m
 #    CAP_SUC                inches                in               millimeters         mm
-#    CONC                   milligrams/liter      mg/L             milligrams/liter    mg/L             
+#    CONC                   milligrams/liter      mg/L             milligrams/liter    mg/L
 #                           micrograms/liter      ug/L             micrograms/liter    ug/L
 #                           counts/liter          Count/L          counts/liter        Count/L
 #    INFIL_DECAY            1/hours               1/hrs            1/hours             1/hrs
-#    POLLUT_DECAY           1/days                1/days           1/days              1/days 
+#    POLLUT_DECAY           1/days                1/days           1/days              1/days
 #    DEPRES_STOR            inches                in               millimeters         mm
 #    DEPTH                  feet                  ft               meters              m
 #    DIAM                   feet                  ft               meters              m
@@ -244,5 +244,3 @@ def get_attribute_metadata(self, attribute):
 #    STREET_CLEAN_INT       days                  days             days                days
 #    VOLUME                 cubic feet            cu ft            cubic meters        cu m
 #    WIDTH                  feet                  ft               meters              m
-
-
diff --git a/swmm_python/toolkit/setup.py b/swmm_python/toolkit/setup.py
diff --git a/tox.ini b/tox.ini
