merge develop

.travis.yml

@@ -4,6 +4,7 @@ python:
  - "2.7"
  - "3.4"
  - "3.5"
+ - "3.6"
  - "nightly"
  - "pypy"
 env:
@@ -12,6 +13,7 @@ env:
    - DJANGO="Django>=1.9,<1.10"
    - DJANGO="Django>=1.10,<1.11"
    - DJANGO="Django>=1.11,<2.0"
+   - DJANGO="Django>=2.0,<2.1"
    - DJANGO="https://github.com/django/django/archive/master.tar.gz"
 install:
  # The default pip doesn't properly support pre-release version specifiers.
@@ -31,12 +33,24 @@ matrix:
   include:
     - python: "3.3"
       env: DJANGO="Django>=1.8,<1.9"
+    # Django 1.11+ supports Python 3.6
+    - python: "3.6"
+      env: DJANGO="Django>=1.11,<2.0"
+    - python: "3.6"
+      env: DJANGO="Django>=2.0,<2.1"
   exclude:
-    # Django master dropped support for Python 2.
+    # Django 2.0+ dropped support for Python 2.
+    - python: "2.7"
+      env: DJANGO="Django>=2.0,<2.1"
+    - python: "pypy"
+      env: DJANGO="Django>=2.0,<2.1"
     - python: "2.7"
       env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
     - python: "pypy"
       env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
+    # Django master dropped support for Python 3.4.
+    - python: "3.4"
+      env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
   allow_failures:
     - env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
 after_success:

AUTHORS.rst

