Skip to content
Browse files

Merge branch 'release/0.1.4'

  • Loading branch information...
2 parents 2d94833 + 26f0882 commit 25d83e6a26629ca3d590e5163c4bea3f0f67d2f4 @klen committed
Showing with 14 additions and 4 deletions.
  1. +2 −0 .makesite/flask/service/flask_install_update.sh.tmpl
  2. +4 −0 Changelog
  3. +4 −0 Makefile
  4. +1 −1 base/__init__.py
  5. +1 −1 base/config/production.py
  6. +1 −1 base/tweetchi/tweetchi.py
  7. +1 −1 makesite.ini
View
2 .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
View
4 Changelog
@@ -1,3 +1,7 @@
+2012-08-06 klen
+
+ * Release 0.1.4
+
2012-08-05 klen
* Update Flask-Collect
View
4 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)
View
2 base/__init__.py
@@ -1 +1 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"
View
2 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/',
View
2 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 = []
View
2 makesite.ini
@@ -1,5 +1,5 @@
[Main]
-template=virtualenv,uwsgi,celeryd,flask
+template=virtualenv,uwsgi,flask
[Templates]
flask=%(source_dir)s/.makesite/flask

0 comments on commit 25d83e6

Please sign in to comment.
Something went wrong with that request. Please try again.