Various improvements to test/lint

- Switch to pytest
- Add flake8
- Enhance TravisCI configuration
  - Switch to container builds
  - Add pypy to grid
  - Add explicit postgres/sqlite to grid
  - Add development Django to grid

Author: dcramer

.gitignore

@@ -1,3 +1,4 @@
+*.eggs
 *.pyc
 *.swp
 *.un~

.travis.yml

@@ -6,17 +6,34 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
+  - "pypy"
+
+sudo: false
+
+cache:
+  directories:
+    - node_modules
+    - .pip_download_cache
+    - "$HOME/virtualenv/python2.7.9"
 
 env:
-  - DJANGO=1.2.7
-  - DJANGO=1.3.7
-  - DJANGO=1.4.12
-  - DJANGO=1.5.7
-  - DJANGO=1.6.4
-  - DJANGO=1.7.7
-  - DJANGO=1.8
+  matrix:
+    - DB=postgres
+    - DB=sqlite
+    - DJANGO=1.2.7
+    - DJANGO=1.3.7
+    - DJANGO=1.4.12
+    - DJANGO=1.5.7
+    - DJANGO=1.6.4
+    - DJANGO=1.7.7
+    - DJANGO=1.8
+    - 'DJANGO="-e git+git://github.com/django/django.git#egg=Django"'
+  global:
+    - PIP_DOWNLOAD_CACHE=".pip_download_cache"
 
 matrix:
+  allow_failures:
+    - env: 'DJANGO="-e git+git://github.com/django/django.git#egg=Django"'
   exclude:
     - python: "3.2"
       env: DJANGO=1.2.7
@@ -50,13 +67,11 @@ matrix:
       env: DJANGO=1.8
 
 before_script:
-  - psql -c 'create database bitfield_test;' -U postgres
+  - psql -c 'create database bitfield;' -U postgres
 
 install:
-  - pip install Django==$DJANGO
-  - "if [[ $DJANGO == '1.2.7' ]]; then pip install psycopg2==2.4.1 django-nose==0.1.3; fi"
-  - "if [[ $DJANGO == '1.3.7' ]]; then pip install psycopg2==2.4.1 django-nose==0.1.3; fi"
-  - "if [[ $DJANGO == '1.8' ]]; then pip install https://github.com/django-nose/django-nose/archive/master.zip; fi"
-  - pip install -e .
+  - make
 
-script: python setup.py test
+script:
+  - make lint
+  - make test

Makefile

@@ -1,5 +1,19 @@
+develop:
+	@echo "--> Installing dependencies"
+	pip install -e .
+	pip install "file://`pwd`#egg=django-bitfield[tests]"
+	@echo ""
+
 test:
-	python setup.py test
+	@echo "--> Running Python tests"
+	py.test
+	@echo ""
+
+lint:
+	@echo "--> Linting Python files"
+	PYFLAKES_NODOCTEST=1 flake8 bitfield
+	@echo ""
+
 
 publish:
 	python setup.py sdist bdist_wheel upload

bitfield/__init__.py