@@ -0,0 +1,130 @@
+Authors
+=======
+
+  * (◕ᴥ◕) (`@ratson`_)
+  * Adam Dobrawy (`@ad-m`_)
+  * Andrea Crotti (`@AndreaCrotti`_)
+  * Andrew (`@AndBondStyle`_)
+  * Antoine Lorence (`@alorence`_)
+  * Artem.Bernatskyy (`@ArtemBernatskyy`_)
+  * Bachynin Ivan (`@vaniakosmos`_)
+  * Bart Moelans (`@bmoelans`_)
+  * Brent O'Connor (`@epicserve`_)
+  * Brian May (`@brianmay`_)
+  * Bruno Alla (`@browniebroke`_)
+  * `@callsamleung`_
+  * Chad Saunders (`@chadsaun`_)
+  * Daniel van Flymen (`@dvf`_)
+  * Daniele Faraglia (`@joke2k`_)
+  * David (`@ddiazpinto`_)
+  * David Karchmer (`@dkarchmer`_)
+  * dennis again (`@immerrr`_)
+  * Dinesh Kumar Sharma (`@dinesh829269`_)
+  * Dustin Wyatt (`@dmwyatt`_)
+  * Ed Morley (`@edmorley`_)
+  * Federico Martinez (`@federicoemartinez`_)
+  * `@fedetorre`_
+  * Flavio Curella (`@fcurella`_)
+  * Florian Demmer (`@fdemmer`_)
+  * `@gabriellima`_
+  * Ivan Anishchuk (`@IvanAnishchuk`_)
+  * Jack Cushman (`@jcushman`_)
+  * Jafnee (`@Jafnee`_)
+  * Jake Merdich (`@jmerdich`_)
+  * James Hiew (`@jameshiew`_)
+  * Jason Kraus (`@zbyte64`_)
+  * Jaye Doepke (`@jtdoepke`_)
+  * jess (`@monkeywithacupcake`_)
+  * Jimmy Merrild Krag (`@beruic`_)
+  * jjlorenzo (`@jjlorenzo`_)
+  * Johannes Hoppe (`@codingjoe`_)
+  * `@kakkulap`_
+  * `@konoufo`_
+  * konstin (`@konstin`_)
+  * Kosei Kitahara (`@Surgo`_)
+  * Mark Heppner (`@mheppner`_)
+  * Mark Rogaski (`@mrogaski`_)
+  * Matthew Jacobi (`@oppianmatt`_)
+  * Max Arnold (`@max-arnold`_)
+  * Neil Lyons (`@nwjlyons`_)
+  * `@nguyentrantuan`_
+  * Nick Travis (`@ntravis`_)
+  * Philippe Luickx (`@philippeluickx`_)
+  * pyup.io bot (`@pyup-bot`_)
+  * Riccardo Magliocchetti (`@xrmx`_)
+  * Roope (`@K377U`_)
+  * Santtu Pajukanta (`@japsu`_)
+  * Sardorbek Imomaliev (`@imomaliev`_)
+  * Simon Lundmark Ornstein (`@simlun`_)
+  * `@thaxy`_
+  * Thinh Nguyen (`@Taik`_)
+  * Tibo Beijen (`@TBeijen`_)
+  * Timothy Allen (`@FlipperPA`_)
+  * `@VKen`_
+  * Vladislav Bakin (`@mixkorshun`_)
+  * Vu Chau (`@vuchau`_)
+
+Generated by https://github.com/pydanny/contributors
+
+.. _`@vuchau`: https://github.com/vuchau
+.. _`@pyup-bot`: https://github.com/pyup-bot
+.. _`@browniebroke`: https://github.com/browniebroke
+.. _`@TBeijen`: https://github.com/TBeijen
+.. _`@zbyte64`: https://github.com/zbyte64
+.. _`@monkeywithacupcake`: https://github.com/monkeywithacupcake
+.. _`@mixkorshun`: https://github.com/mixkorshun
+.. _`@dinesh829269`: https://github.com/dinesh829269
+.. _`@beruic`: https://github.com/beruic
+.. _`@dmwyatt`: https://github.com/dmwyatt
+.. _`@simlun`: https://github.com/simlun
+.. _`@chadsaun`: https://github.com/chadsaun
+.. _`@jtdoepke`: https://github.com/jtdoepke
+.. _`@Surgo`: https://github.com/Surgo
+.. _`@oppianmatt`: https://github.com/oppianmatt
+.. _`@dkarchmer`: https://github.com/dkarchmer
+.. _`@edmorley`: https://github.com/edmorley
+.. _`@epicserve`: https://github.com/epicserve
+.. _`@jjlorenzo`: https://github.com/jjlorenzo
+.. _`@dvf`: https://github.com/dvf
+.. _`@vaniakosmos`: https://github.com/vaniakosmos
+.. _`@kakkulap`: https://github.com/kakkulap
+.. _`@philippeluickx`: https://github.com/philippeluickx
+.. _`@Jafnee`: https://github.com/Jafnee
+.. _`@bmoelans`: https://github.com/bmoelans
+.. _`@gabriellima`: https://github.com/gabriellima
+.. _`@joke2k`: https://github.com/joke2k
+.. _`@AndreaCrotti`: https://github.com/AndreaCrotti
+.. _`@japsu`: https://github.com/japsu
+.. _`@Taik`: https://github.com/Taik
+.. _`@jcushman`: https://github.com/jcushman
+.. _`@nguyentrantuan`: https://github.com/nguyentrantuan
+.. _`@thaxy`: https://github.com/thaxy
+.. _`@alorence`: https://github.com/alorence
+.. _`@federicoemartinez`: https://github.com/federicoemartinez
+.. _`@konstin`: https://github.com/konstin
+.. _`@IvanAnishchuk`: https://github.com/IvanAnishchuk
+.. _`@imomaliev`: https://github.com/imomaliev
+.. _`@K377U`: https://github.com/K377U
+.. _`@immerrr`: https://github.com/immerrr
+.. _`@VKen`: https://github.com/VKen
+.. _`@nwjlyons`: https://github.com/nwjlyons
+.. _`@fedetorre`: https://github.com/fedetorre
+.. _`@callsamleung`: https://github.com/callsamleung
+.. _`@codingjoe`: https://github.com/codingjoe
+.. _`@jmerdich`: https://github.com/jmerdich
+.. _`@jameshiew`: https://github.com/jameshiew
+.. _`@mrogaski`: https://github.com/mrogaski
+.. _`@AndBondStyle`: https://github.com/AndBondStyle
+.. _`@ad-m`: https://github.com/ad-m
+.. _`@FlipperPA`: https://github.com/FlipperPA
+.. _`@konoufo`: https://github.com/konoufo
+.. _`@fdemmer`: https://github.com/fdemmer
+.. _`@ntravis`: https://github.com/ntravis
+.. _`@ddiazpinto`: https://github.com/ddiazpinto
+.. _`@max-arnold`: https://github.com/max-arnold
+.. _`@ratson`: https://github.com/ratson
+.. _`@ArtemBernatskyy`: https://github.com/ArtemBernatskyy
+.. _`@mheppner`: https://github.com/mheppner
+.. _`@xrmx`: https://github.com/xrmx
+.. _`@brianmay`: https://github.com/brianmay
+.. _`@fcurella`: https://github.com/fcurella

