Skip to content
This repository has been archived by the owner on Oct 1, 2020. It is now read-only.

Commit

Permalink
Fixed travis CI pytest
Browse files Browse the repository at this point in the history
  • Loading branch information
rochacbruno committed Aug 28, 2018
1 parent 669b985 commit c0774f0
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 23 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*env
venv
.venv
.talkshow
Expand All @@ -6,3 +7,4 @@ database
.pytest_cache
__pycache__
.secrets.toml
.coverage
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ python:
- "3.6"
install:
- "pip install --upgrade pip"
- "pip install .[dev]"
- "pip install -e .[dev]"
script:
- "flake8 talkshow/"
- "flake8 tests/"
- "py.test --cov=talkshow -v tests/"
- "py.test -v --cov-config .coveragerc --cov=talkshow -l --tb=short --maxfail=1 tests/"
after_success: codecov
2 changes: 1 addition & 1 deletion settings.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ DEBUG = true
SERVER = 'localhost'
PORT = 5000
FLASK_ADMIN_SWATCH = 'cerulean'
SECRET_KEY = ''
SECRET_KEY = 'empty'

[development]
DEBUG = true
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# coding: utf-8
from setuptools import setup
from setuptools import setup, find_packages

requirements = [
'flask',
Expand Down Expand Up @@ -29,7 +29,7 @@
name='talkshow',
version='0.1.0',
description="Call for papers system",
packages=['talkshow'],
packages=find_packages(include=['talkshow', 'talkshow.*']),
include_package_data=True,
install_requires=requirements,
extras_require=requirements_extra
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
from talkshow.app import create_app


@pytest.fixture(scope="module")
@pytest.fixture(scope='module')
def app():
"""Flask Pytest uses it"""
return create_app()


@pytest.fixture(scope="module")
@pytest.fixture(scope='module')
def auth():
"""The Basic Auth credentials for testing"""
credentials = b64encode(bytes("admin:1234", 'ascii')).decode('ascii')
Expand Down
16 changes: 0 additions & 16 deletions tests/test_apy.py

This file was deleted.

0 comments on commit c0774f0

Please sign in to comment.