forked from github/pelican
Merge pull request #907 from saimn/py3k
Drop python 3.2 support and move to python 3.3
This commit is contained in:
Justin Mayer
commit
a81c50ff55
12 changed files with 31 additions and 72 deletions
|
|
@ -1,7 +1,7 @@
|
|||
language: python
|
||||
python:
|
||||
- "2.7"
|
||||
- "3.2"
|
||||
- "3.3"
|
||||
before_install:
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install -qq --no-install-recommends asciidoc
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Contribution submission guidelines
|
|||
* Adhere to PEP8 coding standards whenever possible.
|
||||
* Check for unnecessary whitespace via ``git diff --check`` before committing.
|
||||
* **Add docs and tests for your changes**.
|
||||
* `Run all the tests`_ **on both Python 2.7+ and 3.2+** to ensure nothing was
|
||||
* `Run all the tests`_ **on both Python 2.7 and 3.3** to ensure nothing was
|
||||
accidentally broken.
|
||||
* First line of your commit message should start with present-tense verb, be 50
|
||||
characters or less, and include the relevant issue number(s) if applicable.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
include *.rst
|
||||
global-include *.py
|
||||
recursive-include pelican *.html *.css *png *.in *.rst *.md
|
||||
recursive-include pelican *.html *.css *png *.in *.rst *.md *.mkd *.xml
|
||||
include LICENSE THANKS docs/changelog.rst
|
||||
|
|
|
|||
|
|
@ -43,6 +43,10 @@ To install Pelican and its dependencies::
|
|||
|
||||
$ python setup.py develop
|
||||
|
||||
Or using ``pip``::
|
||||
|
||||
$ pip install -e .
|
||||
|
||||
Coding standards
|
||||
================
|
||||
|
||||
|
|
@ -88,28 +92,22 @@ functional tests. To do so, you can use the following two commands::
|
|||
samples/content/
|
||||
$ pelican -o pelican/tests/output/basic/ samples/content/
|
||||
|
||||
Testing on Python 3.x
|
||||
---------------------
|
||||
Testing on Python 2 and 3
|
||||
-------------------------
|
||||
|
||||
Testing on Python 3.x currently requires some extra steps: installing
|
||||
Python 3.x-compatible versions of dependent packages and plugins.
|
||||
Testing on Python 3 currently requires some extra steps: installing
|
||||
Python 3-compatible versions of dependent packages and plugins.
|
||||
|
||||
However, you must tell ``tox`` to use those Python 3.x-compatible libraries.
|
||||
If you forget this, ``tox`` will pull the regular packages from PyPI, and the
|
||||
tests will fail.
|
||||
Tox_ is a useful tool to run tests on both versions. It will install the
|
||||
Python 3-compatible version of dependent packages.
|
||||
|
||||
Tell ``tox`` about the local packages thusly: enter the source directory of
|
||||
smartypants and run ``tox`` there. Do this again for the ``typogrify`` and
|
||||
``webassets`` packages. SmartyPants and Typogrify do not have real tests, and
|
||||
``webassets`` will fail noisily, but as a result we get these libraries neatly
|
||||
packaged in tox's ``distshare`` directory, which we need in order to run
|
||||
``tox`` for Pelican.
|
||||
.. _Tox: http://testrun.org/tox/latest/
|
||||
|
||||
Python 3.x development tips
|
||||
===========================
|
||||
Python 3 development tips
|
||||
=========================
|
||||
|
||||
Here are some tips that may be useful when doing some code for both Python 2.7
|
||||
and Python 3.x at the same time:
|
||||
and Python 3 at the same time:
|
||||
|
||||
- Assume every string and literal is unicode (import unicode_literals):
|
||||
|
||||
|
|
@ -144,4 +142,3 @@ and Python 3.x at the same time:
|
|||
changed it where I felt necessary.
|
||||
|
||||
- Changed xrange() back to range(), so it is valid in both Python versions.
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,9 @@ Getting started
|
|||
Installing Pelican
|
||||
==================
|
||||
|
||||
Pelican currently runs best on Python 2.7.x; earlier versions of Python are not
|
||||
supported. There is provisional support for Python 3.2 and higher, although
|
||||
there may be rough edges, particularly with regards to optional 3rd-party
|
||||
components.
|
||||
Pelican currently runs best on Python 2.7.x; earlier versions of Python are
|
||||
not supported. There is provisional support for Python 3.3, although there may
|
||||
be rough edges, particularly with regards to optional 3rd-party components.
|
||||
|
||||
You can install Pelican via several different methods. The simplest is via
|
||||
`pip <http://www.pip-installer.org/>`_::
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description><p>Some cool stuff!</p>
|
||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description><p>Some cool stuff!</p>
|
||||
</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description><p>Et voila du contenu en français</p>
|
||||
</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description><p>This is some article, in english</p>
|
||||
</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description><p>Ceci est un article, en français.</p>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description><div class="section" id="why-not">
|
||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description><div class="section" id="why-not">
|
||||
<h2>Why not ?</h2>
|
||||
<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
|
||||
YEAH !</p>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description><p>You're mutually oblivious.</p>
|
||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description><p>You're mutually oblivious.</p>
|
||||
<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
|
||||
<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p></description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description><p>Article 1</p>
|
||||
</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description><p>Article 2</p>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description><p>Some cool stuff!</p>
|
||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description><p>Some cool stuff!</p>
|
||||
</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description><p>This is some article, in english</p>
|
||||
</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description><p>Or completely awesome. Depends the needs.</p>
|
||||
<p><a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description><p>Some content here !</p>
|
||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description><p>Some content here !</p>
|
||||
<div class="section" id="this-is-a-simple-title">
|
||||
<h2>This is a simple title</h2>
|
||||
<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
|
||||
|
|
|
|||
9
setup.py
9
setup.py
|
|
@ -1,14 +1,9 @@
|
|||
#!/usr/bin/env python
|
||||
from setuptools import setup
|
||||
|
||||
requires = ['feedgenerator>=1.5', 'jinja2 >= 2.6', 'pygments', 'docutils',
|
||||
requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.6', 'pygments', 'docutils',
|
||||
'pytz', 'blinker', 'unidecode', 'six']
|
||||
|
||||
try:
|
||||
import argparse # NOQA
|
||||
except ImportError:
|
||||
requires.append('argparse')
|
||||
|
||||
entry_points = {
|
||||
'console_scripts': [
|
||||
'pelican = pelican:main',
|
||||
|
|
@ -41,9 +36,9 @@ setup(
|
|||
'Environment :: Console',
|
||||
'License :: OSI Approved :: GNU Affero General Public License v3',
|
||||
'Operating System :: OS Independent',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Programming Language :: Python :: 3.2',
|
||||
'Programming Language :: Python :: 3.3',
|
||||
'Topic :: Internet :: WWW/HTTP',
|
||||
'Topic :: Software Development :: Libraries :: Python Modules',
|
||||
|
|
|
|||
40
tox.ini
40
tox.ini
|
|
@ -1,29 +1,8 @@
|
|||
# This tests the unified codebase (py26-py32) of Pelican.
|
||||
# This tests the unified codebase (py27, py33) of Pelican.
|
||||
# depends on some external libraries that aren't released yet.
|
||||
#
|
||||
# To run Pelican, you will already have checked out and installed them.
|
||||
#
|
||||
# Now we must tell tox about this package, otherwise tox would load the old
|
||||
# libraries from PyPi.
|
||||
#
|
||||
# Run tox from the libraries source tree. It will save its package in
|
||||
# the distshare directory from where the tests here will pick it up.
|
||||
#
|
||||
# Do that for
|
||||
# https://github.com/dmdm/smartypants.git
|
||||
#
|
||||
# and typogrify:
|
||||
# https://github.com/dmdm/typogrify/tree/py3k
|
||||
#
|
||||
# CAVEAT:
|
||||
# -------
|
||||
#
|
||||
# Please be aware that my port of typogrify is just 2to3'd.
|
||||
# It is not backwards compatible with Python 2.
|
||||
|
||||
|
||||
[tox]
|
||||
envlist = py27,py32,py33
|
||||
envlist = py27,py33
|
||||
|
||||
[testenv]
|
||||
commands =
|
||||
|
|
@ -35,23 +14,12 @@ deps =
|
|||
mock
|
||||
Markdown
|
||||
BeautifulSoup4
|
||||
feedgenerator
|
||||
typogrify
|
||||
|
||||
[testenv:py32]
|
||||
deps =
|
||||
mock
|
||||
Markdown
|
||||
BeautifulSoup4
|
||||
feedgenerator
|
||||
# {distshare}/smartypants-1.6.0.3.zip
|
||||
# {distshare}/typogrify-2.0.0.zip
|
||||
|
||||
[testenv:py33]
|
||||
deps =
|
||||
mock
|
||||
Markdown
|
||||
BeautifulSoup4
|
||||
feedgenerator
|
||||
# {distshare}/smartypants-1.6.0.3.zip
|
||||
# {distshare}/typogrify-2.0.0.zip
|
||||
git+https://github.com/dmdm/smartypants.git#egg=smartypants
|
||||
git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue