Merge branch 'release/0.1.4'

klen · Aug 5, 2012 · 25d83e6 · 25d83e6
2 parents 2d94833 + 26f0882
commit 25d83e6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 4 deletions.
diff --git a/.makesite/flask/service/flask_install_update.sh.tmpl b/.makesite/flask/service/flask_install_update.sh.tmpl
@@ -8,4 +8,6 @@ DEPLOYDIR={{ deploy_dir }}
 
 
 sudo $PYTHON $SOURCEDIR/manage.py collect
+sudo $PYTHON $SOURCEDIR/manage.py create_db
+sudo $PYTHON $SOURCEDIR/manage.py migrate run
 sudo chown $USER:$GROUP -R $DEPLOYDIR
diff --git a/Changelog b/Changelog
@@ -1,3 +1,7 @@
+2012-08-06  klen
+
+	* Release 0.1.4
+
 2012-08-05  klen
 
 	* Update Flask-Collect

diff --git a/Makefile b/Makefile
@@ -49,3 +49,7 @@ babel: $(BABELDIR)/ru
 
 $(BABELDIR)/ru:
 	$(PYBABEL) init -i $(BABELDIR)/babel.pot -d $(BABELDIR) -l ru
+
+.PHONY: chown
+chown:
+	sudo chown $(USER):$(USER) -R $(CURDIR)
diff --git a/base/__init__.py b/base/__init__.py
@@ -1 +1 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"
diff --git a/base/config/production.py b/base/config/production.py
@@ -15,7 +15,7 @@
 DEFAULT_MAIL_SENDER = 'Admin < %s >' % MAIL_USERNAME
 
 ADMINS = frozenset([MAIL_USERNAME])
-COLLECT_STATIC_DIR = op.join(op.dirname(ROOTDIR), 'static')
+COLLECT_STATIC_ROOT = op.join(op.dirname(ROOTDIR), 'static')
 
 OAUTH_TWITTER = dict(
     base_url='http://api.twitter.com/1/',

diff --git a/base/tweetchi/tweetchi.py b/base/tweetchi/tweetchi.py
@@ -41,9 +41,9 @@ def update(self, message, **kwargs):
     def beat(self):
         tweetchi_beat.send(self)
         stack = self.stack
-        print stack
         while stack:
             message, params = stack.pop(0)
+            self.app.logger.info(message)
             self.update(message, **params)
 
         self.stack = []

diff --git a/makesite.ini b/makesite.ini
@@ -1,5 +1,5 @@
 [Main]
-template=virtualenv,uwsgi,celeryd,flask
+template=virtualenv,uwsgi,flask
 
 [Templates]
 flask=%(source_dir)s/.makesite/flask