Skip to content

Commit

Permalink
Fix travis build
Browse files Browse the repository at this point in the history
Travis runs hacking (through flake) using 2.6 as well - which is not a good thing...

Docker-DCO-1.1-Signed-off-by: Olivier Gambier <[email protected]> (github: dmp42)
  • Loading branch information
Olivier Gambier committed Aug 16, 2014
1 parent d861835 commit 4be38d8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ install:
- pip install -rrequirements/test.txt
- pip install .

script: SETTINGS_FLAVOR=test DOCKER_REGISTRY_CONFIG=config_sample.yml flake8 . && \
SETTINGS_FLAVOR=test DOCKER_REGISTRY_CONFIG=config_sample.yml python setup.py nosetests && \
cd depends/docker-registry-core && python setup.py nosetests
script:
- SETTINGS_FLAVOR=test DOCKER_REGISTRY_CONFIG=config_sample.yml flake8
- SETTINGS_FLAVOR=test DOCKER_REGISTRY_CONFIG=config_sample.yml python setup.py nosetests
- cd depends/docker-registry-core && python setup.py nosetests

before_install:
- sudo apt-get update
Expand Down
1 change: 1 addition & 0 deletions docker_registry/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from argparse import ArgumentParser # noqa
from argparse import RawTextHelpFormatter # noqa

import distutils.spawn
import getpass
import logging
Expand Down
3 changes: 2 additions & 1 deletion scripts/diff-worker.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python

import argparse
import argparse # noqa

import logging
import os

Expand Down

0 comments on commit 4be38d8

Please sign in to comment.