[Python-modules-commits] [django-markupfield] 01/06: Import django-markupfield_1.4.1.orig.tar.gz
Michael Fladischer
fladi at moszumanska.debian.org
Tue Oct 18 12:36:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to tag debian/1.4.1-1
in repository django-markupfield.
commit e2eb281a0d63f467ad9aa2c1e2eb469ce8189b16
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Tue Oct 18 14:15:16 2016 +0200
Import django-markupfield_1.4.1.orig.tar.gz
---
CHANGELOG | 4 ++++
PKG-INFO | 13 ++++++++++---
README.rst | 11 +++++++++--
django_markupfield.egg-info/PKG-INFO | 13 ++++++++++---
django_markupfield.egg-info/pbr.json | 2 +-
markupfield/__init__.py | 2 +-
markupfield/tests/tests.py | 19 +++++++++++++------
setup.py | 2 +-
8 files changed, 49 insertions(+), 17 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 67f9d2c..07aed04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.4.1 - 6 October 2016
+======================
+ - compatibility tweaks for Django 1.9 and 1.10
+
1.4.0 - 17 December 2015
=========================
- bugfixes for Django 1.9
diff --git a/PKG-INFO b/PKG-INFO
index 0068f88..d18ce2d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-markupfield
-Version: 1.4.0
+Version: 1.4.1
Summary: Custom Django field for easy use of markup in text fields
Home-page: http://github.com/jamesturk/django-markupfield/
Author: James Turk
@@ -35,9 +35,9 @@ Description: ==================
Requirements
------------
- Requires Django >= 1.7 and Python 2.7 or 3.4+
+ Requires Django >= 1.8 and Python 2.7 or 3.4+
- (1.3 is the last release to officially support Django 1.4 or Python 3.3)
+ (1.3.x is the last release to officially support Django 1.4 or Python 3.3)
Settings
========
@@ -147,6 +147,13 @@ Description: ==================
)
MarkupField(markup_choices=CUSTOM_RENDERERS)
+ .. note::
+ When using ``markdown``, be sure to use ``markdown.markdown`` and not
+ the ``markdown.Markdown`` class, the class requires an explicit ``reset``
+ to function properly in some cases. (See [issue #40](https://github.com/jamesturk/django-markupfield/issues/40)
+ for details.)
+
+
Accessing a MarkupField on a model
----------------------------------
diff --git a/README.rst b/README.rst
index c173a86..47ecbae 100644
--- a/README.rst
+++ b/README.rst
@@ -27,9 +27,9 @@ corresponding translations to your project translation.
Requirements
------------
-Requires Django >= 1.7 and Python 2.7 or 3.4+
+Requires Django >= 1.8 and Python 2.7 or 3.4+
-(1.3 is the last release to officially support Django 1.4 or Python 3.3)
+(1.3.x is the last release to officially support Django 1.4 or Python 3.3)
Settings
========
@@ -139,6 +139,13 @@ Examples
)
MarkupField(markup_choices=CUSTOM_RENDERERS)
+.. note::
+ When using ``markdown``, be sure to use ``markdown.markdown`` and not
+ the ``markdown.Markdown`` class, the class requires an explicit ``reset``
+ to function properly in some cases. (See [issue #40](https://github.com/jamesturk/django-markupfield/issues/40)
+ for details.)
+
+
Accessing a MarkupField on a model
----------------------------------
diff --git a/django_markupfield.egg-info/PKG-INFO b/django_markupfield.egg-info/PKG-INFO
index 0068f88..d18ce2d 100644
--- a/django_markupfield.egg-info/PKG-INFO
+++ b/django_markupfield.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-markupfield
-Version: 1.4.0
+Version: 1.4.1
Summary: Custom Django field for easy use of markup in text fields
Home-page: http://github.com/jamesturk/django-markupfield/
Author: James Turk
@@ -35,9 +35,9 @@ Description: ==================
Requirements
------------
- Requires Django >= 1.7 and Python 2.7 or 3.4+
+ Requires Django >= 1.8 and Python 2.7 or 3.4+
- (1.3 is the last release to officially support Django 1.4 or Python 3.3)
+ (1.3.x is the last release to officially support Django 1.4 or Python 3.3)
Settings
========
@@ -147,6 +147,13 @@ Description: ==================
)
MarkupField(markup_choices=CUSTOM_RENDERERS)
+ .. note::
+ When using ``markdown``, be sure to use ``markdown.markdown`` and not
+ the ``markdown.Markdown`` class, the class requires an explicit ``reset``
+ to function properly in some cases. (See [issue #40](https://github.com/jamesturk/django-markupfield/issues/40)
+ for details.)
+
+
Accessing a MarkupField on a model
----------------------------------
diff --git a/django_markupfield.egg-info/pbr.json b/django_markupfield.egg-info/pbr.json
index 655b143..2568d2e 100644
--- a/django_markupfield.egg-info/pbr.json
+++ b/django_markupfield.egg-info/pbr.json
@@ -1 +1 @@
-{"is_release": false, "git_version": "13efc7b"}
\ No newline at end of file
+{"is_release": true, "git_version": "452d421"}
\ No newline at end of file
diff --git a/markupfield/__init__.py b/markupfield/__init__.py
index 96e3ce8..8e3c933 100644
--- a/markupfield/__init__.py
+++ b/markupfield/__init__.py
@@ -1 +1 @@
-__version__ = '1.4.0'
+__version__ = '1.4.1'
diff --git a/markupfield/tests/tests.py b/markupfield/tests/tests.py
index ac66783..88079bd 100644
--- a/markupfield/tests/tests.py
+++ b/markupfield/tests/tests.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
import json
+import django
from django.test import TestCase
from django.core import serializers
from django.utils.encoding import smart_text
@@ -234,6 +235,14 @@ class MarkupWidgetTests(TestCase):
MarkupTextarea))
def test_markuptextarea_render(self):
+ if django.VERSION < (1, 10):
+ expected = ('<textarea id="id_normal_field" rows="10" cols="40" '
+ 'name="normal_field">**normal**</textarea>'
+ )
+ else:
+ expected = ('<textarea id="id_normal_field" required rows="10" cols="40" '
+ 'name="normal_field">**normal**</textarea>'
+ )
a = Article(normal_field='**normal**',
normal_field_markup_type='markdown',
default_field='**default**',
@@ -241,11 +250,7 @@ class MarkupWidgetTests(TestCase):
markup_choices_field_markup_type='nomarkup')
a.save()
af = ArticleForm(instance=a)
- self.assertHTMLEqual(
- smart_text(af['normal_field']),
- '<textarea id="id_normal_field" rows="10" cols="40" '
- 'name="normal_field">**normal**</textarea>'
- )
+ self.assertHTMLEqual(smart_text(af['normal_field']), expected)
def test_no_markup_type_field_if_set(self):
"""ensure that a field with non-editable markup_type set does not
@@ -281,7 +286,9 @@ class MarkupWidgetTests(TestCase):
from django.contrib import admin
ma = admin.ModelAdmin(Post, admin.site)
self.assertTrue(isinstance(ma.formfield_for_dbfield(
- Post._meta.get_field('body')).widget, AdminMarkupTextareaWidget))
+ Post._meta.get_field('body'), request=None).widget,
+ AdminMarkupTextareaWidget,
+ ))
class MarkupFieldFormSaveTests(TestCase):
diff --git a/setup.py b/setup.py
index c23222e..b69ff43 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ long_description = open('README.rst').read()
setup(
name='django-markupfield',
- version="1.4.0",
+ version="1.4.1",
package_dir={'markupfield': 'markupfield'},
packages=['markupfield', 'markupfield.tests'],
package_data={'markupfield': ['locale/*/*/*']},
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-markupfield.git
More information about the Python-modules-commits
mailing list