Merge pull request #1353 from hlmnrmr/fix-124-capi-expiry

fix(content-api): by default items should not expire in capi
superdesk · Sep 6, 2018 · 8c07557 · 8c07557
2 parents d7fd042 + e26e560
commit 8c07557
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Superdesk Server Changelog
 
+## [1.24.1] 2018-09-06
+
+### Fixed
+
+- By default items should not expire in the Superdesk Content API.
+
 ## [1.24] 2018-08-20
 
 ### Fixed

diff --git a/content_api/commands/remove_expired_items.py b/content_api/commands/remove_expired_items.py
@@ -25,7 +25,7 @@ class RemoveExpiredItems(superdesk.Command):
     """Remove expired items from the content_api items collection"""
 
     log_msg = ''
-    expiry_days = 150
+    expiry_days = 0  # by default this should not run
 
     option_list = [
         superdesk.Option('--expiry', '-m', dest='expiry_days', required=False)

diff --git a/setup.py b/setup.py
@@ -66,7 +66,7 @@
 
 setup(
     name='Superdesk-Core',
-    version='1.24',
+    version='1.24.1',
     description='Superdesk Core library',
     long_description=LONG_DESCRIPTION,
     author='petr jasek',

diff --git a/superdesk/__init__.py b/superdesk/__init__.py
@@ -25,7 +25,7 @@
 from .privilege import privilege, intrinsic_privilege, get_intrinsic_privileges  # noqa
 from .workflow import *  # noqa
 
-__version__ = '1.24'
+__version__ = '1.24.1'
 
 API_NAME = 'Superdesk API'
 SCHEMA_VERSION = 0