Skip to content

Commit

Permalink
Merge 27c5868 into d79e462
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Jan 31, 2019
2 parents d79e462 + 27c5868 commit d7f36e6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 21 deletions.
7 changes: 7 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,11 @@ omit =
*/wsgi.py
setup.py
manage.py
*/config_utils/*
*/navbars.py
*/migrations/*
*/mommy_*
venv/*
runtests.py
.tox/*
.eggs/*
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
zip_safe=False,
keywords='django fields encryption security',
install_requires=[
'pycrypto',
'pycryptodome',
],
classifiers=[
'Environment :: Web Environment',
Expand Down
27 changes: 7 additions & 20 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
[tox]
envlist =
py36-django21
py36-djangotrunk
py37-django21
py37-django21,
py37-djangotrunk
flake8


[flake8]
ignore = E41,F401,W503,F601,W605,E203
max-complexity = 10
max-line-length = 95
exclude = django_crypto_fields/tests/*,django_crypto_fields/migrations/*,.venv/*


[testenv:docs]
changedir = docs
Expand All @@ -23,20 +12,18 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

[testenv]
passenv = CI TRAVIS TRAVIS_*
setenv =
PYTHONWARNINGS=module::DeprecationWarning
commands =
flake8 django_crypto_fields
coverage run --source=django_crypto_fields setup.py test
coverage report
setenv = PYTHONWARNINGS=module::DeprecationWarning
deps =
# -rrequirements.txt
-rrequirements.txt
coverage
flake8
django21: Django>=2.1,<2.2
djangotrunk: https://github.com/django/django/tarball/master
commands =
flake8 django_crypto_fields
coverage run setup.py test
coverage report

[travis]
python =
3.6: py36
3.7: py37

0 comments on commit d7f36e6

Please sign in to comment.