Updating Appveyor to use epanet-output binary wheel

This commit is contained in:
Michael Tryby
2018-03-16 16:21:21 -04:00
parent 63b4438765
commit c9192907a8
4 changed files with 24 additions and 11 deletions

View File

@@ -20,24 +20,19 @@ init:
- set NRTEST_SCRIPT=%EPANET_HOME%\%BUILD_HOME%\packages\nrtest\scripts - set NRTEST_SCRIPT=%EPANET_HOME%\%BUILD_HOME%\packages\nrtest\scripts
- set GENERATOR="Visual Studio 10 2010" - set GENERATOR="Visual Studio 10 2010"
cache:
- C:\ProgramData\chocolatey\bin -> appveyor.yml
- C:\ProgramData\chocolatey\lib -> appveyor.yml
- '%BUILD_HOME% -> CMakeLists.txt'
# called after repo clone # called after repo clone
install: install:
- choco install swig - python -m pip install -r tools\requirements-appveyor.txt
- python -m pip install --src %BUILD_HOME%\packages -r tools\requirements.txt
# called before build # called before build
before_build: before_build:
- mkdir %BUILD_HOME%
- cd %BUILD_HOME% - cd %BUILD_HOME%
- cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=Release .. - cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=Release ..
# run custom build script # run custom build script
build_script: build_script:
- cmake --build . --target runepanet --config Release - cmake --build . --config Release
before_test: before_test:
- cd %EPANET_HOME% - cd %EPANET_HOME%

View File

@@ -22,7 +22,7 @@ except ImportError:
setup( setup(
name = "epanet-output", name = "epanet-output",
version = "1.0", version = "0.1.0-alpha",
ext_modules = [ ext_modules = [
Extension("_epanet_output", Extension("_epanet_output",
sources = ['src/epanet_output.i', 'src/epanet_output.c', 'src/errormanager.c'], sources = ['src/epanet_output.i', 'src/epanet_output.c', 'src/errormanager.c'],

View File

@@ -24,7 +24,7 @@ entry_points = {
setup( setup(
name='nrtest-epanet', name='nrtest-epanet',
version='0.3.0', version='0.4.0',
description="EPANET extension for nrtest", description="EPANET extension for nrtest",
author="Michael E. Tryby", author="Michael E. Tryby",
@@ -38,7 +38,7 @@ setup(
'header_detail_footer>=2.3', 'header_detail_footer>=2.3',
'nrtest>=0.2.0', 'nrtest>=0.2.0',
'numpy>=1.7.0', 'numpy>=1.7.0',
'epanet_output>=0.4.0' 'epanet_output'
], ],
keywords='nrtest_epanet' keywords='nrtest_epanet'
) )

View File

@@ -0,0 +1,18 @@
#
# requirements.txt
#
# Date Created: 10/10/2017
# Author: Michael E. Tryby
# US EPA ORD/NRMRL
#
# Useful for configuring a python environment to run epanet-nrtestsuite.
#
# command:
# $ pip install --src build/packages -r tools/requirements.txt
#
nrtest>=0.2.3
-f https://github.com/OpenWaterAnalytics/epanet-python/releases/download/v0.1.0-alpha/epanet_output-0.1.0a0-cp27-cp27m-win32.whl
-e ./tools/nrtest-epanet