Skip to content
Permalink
Browse files

Bump to 0.5 and fix a documentation issue (#991)

* Use Django 3.0 properties of related fields

* Bump to 0.5
  • Loading branch information
benjaoming committed Nov 19, 2019
1 parent 8b6b7ba commit 969984f3f09e312dcf7c2e97922982b89cecf2e8
Showing with 33 additions and 19 deletions.
  1. +1 −1 README.rst
  2. +2 −2 docs/conf.py
  3. +24 −5 docs/release_notes.rst
  4. +3 −7 requirements_readthedocs.txt
  5. +1 −1 src/wiki/__init__.py
  6. +2 −3 src/wiki/decorators.py
@@ -26,7 +26,7 @@ The below table explains which Django versions are supported.
+------------------+----------------+--------------+
| Release | Django | Upgrade from |
+==================+================+==============+
| 0.5.x (DEV) | 2.1, 2.2, 3.0 | 0.4 |
| 0.5.x | 2.1, 2.2, 3.0 | 0.4 |
+------------------+----------------+--------------+
| 0.4.x | 1.11, 2.0, 2.1 | 0.3 |
+------------------+----------------+--------------+
@@ -83,8 +83,8 @@ def process_docstring(app, what, name, obj, options, lines):

# Add the field's type to the docstring
if isinstance(field, models.ForeignKey):
to = field.rel.to
lines.append(u':type %s: %s to :class:`~%s`' % (field.attname, type(field).__name__, to))
for to in field.to_fields:
lines.append(u':type %s: %s to :class:`~%s`' % (field.attname, type(field).__name__, to))
else:
lines.append(u':type %s: %s' % (field.attname, type(field).__name__))

@@ -6,18 +6,37 @@ Release plan
------------


* **0.3** series supported Django 1.11. As with the upstream Django release, 0.3 was be the last series with Python 2.7 support.
* **0.4+** supports Django 1.11 and Django 2.x and Python 3.4+.
* **0.5** should remove Django 1.11 support and target Bootstrap v4, if you are interested in this work, please get in touch on Github!
* **0.3.x** series suppors Django 1.11. As with the upstream Django release, 0.3 was be the last series with Python 2.7 support.
* **0.4.x** supports Django 1.11 and Django 2.1 and Python 3.4+.
* **0.5.x** Remove Django 1.11 support, adds Django 2.2 and 3.x support.
* **0.6.x (unreleased)** Targets Bootstrap v4, if you are interested in this work, please get in touch on Github!


0.5.dev (unreleased)
--------------------
0.5
---

Changed
~~~~~~~

* Update to Markdown >= 3.1 :url-issue:`920` (Don Bowman, Benjamin Bach)
* Several code-cleanups, test improvements and test

Added
~~~~~

* Django 2.2, 3.0 support

Removed
~~~~~~~

* Django 1.1 support

Translations
~~~~~~~~~~~~

We need help to complete translations. It's done easily by creating a profile and joining
`the django-wiki project on Transifex <https://www.transifex.com/django-wiki/django-wiki/>`__. You are also
encouraged to create new languages if you would like to translate to a language that doesn't yet exist.


0.4.5
@@ -1,11 +1,7 @@
# This is because readthedocs has an old version of pip
# that somehow doesn't like prerelease versions in the
# dependency expressions (>=1.0b1 failes to find dist)
Django>=1.8,<1.12
django_nyt
django-mptt>=0.9.1,<0.10
Pillow
django-sekizai>=0.10
sorl-thumbnail>=12,<13
Markdown>=3.0.0,<3.1.0
Django>=3.0a1,<3.1
bleach>=2.1,<2.2
sphinx>=2.2,<2.3
sphinx_rtd_theme
@@ -19,5 +19,5 @@

default_app_config = 'wiki.apps.WikiConfig'

VERSION = (0, 5, 0, 'alpha', 0)
VERSION = (0, 5, 0, 'final', 0)
__version__ = get_version(VERSION)
@@ -40,7 +40,7 @@ def get_article(func=None, can_read=True, can_write=False, # noqa: max-complexi
keyword args path or article_id and looks up an article, calling the decorated
func with this ID.
Will accept a func(request, article, *args, **kwargs)
Will accept a ``func(request, article, *args, **kwargs)``
NB! This function will redirect if an article does not exist, permissions
are missing or the article is deleted.
@@ -84,8 +84,7 @@ def wrapper(request, *args, **kwargs):
parent = models.URLPath.get_by_path(path)
return HttpResponseRedirect(
reverse(
"wiki:create", kwargs={'path': parent.path, }) +
"?slug=%s" % pathlist[-1].lower())
"wiki:create", kwargs={'path': parent.path, }) + "?slug=%s" % pathlist[-1].lower())
except models.URLPath.DoesNotExist:
return HttpResponseNotFound(
render_to_string(

0 comments on commit 969984f

Please sign in to comment.
You can’t perform that action at this time.