Merge a0f50fc into d79e462

.coveragerc

@@ -3,4 +3,11 @@ omit =
     */wsgi.py
     setup.py
     manage.py
+    */config_utils/*
+    */navbars.py
     */migrations/*
+    */mommy_*
+    venv/*
+    runtests.py
+    .tox/*
+    .eggs/*

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 
 python:
-- 3.6
 - 3.7
 
 dist: xenial
@@ -13,16 +12,14 @@ services:
 
 install:
 - pip install --upgrade pip
-- pip install -r requirements.txt
-- pip install -e .
-- pip install flake8 "tox>=1.8" coveralls tox-travis
+- pip install flake8 coveralls tox-travis
 
 before_script:
 - flake8 django_crypto_fields
 - mysql -e 'create database edc character set utf8;'
 
 script:
-- coverage run --source=django_crypto_fields setup.py test
+- coverage run setup.py test
 
 after_success:
 - coveralls

runtests.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import django
 import logging
+import os
 import sys
 
 from django.conf import settings
@@ -86,6 +87,19 @@ def __getitem__(self, item):
     DEFAULT_SETTINGS.update(KEY_PATH=join(
         DEFAULT_SETTINGS.get('BASE_DIR'), 'crypto_fields'))
 
+if os.environ.get("TRAVIS"):
+    DEFAULT_SETTINGS.update(
+        DATABASES={
+            'default': {
+                'ENGINE': 'django.db.backends.mysql',
+                'NAME': 'edc',
+                'USER': 'travis',
+                'PASSWORD': '',
+                'HOST': 'localhost',
+                'PORT': '',
+            },
+        })
+
 
 def main():
     if not settings.configured:

setup.py

@@ -31,7 +31,7 @@
     zip_safe=False,
     keywords='django fields encryption security',
     install_requires=[
-        'pycrypto',
+        'pycryptodome',
     ],
     classifiers=[
         'Environment :: Web Environment',

tox.ini

@@ -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
@@ -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