From dfe833538c6e1870cf3e808af9deaa7df2aaefbe Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Wed, 3 Aug 2016 15:33:03 +0100 Subject: [PATCH 1/4] Travis: Stop testing on Python 3.2 Since it's no longer supported as of 2016-02-20: https://docs.python.org/devguide/#status-of-python-branches --- .travis.yml | 3 --- README.rst | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cde816c..b712948 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ sudo: false python: - "2.7" - - "3.2" - "3.3" - "3.4" - "3.5" @@ -21,8 +20,6 @@ script: matrix: exclude: - - python: "3.2" - env: DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4" - python: "3.3" env: DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4" fast_finish: true diff --git a/README.rst b/README.rst index b95a54a..adbb566 100644 --- a/README.rst +++ b/README.rst @@ -20,7 +20,7 @@ Installation Requirements ------------ -* Python 2.7+ +* Python 2.7 or 3.3+ * Django 1.8+ * Django REST framework 3.0+ From ded7f15537b030dbad8890f43bdefd2472d63f1c Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Wed, 3 Aug 2016 15:46:19 +0100 Subject: [PATCH 2/4] Travis: Stop testing on django-rest-framework 3.2 Since there have been two major releases since, and both support all tested Django versions. If someone is going to stick on an older d-r-f, they can just remain on an older django-rest-framework-filters too. --- .travis.yml | 1 - README.rst | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b712948..cc72112 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ python: env: - DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4" - DJANGO="django>=1.8.0,<1.9.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4" - - DJANGO="django>=1.8.0,<1.9.0" REST_FRAMEWORK="djangorestframework>=3.2,<3.3" install: - travis_retry pip install -q $DJANGO $REST_FRAMEWORK "coverage==3.7.1" - pip install . diff --git a/README.rst b/README.rst index adbb566..1594baf 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,7 @@ Requirements * Python 2.7 or 3.3+ * Django 1.8+ -* Django REST framework 3.0+ +* Django REST framework 3.3 Usage ----- From 436d038abf9e1ce386dbc427bd251fadef328736 Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Wed, 3 Aug 2016 15:48:28 +0100 Subject: [PATCH 3/4] Travis: Test with django-rest-framework 3.4 I don't think it's necessary to test every single permutation of versions, so this leaves Django 1.8 as the only platform where d-r-f 3.3 is tested. However it's unlikely people using cutting edge Django versions wouldn't also update to d-r-f 3.4. --- .travis.yml | 5 +++-- README.rst | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc72112..3c975ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,8 @@ python: - "3.4" - "3.5" env: - - DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4" + - DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.4,<3.5" + - DJANGO="django>=1.8.0,<1.9.0" REST_FRAMEWORK="djangorestframework>=3.4,<3.5" - DJANGO="django>=1.8.0,<1.9.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4" install: - travis_retry pip install -q $DJANGO $REST_FRAMEWORK "coverage==3.7.1" @@ -20,5 +21,5 @@ script: matrix: exclude: - python: "3.3" - env: DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4" + env: DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.4,<3.5" fast_finish: true diff --git a/README.rst b/README.rst index 1594baf..df6d9e9 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,7 @@ Requirements * Python 2.7 or 3.3+ * Django 1.8+ -* Django REST framework 3.3 +* Django REST framework 3.3, 3.4 Usage ----- From 43a344340f754781ceb57b3c51340fc3bf3a952f Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Wed, 3 Aug 2016 15:49:45 +0100 Subject: [PATCH 4/4] Travis: Test with Django 1.10 --- .travis.yml | 3 +++ README.rst | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c975ec..c3e3e27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ python: - "3.4" - "3.5" env: + - DJANGO="django>=1.10.0,<1.11.0" REST_FRAMEWORK="djangorestframework>=3.4,<3.5" - DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.4,<3.5" - DJANGO="django>=1.8.0,<1.9.0" REST_FRAMEWORK="djangorestframework>=3.4,<3.5" - DJANGO="django>=1.8.0,<1.9.0" REST_FRAMEWORK="djangorestframework>=3.3,<3.4" @@ -20,6 +21,8 @@ script: matrix: exclude: + - python: "3.3" + env: DJANGO="django>=1.10.0,<1.11.0" REST_FRAMEWORK="djangorestframework>=3.4,<3.5" - python: "3.3" env: DJANGO="django>=1.9.0,<1.10.0" REST_FRAMEWORK="djangorestframework>=3.4,<3.5" fast_finish: true diff --git a/README.rst b/README.rst index df6d9e9..e77e694 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ Requirements ------------ * Python 2.7 or 3.3+ -* Django 1.8+ +* Django 1.8, 1.9, 1.10 * Django REST framework 3.3, 3.4 Usage