merges 0.8.x, version 0.9.4

Author: evgenyfadeev

README.rst

@@ -12,7 +12,9 @@ Branch `0.7.x` - is the latest version supporting Django 1.5
 
 Branch `0.8.x` - transitional version for the upgrade of the database to Django 1.7
 
-Branch `master` supports Django 1.7
+Branch `0.9.x` supports Django 1.7
+
+Branch `0.10.x` support Django 1.8
 
 How to contribute
 =================
@@ -40,7 +42,6 @@ License, copyright and trademarks
 =================================
 Askbot software is licensed under GPL, version 3.
 
-Copyright Askbot S.p.A and the project contributors, 2010-2015.
+Copyright Askbot S.p.A and the project contributors, 2010-2020.
 
 "Askbot" is a trademark and service mark registered in the United States, number 4323777.
-

askbot/__init__.py

@@ -7,14 +7,14 @@
 import os
 import platform
 
-VERSION = (0, 9, 3)
+VERSION = (0, 9, 4)
 
 default_app_config = 'askbot.apps.AskbotConfig'
 
 #keys are module names used by python imports,
 #values - the package qualifier to use for pip
 REQUIREMENTS = {
-    'appconf': 'django-appconf',
+    'appconf': 'django-appconf<=1.0.3',
     'akismet': 'akismet==1.0.1',
     'avatar': 'django-avatar==2.2.1',
     'bs4': 'beautifulsoup4<=4.4.1',
@@ -33,11 +33,13 @@
     'jwt': 'pyjwt<=1.7.1',
     'keyedcache': 'django-keyedcache<=1.5.1',
     'longerusername': 'longerusername<=0.4',
+    'markupsafe': 'MarkupSafe<=1.1.1',
     'markdown2': 'markdown2<=2.3.1',
     'mock': 'mock==2.0.0',
     'oauth2': 'oauth2<=1.9.0.post1',
     'openid': 'python-openid<=2.2.5',
     'picklefield': 'django-picklefield==0.3.0',
+    'PIL': 'Pillow<=6.2.2',
     'pystache': 'pystache==0.3.1',
     'pytz': 'pytz<=2016.4',
     'captcha': 'django-recaptcha>=1.0.3,<=1.0.5',

askbot/search/postgresql/thread_and_post_models_01022013.plsql

@@ -52,7 +52,6 @@ DECLARE
     onerow record;
 BEGIN
     DROP AGGREGATE IF EXISTS concat_tsvectors(tsvector);
-    END LOOP;
     CREATE AGGREGATE concat_tsvectors (
         BASETYPE = tsvector,
         SFUNC = tsv_add,

askbot_requirements.txt

@@ -1,6 +1,6 @@
 Coffin>=0.3,<=0.3.8
 Jinja2==2.8
-django-appconf
+django-appconf<=1.0.3
 South>=0.7.1,<=1.0.2
 akismet==1.0.1
 beautifulsoup4<=4.4.1
@@ -21,9 +21,11 @@ django-transaction-signals==1.0.0
 django<1.8
 html5lib==0.9999999
 jsonfield<=1.0.3
+MarkupSafe<=1.1.1
 markdown2<=2.3.1
 mock==2.0.0
 oauth2<=1.9.0.post1
+Pillow<=6.2.2
 pyjwt<=1.4.0
 pystache==0.3.1
 python-cas==1.1.0

setup.py

@@ -47,7 +47,8 @@
         'Topic :: Communications',
         'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
     ],
-    long_description = """Askbot will work alone or with other django apps (with some limitations, please see below), Django 1.7, PostgresQL(recommended) (>=8.3) and MySQL(**) (MyISAM backend only - see footnote **)
+    long_description_content_type='text/markdown',
+    long_description="""Askbot will work alone or with other django apps (with some limitations, please see below), Django 1.7, PostgresQL(recommended) (>=8.3) and MySQL(**) (MyISAM backend only - see footnote **)
 
     This version of Askbot supports only Django 1.7.