Skip to content

Commit

Permalink
fix scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
timkpaine committed Dec 27, 2019
1 parent 573761c commit 6492f89
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ addons:


script:
- if [ "$TEST" = "PYTHON" ]; then make build && make test; fi
- if [ "$TEST" = "PYTHON" ]; then python3 -m pip install -3 .[dev]; fi
- if [ "$TEST" = "PYTHON" ]; then make lint; fi
- if [ "$TEST" = "PYTHON" ]; then make tests; fi
- if [ "$TEST" = "DOCKER" ]; then docker build .; fi

branches:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM timkpaine/aat-deps:latest
WORKDIR /usr/src/app
ADD . /usr/src/app

RUN python3 -m pip install -U codecov coverage pytest pytest-cov mock flake8 pylint
RUN python3 -m pip install -r requirements.txt
RUN python3 -m pip install -e .[dev]

RUN make test
RUN make lint
RUN make tests
RUN codecov --token caa422e7-7543-4adb-8ee1-e4a7ea24b988
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ install: ## install the package
tests: ## Clean and Make unit tests
python3 -m pytest -v ./aat/tests --cov=aat

test: clean build lint ## run the tests for travis CI
@ python3 -m pytest -v ./aat/tests --cov=aat

test_verbose: ## run the tests with full output
@ python3 -m pytest -vv ./aat/tests --cov=aat

Expand Down

0 comments on commit 6492f89

Please sign in to comment.