Start adding git commit hash to the release directory name

diff --git a/fnpdjango/deploy/__init__.py b/fnpdjango/deploy/__init__.py
index 3fce286..7c20cd4 100644 (file)
--- a/fnpdjango/deploy/__init__.py
+++ b/fnpdjango/deploy/__init__.py
@@ -18,6 +18,7 @@ Then set up some env properties:
         to django_root_path (defaults to project_name/localsettings.py)
     skip_collect_static (optional): if True, Django collectstatic command is not called
 """
         to django_root_path (defaults to project_name/localsettings.py)
     skip_collect_static (optional): if True, Django collectstatic command is not called
 """

+from subprocess import check_output

 from os.path import abspath, dirname, exists, join
 from django.utils.crypto import get_random_string
 from fabric.api import *
 from os.path import abspath, dirname, exists, join
 from django.utils.crypto import get_random_string
 from fabric.api import *


@@ -64,7 +65,7 @@ def deploy():
     require('hosts', 'app_path')
 
     import time
     require('hosts', 'app_path')
 
     import time

-    env.release = time.strftime('%Y-%m-%dT%H%M')
+    env.release = '%s_%s' % (time.strftime('%Y-%m-%dT%H%M'), check_output(['git', 'rev-parse', 'HEAD']).strip())

 
     setup()
     if not check_localsettings():
 
     setup()
     if not check_localsettings():

diff --git a/setup.py b/setup.py
index 3962e6d..25a745c 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def whole_trees(package_dir, paths):
 
 setup(
     name='fnpdjango',
 
 setup(
     name='fnpdjango',

-    version='0.1.11',
+    version='0.1.12',

     author='Radek Czajka',
     author_email='radekczajka@nowoczesnapolska.org.pl',
     url = '',
     author='Radek Czajka',
     author_email='radekczajka@nowoczesnapolska.org.pl',
     url = '',