diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-03-29 17:06:38 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-03-29 17:42:34 -0400 |
| commit | c65c7cdb0f600c2c8eba2cca63377fd81928401c (patch) | |
| tree | 00398cb6f7feaad2be08a0b3ca58f3dba771973f | |
| parent | 790cae983cc1ac0a78d8eddc2a9176d801fe6306 (diff) | |
| download | askbot-c65c7cdb0f600c2c8eba2cca63377fd81928401c.tar.gz askbot-c65c7cdb0f600c2c8eba2cca63377fd81928401c.tar.bz2 askbot-c65c7cdb0f600c2c8eba2cca63377fd81928401c.zip | |
bumped version to 0.7.40
| -rw-r--r-- | askbot/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/doc/source/changelog.rst | 6 | ||||
| -rw-r--r-- | askbot/tests/form_tests.py | 3 | ||||
| -rw-r--r-- | askbot/views/readers.py | 2 | ||||
| -rw-r--r-- | askbot_requirements.txt | 2 | ||||
| -rw-r--r-- | askbot_requirements_dev.txt | 2 |
6 files changed, 11 insertions, 6 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py index 7b8a7280..0962acd8 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -15,7 +15,7 @@ VERSION = (0, 7, 39) #values - the package qualifier to use for pip REQUIREMENTS = { 'akismet': 'akismet', - 'django': 'django>=1.1.2', + 'django': 'django==1.3.1', 'jinja2': 'Jinja2', 'coffin': 'Coffin>=0.3', 'south': 'South>=0.7.1', diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst index a1a2eaf7..1055caf7 100644 --- a/askbot/doc/source/changelog.rst +++ b/askbot/doc/source/changelog.rst @@ -1,8 +1,8 @@ Changes in Askbot ================= -Development version (not released yet) --------------------------------------- +0.7.40 (March 29, 2012) +----------------------- * New data models!!! (`Tomasz Zieliński <http://pyconsultant.eu>`_) * Made email recovery link work when askbot is deployed on subdirectory (Evgeny) * Added tests for the CSRF_COOKIE_DOMAIN setting in the startup_procedures (Evgeny) @@ -25,6 +25,8 @@ Development version (not released yet) * Added "reply by email" function (`Vasil Vangelovski <http://www.atomidata.com>`_) * Enabled "ask by email" via Lamson (Evgeny) * Tags can be optional (Evgeny) +* Fixed dependency of Django up to 1.3.1, because settings must be upgraded + for Django 1.4 (Evgeny) 0.7.39 (Jan 11, 2012) --------------------- diff --git a/askbot/tests/form_tests.py b/askbot/tests/form_tests.py index 22f2a77c..4c67c1ff 100644 --- a/askbot/tests/form_tests.py +++ b/askbot/tests/form_tests.py @@ -50,6 +50,8 @@ class AskByEmailFormTests(AskbotTestCase): def test_subject_line(self): """loops through various forms of the subject line and makes sure that tags and title are parsed out""" + setting_backup = askbot_settings.TAGS_ARE_REQUIRED + askbot_settings.update('TAGS_ARE_REQUIRED', True) for test_case in SUBJECT_LINE_CASES: self.data['subject'] = test_case[0] form = forms.AskByEmailForm(self.data) @@ -66,6 +68,7 @@ class AskByEmailFormTests(AskbotTestCase): form.cleaned_data['title'], output[1] ) + askbot_settings.update('TAGS_ARE_REQUIRED', setting_backup) def test_email(self): """loops through variants of the from field diff --git a/askbot/views/readers.py b/askbot/views/readers.py index 5ff7889d..7886439c 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -525,7 +525,7 @@ def question(request, id):#refactor - long subroutine. display question body, an ) data = { - 'is_cacheable': is_cacheable, + 'is_cacheable': False,#is_cacheable, #temporary, until invalidation fix 'long_time': const.LONG_TIME,#"forever" caching 'page_class': 'question-page', 'active_tab': 'questions', diff --git a/askbot_requirements.txt b/askbot_requirements.txt index 5bf06e30..301fb93e 100644 --- a/askbot_requirements.txt +++ b/askbot_requirements.txt @@ -1,5 +1,5 @@ akismet -django>=1.1.2 +django==1.3.1 Jinja2 Coffin>=0.3 South>=0.7.1 diff --git a/askbot_requirements_dev.txt b/askbot_requirements_dev.txt index e05e53b6..199f0308 100644 --- a/askbot_requirements_dev.txt +++ b/askbot_requirements_dev.txt @@ -1,5 +1,5 @@ akismet -django>=1.1.2 +django==1.3.1 Jinja2 Coffin>=0.3 South>=0.7.1 |