Merge pull request #443 from Stranger6667/django-2.1

Django 2.1 + Python 3.7 builds
django-money · Aug 3, 2018 · 2a4e561 · 2a4e561
2 parents 8ddbabd + 8a1dcab
commit 2a4e561
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,10 +13,22 @@ matrix:
       env: TOX_ENV=lint
     - python: 3.6
       env: TOX_ENV=no_rest_framework
+    - python: 3.7
+      dist: xenial
+      env: TOX_ENV=django_master-py37
     - python: 3.6
       env: TOX_ENV=django_master-py36
     - python: 3.5
       env: TOX_ENV=django_master-py35
+    - python: 3.7
+      dist: xenial
+      env: TOX_ENV=django21-py37
+    - python: 3.6
+      env: TOX_ENV=django21-py36
+    - python: 3.5
+      env: TOX_ENV=django21-py35
+    - python: pypy3
+      env: TOX_ENV=django21-pypy3
     - python: 3.6
       env: TOX_ENV=django20-py36
     - python: 3.5

diff --git a/README.rst b/README.rst
@@ -25,9 +25,9 @@ http://code.google.com/p/python-money/
 
 This version adds tests, and comes with several critical bugfixes.
 
-Django versions supported: 1.8, 1.11, 2.0
+Django versions supported: 1.8, 1.11, 2.0, 2.1
 
-Python versions supported: 2.7, 3.4, 3.5, 3.6
+Python versions supported: 2.7, 3.4, 3.5, 3.6, 3.7
 
 PyPy versions supported: PyPy 2.6, PyPy3 2.4
 

diff --git a/djmoney/forms/widgets.py b/djmoney/forms/widgets.py
@@ -19,5 +19,7 @@ def __init__(self, choices=CURRENCY_CHOICES, amount_widget=TextInput, currency_w
 
     def decompress(self, value):
         if value is not None:
+            if isinstance(value, (list, tuple)):
+                return value
             return [value.amount, value.currency]
         return [None, self.default_currency]
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -3,11 +3,19 @@
 Changelog
 =========
 
+Unreleased
+----------
+
+Fixed
+~~~~~
+
+- ``djmoney.forms.widgets.MoneyWidget`` decompression on Django 2.1+. (`Stranger6667`_)
+
 `0.14.2`_ - 2018-07-23
 ----------------------
 
 Fixed
-~~~~
+~~~~~
 
 - Validation of ``djmoney.forms.fields.MoneyField`` when ``disabled=True`` is passed to it. `#439`_ (`stinovlas`_, `Stranger6667`_)
 

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist =
     django_master-py{36,35}
+    django21-py{37,36,35,py3}
     django20-py{36,35,34,py3}
     django111-py{36,35,34,27,py}
     django18-py{35,34,27,py}
@@ -18,6 +19,7 @@ deps =
     django18: {[django]1.8.x}
     django111: {[django]1.11.x}
     django20: {[django]2.0.x}
+    django21: {[django]2.1.x}
     django_master: {[django]master}
 commands = py.test --ds=tests.settings --cov=./djmoney {posargs}
 usedevelop = false
@@ -49,6 +51,10 @@ commands =
        Django>=2.0,<2.1
        django-reversion>=2.0.8
        djangorestframework>=3.7.3
+2.1.x  =
+       Django>=2.1,<2.2
+       django-reversion>=2.0.8
+       djangorestframework>=3.7.3
 master =
        https://github.com/django/django/tarball/master
        django-reversion>=2.0.8