Skip to content

Commit

Permalink
Merge pull request #1864 from petrjasek/master
Browse files Browse the repository at this point in the history
chore: update server/client core
  • Loading branch information
petrjasek committed Mar 24, 2016
2 parents 6b7539b + 44f6945 commit e91ef3f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "superdesk",
"license": "GPL-3.0",
"dependencies": {
"superdesk-core": "superdesk/superdesk-client-core#a71b2086",
"superdesk-core": "superdesk/superdesk-client-core#90f64b638",
"grunt": "~0.4.5",
"grunt-angular-gettext": "2.1.3",
"grunt-angular-templates": "0.5.7",
Expand Down
4 changes: 2 additions & 2 deletions scripts/update-cores-references.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion server/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e91ef3f

Please sign in to comment.