Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ python:


before_install:
- "sudo apt-get update"
- "sudo apt-get install -qq cups cups-pdf"
- "curl http://www.cups.org/software/ipptool/ipptool-20130731-linux-ubuntu-x86_64.tar.gz | tar xvzf -"
- sudo apt-get update
- sudo apt-get install -qq cups cups-pdf
- curl http://www.cups.org/software/ipptool/ipptool-20130731-linux-ubuntu-x86_64.tar.gz | tar xvzf -
- "echo \"[main]\nipptool_path = \"$TRAVIS_BUILD_DIR\"/ipptool-20130731/ipptool\ncups_uri = http://localhost:631/\" > ~/.pyipptool.cfg"
- "echo \"$USER:travis\" | sudo chpasswd"
- "sudo pip install -U pip setuptools"
- cat ~/.pyipptool.cfg
- echo "$USER:travis" | sudo chpasswd
- sudo pip install -U pip setuptools

install:
- "pip install -e . pytest-cov coveralls pytest mock tornado pkipplib"
- pip install -e . pytest-cov coveralls pytest mock tornado pkipplib pep8

script: "py.test --cov pyipptool --ignore ipptool-20130731"
script:
- py.test --cov pyipptool --ignore ipptool-20130731
- pep8 pyipptool tests

after_success:
coveralls
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def read_that_file(path):
packages=('pyipptool',),
install_requires=('deform>=2.0a2',),
extra_requires={'Tornado': ('tornado', 'futures')},
tests_require=('mock', 'pytest', 'coverage',
tests_require=('mock', 'pytest', 'coverage', 'pep8',
'pytest-cov', 'coveralls', 'pkipplib', 'tornado'),
include_package_data=True,
test_suite='tests',
Expand Down
1 change: 1 addition & 0 deletions tests/test_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def test_ipp_file_widget():
response = widget.serialize(field, '/path/to/file.txt')
assert response == 'FILE /path/to/file.txt'


def test_ipp_file_widget_with_None():
from pyipptool.widgets import IPPFileWidget

Expand Down