Skip to content

Commit

Permalink
continuous code quality test integration with scrutinizer-ci.com
Browse files Browse the repository at this point in the history
  • Loading branch information
giampaolo committed Jul 11, 2015
1 parent 1405e85 commit 2c82549
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 10 deletions.
6 changes: 6 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[report]
include =
*psutil*
omit =
test/*
*setup*
7 changes: 7 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ Bug tracker at https://github.com/giampaolo/psutil/issues
3.1.0 - XXXX-XX-XX
==================

**Enhancements**

- #646: continuous tests integration for Windows with
https://ci.appveyor.com/project/giampaolo/psutil.
- #651: continuous code quality test integration with
https://scrutinizer-ci.com/g/giampaolo/psutil/

**Bug fixes**

- #340: [Windows] Process.open_files() no longer hangs. Instead it uses a
Expand Down
6 changes: 4 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
include .coveragerc
include .git-pre-commit
include .git-pre-commit
include .gitignore
include .travis.yml
include .git-pre-commit
include CREDITS
include HISTORY.rst
include INSTALL.rst
Expand All @@ -13,8 +14,9 @@ include README.rst
include setup.py
include TODO
include tox.ini
recursive-include docs *
recursive-exclude docs/_build *
recursive-include .appveyor/*
recursive-include docs *
recursive-include examples *.py
recursive-include psutil *.py *.c *.h
recursive-include test *.py README*
10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
PYTHON = python
TSCRIPT = test/test_psutil.py

# Private vars
COVERAGE_OPTS = --include="*psutil*" --omit="test/*,*setup*"

all: test

clean:
Expand Down Expand Up @@ -86,11 +83,12 @@ test-memleaks-by-name: install
@$(PYTHON) -m nose test/test_memory_leaks.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))

coverage: install
# Note: coverage options are controlled by .coveragerc file
rm -rf .coverage htmlcov
$(PYTHON) -m coverage run $(TSCRIPT) $(COVERAGE_OPTS)
$(PYTHON) -m coverage report $(COVERAGE_OPTS)
$(PYTHON) -m coverage run $(TSCRIPT)
$(PYTHON) -m coverage report
@echo "writing results to htmlcov/index.html"
$(PYTHON) -m coverage html $(COVERAGE_OPTS)
$(PYTHON) -m coverage html
$(PYTHON) -m webbrowser -t htmlcov/index.html

pep8:
Expand Down
12 changes: 10 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,19 @@

.. image:: https://api.travis-ci.org/giampaolo/psutil.png?branch=master
:target: https://travis-ci.org/giampaolo/psutil
:alt: Travis (Linux)
:alt: Linux tests (Travis)

.. image:: https://ci.appveyor.com/api/projects/status/qdwvw7v1t915ywr5/branch/master?svg=true
:target: https://ci.appveyor.com/project/giampaolo/psutil
:alt: Appveyor (Windows)
:alt: Windows tests (Appveyor)

.. image:: https://coveralls.io/repos/giampaolo/psutil/badge.svg?branch=master&service=github
:target: https://coveralls.io/github/giampaolo/psutil?branch=master
:alt: Test coverage (coverall.io)

.. image:: https://img.shields.io/scrutinizer/g/giampaolo/psutil.svg
:target: https://scrutinizer-ci.com/g/giampaolo/psutil/
:alt: Code quality (scrutinizer-ci.com)

===========
Quick links
Expand Down

0 comments on commit 2c82549

Please sign in to comment.