PEP-8 style cleanup, GPL headers.

Author: yossigo

MANIFEST.in

@@ -1,3 +1,5 @@
 include mbdirector/schema/*.json
 include mbdirector/static/css/*
 include mbdirector/templates/*.html
+include README.md
+include COPYING

mbdirector/benchmark.py

@@ -1,7 +1,24 @@
+# Copyright (C) 2019 Redis Labs Ltd.
+#
+# This file is part of mbdirector.
+#
+# mbdirector is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2.
+#
+# mbdirector is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with memtier_benchmark.  If not, see <http://www.gnu.org/licenses/>.
+
 import os.path
 import subprocess
 import logging
 
+
 class Benchmark(object):
     def __init__(self, config, **kwargs):
         self.config = config

mbdirector/main.py

@@ -1,3 +1,19 @@
+# Copyright (C) 2019 Redis Labs Ltd.
+#
+# This file is part of mbdirector.
+#
+# mbdirector is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2.
+#
+# mbdirector is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with memtier_benchmark.  If not, see <http://www.gnu.org/licenses/>.
+
 """
 Main module.
 """
@@ -14,6 +30,7 @@
 from mbdirector.runner import Runner
 from mbdirector.serve import run_webserver
 
+
 def config_logging(log_filename, loglevel):
     formatter = logging.Formatter(
         fmt='%(asctime)s %(levelname)s %(message)s')
@@ -29,10 +46,12 @@ def config_logging(log_filename, loglevel):
     root_logger.addHandler(file_handler)
     root_logger.setLevel(getattr(logging, loglevel.upper()))
 
+
 @click.group()
 def cli():
     pass
 
+
 @cli.command()
 @click.option('--spec', '-s', required=True, type=click.File('r'),
               help='Benchmark specifications')
@@ -53,7 +72,7 @@ def benchmark(spec, loglevel, skip_benchmarks, skip_targets):
         sys.exit(1)
 
     try:
-       spec_json = json.load(spec)
+        spec_json = json.load(spec)
     except Exception as err:
         click.echo('Error: failed to spec: {}: {}'.format(
             spec.name, err))
@@ -75,6 +94,7 @@ def benchmark(spec, loglevel, skip_benchmarks, skip_targets):
                      skip_benchmarks, skip_targets)
     _runner.run()
 
+
 @cli.command()
 @click.option('--bind', '-b', required=False, default='127.0.0.1',
               help='Address to bind to')

mbdirector/runner.py

@@ -1,3 +1,19 @@
+# Copyright (C) 2019 Redis Labs Ltd.
+#
+# This file is part of mbdirector.
+#
+# mbdirector is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2.
+#
+# mbdirector is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with memtier_benchmark.  If not, see <http://www.gnu.org/licenses/>.
+
 import os
 import logging
 import time
@@ -7,6 +23,7 @@
 from mbdirector.target import Target
 from mbdirector.benchmark import Benchmark
 
+
 class RunConfig(object):
     next_id = 1
 

mbdirector/serve.py

@@ -1,16 +1,35 @@
+# Copyright (C) 2019 Redis Labs Ltd.
+#
+# This file is part of mbdirector.
+#
+# mbdirector is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2.
+#
+# mbdirector is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with memtier_benchmark.  If not, see <http://www.gnu.org/licenses/>.
+
 import os.path
 import json
 
 from flask import (Flask, render_template, send_file, abort, Response,
                    send_from_directory)
 from werkzeug.serving import run_simple
 
+
 class Config(object):
     RESULTS_BASEDIR = 'results'
 
+
 app = Flask(__name__)
 app.config.from_object('mbdirector.serve.Config')
 
+
 class BenchmarkResults(object):
     def __init__(self, dirname):
         self.dirname = dirname
@@ -41,6 +60,7 @@ def files(self):
                   if os.path.exists(os.path.join(self.dirname, f))]
         return result
 
+
 class RunResults(object):
     OK = 'ok'
     NOTFOUND = 'results-not-found'
@@ -130,36 +150,42 @@ def get_run_results():
 
     return [RunResults(d) for d in sorted(dirs)]
 
+
 @app.route('/')
 def index():
     return render_template('index.html', results=get_run_results())
 
+
 @app.route('/run/<run>')
 def get_run(run):
     return render_template('run.html', run=RunResults(run))
 
+
 @app.route('/run/<run>/spec')
 def get_run_spec(run):
     specfile = open(os.path.join(
         app.config['RESULTS_BASEDIR'], run, 'spec.json'), 'r')
     return send_file(specfile, mimetype='text/plain')
 
+
 @app.route('/run/<run>/<benchmark>/json')
 def get_benchmark_json(run, benchmark):
     run = RunResults(run)
-    if not benchmark in run.benchmarks:
+    if benchmark not in run.benchmarks:
         abort(404)
     return Response(run.benchmarks[benchmark].print_json(),
                     mimetype='text/plan')
 
+
 @app.route('/run/<run>/<benchmark>/file/<filename>')
 def get_benchmark_file(run, benchmark, filename):
     run = RunResults(run)
-    if not benchmark in run.benchmarks:
+    if benchmark not in run.benchmarks:
         abort(404)
     return send_from_directory(
         os.path.abspath(run.benchmarks[benchmark].dirname),
         filename, mimetype='text/plan')
 
+
 def run_webserver(bind, port):
     run_simple(bind, port, app)

mbdirector/target.py

@@ -1,3 +1,19 @@
+# Copyright (C) 2019 Redis Labs Ltd.
+#
+# This file is part of mbdirector.
+#
+# mbdirector is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2.
+#
+# mbdirector is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with memtier_benchmark.  If not, see <http://www.gnu.org/licenses/>.
+
 """
 Setup and tear down test targets.
 """
@@ -9,6 +25,7 @@
 
 import redis
 
+
 class Target(object):
     """
     Currently hard coded to RedisProcessTarget, but should be extended in
@@ -22,6 +39,7 @@ def from_json(cls, config, json):
         """
         return RedisProcessTarget(config, **json)
 
+
 class RedisProcessTarget(object):
     """
     Implements a local Redis process target.
@@ -75,6 +93,7 @@ def _get_conn(self, retries=10, interval=0.1):
                     time.sleep(interval)
                 else:
                     raise
+
     def _ping(self, retries=20, interval=0.2):
         while retries:
             try:
@@ -84,4 +103,3 @@ def _ping(self, retries=20, interval=0.2):
                 if not retries:
                     raise
                 time.sleep(interval)
-

setup.py

@@ -2,6 +2,8 @@
 setup(
     name='mbdirector',
     version='0.1.0',
+    url='https://github.com/RedisLabs/mbdirector',
+    license='GPL',
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,