Skip to content

Commit

Permalink
Update scaffolding etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
chrzyki committed Feb 15, 2018
1 parent 3281a68 commit 72fa56a
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 21 deletions.
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# development environment: install in development mode
-e .[dev,test]
7 changes: 6 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
[tool:pytest]
testpaths = ids
filterwarnings =
ignore::UserWarning
ignore::sqlalchemy.exc.SAWarning
addopts =
--cov=ids
--cov-report term-missing

[coverage:run]
source = ids

[coverage:report]
show_missing = true

[compile_catalog]
directory = ids/locale
domain = clld
Expand Down
9 changes: 7 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,19 @@
include_package_data=True,
zip_safe=False,
install_requires=[
'clld~=4.0',
'clldmpg~=3.1',
'clld-glottologfamily-plugin>=1.3',
'sqlalchemy',
'waitress',
],
extras_require={
'dev': ['flake8', 'waitress'],
'test': [
'dev': [
'flake8',
'psycopg2',
'tox',
],
'test': [
'mock',
'pytest>=3.1',
'pytest-clld',
Expand Down
3 changes: 3 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import pytest

pytest_plugins = ['clld']
File renamed without changes.
11 changes: 11 additions & 0 deletions tests/test_selenium.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from __future__ import unicode_literals

import time

import pytest


@pytest.mark.selenium
def test_ui(selenium):
selenium.browser.get(selenium.url('/download'))
time.sleep(3)
24 changes: 6 additions & 18 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
[tox]
envlist =
py34,py27
py{27,34,35,36}
skip_missing_interpreters =
true

[testenv]
extras =
test
commands =
python -m pytest {posargs}
deps =
pytest
mock
psycopg2
coverage
pytest-clld
pytest-cov
pytest-mock
webtest

[testenv:py34]
basepython = python3.4

[testenv:py27]
basepython = python2.7

python -m pytest -m "not selenium" {posargs}

0 comments on commit 72fa56a

Please sign in to comment.