Merge pull request #26 from blueboxgroup/pep8-fix

Fix pep8 failures
This commit is contained in:
Craig Tracey 2015-02-12 16:27:59 -05:00
commit 4883c99c40
3 changed files with 3 additions and 6 deletions

View File

@ -15,6 +15,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
import docker import docker
import jinja2
import json import json
import logging import logging
import os import os
@ -25,8 +26,6 @@ from giftwrap.builder import Builder
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
import jinja2
DEFAULT_TEMPLATE_FILE = os.path.join(os.path.dirname( DEFAULT_TEMPLATE_FILE = os.path.join(os.path.dirname(
os.path.dirname(__file__)), os.path.dirname(__file__)),
'templates/Dockerfile.jinja2') 'templates/Dockerfile.jinja2')

View File

@ -19,6 +19,7 @@ import os
import shutil import shutil
import tempfile import tempfile
from giftwrap.builder import Builder
from giftwrap.gerrit import GerritReview from giftwrap.gerrit import GerritReview
from giftwrap.openstack_git_repo import OpenstackGitRepo from giftwrap.openstack_git_repo import OpenstackGitRepo
from giftwrap.package import Package from giftwrap.package import Package
@ -27,9 +28,6 @@ from giftwrap.util import execute
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
from giftwrap.builder import Builder
class PackageBuilder(Builder): class PackageBuilder(Builder):
def __init__(self, spec): def __init__(self, spec):

View File

@ -17,7 +17,7 @@ downloadcache = {toxworkdir}/_download
[testenv:pep8] [testenv:pep8]
commands = commands =
flake8 {posargs} {toxinidir}/giftwrap flake8 {posargs} --ignore=E402 {toxinidir}/giftwrap
[testenv:venv] [testenv:venv]
commands = {posargs} commands = {posargs}