Using django-markwhat as a drop-in replacement for ``django.contirb.markup``

eudicots / Cactus

Static site generator for designers. Uses Python and Django templates.

BSD 3-Clause "New" or "Revised" License

3.47k stars 314 forks source link

Using django-markwhat as a drop-in replacement for ``django.contirb.markup`` #106

Closed Alir3z4 closed 9 years ago

Alir3z4 commented 9 years ago

This patch fixes #102

Using django-markwhat as a drop-in replacement for django.contirb.markup since it's deprecated.

From django-markwhat docs

Extracted from Django 1.4 since markup deprecation

Supported Python versions

Python 2 (2.7)
Python 3 (3.2, 3.3, 3.4)
PyPy

Alir3z4 commented 9 years ago

Any update on this? Does it requires further changes?

koobs commented 9 years ago

Tests pass using Cactus 3.0.2 with Django 1.6.11 after merging this change. I'll be using it in the FreeBSD Port for Cactus. Can someone please merge this and update requirements to allow Django >=1.5.5,<1.7

@Alir3z4 You could update this PR to include the above requirements changes too for completeness.

3.0.2/1.6.11 - Ran 123 tests in 22.212s OK
3.0.2/1.7.10 - Ran 123 tests in 11.487s - FAILED (errors=45)
- ImportError: cannot import name add_to_builtins fixed by https://github.com/jezdez/django-hosts/issues/31
- AppRegistryNotReady: Apps aren't loaded yet.

koobs commented 9 years ago

@Alir3z4 Please rebase your changes again master so we can get this merged :)

krallin commented 9 years ago

@koobs , @Alir3z4 , I'm doing those changes in #186.

Updating to Django 1.7 would be more difficult, mainly because it'd involve dropping support for Python 2.6.

Cheers,