CHANGELOG.rst

@@ -0,0 +1,128 @@
+Changelog
+=========
+All notable changes to this project will be documented in this file.
+
+The format is *inspired* by `Keep a Changelog <http://keepachangelog.com/en/1.0.0/>`_
+and this project adheres to `Semantic Versioning <http://semver.org/spec/v2.0.0.html>`_.
+
+
+`v0.4.5-dev`_ - ~June-2018
+--------------------------
+Added
++++++
+  - Support for Django 2.0
+  - Support for smart casting
+
+Changed
++++++++
+  - Fix parsing option values None, True and False
+  - Order of importance of engine configuration in db_url_config
+
+Removed
++++++++
+  - Remove django and six dependencies
+
+
+`v0.4.4`_ - 21-August-2017
+--------------------------
+
+Added
++++++
+  - Support for django-redis multiple locations (master/slave, shards)
+  - Support for Elasticsearch2
+  - Support for Mysql-connector
+  - Support for pyodbc
+  - Add __contains__ feature to Environ class
+
+Changed
++++++++
+  - Fix Path subtracting
+
+
+`v0.4.3`_ - 21-August-2017
+--------------------------
+Changed
++++++++
+  - Rollback the default Environ to os.environ
+
+`v0.4.2`_ - 13-April-2017
+-------------------------
+Added
++++++
+  - Confirm support for Django 1.11.
+  - Support for Redshift database URL
+
+Changed
++++++++
+  - Fix uwsgi settings reload problem (#55)
+  - Update support for django-redis urls (#109)
+
+`v0.4.1`_ - 13-November-2016
+----------------------------
+Added
++++++
+  - Add support for Django 1.10
+
+Changed
++++++++
+  - Fix for unsafe characters into URLs
+  - Clarifying warning on missing or unreadable file. Thanks to @nickcatal
+  - Fix support for Oracle urls
+  - Fix support for django-redis
+
+`v0.4.0`_ - 23-September-2015
+-----------------------------
+Added
++++++
+  - New email schemes - smtp+ssl and smtp+tls (smtps would be deprecated)
+  - Add tuple support. Thanks to @anonymouzz
+  - Add LDAP url support for database (django-ldapdb)
+
+Changed
++++++++
+  - Fix non-ascii values (broken in Python 2.x)
+  - redis_cache replaced by django_redis
+  - Fix psql/pgsql url
+
+`v0.3`_ - 03-June-2014
+----------------------
+Added
++++++
+  - Add cache url support
+  - Add email url support
+  - Add search url support
+
+Changed
++++++++
+  - Rewriting README.rst
+
+0.2.1 19-April-2013
+-------------------
+Changed
++++++++
+  - environ/environ.py: Env.__call__ now uses Env.get_value instance method
+
+0.2 16-April-2013
+-----------------
+Changed
++++++++
+  - environ/environ.py, environ/test.py, environ/test_env.txt: add advanced
+    float parsing (comma and dot symbols to separate thousands and decimals)
+  - README.rst, docs/index.rst: fix TYPO in documentation
+
+0.1 2-April-2013
+-----------------
+Added
++++++
+  - initial release
+
+
+.. _v0.4.5-dev: https://github.com/joke2k/django-environ/compare/v0.4.4...develop
+.. _v0.4.4: https://github.com/joke2k/django-environ/compare/v0.4.3...v0.4.4
+.. _v0.4.3: https://github.com/joke2k/django-environ/compare/v0.4.2...v0.4.3
+.. _v0.4.2: https://github.com/joke2k/django-environ/compare/v0.4.1...v0.4.2
+.. _v0.4.1: https://github.com/joke2k/django-environ/compare/v0.4.0...v0.4.1
+.. _v0.4.0: https://github.com/joke2k/django-environ/compare/v0.3...v0.4.0
+.. _v0.3: https://github.com/joke2k/django-environ/compare/v0.2.1...v0.3
+.. _`Keep a Changelog`: http://keepachangelog.com/en/1.0.0/
+.. _`Semantic Versioning`: http://semver.org/spec/v2.0.0.html