From 01abcb67ef3efc52edcfa302377137b46007287f Mon Sep 17 00:00:00 2001 From: MarkKoz Date: Sat, 22 Feb 2020 21:24:52 -0800 Subject: CI: don't run commands through pipenv Since #62, the dependencies have been installed to the system interpreter. Therefore, it's not necessary to run through pipenv to ensure the commands run through an activated virtual environment. This should also fix pipenv run creating a virtual environment. It seems it cannot tell when it should be using the system interpreter. It probably wasn't designed for that anyway i.e. the intent was to run commands directly in such case, which is what this PR will do. --- ci/lint-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/lint-test.yml b/ci/lint-test.yml index 3c3eae6..6350fde 100644 --- a/ci/lint-test.yml +++ b/ci/lint-test.yml @@ -1,7 +1,7 @@ steps: - script: | docker exec snekbox_test /bin/bash -c \ - 'pipenv run lint --format junit-xml --output-file test-lint.xml' + 'flake8 --format junit-xml --output-file test-lint.xml' displayName: 'Run Linter' - task: PublishTestResults@2 @@ -17,7 +17,7 @@ steps: - script: | docker exec snekbox_test /bin/bash -c \ - 'pipenv run coverage run -m xmlrunner' + 'coverage run -m xmlrunner' displayName: 'Run Unit Tests' - task: PublishTestResults@2 @@ -30,7 +30,7 @@ steps: # Run report too because the XML report doesn't output to stdout. - script: | docker exec snekbox_test /bin/bash -c \ - 'pipenv run /bin/bash -c "coverage report && coverage xml"' + 'coverage report && coverage xml' displayName: 'Generate Coverage Report' - task: PublishCodeCoverageResults@1 -- cgit v1.2.3