Merge branch 'release/1.3.0'

.travis.yml

@@ -1,27 +1,6 @@
 language: python
+sudo: false
 install:
-  - pip install tox
-env:
-  - TOX_ENV=python27-django14
-  - TOX_ENV=python27-django16
-  - TOX_ENV=python27-django17
-  - TOX_ENV=python27-django18
-  - TOX_ENV=python27-djangodev
-  - TOX_ENV=python33-django16
-  - TOX_ENV=python33-django17
-  - TOX_ENV=python33-django18
-  - TOX_ENV=python33-djangodev
-  - TOX_ENV=python34-django16
-  - TOX_ENV=python34-django17
-  - TOX_ENV=python34-django18
-  - TOX_ENV=python34-djangodev
-  - TOX_ENV=cov
-  - TOX_ENV=flake8
+  - pip install tox==2.1.1
 script:
-  - tox -e $TOX_ENV
-matrix:
-  fast_finish: true
-  allow_failures:
-    - env: TOX_ENV=python27-djangodev
-    - env: TOX_ENV=python33-djangodev
-    - env: TOX_ENV=python34-djangodev
+  - tox

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## Unreleased
 
-Nothing yet.
+* Nothing yet
+
+## 1.3.0
+
+* Loosened version requirement for `laterpay-client` (so it could use v4.0.0 and higher).
 
 ## 1.2.0
 

README.rst

@@ -10,9 +10,6 @@ django-laterpay
 .. image:: https://coveralls.io/repos/laterpay/django-laterpay/badge.png?branch=develop
     :target: https://coveralls.io/r/laterpay/django-laterpay
 
-.. image:: https://pypip.in/d/django-laterpay/badge.png
-    :target: https://crate.io/packages/django-laterpay?version=latest
-
 
 `LaterPay <http://www.laterpay.net/>`__ Django utilities
 

requirements-test.txt

@@ -1,3 +1,3 @@
-coverage==3.7.1
-coveralls
-flake8
+coverage==4.0.3
+coveralls==1.1
+flake8==2.5.1

setup.py

@@ -4,7 +4,7 @@
 import codecs
 import os
 
-_version = "1.2.0"
+_version = "1.3.0"
 _packages = find_packages('.', exclude=["*.tests", "*.tests.*", "tests.*", "tests"])
 
 if os.path.exists('README.rst'):
@@ -30,7 +30,7 @@
     package_data={'djlaterpay': ['templates/laterpay/inclusion/*']},
 
     install_requires=(
-        'laterpay-client==3.2.1',
+        'laterpay-client>=3.2.1',
         'Django',
     ),
 

tox.ini

@@ -1,7 +1,8 @@
 [tox]
 envlist =
-	{python27,python33,python34}-{django16,django17,django18,djangodev},
-	python27-django14,
+	{python27,python34}-{django16,django17,django18}-{lpclient32,lpclient40},
+	python33-{django16,django17,django18}-{lpclient32,lpclient40},
+	python27-django14-lpclient32,
 	cov,
 	flake8,
 
@@ -12,16 +13,18 @@ basepython =
 	python34: python3.4
 deps =
 	-r{toxinidir}/requirements-test.txt
-	django14: Django==1.4.16
-	django16: Django==1.6.8
-	django17: Django==1.7.1
-	django18: Django==1.8.3
-	djangodev: git+https://github.com/django/django.git
+	django14: Django==1.4.22
+	django16: Django==1.6.11
+	django17: Django==1.7.11
+	django18: Django==1.8.7
+	lpclient32: laterpay-client==3.2.1
+	lpclient40: laterpay-client==4.0.0
 commands =
 	python setup.py test
 
 [testenv:cov]
 basepython = python2.7
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 commands =
 	coverage run --source djlaterpay setup.py test
 	coverage report