aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Tibold2012-04-11 23:51:00 +0200
committerMarko Tibold2012-04-11 23:51:00 +0200
commit64a49905a40f5718d721f9ea300a1d42c8886392 (patch)
tree5af1bcf0cabbcec177fe2f22370fa62f230cdfb5
parenta07212389d86081353c9702880dd0da23d9579d5 (diff)
downloaddjango-rest-framework-64a49905a40f5718d721f9ea300a1d42c8886392.tar.bz2
Use seuptools to be explicit about optional version-dependency of markdown.
-rw-r--r--CHANGELOG.rst5
-rwxr-xr-xsetup.py3
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ddc3ac17..6471edbe 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Release Notes
=============
+0.4.0-dev
+---------
+
+* Markdown < 2.0 is no longer supported.
+
0.3.3
-----
diff --git a/setup.py b/setup.py
index 5cd2a28f..79bd7353 100755
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,9 @@ setup(
package_data=get_package_data('djangorestframework'),
test_suite='djangorestframework.runtests.runcoverage.main',
install_requires=['URLObject>=0.6.0'],
+ extras_require={
+ 'markdown': ["Markdown>=2.0"]
+ },
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Web Environment',