Remove testing tools from dependencies, update testing matrix and set…

…up.py

.travis.yml

@@ -1,10 +1,16 @@
+dist: xenial   # required for Python >= 3.7
 language: python
 
-python:
-  - "2.7"
-  - "3.4"
+matrix:
+  include:
+    - { python: "2.7", env: DJANGO=1.11 }
+    - { python: "3.4", env: DJANGO=2.0 }
+    - { python: "nightly", env: DJANGO=2.2 }
 
-install: pip install -r requirements.txt
+install:
+  - pip install -r requirements.txt
+  - pip install 'py>1.7' 'pytest>4' 'pytest-django' 'pytest-cov'
+  - pip install coveralls
 
 script: python setup.py test
 

batch_requests/__init__.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 __title__ = 'django-batch-requests'
-__version__ = '0.1.1'
-__author__ = 'Rahul Tanwani'
+__version__ = '1.0'
+__author__ = 'Rahul Tanwani, Tomasz Nowak'
 __license__ = 'MIT'
 
 # Version synonym

requirements.txt

@@ -1,11 +1,2 @@
-Django==1.11
-flake8==2.4.0
-mccabe==0.3
-pep8==1.5.7
-py==1.4.26
-pyflakes==0.8.1
-pytest==2.6.4
-pytest-django==2.8.0
-coveralls==0.5
-pytest-cov==1.8.1
-futures==3.0.5
+Django>=1.11
+futures<4

setup.py

@@ -31,9 +31,9 @@ def run(self):
 package = 'batch_requests'
 description = 'Create batch APIs for Django.'
 long_description = 'Django batch requests allow developers to combine multiple http requests into a single batch request. This is essentially useful to avoid making multiple http requests to save on round trip network latency.'
-url = 'https://github.com/tanwanirahul/django-batch-requests'
-author = 'Rahul Tanwani'
-author_email = 'tanwanirahul@gmail.com'
+url = 'https://github.com/tomaszn/django-batch-requests'
+author = 'Rahul Tanwani, Tomasz Nowak'
+author_email = 'tanwanirahul@gmail.com, tomaszn@users.noreply.github.com'
 license = 'MIT'
 install_requires = []
 
@@ -92,7 +92,8 @@ def get_package_data(package):
     packages=get_packages(package),
     package_data=get_package_data(package),
     install_requires=install_requires,
-    cmdclass = {'test': PyTest},
+    tests_require=['py>1.7', 'pytest>4', 'pytest-django', 'pytest-cov==1.8.1'],
+    cmdclass={'test': PyTest},
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
@@ -103,6 +104,8 @@ def get_package_data(package):
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
         'Topic :: Internet :: WWW/HTTP'
     ]
 )

tox.ini

@@ -1,12 +1,17 @@
 [tox]
 envlist = py27-{tests,flake8}
+          py36-{tests}
 
-[testenv:py27-tests]
+[testenv]
 deps =
-       -rrequirements.txt
+    pytest>4
+    pytest-django
+    -rrequirements.txt
 commands = ./runtests.py --fast
 
 [testenv:py27-flake8]
-deps = 
-       -rrequirements.txt
+deps =
+    pytest>4
+    flake8
+    -rrequirements.txt
 commands = ./runtests.py --lintonly