Merge pull request #3 from novafloss/tox-ini-revamp-linters

A few tox.ini cleanups and improvements

Author: ewjoachim

.travis.yml

@@ -1,15 +1,34 @@
 # Config file for automatic testing at travis-ci.org
 language: python
-python:
-  - "3.5"
-env:
-  - TOX_ENV=py27-django18
-  - TOX_ENV=py35-django18
-  - TOX_ENV=py27-django19
-  - TOX_ENV=py35-django19
-  - TOX_ENV=py27-django110
-  - TOX_ENV=py35-django110
+
+matrix:
+    include:
+      # Python version is just for the look on travis.
+        - python: 2.7
+          env: TOX_ENV=py27-django18
+
+        - python: 2.7
+          env: TOX_ENV=py27-django19
+
+        - python: 2.7
+          env: TOX_ENV=py27-django110
+
+        - python: 3.5
+          env: TOX_ENV=py35-django18
+
+        - python: 3.5
+          env: TOX_ENV=py35-django19
+
+        - python: 3.5
+          env: TOX_ENV=py35-django110
+
+        - env: TOX_ENV=linters
+
 install:
-  - pip install tox
+  - pip install tox codecov
+
 script:
   - tox -e $TOX_ENV
+
+after_success:
+  - codecov

Makefile

@@ -17,7 +17,7 @@ clean-pyc: ## remove Python file artifacts
 	find . -name '*~' -exec rm -f {} +
 
 lint: ## check style with flake8
-	flake8 django_readonly_field tests
+	flake8 --exclude="migrations,.tox,docs,build" .
 
 test: ## run tests quickly with the default Python
 	python runtests.py
@@ -27,8 +27,6 @@ test-all: ## run tests on every Python version with tox
 
 coverage: ## check code coverage quickly with the default Python
 	coverage run --source django_readonly_field runtests.py
-	coverage report -m
-	coverage html
 
 docs: ## generate Sphinx HTML documentation, including API docs
 	rm -f docs/django-readonly-field.rst

django_readonly_field/compiler.py

@@ -1,9 +1,13 @@
 from django.db.models.sql.compiler import SQLCompiler
-from django.db.models.sql.compiler import SQLInsertCompiler as BaseSQLInsertCompiler
+from django.db.models.sql.compiler import SQLInsertCompiler as BaseSQLInsertCompiler  # noqa
 from django.db.models.sql.compiler import SQLDeleteCompiler
-from django.db.models.sql.compiler import SQLUpdateCompiler as BaseSQLUpdateCompiler
+from django.db.models.sql.compiler import SQLUpdateCompiler as BaseSQLUpdateCompiler  # noqa
 from django.db.models.sql.compiler import SQLAggregateCompiler
 
+SQLCompiler = SQLCompiler
+SQLDeleteCompiler = SQLDeleteCompiler
+SQLAggregateCompiler = SQLAggregateCompiler
+
 
 class ReadOnlySQLCompilerMixin(object):
 

requirements_dev.txt

@@ -2,3 +2,4 @@
 bumpversion==0.5.3
 wheel==0.29.0
 sphinx>=1.4.6
+tox>=1.7.0

requirements_test.txt

@@ -1,7 +1,5 @@
 -r requirements.txt
 coverage==4.1
 mock>=1.0.1
-flake8>=2.1.0
-tox>=1.7.0
 psycopg2>=2.6.2
 dj_database_url>=0.4.1

runtests.py

@@ -1,24 +1,45 @@
 #!/usr/bin/env python
 import sys
 import os
+import contextlib
 
-try:
-    from django import setup
-except ImportError:
-    import traceback
-    traceback.print_exc()
-    msg = "To fix this error, run: pip install -r requirements_test.txt"
-    raise ImportError(msg)
 
-from django.test.utils import get_runner
-from django.conf import settings
-os.environ["DJANGO_SETTINGS_MODULE"] = "tests.readonly_project.settings"
-setup()
+@contextlib.contextmanager
+def cover():
+    do_coverage = "COVERAGE" in os.environ
+
+    if do_coverage:
+        import coverage
+        cov = coverage.Coverage(source=["django_readonly_field"])
+        cov.start()
+        print("Coverage will be generated")
+
+    try:
+        yield
+    finally:
+        if do_coverage:
+            cov.stop()
+            cov.save()
 
 
 def run_tests(*test_args):
-    from django.core.management import execute_from_command_line
-    execute_from_command_line(["", "test", ] + sys.argv[1:])
+
+    with cover():
+        try:
+            from django import setup
+        except ImportError:
+            import traceback
+            traceback.print_exc()
+            msg = ("To fix this error, run: "
+                   "pip install -r requirements_test.txt")
+            raise ImportError(msg)
+
+        module = "tests.readonly_project.settings"
+        os.environ["DJANGO_SETTINGS_MODULE"] = module
+        setup()
+
+        from django.core.management import execute_from_command_line
+        execute_from_command_line(["", "test", ] + sys.argv[1:])
 
 
 if __name__ == '__main__':

setup.py

@@ -42,7 +42,8 @@
         'django_readonly_field',
     ],
     include_package_data=True,
-    install_requires=[],
+    install_requires=["Django>=1.8,<1.11"],
+    test_requires=["tox"],
     license="MIT",
     zip_safe=False,
     keywords='django-readonly-field',

tox.ini

@@ -1,11 +1,10 @@
 [tox]
+skipsdist = True
 envlist =
-    {py27,py35}-django18
-    {py27,py35}-django19
-    {py27,py35}-django110
+    {py27,py35}-django{18,19,110},linters
 
 [testenv]
-passenv = DATABASE_URL
+passenv = DATABASE_URL COVERAGE
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/django_readonly_field
 commands =
@@ -16,3 +15,12 @@ deps =
     django-19: Django>=1.9,<1.10
     django-110: Django>=1.10,<1.11
     -r{toxinidir}/requirements_test.txt
+
+# Dedicated linter tox target
+[testenv:linters]
+whitelist_externals = make
+deps =
+    # Does not need any other requirement
+    flake8>=2.1.0
+commands =
+    make lint