Merge pull request #26 from michaeltryby/dev

Configuring coveralls

Author: michaeltryby

.coveralls.yml.enc

@@ -0,0 +1 @@
+�Y�!ى���~���/)�]��g��J���f~����o�\,&$n��q�:J*�o����[�

README.md

@@ -1,52 +1,16 @@
 # swmm-python
 
-## Build Notes 
 
-Hints for building SWIG wrapper for SWMM Toolkit on Windows. This package
-is currently under active development. The build process is likely to change. 
+## Build Status
+[![Build status](https://ci.appveyor.com/api/projects/status/g13vapirwhinmtob/branch/dev?svg=true)](https://ci.appveyor.com/project/michaeltryby/swmm-python/branch/dev)
 
+[![Coverage Status](https://coveralls.io/repos/github/michaeltryby/swmm-python/badge.svg)](https://coveralls.io/github/michaeltryby/swmm-python)
 
-### Dependencies
-- Python 3.6.5 64 bit 
-- Visual Studio 14 2015
-- CMake
-- SWIG
 
+## Contents
+* swmm-python - SWIG based wrappers for the SWMM Toolkit and Output libraries.
+* ...
 
-### Build Process
-The idea here is to build the SWMM library seperately and link it with the SWIG 
-wrapper. This approach uses implicit linking, therefore, an import library 
-must be created. CMake does this automatically using the Generate Export Header 
-function. Once built the SWMM library and headers are manually copied to the 
-swmm-toolkit directory. To run, the resulting swmm-toolkit.pyd needs the 
-swmm5.dll.   
 
-
-Step 1 - Build SWMM Library
-
-Checkout the feature-reentrancy branch of the OWA SWMM project. Build the SWMM 
-Library using CMake generator "Visual Studio 14 2015 Win64". Be sure "generate 
-export header" section of the SWMM Project CMakeLists.txt is not commented out. 
-
-
-Step 2 - Copy SWMM Library
-
-In the swmm\toolkit directory copy swmm5.h, swmm5_export.h, toolkitAPI.h, 
-swmm5.dll, swmm5.lib, and swmm5.exp all together in the same folder. The 
-setup.py file is configured to find them there. 
-
-
-Step 3 - Build SWMM Toolkit
-
-Execute the command `python setup.py build` 
-
-
-Step 4 - Running SWMM Toolkit
-
-Install the pyd and the dll in the same directory and add the directory to 
-the python path. 
-
-
-#### Common Problems
-When I used the Developer Command Prompt for Visual Studio 2015 the build 
-fails with linking errors. Use a regular Command Prompt to build. 
+## Build Notes
+Note that swmm-python wraps the feature-wrapper branch of SWMM v5.1.12.  

appveyor.yml

@@ -1,11 +1,15 @@
 
 
 environment:
-    matrix:
-        - PYTHON: "C:\\Python36-x64"
+  passphrase:
+    secure: En1qcj1/l2B3Nov+vOHlfRrFZk00bg1HPRouD64Gzfw=
+  matrix:
+    - PYTHON: "C:\\Python36-x64"
 
 install:
     - choco install swig
+    - ps: iex ((New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/appveyor/secure-file/master/install.ps1'))
+    - appveyor-tools\secure-file -decrypt .coveralls.yml.enc -secret %passphrase%
     - "%PYTHON%\\python.exe -m pip install wheel tox"
 
 

setup.cfg

@@ -0,0 +1,2 @@
+[aliases]
+test=pytest

setup.py

@@ -67,6 +67,7 @@ def run(self):
     cmdclass={
         'install': InstallCmd,
         'develop': DevelopCmd
-
-    }
+    },
+    setup_requires=["pytest-runner"],
+    tests_require=["pytest"]
 )

tox.ini

@@ -4,13 +4,16 @@
 envlist = py36
 
 [testenv]
-whitelist_externals =
-  swig
+passenv = APPVEYOR APPVEYOR_*
+whitelist_externals = swig
 skipsdist = True
 usedevelop = True
 deps =
   pytest
   numpy
   aenum
+  PyYAML
+  coveralls
 commands =
-  python -m pytest --color=yes swmm_python -s
+  coverage run --source=swmm_python setup.py test
+  coveralls