From efb8a35ea4fb259140aebbe676ed44509136808f Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 10 Jul 2019 02:57:53 -0400 Subject: [PATCH 1/5] Update changelog, add release notes for v3.2.6 Signed-off-by: Roberto Rosario --- HISTORY.rst | 5 +- docs/releases/3.2.6.rst | 111 ++++++++++++++++++++++++++++++++++++++++ docs/releases/index.rst | 1 + 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 docs/releases/3.2.6.rst diff --git a/HISTORY.rst b/HISTORY.rst index 40902f1315..8f70bcdaac 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,9 +1,12 @@ -3.2.6 (2019-07-XX) +3.2.6 (2019-07-10) ================== * Remove the smart settings app * import. * Encode settings YAML before hashing. * Fix document icon used in the workflow runtime links. * Add trashed date time label. +* Fix thumbnail generation issue. GitLab issue #637. + Thanks to Giacomo Cariello (@giacomocariello) for the report + and the merge request fixing the issue. 3.2.5 (2019-07-05) ================== diff --git a/docs/releases/3.2.6.rst b/docs/releases/3.2.6.rst new file mode 100644 index 0000000000..0e897a24c9 --- /dev/null +++ b/docs/releases/3.2.6.rst @@ -0,0 +1,111 @@ +Version 3.2.6 +============= + +Released: July 10, 2019 + + +Changes +------- + +- Remove the smart settings app * import. Following MERC 0005. +- Encode settings YAML before hashing. Avoids unicode issues with Python 3. +- Fix document icon used in the workflow runtime links. +- Add trashed date time label. +- Fix thumbnail generation issue. GitLab issue #637. + Thanks to Giacomo Cariello (@giacomocariello) for the report + and the merge request fixing the issue. + +Removals +-------- + +- None + + +Upgrading from a previous version +--------------------------------- + +If installed via Python's PIP +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Remove deprecated requirements:: + + sudo -u mayan curl https://gitlab.com/mayan-edms/mayan-edms/raw/master/removals.txt -o /tmp/removals.txt && sudo -u mayan /opt/mayan-edms/bin/pip uninstall -y -r /tmp/removals.txt + +Type in the console:: + + sudo -u mayan /opt/mayan-edms/bin/pip install mayan-edms==3.2.6 + +the requirements will also be updated automatically. + + +Using Git +^^^^^^^^^ + +If you installed Mayan EDMS by cloning the Git repository issue the commands:: + + $ git reset --hard HEAD + $ git pull + +otherwise download the compressed archived and uncompress it overriding the +existing installation. + +Remove deprecated requirements:: + + $ pip uninstall -y -r removals.txt + +Next upgrade/add the new requirements:: + + $ pip install --upgrade -r requirements.txt + + +Common steps +^^^^^^^^^^^^ + +Perform these steps after updating the code from either step above. + +Make a backup of your supervisord file:: + + sudo cp /etc/supervisor/conf.d/mayan.conf /etc/supervisor/conf.d/mayan.conf.bck + +Update the supervisord configuration file. Replace the environment +variables values show here with your respective settings. This step will refresh +the supervisord configuration file with the new queues and the latest +recommended layout:: + + sudo MAYAN_DATABASE_ENGINE=django.db.backends.postgresql MAYAN_DATABASE_NAME=mayan \ + MAYAN_DATABASE_PASSWORD=mayanuserpass MAYAN_DATABASE_USER=mayan \ + MAYAN_DATABASE_HOST=127.0.0.1 MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \ + /opt/mayan-edms/bin/mayan-edms.py platformtemplate supervisord > /etc/supervisor/conf.d/mayan.conf + +Edit the supervisord configuration file and update any setting the template +generator missed:: + + sudo vi /etc/supervisor/conf.d/mayan.conf + +Migrate existing database schema with:: + + sudo -u mayan MAYAN_DATABASE_ENGINE=django.db.backends.postgresql MAYAN_DATABASE_NAME=mayan \ + MAYAN_DATABASE_PASSWORD=mayanuserpass MAYAN_DATABASE_USER=mayan \ + MAYAN_DATABASE_HOST=127.0.0.1 MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \ + /opt/mayan-edms/bin/mayan-edms.py performupgrade + +Add new static media:: + + sudo -u mayan MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \ + /opt/mayan-edms/bin/mayan-edms.py preparestatic --noinput + +The upgrade procedure is now complete. + + +Backward incompatible changes +----------------------------- + +- None + + +Bugs fixed or issues closed +--------------------------- + +- :gitlab-issue:`637` Thumbnail generation bug + +.. _PyPI: https://pypi.python.org/pypi/mayan-edms/ diff --git a/docs/releases/index.rst b/docs/releases/index.rst index 80bdb19c1e..452c02cdb6 100644 --- a/docs/releases/index.rst +++ b/docs/releases/index.rst @@ -20,6 +20,7 @@ versions of the documentation contain the release notes for any later releases. .. toctree:: :maxdepth: 1 + 3.2.6 3.2.5 3.2.4 3.2.3 From 6dde3e1ac3b81b3e21b7a898fc4553a9cd9b3a88 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 10 Jul 2019 03:14:12 -0400 Subject: [PATCH 2/5] PEP8 cleanup Signed-off-by: Roberto Rosario --- mayan/apps/smart_settings/tests/test_classes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mayan/apps/smart_settings/tests/test_classes.py b/mayan/apps/smart_settings/tests/test_classes.py index 6e88607f7f..dc472dd245 100644 --- a/mayan/apps/smart_settings/tests/test_classes.py +++ b/mayan/apps/smart_settings/tests/test_classes.py @@ -11,7 +11,7 @@ from mayan.apps.common.settings import setting_paginate_by from mayan.apps.common.tests import BaseTestCase from mayan.apps.storage.utils import fs_cleanup -from ..classes import Namespace, Setting +from ..classes import Setting from .literals import ENVIRONMENT_TEST_NAME, ENVIRONMENT_TEST_VALUE from .mixins import SmartSettingTestMixin @@ -52,4 +52,3 @@ class ClassesTestCase(SmartSettingTestMixin, BaseTestCase): self.assertFalse(Setting.check_changed()) test_setting.value = 'test value edited' self.assertTrue(Setting.check_changed()) - From d04f1eb9a5054dc134744562d224435416f6e7a1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 10 Jul 2019 03:17:04 -0400 Subject: [PATCH 3/5] Improve Setting check changed test Signed-off-by: Roberto Rosario --- mayan/apps/smart_settings/tests/test_classes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mayan/apps/smart_settings/tests/test_classes.py b/mayan/apps/smart_settings/tests/test_classes.py index dc472dd245..4eb6839ea9 100644 --- a/mayan/apps/smart_settings/tests/test_classes.py +++ b/mayan/apps/smart_settings/tests/test_classes.py @@ -48,6 +48,7 @@ class ClassesTestCase(SmartSettingTestMixin, BaseTestCase): default='test value' ) # Initialize hash cache + Setting._cache_hash = None Setting.check_changed() self.assertFalse(Setting.check_changed()) test_setting.value = 'test value edited' From 1e1e930e88a1508a195292001033dc666a0c7131 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 10 Jul 2019 03:18:07 -0400 Subject: [PATCH 4/5] Bump version to 3.2.6 Signed-off-by: Roberto Rosario --- docker/rootfs/version | 2 +- mayan/__init__.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/rootfs/version b/docker/rootfs/version index 5ae69bd5f0..34cde5690e 100755 --- a/docker/rootfs/version +++ b/docker/rootfs/version @@ -1 +1 @@ -3.2.5 +3.2.6 diff --git a/mayan/__init__.py b/mayan/__init__.py index 3c4a65b10d..971d0e8e2e 100644 --- a/mayan/__init__.py +++ b/mayan/__init__.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals __title__ = 'Mayan EDMS' -__version__ = '3.2.5' -__build__ = 0x030205 -__build_string__ = 'v3.2.5_Fri Jul 5 16:39:17 2019 -0400' +__version__ = '3.2.6' +__build__ = 0x030206 +__build_string__ = 'v3.2.5-11-gd04f1eb9a5_Wed Jul 10 03:17:04 2019 -0400' __django_version__ = '1.11' __author__ = 'Roberto Rosario' __author_email__ = 'roberto.rosario@mayan-edms.com' From 3621af7e7dc7773142e5b42a12c3513632c80126 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 10 Jul 2019 03:19:09 -0400 Subject: [PATCH 5/5] Update build string Signed-off-by: Roberto Rosario --- mayan/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mayan/__init__.py b/mayan/__init__.py index 971d0e8e2e..5c740e43d9 100644 --- a/mayan/__init__.py +++ b/mayan/__init__.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals __title__ = 'Mayan EDMS' __version__ = '3.2.6' __build__ = 0x030206 -__build_string__ = 'v3.2.5-11-gd04f1eb9a5_Wed Jul 10 03:17:04 2019 -0400' +__build_string__ = 'v3.2.6_Wed Jul 10 03:18:15 2019 -0400' __django_version__ = '1.11' __author__ = 'Roberto Rosario' __author_email__ = 'roberto.rosario@mayan-edms.com'