@@ -2,11 +2,13 @@
 django-bitfield
 ~~~~~~~~~~~~~~~
 """
+from __future__ import absolute_import
+
+from bitfield.models import Bit, BitHandler, CompositeBitField, BitField  # NOQA
+
 
 try:
     VERSION = __import__('pkg_resources') \
         .get_distribution('bitfield').version
 except Exception:
     VERSION = 'unknown'
-
-from bitfield.models import Bit, BitHandler, CompositeBitField, BitField  # noqa

bitfield/compat.py

@@ -1,11 +1,16 @@
+from __future__ import absolute_import
+
 __all__ = ('bitand', 'bitor')
 
+
 def bitand(a, b):
     return a.bitand(b)
 
+
 def bitor(a, b):
     return a.bitor(b)
 
+
 try:
     from django.db.models.expressions import ExpressionNode
     ExpressionNode.BITAND  # noqa
@@ -15,8 +20,8 @@ def bitor(a, b):
     pass
 except AttributeError:
     # Django < 1.5
-    def bitand(a, b):
+    def bitand(a, b):  # NOQA
         return a & b
 
-    def bitor(a, b):
+    def bitor(a, b):  # NOQA
         return a | b

bitfield/forms.py

@@ -1,4 +1,7 @@
+from __future__ import absolute_import
+
 from django.forms import CheckboxSelectMultiple, IntegerField, ValidationError
+
 try:
     from django.utils.encoding import force_text
 except ImportError:

bitfield/models.py

@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+
+import six
+
 from django.db.models import signals
 from django.db.models.fields import Field, BigIntegerField
 from django.db.models.fields.subclassing import Creator
@@ -7,8 +11,6 @@
     # django 1.2
     from django.db.models.fields.subclassing import LegacyConnection as SubfieldBase  # NOQA
 
-import six
-
 from bitfield.forms import BitFormField
 from bitfield.query import BitQueryLookupWrapper
 from bitfield.types import BitHandler, Bit
@@ -244,7 +246,7 @@ class CompositeBitField(object):
     is_relation = False
     many_to_many = False
     concrete = False
-    
+
     def __init__(self, fields):
         self.fields = fields
 

bitfield/query.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+
+
 class BitQueryLookupWrapper(object):
     def __init__(self, alias, column, bit):
         self.table_alias = alias
@@ -17,12 +20,11 @@ def as_sql(self, qn, connection=None):
         return ("(%s.%s & %d)" % (qn(self.table_alias), qn(self.column), self.bit.mask),
                 [])
 
-
 try:
     # Django 1.7+
     from django.db.models.lookups import Exact
-    class BitQueryLookupWrapper(Exact):
 
+    class BitQueryLookupWrapper(Exact):  # NOQA
         def process_lhs(self, qn, connection, lhs=None):
             lhs_sql, params = super(BitQueryLookupWrapper, self).process_lhs(
                 qn, connection, lhs)

bitfield/tests/__init__.py

@@ -1,2 +1,4 @@
-from .forms import *
-from .models import *
+from __future__ import absolute_import
+
+from .forms import *  # NOQA
+from .models import *  # NOQA

bitfield/tests/forms.py

@@ -1,9 +1,11 @@
+from __future__ import absolute_import
+
 from django import forms
-from bitfield.tests.models import BitFieldTestModel, CompositeBitFieldTestModel
+
+from bitfield.tests.models import BitFieldTestModel
 
 
 class BitFieldTestModelForm(forms.ModelForm):
-    
     class Meta:
         model = BitFieldTestModel
         exclude = tuple()

bitfield/tests/tests.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import pickle
 
 from django.db import connection, models

bitfield/types.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from six import string_types
 
 
@@ -127,13 +129,13 @@ def __eq__(self, other):
 
     def __lt__(self, other):
         return int(self._value) < other
-    
+
     def __le__(self, other):
         return int(self._value) <= other
-    
+
     def __gt__(self, other):
         return int(self._value) > other
-    
+
     def __ge__(self, other):
         return int(self._value) >= other
 
@@ -243,7 +245,7 @@ def get_label(self, flag):
 
 if django.VERSION[:2] >= (1, 8):
     from django.core.exceptions import ImproperlyConfigured
-    
+
     # We need to register adapters in Django 1.8 in order to prevent
     # "ProgrammingError: can't adapt type"
     try:
@@ -252,7 +254,7 @@ def get_label(self, flag):
         Database.register_adapter(BitHandler, lambda x: int(x))
     except ImproperlyConfigured:
         pass
-    
+
     try:
         from django.db.backends.postgresql_psycopg2.base import Database
         Database.extensions.register_adapter(Bit, lambda x: Database.extensions.AsIs(int(x)))

conftest.py

@@ -0,0 +1,42 @@
+from __future__ import absolute_import
+
+import os.path
+import sys
+
+from django.conf import settings
+
+
+sys.path.insert(0, os.path.dirname(__file__))
+
+
+def pytest_configure(config):
+    if not settings.configured:
+        test_db = os.environ.get('DB', 'postgres')
+
+        DATABASES = {
+            'default': {
+                'NAME': 'bitfield',
+            }
+        }
+
+        if test_db == 'postgres':
+            DATABASES['default'].update({
+                'ENGINE': 'django.db.backends.postgresql_psycopg2',
+                'USER': 'postgres',
+            })
+        elif test_db == 'sqlite':
+            DATABASES['default'].update({
+                'ENGINE': 'django.db.backends.sqlite3',
+                'NAME': ':memory:',
+            })
+
+        settings.configure(
+            DATABASES=DATABASES,
+            INSTALLED_APPS=[
+                'django.contrib.contenttypes',
+                'bitfield',
+                'bitfield.tests',
+            ],
+            ROOT_URLCONF='',
+            DEBUG=False,
+        )

runtests.py

@@ -1,2 +1,12 @@
+[pytest]
+python_files=test*.py
+addopts=--tb=native -p no:doctest
+norecursedirs=bin dist docs	htmlcov hooks node_modules .* {args}
+
+[flake8]
+ignore = F999,E501,E128,E124,E402,W503,E731,F841
+max-line-length = 100
+exclude = .tox,.git,docs
+
 [wheel]
 universal = 1

setup.cfg

@@ -15,14 +15,13 @@
         'Django>=1.2',
         'six',
     ],
-    setup_requires=[
-        'nose>=1.0',
-    ],
-    tests_require=[
-        'django-nose>=0.1.3',
-        'psycopg2>=2.3',
-    ],
-    test_suite='runtests.runtests',
+    extras_require={
+        'tests': [
+            'flake8',
+            'psycopg2>=2.3',
+            'pytest-django',
+        ],
+    },
     include_package_data=True,
     classifiers=[
         'Framework :: Django',