summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-06-09 12:41:03 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-06-09 12:41:03 -0700
commit1214fbff0f07fb9fb87cea5f536fc67b40ae99cc (patch)
tree8c3d3687fd0778d750581cb9d0a96989cac927f7
parente66de3809b5e2b17e57af469df3750a87bbd1ec0 (diff)
parente2e1466f416f2a9ca9f8ecd19259f3e50d25a349 (diff)
Merge branch '2.0' into 2.1
-rw-r--r--.travis.yml4
-rw-r--r--README.rst4
-rw-r--r--codecov.yml1
-rw-r--r--sites/www/changelog.rst3
4 files changed, 8 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index c8faf0a2..7ca8db09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ install:
# Self-install for setup.py-driven deps
- pip install -e .
# Dev (doc/test running) requirements
- - pip install coveralls # For coveralls.io specifically
+ - pip install codecov # For codecov specifically
- pip install -r dev-requirements.txt
script:
# Main tests, w/ coverage!
@@ -33,4 +33,4 @@ notifications:
on_failure: change
email: false
after_success:
- - coveralls
+ - codecov
diff --git a/README.rst b/README.rst
index e267f69a..399dceb9 100644
--- a/README.rst
+++ b/README.rst
@@ -6,8 +6,8 @@ Paramiko
.. image:: https://travis-ci.org/paramiko/paramiko.svg?branch=master
:target: https://travis-ci.org/paramiko/paramiko
-.. image:: https://coveralls.io/repos/paramiko/paramiko/badge.svg?branch=master&service=github
- :target: https://coveralls.io/github/paramiko/paramiko?branch=master
+.. image:: https://codecov.io/gh/paramiko/paramiko/branch/master/graph/badge.svg
+ :target: https://codecov.io/gh/paramiko/paramiko
:Paramiko: Python SSH module
:Copyright: Copyright (c) 2003-2009 Robey Pointer <robeypointer@gmail.com>
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 00000000..69cb7601
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1 @@
+comment: false
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index b77ac123..706385cb 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :support:`956 backported` Switch code coverage service from coveralls.io to
+ codecov.io (& then disable the latter's auto-comments.) Thanks to Nikolai
+ Røed Kristiansen for the patch.
* :bug:`949` SSHClient and Transport could cause a memory leak if there's
a connection problem or protocol error, even if ``Transport.close()``
is called. Thanks Kyle Agronick for the discovery and investigation,