Skip to content

Commit

Permalink
Merge tag 'v0.4.5' into develop
Browse files Browse the repository at this point in the history
Added
+++++
  - Support for Django 2.0
  - Support for smart casting
  - Support PostgreSQL unix domain socket paths
  - Tip: Multiple env files

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
  • Loading branch information
joke2k committed Jun 25, 2018
2 parents 689f48e + b32c07d commit 31794b9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is *inspired* by `Keep a Changelog <http://keepachangelog.com/en/1.0.
and this project adheres to `Semantic Versioning <http://semver.org/spec/v2.0.0.html>`_.


`v0.4.5-dev`_ - ~June-2018
`v0.4.5`_ - 25-June-2018
--------------------------
Added
+++++
Expand Down Expand Up @@ -119,7 +119,7 @@ Added
- initial release


.. _v0.4.5-dev: https://github.com/joke2k/django-environ/compare/v0.4.4...develop
.. _v0.4.5: https://github.com/joke2k/django-environ/compare/v0.4.4...v0.4.5
.. _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
Expand Down
2 changes: 1 addition & 1 deletion environ/environ.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
logger = logging.getLogger(__name__)


VERSION = '0.4.4'
VERSION = '0.4.5'
__author__ = 'joke2k'
__version__ = tuple(VERSION.split('.'))

Expand Down
2 changes: 1 addition & 1 deletion environ/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ def test_postgres_parsing_unix_domain_socket(self):
url = 'postgres:////var/run/postgresql/db'
url = Env.db_url_config(url)

self.assertEqual(url['ENGINE'], 'django.db.backends.postgresql_psycopg2')
self.assertEqual(url['ENGINE'], DJANGO_POSTGRES)
self.assertEqual(url['NAME'], 'db')
self.assertEqual(url['HOST'], '/var/run/postgresql')

Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
URL = 'https://github.com/joke2k/django-environ'
EMAIL = '[email protected]'
AUTHOR = 'joke2k'
VERSION = '0.4.4'
REQUIREMENTS = [
'six',
]
VERSION = '0.4.5'
LICENSE = 'MIT'

here = os.path.abspath(os.path.dirname(__file__))
Expand Down

0 comments on commit 31794b9

Please sign in to comment.