From e9eb1689e2f38ca1e5ddac107f10cb20744616fe Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 20 Oct 2012 19:38:54 -0500 Subject: [PATCH 1/3] fixed a problem with capitalization in wiki --- VERSION | 2 +- gluon/tools.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 827cea5a..d0eec140 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.1.1 (2012-10-20 15:27:09) dev +Version 2.1.1 (2012-10-20 19:38:48) dev diff --git a/gluon/tools.py b/gluon/tools.py index 3b20d71d..580d4037 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -5082,7 +5082,7 @@ class Wiki(object): content.append(DIV(form, _class='w2p_wiki_form')) if request.vars.q: tags = [v.strip() for v in request.vars.q.split(',')] - tags = [v for v in tags if v] + tags = [v.lower() for v in tags if v] if tags or not query is None: db = self.auth.db count = db.wiki_tag.wiki_page.count() From 1cc2decfddb4ec2b9a2cd8e098754504856f1990 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 21 Oct 2012 09:23:26 -0500 Subject: [PATCH 2/3] assign_task takes better care for group_names, thanks Niphlod --- VERSION | 2 +- gluon/scheduler.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index d0eec140..5040eda2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.1.1 (2012-10-20 19:38:48) dev +Version 2.1.1 (2012-10-21 09:23:20) dev diff --git a/gluon/scheduler.py b/gluon/scheduler.py index 0495d01c..fb6d5841 100644 --- a/gluon/scheduler.py +++ b/gluon/scheduler.py @@ -789,7 +789,7 @@ class Scheduler(MetaScheduler): db(st.status.belongs( (QUEUED, ASSIGNED)))(st.stop_time < now).update(status=EXPIRED) - all_available = db(st.status.belongs((QUEUED, ASSIGNED)))((st.times_run < st.repeats) | (st.repeats == 0))(st.start_time <= now)((st.stop_time is None) | (st.stop_time > now))(st.next_run_time <= now)(st.enabled == True) + all_available = db(st.status.belongs((QUEUED, ASSIGNED)))((st.times_run < st.repeats) | (st.repeats == 0))(st.start_time <= now)((st.stop_time == None) | (st.stop_time > now))(st.next_run_time <= now)(st.enabled == True) limit = len(all_workers) * (50 / len(wkgroups)) #if there are a moltitude of tasks, let's figure out a maximum of tasks per worker. #this can be adjusted with some added intelligence (like esteeming how many tasks will @@ -805,7 +805,7 @@ class Scheduler(MetaScheduler): #let's freeze it up db.commit() for group in wkgroups.keys(): - tasks = all_available(st.group_name == group).select( + tasks = all_available(st.group_name==group).select( limitby=(0, limit), orderby=st.next_run_time) #let's break up the queue evenly among workers for task in tasks: From 37bc09169f7e00b1f01ed3b263857ed3f5fa04c7 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 21 Oct 2012 10:54:13 -0500 Subject: [PATCH 3/3] R-2.2.1 --- CHANGELOG | 10 ++++++++++ Makefile | 2 +- VERSION | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 49a97ad1..16eae8ab 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +## 2.2.1 + +- session.connect(cookie_key='secret', compression_level=9) stores sessions in cookies +- T.is_writable = False prevents T from dynamically updating langauge files +- all code is more PEP8 compliant +- better custom_importer behaviour (now works per app, is smalled and faster) +- fixed some bugs +- upgraded feedparser.py and rss2.py +- codemirror has autoresize + ## 2.1.0 - overall faster web2py diff --git a/Makefile b/Makefile index 28c222ed..f8208a90 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ update: wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py echo "remember that pymysql was tweaked" src: - echo 'Version 2.1.1 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION + echo 'Version 2.2.1 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION ### rm -f all junk files make clean ### clean up baisc apps diff --git a/VERSION b/VERSION index 5040eda2..6b905346 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.1.1 (2012-10-21 09:23:20) dev +Version 2.2.1 (2012-10-21 10:54:10) stable