diff --git a/appveyor.yml b/appveyor.yml index 42eece6..d6808f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,24 +20,19 @@ init: - set NRTEST_SCRIPT=%EPANET_HOME%\%BUILD_HOME%\packages\nrtest\scripts - 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 install: - - choco install swig - - python -m pip install --src %BUILD_HOME%\packages -r tools\requirements.txt + - python -m pip install -r tools\requirements-appveyor.txt # called before build before_build: + - mkdir %BUILD_HOME% - cd %BUILD_HOME% - cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=Release .. # run custom build script build_script: - - cmake --build . --target runepanet --config Release + - cmake --build . --config Release before_test: - cd %EPANET_HOME% diff --git a/tools/epanet-output/setup.py b/tools/epanet-output/setup.py index 90d57e0..5296026 100644 --- a/tools/epanet-output/setup.py +++ b/tools/epanet-output/setup.py @@ -22,7 +22,7 @@ except ImportError: setup( name = "epanet-output", - version = "1.0", + version = "0.1.0-alpha", ext_modules = [ Extension("_epanet_output", sources = ['src/epanet_output.i', 'src/epanet_output.c', 'src/errormanager.c'], diff --git a/tools/nrtest-epanet/setup.py b/tools/nrtest-epanet/setup.py index 0318ab2..897e621 100644 --- a/tools/nrtest-epanet/setup.py +++ b/tools/nrtest-epanet/setup.py @@ -24,7 +24,7 @@ entry_points = { setup( name='nrtest-epanet', - version='0.3.0', + version='0.4.0', description="EPANET extension for nrtest", author="Michael E. Tryby", @@ -38,7 +38,7 @@ setup( 'header_detail_footer>=2.3', 'nrtest>=0.2.0', 'numpy>=1.7.0', - 'epanet_output>=0.4.0' + 'epanet_output' ], keywords='nrtest_epanet' ) diff --git a/tools/requirements-appveyor.txt b/tools/requirements-appveyor.txt new file mode 100644 index 0000000..17a7f3c --- /dev/null +++ b/tools/requirements-appveyor.txt @@ -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