summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-07-11 18:09:54 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2015-07-11 18:09:54 +0200
commit2c8254930ea2e6d2631a97bd24be94acb1762a8d (patch)
tree16f0d02ee39f31d6c77307f653de7a9e95d95b4a
parent1405e8586167c6997b219088d809cddf24429811 (diff)
downloadpsutil-2c8254930ea2e6d2631a97bd24be94acb1762a8d.tar.gz
continuous code quality test integration with scrutinizer-ci.com
-rw-r--r--.coveragerc6
-rw-r--r--HISTORY.rst7
-rw-r--r--MANIFEST.in6
-rw-r--r--Makefile10
-rw-r--r--README.rst12
5 files changed, 31 insertions, 10 deletions
diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 00000000..189c2245
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,6 @@
+[report]
+include =
+ *psutil*
+omit =
+ test/*
+ *setup*
diff --git a/HISTORY.rst b/HISTORY.rst
index 7eda3025..61f9799d 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -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
diff --git a/MANIFEST.in b/MANIFEST.in
index 18136122..d807be28 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -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
@@ -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*
diff --git a/Makefile b/Makefile
index e33d30a9..9b1b2397 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,6 @@
PYTHON = python
TSCRIPT = test/test_psutil.py
-# Private vars
-COVERAGE_OPTS = --include="*psutil*" --omit="test/*,*setup*"
-
all: test
clean:
@@ -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:
diff --git a/README.rst b/README.rst
index 344f5161..19eec52a 100644
--- a/README.rst
+++ b/README.rst
@@ -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