From 38c33b67033bbb088d4cdbe767eb2bb2d173742b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 5 Jul 2019 15:28:39 -0400 Subject: [PATCH] Update Django to version 1.11.22 Signed-off-by: Roberto Rosario --- HISTORY.rst | 1 + docs/releases/3.2.5.rst | 1 + mayan/__init__.py | 2 +- mayan/apps/common/dependencies.py | 2 +- requirements/common.txt | 2 +- setup.py | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 272d06b1e3..e57b6575a9 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -11,6 +11,7 @@ * Add alert when settings are changed and util the installation is restarted. GitLab issue #605. Thanks to Vikas Kedia (@vikaskedia) to the report. +* Update Django to version 1.11.22. 3.2.4 (2019-06-29) ================== diff --git a/docs/releases/3.2.5.rst b/docs/releases/3.2.5.rst index 4bfc90146b..d9c8539fcf 100644 --- a/docs/releases/3.2.5.rst +++ b/docs/releases/3.2.5.rst @@ -18,6 +18,7 @@ Changes - Add alert when settings are changed and util the installation is restarted. GitLab issue #605. Thanks to Vikas Kedia (@vikaskedia) to the report. +- Update Django to version 1.11.22. Removals -------- diff --git a/mayan/__init__.py b/mayan/__init__.py index 02c2642a13..d6a049c6b8 100644 --- a/mayan/__init__.py +++ b/mayan/__init__.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals __title__ = 'Mayan EDMS' __version__ = '3.2.4' __build__ = 0x030204 -__build_string__ = 'v3.2.4_Sat Jun 29 02:50:51 2019 -0400' +__build_string__ = 'v3.2.4-16-g557a20d6cc_Fri Jul 5 03:10:42 2019 -0400' __django_version__ = '1.11' __author__ = 'Roberto Rosario' __author_email__ = 'roberto.rosario@mayan-edms.com' diff --git a/mayan/apps/common/dependencies.py b/mayan/apps/common/dependencies.py index d8f1c71ba1..e4c5ba335c 100644 --- a/mayan/apps/common/dependencies.py +++ b/mayan/apps/common/dependencies.py @@ -36,7 +36,7 @@ PythonDependency( ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ''', module=__name__, name='django', version_string='==1.11.20' + ''', module=__name__, name='django', version_string='==1.11.22' ) PythonDependency( copyright_text=''' diff --git a/requirements/common.txt b/requirements/common.txt index 86583ad884..08f9ef96a1 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -1 +1 @@ -django==1.11.20 +django==1.11.22 diff --git a/setup.py b/setup.py index 82e884c336..f5faa6b54f 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ def find_packages(directory): return packages install_requires = """ -django==1.11.20 +django==1.11.22 Pillow==6.0.0 PyPDF2==1.26.0 PyYAML==5.1