Merged in feature/remove-future-mock (pull request #51)

Cleanup __future__ and mock

badwolf/__init__.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 
 __version__ = u'0.8.3'
 

badwolf/app.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import os
 import logging.config
 

badwolf/bitbucket.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import logging
 from urllib.parse import quote
 

badwolf/builder.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import io
 import time

badwolf/cli.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 import signal
 
 import click

badwolf/cloner.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import os
 import logging
 
@@ -42,13 +41,15 @@ def clone(self):
             # Push to branch or ci retry comment on some commit
             if not self.is_commit_exists(gitcmd, self.commit_hash):
                 logger.info('Unshallowing a shallow cloned repository')
-                gitcmd.fetch('--unshallow')
+                output = gitcmd.fetch('--unshallow')
+                logger.info('%s', output)
             logger.info('Checkout commit %s', self.commit_hash)
             gitcmd.checkout(self.commit_hash)
 
         gitmodules = os.path.join(clone_path, '.gitmodules')
         if os.path.exists(gitmodules):
-            gitcmd.submodule('update', '--init', '--recursive')
+            output = gitcmd.submodule('update', '--init', '--recursive')
+            logger.info('%s', output)
 
     def _merge_pull_request(self, gitcmd):
         # Pull Request

badwolf/context.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import uuid
 

badwolf/default_settings.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os
 import sys
 import base64

badwolf/deploy/__init__.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import time
 import logging
 

badwolf/deploy/providers/__init__.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 
 
 class Provider(object):

badwolf/deploy/providers/pypi.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import logging
 
 from badwolf.utils import run_command

badwolf/deploy/providers/script.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 
 from badwolf.utils import run_command
 from badwolf.deploy.providers import Provider

badwolf/exceptions.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 
 
 class BadwolfException(Exception):

badwolf/extensions.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 from raven.contrib.flask import Sentry
 from flask_mail import Mail
 

badwolf/lint/__init__.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 
 
 class Problem(object):

badwolf/lint/linters/__init__.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import re
 import sys

badwolf/lint/linters/bandit.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import io
 import csv

badwolf/lint/linters/csslint.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import os
 
 from badwolf.utils import run_command

badwolf/lint/linters/eslint.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 
 from badwolf.utils import run_command

badwolf/lint/linters/flake8.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import logging
 import configparser

badwolf/lint/linters/jscs.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 
 from badwolf.utils import run_command

badwolf/lint/linters/jsonlint.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import os
 import re
 

badwolf/lint/linters/pep8.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import logging
 
 from badwolf.utils import run_command

badwolf/lint/linters/pylint.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import logging
 
 from badwolf.utils import to_text, run_command

badwolf/lint/linters/rstlint.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import os
 import logging
 

badwolf/lint/linters/sasslint.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 
 from badwolf.utils import run_command

badwolf/lint/linters/shellcheck.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from badwolf.utils import run_command
 from badwolf.lint import Problem
 from badwolf.lint.linters import Linter

badwolf/lint/linters/stylelint.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import json
 

badwolf/lint/linters/yamllint.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import logging
 
 from badwolf.utils import run_command

badwolf/lint/processor.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import time
 import logging
 

badwolf/lint/utils.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 from xml.etree import ElementTree
 

badwolf/log/views.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import logging
 

badwolf/notification.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import logging
 import smtplib
 

badwolf/oauth/views.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import logging
 
 from flask import Blueprint, request, current_app, redirect, jsonify

badwolf/pipeline.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import shutil
 import logging

badwolf/security.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 
 from flask import current_app, Blueprint, request
 from cryptography.fernet import Fernet

badwolf/spec.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import io
 import base64
 import logging

badwolf/tasks.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import time
 import logging
 from concurrent.futures import ProcessPoolExecutor

badwolf/utils.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import logging
 import subprocess

badwolf/webhook/views.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import json
 import logging
 

badwolf/wsgi.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 from badwolf import create_app
 
 

dev-requirements.txt

@@ -3,5 +3,4 @@ pytest
 pytest-cov
 pytest-capturelog
 coverage
-mock
 Sphinx

setup.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 import os
 import sys
+
 from setuptools import setup, find_packages
 from setuptools.command.test import test as TestCommand
 

tests/conftest.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import pytest
 
 

tests/test_auto_merge_pull_request.py

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import json
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from flask import url_for
 

tests/test_bitbucket_webhook_comment.py

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import json
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from flask import url_for
 

tests/test_bitbucket_webhook_pr_created_updated.py

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 import json
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from flask import url_for
 

tests/test_bitbucket_webhook_repo_push.py

@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import json
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from flask import url_for
 

tests/test_lint.py

@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import os
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 from unidiff import PatchSet
 

tests/test_log.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 from flask import url_for
 
 

tests/test_pipeline.py

@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+import unittest.mock as mock
 
 import git
 import pytest

tests/test_secure_token.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 
 from badwolf.security import SecureToken