Skip to content

Commit 30df14e

Browse files
committed
Publishes version 0.11.0
2 parents f0baf57 + ad68118 commit 30df14e

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

README.rst

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,11 @@ Branch `0.7.x` - is the latest version supporting Django 1.5
1717

1818
Branch `0.8.x` - transitional version for the upgrade of the database to Django 1.7
1919

20-
Branch `0.9.x` - supports Django 1.7
20+
Branch `0.9.x` supports Django 1.7
2121

2222
Branch `0.10.x` - supports Django 1.8
2323

24-
Branch `master` - EXPERIMENTAL - supports Django 2.2/Python 3, soon to be released
25-
26-
NOTE: the `master` branch lacks the file settings.py generator
27-
use askbot/setup_templates/settings.py.jinja2 as a basis for your settings.py file.
28-
this is very soon to be resolved.
24+
Branch `master` - released as versions 0.11.x - supports Django 2.2/Python 3
2925

3026
How to contribute
3127
=================
@@ -49,7 +45,6 @@ License, copyright and trademarks
4945
=================================
5046
Askbot software is licensed under GPL, version 3.
5147

52-
Copyright Askbot S.p.A and the project contributors, 2010-2019.
48+
Copyright Askbot S.p.A and the project contributors, 2010-2020.
5349

5450
"Askbot" is a trademark and service mark registered in the United States, number 4323777.
55-

setup.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@
55
import sys
66
import askbot
77

8+
PYTHON_VERSION_INFO = \
9+
"""
10+
ERROR: This version of Askbot only works with Python 3,
11+
if you need Askbot to work with Python 2,
12+
try versions 0.10.x and earlier.
13+
"""
14+
15+
if sys.version_info[0] < 3:
16+
print(PYTHON_VERSION_INFO)
17+
sys.exit(1)
18+
819
setup(
920
name = "askbot",
1021
version = askbot.get_version(),#remember to manually set this correctly
@@ -35,18 +46,17 @@
3546
'Natural Language :: Serbian',
3647
'Natural Language :: Turkish',
3748
'Operating System :: OS Independent',
38-
'Programming Language :: Python :: 2.5',
39-
'Programming Language :: Python :: 2.6',
40-
'Programming Language :: Python :: 2.7',
49+
'Programming Language :: Python :: 3',
4150
'Programming Language :: JavaScript',
4251
'Topic :: Communications :: Usenet News',
4352
'Topic :: Communications :: Email :: Mailing List Servers',
4453
'Topic :: Communications',
4554
'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
4655
],
47-
long_description = """Askbot will work alone or with other django apps (with some limitations, please see below), Django 1.8, PostgresQL(recommended) and MySQL >5.6
56+
long_description_content_type='text/markdown',
57+
long_description = """Askbot will work alone or with other django apps (with some limitations, please see below), Django 2.2, PostgresQL(recommended) and MySQL >5.6
4858
49-
This version of Askbot supports only Django 1.8.
59+
This version of Askbot supports only Django 2 and Python 3. Versions 0.10.x and earlier support Python 2.
5060
5161
To upgrade, or select version of Askbot working with earlier versions of Django,
5262
please follow instructions at

0 commit comments

Comments
 (0)