From 82fc5485232f1b9fd6bee1b4997058d5a884f483 Mon Sep 17 00:00:00 2001 From: fredkingham Date: Wed, 13 Feb 2019 22:13:52 +0000 Subject: [PATCH 1/3] bumps django version as 2.0.9 to 2.0.13 --- changelog.md | 4 ++++ doc/docs/reference/upgrading.md | 18 +++++++++++++++++- .../scaffold/requirements.txt.jinja2 | 2 +- setup.py | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index fb65e5d48..843eaa89b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +### 0.13.1 (Minor Release) + +Upgrades the setup.py Django version from 2.0.9 to 2.0.13 + ### 0.13.0 (Major Release) #### Removes support for Python 2.x diff --git a/doc/docs/reference/upgrading.md b/doc/docs/reference/upgrading.md index 4bfcf84f9..50b0cef10 100644 --- 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/opal/scaffolding/scaffold/requirements.txt.jinja2 b/opal/scaffolding/scaffold/requirements.txt.jinja2 index a9d5ee6a0..855f1dccb 100644 --- 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/setup.py b/setup.py index 1e8a9b306..7855b840f 100644 --- 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', From 8cf51e6cd3eff476cc1bcac6446a91cdd5f7d197 Mon Sep 17 00:00:00 2001 From: fredkingham Date: Tue, 19 Feb 2019 16:12:30 +0000 Subject: [PATCH 2/3] Removes the dependency from setup.py as we are only on python3 now --- changelog.md | 2 +- setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 843eaa89b..d7d6b1997 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ ### 0.13.1 (Minor Release) -Upgrades the setup.py Django version from 2.0.9 to 2.0.13 +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) diff --git a/setup.py b/setup.py index 7855b840f..9551326ea 100644 --- a/setup.py +++ b/setup.py @@ -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", From 42f6ec46736b81b7fae834cdcdacd0a47b90d639 Mon Sep 17 00:00:00 2001 From: fredkingham Date: Fri, 22 Feb 2019 16:03:12 +0000 Subject: [PATCH 3/3] bumping the version to 0.13.1 --- doc/mkdocs.yml | 2 +- opal/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/mkdocs.yml b/doc/mkdocs.yml index 94e9e7d18..a8f6e135a 100644 --- 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.13.1 markdown_extensions: - fenced_code diff --git a/opal/_version.py b/opal/_version.py index b08c829ed..0a555bc3a 100644 --- a/opal/_version.py +++ b/opal/_version.py @@ -1,4 +1,4 @@ """ Declare our current version string """ -__version__ = '0.13.0' +__version__ = '0.13.1'