github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'v3.6.3'

Browse source 
Conflicts:
	docs/changelog.rst
	pelican/__init__.py
	setup.py
This commit is contained in:
Justin Mayer 2015-08-14 17:16:38 -07:00
commit f0a6725a74
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/changelog.rst
View file

@ -1,10 +1,10 @@
Release history Release history
############### ###############
Next release 3.6.3 (2015-08-14)
============ ==================
- Nothing yet * Fix permissions issue in release tarball
3.6.2 (2015-08-01) 3.6.2 (2015-08-01)
================== ==================

2
docs/conf.py
View file

@ -18,7 +18,7 @@ copyright = '2015, Alexis Metaireau and contributors'
exclude_patterns = ['_build'] exclude_patterns = ['_build']
release = __version__ release = __version__
version = '.'.join(release.split('.')[:1]) version = '.'.join(release.split('.')[:1])
last_stable = '3.6.2' last_stable = '3.6.3'
rst_prolog = ''' rst_prolog = '''
.. |last_stable| replace:: :pelican-doc:`{0}` .. |last_stable| replace:: :pelican-doc:`{0}`
'''.format(last_stable) '''.format(last_stable)

2
pelican/__init__.py
View file

@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
file_watcher, maybe_pluralize) file_watcher, maybe_pluralize)
from pelican.writers import Writer from pelican.writers import Writer
__version__ = "3.6.3.dev" __version__ = "3.6.3"
DEFAULT_CONFIG_NAME = 'pelicanconf.py' DEFAULT_CONFIG_NAME = 'pelicanconf.py'

2
setup.py
View file

@ -22,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
setup( setup(
name="pelican", name="pelican",
version="3.6.3.dev", version="3.6.3",
url='http://getpelican.com/', url='http://getpelican.com/',
author='Alexis Metaireau', author='Alexis Metaireau',
author_email='authors@getpelican.com', author_email='authors@getpelican.com',