Use pytest-flake8 and fix issues

Makefile

@@ -1,5 +1,5 @@
 test:
-	py.test --pep8 --flakes --cov=rq_retry_scheduler --cov-config .coveragerc
+	py.test --flake8 --cov=rq_retry_scheduler --cov-config .coveragerc
 
 coverage-html:
 	coverage html -d coverage_html

pytest.ini

@@ -1,7 +1,4 @@
 [pytest]
 norecursedirs = lib bin
-pep8ignore =
-    rq_retry_scheduler/*/__init__.py E402
-
-flakes-ignore =
-    **/__init__.py UnusedImport
+flake8-ignore =
+    rq_retry_scheduler/*/__init__.py E402 F401

requirements.txt

@@ -1,9 +1,8 @@
 # Development pip requirements
 rq
 pytest>=3.0.2
-pytest-pep8
 pytest-cov
 pytest-mock
 pytest-env
-pytest-flakes
+pytest-flake8
 coveralls

rq_retry_scheduler/worker.py

@@ -38,7 +38,7 @@ def exc_handler(self, job, exc_type, exc_value, traceback):
         job.meta['failures'] += 1
 
         self.log.info("Job {}: Exception handler with {} failures".format(
-                        job.id, job.meta['failures']))
+                      job.id, job.meta['failures']))
 
         delay = self.retry_delays.get(job.meta['failures'])
 
@@ -49,7 +49,7 @@ def exc_handler(self, job, exc_type, exc_value, traceback):
             return True
 
         self.log.info("Job {}: Requeueing in {} into queue {}".format(
-                       job.id, delay, job.origin))
+                      job.id, delay, job.origin))
 
         queue = self.queue_class(job.origin, connection=self.connection)
         queue.enqueue_job_in(delay, job)