Merge pull request #85 from edmorley/update-testing-matrix

Update testing matrix Django and Python versions

.travis.yml

@@ -1,20 +1,17 @@
 language: python
 sudo: false
 python:
- - "2.6"
  - "2.7"
- - "3.3"
  - "3.4"
  - "3.5"
  - "nightly"
+ - "pypy"
 env:
   matrix:
-   - DJANGO=Django==1.4
-   - DJANGO=Django==1.5
-   - DJANGO=Django==1.6
-   - DJANGO=Django==1.7
-   - DJANGO=Django==1.8
-   - DJANGO=Django==1.9
+   - DJANGO="Django>=1.8,<1.9"
+   - DJANGO="Django>=1.9,<1.10"
+   - DJANGO="Django>=1.10,<1.11"
+   - DJANGO="https://github.com/django/django/archive/master.tar.gz"
 install:
  - pip install $DJANGO
  - pip install .
@@ -29,25 +26,12 @@ branches:
   - /^v[\d\.]+/
 script: coverage run --source=environ setup.py test
 matrix:
-  exclude:
-    - python: "2.6"
-      env: DJANGO=Django==1.7
-    - python: "2.6"
-      env: DJANGO=Django==1.8
-    - python: "2.6"
-      env: DJANGO=Django==1.9
+  fast_finish: true
+  include:
     - python: "3.3"
-      env: DJANGO=Django==1.4
-    - python: "3.3"
-      env: DJANGO=Django==1.5
-    - python: "3.4"
-      env: DJANGO=Django==1.4
-    - python: "3.4"
-      env: DJANGO=Django==1.5
-    - python: "3.5"
-      env: DJANGO=Django==1.4
-    - python: "3.5"
-      env: DJANGO=Django==1.5
+      env: DJANGO="Django>=1.8,<1.9"
+  allow_failures:
+    - env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
 after_success:
   - coverage report
   - pip install --quiet python-coveralls

README.rst

@@ -242,7 +242,7 @@ Django-environ is licensed under the MIT License - see the `LICENSE`_ file for d
 Changelog
 =========
 
-`0.4.0 - 23-September-2015 <http://github.com/joke2k/django-environ/compare/v0.3...v0.4>`__
+`0.4.0 - 23-September-2015 <https://github.com/joke2k/django-environ/compare/v0.3...v0.4>`__
 -------------------------------------------------------------------------------------------
   - Fix non-ascii values (broken in Python 2.x)
   - New email schemes - smtp+ssl and smtp+tls (smtps would be deprecated)
@@ -251,7 +251,7 @@ Changelog
   - Add LDAP url support for database (django-ldapdb)
   - Fix psql/pgsql url
 
-`0.3 - 03-June-2014 <http://github.com/joke2k/django-environ/compare/v0.2.1...v0.3>`__
+`0.3 - 03-June-2014 <https://github.com/joke2k/django-environ/compare/v0.2.1...v0.3>`__
 --------------------------------------------------------------------------------------
   - Add cache url support
   - Add email url support

appveyor.yml

@@ -9,7 +9,7 @@ init:
   - "ECHO %PYTHON%"
   - ps: "ls C:/Python*"
 install:
-  - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py')
+  - ps: (new-object net.webclient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'C:/get-pip.py')
   - "%PYTHON%/python.exe C:/get-pip.py"
   - "%PYTHON%/Scripts/pip.exe install -e ."
 test_script:

setup.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from __future__ import unicode_literals
 from setuptools import setup, find_packages
 import io
@@ -23,6 +25,8 @@
           'Programming Language :: Python',
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: Implementation :: CPython',
+          'Programming Language :: Python :: Implementation :: PyPy',
           'Topic :: Software Development :: Libraries :: Python Modules',
           'Topic :: Utilities',
           'License :: OSI Approved :: MIT License',
@@ -31,7 +35,7 @@
       keywords='django environment variables 12factor',
       author=author,
       author_email='joke2k@gmail.com',
-      url='http://github.com/joke2k/django-environ',
+      url='https://github.com/joke2k/django-environ',
       license='MIT License',
       packages=find_packages(),
       platforms=["any"],