diff --git a/appveyor.yml b/appveyor.yml index 56ef02d..9c8c6d9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,7 @@ init: # called after repo clone install: - - choco install swig + - python -m pip install -r tools\requirements-appveyor.txt # called before build before_build: @@ -41,7 +41,6 @@ build_script: before_test: - cd %EPANET_HOME% - - python -m pip install -r tools\requirements.txt - tools\gen-config.cmd %EPANET_HOME%\%BUILD_HOME%\bin\Release > %TEST_HOME%\apps\epanet-%APPVEYOR_REPO_COMMIT%.json # run custom test script @@ -52,7 +51,3 @@ test_script: # run regression tests - cd %EPANET_HOME% - tools\run-nrtest.cmd %NRTEST_SCRIPT% %TEST_HOME% %APPVEYOR_REPO_COMMIT% - -cache: - - C:\ProgramData\chocolatey\bin -> appveyor.yml - - C:\ProgramData\chocolatey\lib -> appveyor.yml diff --git a/tools/epanet-output/setup.py b/tools/epanet-output/setup.py index d1ce65d..92881ce 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", define_macros = [('epanet_output_EXPORTS', None)], 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