From 2959328333b59f9f2cb903b976ed26d8c94b74e0 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Mon, 5 Mar 2012 16:57:18 -0500 Subject: [PATCH] Go --- fabfile.py | 17 +++++++++++++++-- media/css/style.css | 1 + media/css/style.scss | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/fabfile.py b/fabfile.py index a800b54..add27cb 100644 --- a/fabfile.py +++ b/fabfile.py @@ -3,9 +3,22 @@ from fabric.api import cd, local, env, run env.hosts = ['nick@beta.snipt.net:39039'] env.site_path = '/var/www/snipt' +env.venv_path = '/home/nick/.virtualenvs/snipt' -def deploy(): +def _python(cmd): + return env.venv_path.rstrip('/') + '/bin/python ' + cmd + +def deploy(m): local('python manage.py collectstatic --ignore grappelli --ignore admin --noinput') + + try: + local('hg commit -m {}'.format(m)) + local('hg push') + except: + pass + with cd(env.site_path): run('hg pull -u') - run('python manage.py collectstatic --ignore grappelli --ignore admin --noinput') + run(_python('manage.py collectstatic --ignore grappelli --ignore admin --noinput')) + + diff --git a/media/css/style.css b/media/css/style.css index 69e35f9..28124dc 100644 --- a/media/css/style.css +++ b/media/css/style.css @@ -3,6 +3,7 @@ html, body { } body { + background: blue; color: #666; font: normal 14px/16px "Helvetica Neue", Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif; text-rendering: optimizeLegibility; diff --git a/media/css/style.scss b/media/css/style.scss index c2fcc96..bb75c17 100644 --- a/media/css/style.scss +++ b/media/css/style.scss @@ -58,6 +58,7 @@ html, body { background: #F5F2F3 url('/static/images/bg.gif') top left repeat; } body { + background: blue; color: #666; font: normal 14px/16px $Helvetica; text-rendering: optimizeLegibility;