Skip to content

Commit

Permalink
global: fix Travis CI build tests
Browse files Browse the repository at this point in the history
* Fixes Travis CI build tests by upgrading pytest, amending pep257 code
  style, and removing `--use-mirrors` directive.

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
  • Loading branch information
tiborsimko committed Jun 21, 2016
1 parent 4b93815 commit ca391e8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of Flask-Breadcrumbs
# Copyright (C) 2013, 2014 CERN.
# Copyright (C) 2013, 2014, 2016 CERN.
#
# Flask-Breadcrumbs is free software; you can redistribute it and/or
# modify it under the terms of the Revised BSD License; see LICENSE
Expand All @@ -16,15 +16,13 @@ python:
- "3.4"

install:
- pip install --upgrade pip --use-mirrors
- pip install coveralls pep257 --use-mirrors
- pip install pytest pytest-pep8 pytest-cov pytest-cache --use-mirrors
- pip install --upgrade pip
- pip install coveralls pep257
- pip install pytest pytest-pep8 pytest-cov pytest-cache
- pip install -e .[docs]

script:
- pep257 flask_breadcrumbs
- "sphinx-build -qnNW docs docs/_build/html"
- python setup.py test
- "./run-tests.sh"

after_success:
- coveralls
Expand Down
3 changes: 1 addition & 2 deletions flask_breadcrumbs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of Flask-Breadcrumbs
# Copyright (C) 2013, 2014, 2015 CERN.
# Copyright (C) 2013, 2014, 2015, 2016 CERN.
#
# Flask-Breadcrumbs is free software; you can redistribute it and/or
# modify it under the terms of the Revised BSD License; see LICENSE
Expand Down Expand Up @@ -40,7 +40,6 @@ def default_breadcrumb_root(app, path):


class Breadcrumbs(Menu, object):

"""Breadcrumb organizer for a :class:`~flask.Flask` application."""

def __init__(self, app=None, init_menu=True):
Expand Down
4 changes: 2 additions & 2 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
#
# This file is part of Flask-Breadcrumbs
# Copyright (C) 2014 CERN.
# Copyright (C) 2014, 2016 CERN.
#
# Flask-Breadcrumbs is free software; you can redistribute it and/or modify
# it under the terms of the Revised BSD License; see LICENSE file for
# more details.


[pytest]
addopts = --clearcache --pep8 --ignore=docs --cov=flask_breadcrumbs --cov-report=term-missing tests flask_breadcrumbs
addopts = --pep8 --ignore=docs --cov=flask_breadcrumbs --cov-report=term-missing tests flask_breadcrumbs
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of Flask-Breadcrumbs
# Copyright (C) 2013, 2014 CERN.
# Copyright (C) 2013, 2014, 2016 CERN.
#
# Flask-Breadcrumbs is free software; you can redistribute it and/or
# modify it under the terms of the Revised BSD License; see LICENSE
Expand Down Expand Up @@ -51,7 +51,8 @@ def run_tests(self):
'pytest-cache>=1.0',
'pytest-cov>=1.8.0',
'pytest-pep8>=1.0.6',
'pytest>=2.6.1',
'pytest>=2.8.0',
'pep257>=0.7.0',
'coverage'
]

Expand All @@ -76,6 +77,7 @@ def run_tests(self):
],
extras_require={
'docs': ['sphinx'],
'tests': tests_require,
},
tests_require=tests_require,
cmdclass={'test': PyTest},
Expand Down

0 comments on commit ca391e8

Please sign in to comment.