fixes merge conflicts with v0.14.0

openhealthcare · Feb 25, 2019 · 30f3e2a · 30f3e2a
2 parents 2c46977 + f3e8cd0
commit 30f3e2a
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,9 @@
 
 Adds a `age` property to demographics that returns the patient's age.
 
+### 0.13.1 (Minor Release)
+
+Upgrades the setup.py Django version from 2.0.9 to 2.0.13. Removes the six library dependency from setup.py.
 
 ### 0.13.0 (Major Release)
 
@@ -141,6 +144,13 @@ including the `reopen_episode_modal.html` template and the url/view at `template
 * Psycopg2: 2.7 -> 2.7.6.1
 * Python Dateutil: 2.4.2 -> 2.7.5
 
+
+### 0.12.1 (Minor Release)
+* If an item is deleted from the edit item modal, RecordEditor.openEditItemModal will now resolve after the delete item modal is closed with 'deleted'
+
+* Fixes the default investigation modal
+
+
 ### 0.12.0 (Major Release)
 
 #### Misc Changes

diff --git a/doc/docs/reference/upgrading.md b/doc/docs/reference/upgrading.md
@@ -3,6 +3,22 @@
 This document provides instructions for specific steps required to upgrading your Opal
 application to a later version where there are extra steps required.
 
+### 0.13.0 -> 0.13.1
+
+Upgrades django (minor security upgrade).
+
+How you do this depends on how you have configured your application. You will need to
+update both the Opal version, and versions of upgraded dependencies if
+you have specified them in for instance, a requirements.txt.
+
+(This will be the case if you use the requirements.txt originally provided by
+`opal startproject`)
+
+    # requirements.txt
+    opal==0.13.1
+    django==2.0.13
+
+
 ### 0.12.0 - 0.11.2 -> 0.13.0
 
 #### Python versions
@@ -24,7 +40,7 @@ you have specified them in for instance, a requirements.txt.
 `opal startproject`)
 
     # requirements.txt
-    opal==0.10.0
+    opal==0.13.0
     django==2.0.9
     django-reversion==3.0.1
     djangorestframework==3.7.4

diff --git a/doc/mkdocs.yml b/doc/mkdocs.yml
@@ -123,7 +123,7 @@ dev_addr: 0.0.0.0:8965
 include_next_prev: false
 
 extra:
-  version: v0.13.0
+  version: v0.14.0
 
 markdown_extensions:
     - fenced_code
diff --git a/opal/_version.py b/opal/_version.py
@@ -1,4 +1,4 @@
 """
 Declare our current version string
 """
-__version__ = '0.13.0'
+__version__ = '0.14.0'
diff --git a/opal/scaffolding/scaffold/requirements.txt.jinja2 b/opal/scaffolding/scaffold/requirements.txt.jinja2
@@ -1,5 +1,5 @@
 # cryptography is required for heroku deployment
-django==2.0.9
+django==2.0.13
 dj-database-url==0.2.1
 gunicorn==0.17.4
 psycopg2==2.7.6.1

diff --git a/opal/static/js/test/edit_item.controller.test.js b/opal/static/js/test/edit_item.controller.test.js
@@ -330,4 +330,4 @@ describe('EditItemCtrl', function (){
         });
     });
 
-});
+});
diff --git a/setup.py b/setup.py
@@ -48,7 +48,7 @@
         'ffs>=0.0.8.2',
         'letter==0.5',
         'jinja2==2.10',
-        'django==2.0.9',
+        'django==2.0.13',
         'requests==2.20.1',
         'django-axes==1.7.0',
         'djangorestframework==3.7.4',
@@ -57,7 +57,6 @@
         'python-dateutil==2.7.5',
         'django-celery==3.2.2',
         'celery==3.1.25',
-        'six>=1.10.0',
         ],
     classifiers = [
         "Programming Language :: Python",