From a3d63b1e42223ea0a2b8c40afd6b4f7e681d7029 Mon Sep 17 00:00:00 2001 From: Petr Date: Thu, 24 Mar 2016 07:17:17 +0100 Subject: [PATCH 1/2] chore: update server/client core plus fix update cores script pattern --- client/package.json | 2 +- scripts/update-cores-references.py | 4 ++-- server/requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/package.json b/client/package.json index f5e43e959..b68c20fcb 100644 --- a/client/package.json +++ b/client/package.json @@ -2,7 +2,7 @@ "name": "superdesk", "license": "GPL-3.0", "dependencies": { - "superdesk-core": "superdesk/superdesk-client-core#a71b2086", + "superdesk-core": "superdesk/superdesk-client-core#50a1b7369", "grunt": "~0.4.5", "grunt-angular-gettext": "2.1.3", "grunt-angular-templates": "0.5.7", diff --git a/scripts/update-cores-references.py b/scripts/update-cores-references.py index a2654991b..af86ca414 100755 --- a/scripts/update-cores-references.py +++ b/scripts/update-cores-references.py @@ -8,7 +8,7 @@ { 'feed_url': 'https://github.com/superdesk/superdesk-core/commits/master.atom', 'file_name': 'server/requirements.txt', - 'pattern': 'superdesk-core@([a-f0-9]*)' + 'pattern': 'superdesk-core.git@([a-f0-9]*)' }, # superdesk-client-core { @@ -20,7 +20,7 @@ def get_last_commit(url): feed = feedparser.parse(url) - return feed['entries'][0]['id'].split('/')[1] + return feed['entries'][0]['id'].split('/')[1][:9] def replace_in_file(filename, search, new_value): diff --git a/server/requirements.txt b/server/requirements.txt index 9470dfc20..e4be83ac1 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -3,4 +3,4 @@ honcho==0.6.6 pymongo==2.8 Eve==0.6.0 -git+git://github.com/superdesk/superdesk-core.git@ea1b2b492#egg=Superdesk-Core +git+git://github.com/superdesk/superdesk-core.git@aabd26744#egg=Superdesk-Core From 44f6945b101c336aef77935cfdce070a6d83515e Mon Sep 17 00:00:00 2001 From: Petr Date: Thu, 24 Mar 2016 14:33:11 +0100 Subject: [PATCH 2/2] chore(client): update client core again --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index b68c20fcb..ac84ca2a2 100644 --- a/client/package.json +++ b/client/package.json @@ -2,7 +2,7 @@ "name": "superdesk", "license": "GPL-3.0", "dependencies": { - "superdesk-core": "superdesk/superdesk-client-core#50a1b7369", + "superdesk-core": "superdesk/superdesk-client-core#90f64b638", "grunt": "~0.4.5", "grunt-angular-gettext": "2.1.3", "grunt-angular-templates": "0.5.7",