Skip to content

Commit

Permalink
prepare 0.10.4; minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Jan 12, 2017
1 parent 7ae1223 commit 8729119
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 9 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ are used for versioning (schema follows below):
0.3.4 to 0.4).
- All backwards incompatible changes are mentioned in this document.

0.10.4
------
2017-01-11

- Minor fixes in Django admin.

0.10.3
------
2016-11-24
Expand Down
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ handling the submitted form data).

Prerequisites
=============
Current
Present
-------
- Django 1.8, 1.9, 1.10
- Python >= 2.7, >= 3.3
Expand All @@ -25,6 +25,7 @@ Past
- Dropping support of Python 2.6 has been announced in version 0.9.17.
As of 0.9.17 everything is still backwards compatible with Python 2.6, but
in future versions compatibility with it will be wiped out.
- Since version 0.10.4 support for Python 3.3 has been dropped.

Key concepts
============
Expand Down
3 changes: 2 additions & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ handling the submitted form data).

Prerequisites
=============
Current
Present
-------
- Django 1.8, 1.9, 1.10
- Python >= 2.7, >= 3.3
Expand All @@ -25,6 +25,7 @@ Past
- Dropping support of Python 2.6 has been announced in version 0.9.17.
As of 0.9.17 everything is still backwards compatible with Python 2.6, but
in future versions compatibility with it will be wiped out.
- Since version 0.10.4 support for Python 3.3 has been dropped.

Key concepts
============
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from distutils.version import LooseVersion
from setuptools import setup, find_packages

version = '0.10.3'
version = '0.10.4'

# ***************************************************************************
# ************************** Django version *********************************
Expand Down Expand Up @@ -310,10 +310,10 @@
"customisable, modular, user- and developer- friendly."),
long_description="{0}{1}".format(readme, screenshots),
classifiers=[
"Programming Language :: Python :: 2.6",
# "Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
# "Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Environment :: Web Environment",
Expand Down
4 changes: 2 additions & 2 deletions src/fobi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__title__ = 'django-fobi'
__version__ = '0.10.3'
__build__ = 0x000076
__version__ = '0.10.4'
__build__ = 0x000077
__author__ = 'Artur Barseghyan <[email protected]>'
__copyright__ = '2014-2016 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'
Expand Down
7 changes: 5 additions & 2 deletions src/fobi/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def plugin_uid_admin(self):
Mainly used in admin.
"""
return self.__unicode__()
return self.__str__()
plugin_uid_admin.allow_tags = True
plugin_uid_admin.short_description = _('Plugin')

Expand Down Expand Up @@ -391,7 +391,10 @@ def get_absolute_url(self):
:return string:
"""
return reverse('fobi.view_form_entry', kwargs={'slug': self.slug})
return reverse(
'fobi.view_form_entry',
kwargs={'form_entry_slug': self.slug}
)


@python_2_unicode_compatible
Expand Down

0 comments on commit 8729119

Please sign in to comment.