Merge pull request #708 from DanCech/codecov-badge

add codecov badge

Author: DanCech

README.md

@@ -3,6 +3,7 @@
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/85221cd3bb6e49d7bbd6fed376a88264)](https://www.codacy.com/app/graphite-project/carbon?utm_source=github.com&utm_medium=referral&utm_content=graphite-project/carbon&utm_campaign=badger)
 [![Build Status](https://secure.travis-ci.org/graphite-project/carbon.png?branch=master)](http://travis-ci.org/graphite-project/carbon)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fgraphite-project%2Fcarbon.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fgraphite-project%2Fcarbon?ref=badge_shield)
+[![codecov](https://codecov.io/gh/graphite-project/carbon/branch/master/graph/badge.svg)](https://codecov.io/gh/graphite-project/carbon)
 
 ## Overview
 

bin/carbon-aggregator-cache.py

@@ -25,10 +25,10 @@
 LIB_DIR = os.path.join(ROOT_DIR, "lib")
 sys.path.insert(0, LIB_DIR)
 
-from carbon.util import run_twistd_plugin
-from carbon.exceptions import CarbonConfigException
+from carbon.util import run_twistd_plugin  # noqa
+from carbon.exceptions import CarbonConfigException  # noqa
 
 try:
     run_twistd_plugin(__file__)
-except CarbonConfigException, exc:
+except CarbonConfigException as exc:
     raise SystemExit(str(exc))

bin/carbon-aggregator.py

@@ -25,8 +25,8 @@
 LIB_DIR = os.path.join(ROOT_DIR, "lib")
 sys.path.insert(0, LIB_DIR)
 
-from carbon.util import run_twistd_plugin
-from carbon.exceptions import CarbonConfigException
+from carbon.util import run_twistd_plugin  # noqa
+from carbon.exceptions import CarbonConfigException  # noqa
 
 try:
     run_twistd_plugin(__file__)

bin/carbon-cache.py

@@ -25,8 +25,8 @@
 LIB_DIR = os.path.join(ROOT_DIR, "lib")
 sys.path.insert(0, LIB_DIR)
 
-from carbon.util import run_twistd_plugin
-from carbon.exceptions import CarbonConfigException
+from carbon.util import run_twistd_plugin  # noqa
+from carbon.exceptions import CarbonConfigException  # noqa
 
 try:
     run_twistd_plugin(__file__)

bin/carbon-client.py

@@ -14,7 +14,6 @@
 limitations under the License."""
 
 import sys
-import imp
 from os.path import dirname, join, abspath, exists
 from optparse import OptionParser
 
@@ -35,22 +34,24 @@
 except ImportError:
   pass
 
-from twisted.internet import stdio, reactor, defer
-from twisted.protocols.basic import LineReceiver
-from carbon.routers import ConsistentHashingRouter, RelayRulesRouter
-from carbon.client import CarbonClientManager
-from carbon import log, events
+from twisted.internet import stdio, reactor, defer  # noqa
+from twisted.protocols.basic import LineReceiver  # noqa
+from carbon.routers import ConsistentHashingRouter, RelayRulesRouter  # noqa
+from carbon.client import CarbonClientManager  # noqa
+from carbon import log, events  # noqa
 
 
 option_parser = OptionParser(usage="%prog [options] <host:port:instance> <host:port:instance> ...")
 option_parser.add_option('--debug', action='store_true', help="Log debug info to stdout")
 option_parser.add_option('--keyfunc', help="Use a custom key function (path/to/module.py:myFunc)")
 option_parser.add_option('--replication', type='int', default=1, help='Replication factor')
-option_parser.add_option('--routing', default='consistent-hashing',
+option_parser.add_option(
+  '--routing', default='consistent-hashing',
   help='Routing method: "consistent-hashing" (default) or "relay"')
-option_parser.add_option('--diverse-replicas', action='store_true', help="Spread replicas across diff. servers")
-option_parser.add_option('--relayrules', default=default_relayrules,
-  help='relay-rules.conf file to use for relay routing')
+option_parser.add_option(
+  '--diverse-replicas', action='store_true', help="Spread replicas across diff. servers")
+option_parser.add_option(
+  '--relayrules', default=default_relayrules, help='relay-rules.conf file to use for relay routing')
 
 options, args = option_parser.parse_args()
 
@@ -74,7 +75,7 @@
     instance = parts[2]
   else:
     instance = None
-  destinations.append( (host, port, instance) )
+  destinations.append((host, port, instance))
 
 if options.debug:
   log.logToStdout()
@@ -104,26 +105,31 @@ class StdinMetricsReader(LineReceiver):
   delimiter = '\n'
 
   def lineReceived(self, line):
-    #log.msg("[DEBUG] lineReceived(): %s" % line)
+    # log.msg("[DEBUG] lineReceived(): %s" % line)
     try:
       (metric, value, timestamp) = line.split()
       datapoint = (float(timestamp), float(value))
-      assert datapoint[1] == datapoint[1] # filter out NaNs
+      assert datapoint[1] == datapoint[1]  # filter out NaNs
       client_manager.sendDatapoint(metric, datapoint)
     except ValueError:
       log.err(None, 'Dropping invalid line: %s' % line)
 
   def connectionLost(self, reason):
     log.msg('stdin disconnected')
+
     def startShutdown(results):
       log.msg("startShutdown(%s)" % str(results))
       allStopped = client_manager.stopAllClients()
       allStopped.addCallback(shutdown)
+
     firstConnectsAttempted.addCallback(startShutdown)
 
-stdio.StandardIO( StdinMetricsReader() )
+
+stdio.StandardIO(StdinMetricsReader())
 
 exitCode = 0
+
+
 def shutdown(results):
   global exitCode
   for success, result in results:

bin/carbon-relay.py

@@ -25,8 +25,8 @@
 LIB_DIR = os.path.join(ROOT_DIR, "lib")
 sys.path.insert(0, LIB_DIR)
 
-from carbon.util import run_twistd_plugin
-from carbon.exceptions import CarbonConfigException
+from carbon.util import run_twistd_plugin  # noqa
+from carbon.exceptions import CarbonConfigException  # noqa
 
 try:
     run_twistd_plugin(__file__)

bin/validate-storage-schemas.py

@@ -15,7 +15,7 @@
 
 import sys
 import whisper
-from os.path import dirname, exists, join, realpath
+from os.path import dirname, join, realpath
 
 try:
   from ConfigParser import ConfigParser
@@ -46,17 +46,21 @@
     try:
       archives.append(whisper.parseRetentionDef(retention))
     except ValueError as e:
-      print("  - Error: Section '%s' contains an invalid item in its retention definition ('%s')" % \
-        (section, retention))
+      print(
+        "  - Error: Section '%s' contains an invalid item in its retention definition ('%s')" %
+        (section, retention)
+      )
       print("    %s" % e)
       section_failed = True
 
   if not section_failed:
     try:
       whisper.validateArchiveList(archives)
     except whisper.InvalidConfiguration as e:
-      print("  - Error: Section '%s' contains an invalid retention definition ('%s')" % \
-        (section, ','.join(retentions)))
+      print(
+        "  - Error: Section '%s' contains an invalid retention definition ('%s')" %
+        (section, ','.join(retentions))
+      )
       print("    %s" % e)
 
   if section_failed:
@@ -65,6 +69,6 @@
     print("  OK")
 
 if errors_found:
-  raise SystemExit( "Storage-schemas configuration '%s' failed validation" % SCHEMAS_FILE)
+  raise SystemExit("Storage-schemas configuration '%s' failed validation" % SCHEMAS_FILE)
 
 print("Storage-schemas configuration '%s' is valid" % SCHEMAS_FILE)

lib/twisted/plugins/carbon_aggregator_plugin.py

@@ -5,6 +5,7 @@
 
 from carbon import conf
 
+
 @implementer(IServiceMaker, IPlugin)
 class CarbonAggregatorServiceMaker(object):
 

tox.ini

@@ -13,7 +13,7 @@ setenv =
   GRAPHITE_NO_PREFIX=true
   PYTHONPATH={toxinidir}/lib
 commands =
-  coverage run --branch --include=lib/*,bin/* --omit=lib/carbon/tests/* "{envbindir}/trial" carbon
+  coverage run --branch --source=lib,bin --omit=lib/carbon/tests/* "{envbindir}/trial" carbon
   coverage xml
   coverage report
 deps =
@@ -25,7 +25,7 @@ deps =
   flake8==2.6.2
   six
 commands =
-  flake8 {toxinidir}/lib/carbon
+  flake8 {toxinidir}/lib {toxinidir}/bin
 
 [testenv:benchmark]
 voting = False