From 8602d80e89658819965b7deb1f9c47aa9e5a6f22 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 11 May 2018 15:37:28 -0400 Subject: [PATCH 1/3] try travis yet again --- .gitignore | 5 ++++- .travis.yml | 1 - design_request_example.json | 33 --------------------------------- 3 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 design_request_example.json diff --git a/.gitignore b/.gitignore index 7fe3d27a..2329b52b 100644 --- a/.gitignore +++ b/.gitignore @@ -103,4 +103,7 @@ coverage.xml docs/_build/ venv/ *.iml -.idea/ \ No newline at end of file +.idea/ + +# Pytest +.pytest_cache/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index cb7df909..00e5c6e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ python: - '3.6' install: - pip install -r requirements-dev.txt -- pip install --user codecov matrix: fast_finish: true script: diff --git a/design_request_example.json b/design_request_example.json deleted file mode 100644 index 580e846a..00000000 --- a/design_request_example.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "request": { - "unit_process": "pipe_example", - "name":"conduction line", - "request_timestamp":"1503614908", - "flow_rate": { - "magnitude":3.5, - "units":"L/s" - }, - "length":{ - "magnitude":4, - "units":"m" - }, - "max_hl":{ - "magnitude":30, - "units":"cm" - } - - }, - "result": { - "unit_process": "pipe_example", - "name":"conduction line", - "length":{ - "magnitude":4, - "units":"m" - }, - "nominal_diameter":3, - "resulting_headloss":{ - "magnitude":20, - "units":"cm" - } - } -} \ No newline at end of file From 5914ce6c909c8061c9bdeee9e9a000cc2b519107 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 11 May 2018 15:42:36 -0400 Subject: [PATCH 2/3] testing travis again --- .travis.yml | 2 +- requirements-dev.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00e5c6e0..b326726f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ install: matrix: fast_finish: true script: -- pytest +- pytest --cov=./ stages: - test - deploy diff --git a/requirements-dev.txt b/requirements-dev.txt index 8b51fbe5..97919180 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,4 +2,5 @@ scipy numpy pandas matplotlib -pint \ No newline at end of file +pint +codecov \ No newline at end of file From d65d933d1b5c33719204f50a41e9acdbeee9c1aa Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 11 May 2018 15:54:25 -0400 Subject: [PATCH 3/3] added the pytest-cov dependency --- requirements-dev.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 97919180..5ef85baf 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,4 +3,5 @@ numpy pandas matplotlib pint -codecov \ No newline at end of file +codecov +pytest-cov \ No newline at end of file