Skip to content
Closed

Tox #38

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
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ build:
- 'pip install coverage --force-reinstall -U'
override:
-
command: python3 -m pytest --cov=psqlextra
command: tox
coverage:
file: '.coverage'
format: 'py-cc'
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Working with the code

.. code-block:: bash

λ py.test
λ tox

5. Run the benchmarks:

Expand Down
7 changes: 4 additions & 3 deletions requirements/analysis.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# pylint
pylint-celery==0.3
pylint-common==0.2.2
pylint-django==0.7.2
pylint-plugin-utils==0.2.4
pylint-common==0.2.5
pylint-django==0.8.0
pylint-plugin-utils==0.2.6

3 changes: 2 additions & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
enforce==0.3.2
enforce==0.3.4

26 changes: 12 additions & 14 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
-r base.txt

coverage==4.2
Django==1.11.1
django-coverage-plugin==1.3.1
psycopg2==2.7.3.2
pylint==1.6.4
pylint-common==0.2.2
pylint-django==0.7.2
pylint-plugin-utils==0.2.4
coverage==4.2
pylint==1.8.1
pylint-common==0.2.5
pylint-django==0.8.0
pylint-plugin-utils==0.2.6
coverage==4.4.2
django-coverage-plugin==1.3.1
flake8==3.0.4
pep8==1.7.0
dj-database-url==0.4.1
pytest==3.0.6
pytest-benchmark==3.0.0
flake8==3.5.0
pep8==1.7.1
dj-database-url==0.4.2
pytest==3.3.2
pytest-benchmark==3.1.1
pytest-django==3.1.2
pytest-cov==2.4.0
pytest-cov==2.5.1
tox==2.9.1
12 changes: 12 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[tox]
envlist = py35-dj{111,20}

[testenv]
deps =
dj111: Django>=1.11,<1.12
dj20: Django>=2.0,<2.1
-rrequirements/test.txt
setenv =
DJANGO_SETTINGS_MODULE=settings
passenv = DATABASE_URL
commands = python -m pytest --cov=psqlextra