cleanup dev and test configuration (#133)

.gitignore

@@ -4,7 +4,7 @@
 *.so
 
 # Packages
-*.egg
+*.eggs
 *.egg-info
 dist
 build
@@ -44,3 +44,5 @@ docs/_build
 
 .cache
 .pytest_cache
+
+.env

.travis.yml

@@ -9,18 +9,18 @@ env:
   - secure: eO08tZokK+Etpp4ISvxVaWHe5tN6PC/SzLHcltqgvqRYa7L9zY5NKQjiY5LvUw1onnbbSPMnTabFWrcw3VtoQ1he5M2NbqqTSLTxT9dSWXhy6KRymNXVkEv4Ar6WWiQDUPlyMY7XTG35G5jo6C3LBer5FRKDpEAPlw51z4TyML0=
   matrix:
   - DJANGO="https://github.com/django/django/archive/stable/2.0.x.tar.gz#egg=django"
+  - DJANGO="https://github.com/django/django/archive/stable/2.1.x.tar.gz#egg=django"
   - DJANGO="https://github.com/django/django/archive/stable/1.11.x.tar.gz#egg=django"
   - DJANGO="https://github.com/django/django/archive/master.tar.gz#egg=django"
 matrix:
   allow_failures:
   - env: DJANGO="https://github.com/django/django/archive/master.tar.gz#egg=django"
 install:
-- pip install -U codecov
-- pip install -r requirements-dev.txt
+- pip install -U codecov isort
 - pip install $DJANGO
 script:
+- coverage run --source=closeio setup.py test
 - isort --check-only --recursive --diff .
-- coverage run --source=closeio -m 'pytest'
 after_success:
 - codecov
 deploy:

requirements.txt

@@ -2,4 +2,3 @@ python-dateutil>=2.2
 requests>=2.2.1
 six>=1.6.1
 slumber==0.7.1
-wheel>=0.22.0

setup.cfg

@@ -24,14 +24,21 @@ pytest11 =
     closeio = closeio.contrib.pytest_plugin
 
 [tool:pytest]
-norecursedirs=env .git venv
+norecursedirs=env .git venv .eggs
 addopts = --tb=short -rxs
 pep8maxlinelength=99
 pep8ignore=
     runtests.py ALL
 flakes-ignore=
     runtests.py ALL
 
+[extras]
+django =
+    django>=1.11
+
+[aliases]
+test = pytest
+
 [pycodestyle]
 max-line-length = 99
 statistics = true
@@ -58,5 +65,5 @@ multi_line_output = 5
 line_length = 79
 combine_as_imports = true
 known_first_party =  closeio,tests
-known_third_party = django
-skip = wsgi.py,docs,env
+known_third_party = dateutil,django,pytest,six,slumber
+skip = wsgi.py,docs,env,.eggs

setup.py

@@ -3,6 +3,7 @@
 from setuptools import setup
 
 setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr', 'pytest-runner'],
+    tests_require=['django>=1.11', 'pytest', 'pytest-django', 'pytest-rerunfailures'],
     pbr=True,
 )