Merge branch 'release/v0.13'

.coveragerc

@@ -1,6 +1,16 @@
-[report]
+[run]
 source		= zinnia
-omit		= */eggs/*,*/lib/*,*/demo/*,*/tests/*
+omit		= zinnia/tests/*
+                  zinnia/migrations/*
+                  zinnia/management/*
+                  zinnia/spam_checker/backends/*
+                  zinnia/url_shortener/backends/*
+                  demo/*
+                  eggs/*
+                  */lib/*
+
+[report]
+show_missing    = True
 exclude_lines	=
     pragma: no cover
     from xmlrpc.client import Fault

.travis.yml

@@ -7,8 +7,7 @@ install:
     - python bootstrap.py
     - ./bin/buildout -c travis.cfg
 before_script:
-    - ./bin/pyflakes zinnia
-    - ./bin/pep8 --count --show-source --statistics --exclude=migrations zinnia
+    - ./bin/flake8 --count --show-source --statistics --exclude=migrations zinnia
 script:
     - ./bin/test
 after_success:

Makefile

@@ -28,10 +28,8 @@ sphinx:
 docs: coverage sphinx
 
 kwalitee:
-	@echo "$(COLOR)* Running pyflakes$(NO_COLOR)"
-	@./bin/pyflakes zinnia
-	@echo "$(COLOR)* Running pep8$(NO_COLOR)"
-	@./bin/pep8 --count --show-source --show-pep8 --statistics --exclude=migrations zinnia
+	@echo "$(COLOR)* Running flake8$(NO_COLOR)"
+	@./bin/flake8 --count --show-source --show-pep8 --statistics --exclude=migrations zinnia
 	@echo "$(SUCCESS_COLOR)* No kwalitee errors, Congratulations ! :)$(NO_COLOR)"
 
 translations:

README.rst

@@ -69,6 +69,7 @@ or you can visit these websites who use Zinnia.
 * `Sergey Miracle`_.
 * `Infantium`_.
 * `Pana`_.
+* `MAGIC Center at RIT`_.
 
 
 If you are a proud user of Zinnia, send me the URL of your website and I
@@ -133,6 +134,7 @@ More information and help available at these URLs :
 .. _`Darwin's Weblog`: http://darwin.willbreak.it/
 .. _`ShiningPanda`: http://www.shiningpanda.com/blog/
 .. _`Pana`: http://chusen87.com/news/
+.. _`MAGIC Center at RIT`: http://magic.rit.edu/
 .. _`Code repository`: https://github.com/Fantomas42/django-blog-zinnia
 .. _`Documentation`: http://docs.django-blog-zinnia.com/
 .. _`Travis CI server`: http://travis-ci.org/Fantomas42/django-blog-zinnia

buildout.cfg

@@ -1,88 +1,83 @@
 [buildout]
-extends			= versions.cfg
-
-parts			= test
-			  demo
-			  docs
-			  tox
-			  cover
-			  pep8
-			  pyflakes
-
-develop			= .
-
-eggs 			= django
-			  django-blog-zinnia
-			  django-tagging
-			  django-bitly
-			  django-xmlrpc
-			  django-mptt
-			  pyparsing
-			  tweepy
-			  gdata
-			  pytz
-			  feedparser
-			  beautifulsoup4
-			  Pillow
-			  South
-			  docutils
-			  Markdown
-			  textile
-			  akismet
-			  PyMollom
-			  pdbpp
-			  nose
-			  coverage
-			  nose-sfd
-			  nose-progressive
-
-show-picked-versions	= true
+extends                 = versions.cfg
+parts                   = test
+                          demo
+                          docs
+                          tox
+                          cover
+                          flake8
+                          evolution
+develop                 = .
+eggs                    = django
+                          django-blog-zinnia
+                          django-tagging
+                          django-bitly
+                          django-xmlrpc
+                          django-mptt
+                          pyparsing
+                          tweepy
+                          gdata
+                          pytz
+                          feedparser
+                          beautifulsoup4
+                          Pillow
+                          South
+                          docutils
+                          Markdown
+                          textile
+                          akismet
+                          PyMollom
+                          pdbpp
+show-picked-versions    = true
 
 [demo]
-recipe			= djangorecipe
-projectegg 		= demo
-settings 		= settings
-eggs 			= ${buildout:eggs}
+recipe                  = djangorecipe
+projectegg              = demo
+settings                = settings
+eggs                    = ${buildout:eggs}
 
 [test]
-recipe			= pbp.recipe.noserunner
-eggs 			= ${buildout:eggs}
-defaults 		= --with-progressive
-			  --with-sfd
-environment		= testenv
+recipe                  = pbp.recipe.noserunner
+eggs                    = nose
+                          nose-sfd
+                          nose-progressive
+                          ${buildout:eggs}
+defaults                = --with-progressive
+                          --with-sfd
+environment             = testenv
 
 [cover]
-recipe			= pbp.recipe.noserunner
-eggs 			= ${buildout:eggs}
-defaults 		= --with-sfd
-			  --with-xunit
-			  --xunit-file=docs/coverage/nosetests.xml
-			  --with-coverage
-			  --cover-package=zinnia
-			  --cover-erase
-			  --cover-html
-			  --cover-html-dir=docs/coverage
-environment		= testenv
+recipe                  = pbp.recipe.noserunner
+eggs                    = coverage
+                          ${test:eggs}
+defaults                = --with-sfd
+                          --with-xunit
+                          --xunit-file=docs/coverage/nosetests.xml
+                          --with-coverage
+                          --cover-package=zinnia
+                          --cover-erase
+                          --cover-html
+                          --cover-html-dir=docs/coverage
+environment             = testenv
 
 [docs]
-recipe			= collective.recipe.sphinxbuilder
-source			= ${buildout:directory}/docs
-build 			= ${buildout:directory}/docs/build
-eggs 			= ${buildout:eggs}
+recipe                  = collective.recipe.sphinxbuilder
+source                  = ${buildout:directory}/docs
+build                   = ${buildout:directory}/docs/build
+eggs                    = ${buildout:eggs}
 
-[pyflakes]
-recipe			= zc.recipe.egg
-eggs 			= pyflakes
+[flake8]
+recipe                  = zc.recipe.egg
+eggs                    = flake8
 
 [tox]
-recipe			= zc.recipe.egg
-scripts         	= tox
-eggs            	= tox
-entry-points    	= tox=tox:cmdline
+recipe                  = zc.recipe.egg
+eggs                    = tox
 
-[pep8]
-recipe			= zc.recipe.egg
-eggs 			= pep8
+[evolution]
+recipe                  = zc.recipe.egg
+eggs                    = buildout-versions-checker
+scripts                 = check-buildout-updates=evolve
 
 [testenv]
-DJANGO_SETTINGS_MODULE	= zinnia.testsettings
+DJANGO_SETTINGS_MODULE  = zinnia.testsettings

demo/settings.py

@@ -43,6 +43,7 @@
     ('eu', gettext('Basque')),
     ('ca', gettext('Catalan')),
     ('tr', gettext('Turkish')),
+    ('sv', gettext('Swedish')),
     ('hr_HR', gettext('Croatian')),
     ('pt_BR', gettext('Brazilian Portuguese')),
     ('fi_FI', gettext('Finnish (Finland)')),

docs/getting-started/install.rst

@@ -12,7 +12,7 @@ Dependencies
 Make sure to install these packages prior to installation :
 
 * `Python`_ >= 2.6.5
-* `Django`_ >= 1.5
+* `Django`_ == 1.5
 * `PIL`_ >= 1.1.6 or `Pillow`_ >= 2.0.0
 * `django-mptt`_ >= 0.5.1 < 0.6
 * `django-tagging`_ >= 0.3.1

docs/notes/changelog.rst

@@ -4,11 +4,13 @@ CHANGELOG
 0.13
 ----
 
-* Python 3.0 support
+* Start Python 3.0 support
 * Display page number in list
 * Basic support of custom User
 * Django 1.4 is no longer supported
 
+https://github.com/Fantomas42/django-blog-zinnia/compare/v0.12.3...v0.13
+
 0.12.3
 ------
 

docs/ref/settings.rst

@@ -270,8 +270,8 @@ ZINNIA_AUTO_MODERATE_COMMENTS
 -----------------------------
 **Default value:** ``False``
 
-Determine if a new comment should be allowed to show up
-immediately or should be marked non-public and await approval.
+Determine if a new comment should be marked non-public and await approval.
+Leave as ``False`` to allow comments to show up immediately.
 
 .. setting:: ZINNIA_AUTO_CLOSE_COMMENTS_AFTER
 

travis.cfg

@@ -1,27 +1,23 @@
 [buildout]
-extends			= buildout.cfg
-
-parts			= test
-			  pep8
-			  pyflakes
-			  coveralls
-
+extends                 = buildout.cfg
+parts                   = test
+                          flake8
+                          coveralls
 eggs                   -= django-bitly
-			  tweepy
-			  gdata
-			  feedparser
-			  South
-			  akismet
-			  PyMollom
-			  pdbpp
-			  nose-progressive
+                          tweepy
+                          gdata
+                          feedparser
+                          South
+                          akismet
+                          PyMollom
+                          pdbpp
+                          nose-progressive
 
 [test]
-defaults 		= --with-sfd
-			  --with-coverage
+defaults                = --with-sfd
+                          --with-coverage
 
 [coveralls]
-recipe			= zc.recipe.egg
-eggs			= python-coveralls
-scripts         	= coveralls
-entry-points    	= coveralls=coveralls:wear
+recipe                  = zc.recipe.egg
+eggs                    = python-coveralls
+

versions.cfg

@@ -1,13 +1,13 @@
 [versions]
 # Django
 Pillow				= 2.1.0
-pytz				= 2013b
+pytz				= 2013d
 South				= 0.8.2
-django				= 1.5.2
+django				= 1.5.4
 
 # Zinnia main
 pyparsing			= 2.0.1
-beautifulsoup4			= 4.3.0
+beautifulsoup4			= 4.3.1
 django-mptt			= 0.6.0
 django-xmlrpc			= 0.1.5
 django-tagging			= 0.3.1
@@ -23,14 +23,15 @@ feedparser			= 5.1.3
 gdata				= 2.0.18
 
 # Documentation
-Jinja2				= 2.6
+Jinja2				= 2.7.1
+MarkupSafe                      = 0.18
 Pygments			= 1.6
-Sphinx				= 1.1.3
-docutils			= 0.10
+Sphinx				= 1.2b1
+docutils			= 0.11
 
 # Tests
 nose				= 1.3.0
-blessings			= 1.5
+blessings			= 1.5.1
 nose-sfd			= 0.1
 nose-progressive		= 1.5
 coverage			= 3.6
@@ -42,26 +43,32 @@ pyrepl				= 0.8.4
 wmctrl				= 0.1
 
 # Tox
-tox				= 1.5.0
+tox				= 1.6.1
 py				= 1.4.15
 argparse			= 1.2.1
 virtualenv			= 1.10.1
 python-termstyle		= 0.1.10
 
 # Kwalitee
+flake8                          = 2.0
 pep8				= 1.4.6
 pyflakes			= 0.7.3
+mccabe                          = 0.2.1
 
 # Coveralls
 python-coveralls		= 2.4.0
-six				= 1.3.0
+six				= 1.4.1
 PyYAML				= 3.10
 requests			= 1.2.3
-sh				= 1.08
+sh				= 1.09
+
+# Evolution
+buildout-versions-checker       = 1.0
+futures                         = 2.1.4
 
 # Buildout
-zc.buildout			= 2.2.0
-zc.recipe.egg			= 2.0.0
+zc.buildout			= 2.2.1
+zc.recipe.egg			= 2.0.1
 distribute			= 0.7.3
 djangorecipe			= 1.5
 pbp.recipe.noserunner		= 0.2.6

zinnia/__init__.py

@@ -1,5 +1,5 @@
 """Zinnia"""
-__version__ = '0.13.dev'
+__version__ = '0.13'
 __license__ = 'BSD License'
 
 __author__ = 'Fantomas42'