Skip to content

Commit

Permalink
Switch to CodeCov, and track JS+Python coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
bjacobel authored and andy-armstrong committed Jan 12, 2017
1 parent 5ccf802 commit 2fd9819
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 16 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ script:
- make test-all
- gulp test
after_success:
- coveralls
- coverage xml
- bash <(curl -s https://codecov.io/bash) -cF python -f coverage.xml
- bash <(curl -s https://codecov.io/bash) -cF javascript -f build/coverage-js/coverage.xml
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ clean: ## remove generated byte code, coverage reports, and build artifacts
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '*~' -exec rm -f {} +
coverage erase
rm -fr build/
rm -fr dist/
rm -fr *.egg-info
Expand All @@ -37,14 +36,13 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
pip-compile --upgrade -o requirements/doc.txt requirements/base.in requirements/doc.in
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
# Let tox control the Django version for tests
sed '/django==/d' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt

requirements: ## install development environment requirements
pip install -qr requirements/dev.txt --exists-action w
pip-sync requirements/base.txt requirements/dev.txt requirements/private.* requirements/test.txt
pip-sync requirements/*.txt requirements/private.*

install: upgrade requirements
./manage.py syncdb --noinput --settings=test_settings
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ django-component-views
:target: https://travis-ci.org/edx/edx-proctoring
:alt: Travis

.. image:: http://codecov.io/github/edx/edx-proctoring/coverage.svg?branch=master
:target: http://codecov.io/github/edx/edx-proctoring?branch=master
.. image:: https://codecov.io/gh/edx/edx-proctoring/branch/master/graph/badge.svg
:target: https://codecov.io/gh/edx/edx-proctoring
:alt: Codecov

.. image:: https://img.shields.io/pypi/pyversions/edx-proctoring.svg
Expand Down Expand Up @@ -130,4 +130,4 @@ Have a question about this repository, or about Open edX in general? Please
refer to this `list of resources`_ if you need any assistance.

.. _list of resources: https://open.edx.org/getting-help
.. _Including Proctored Exams In Your Course: http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/course_features/credit_courses/proctored_exams.html
.. _Including Proctored Exams In Your Course: http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/course_features/credit_courses/proctored_exams.html
5 changes: 0 additions & 5 deletions requirements/travis.in

This file was deleted.

6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@ ignore = D101,D200,D203,D212
match-dir = (?!migrations)

[testenv]
addopts = --cov edx_proctoring --cov-report term-missing --cov-report xml
norecursedirs = .* docs requirements
setenv =
DJANGO_SETTINGS_MODULE = test_settings
deps =
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
-r{toxinidir}/requirements/test.txt
-rrequirements/test.txt
commands =
./manage.py test {posargs}
coverage run ./manage.py test {posargs}

[testenv:docs]
setenv =
Expand Down

0 comments on commit 2fd9819

Please sign in to comment.