1
0
Fork 0
forked from github/pelican

Cleanup tox and remove mentions of webassets.

Nose and unittest2 have been removed from pelican's dependencies, and webassets
moved to pelican-plugins.
This commit is contained in:
Simon Conseil 2013-04-13 22:56:45 +02:00
commit 40643ce554
3 changed files with 4 additions and 26 deletions

View file

@ -27,7 +27,6 @@ Pelican currently supports:
* Publication of articles in multiple languages * Publication of articles in multiple languages
* Atom/RSS feeds * Atom/RSS feeds
* Code syntax highlighting * Code syntax highlighting
* Asset management with `webassets`_ (optional)
* Import from WordPress, Dotclear, or RSS feeds * Import from WordPress, Dotclear, or RSS feeds
* Integration with external tools: Twitter, Google Analytics, etc. (optional) * Integration with external tools: Twitter, Google Analytics, etc. (optional)
@ -67,4 +66,3 @@ client handy, use the webchat_ for quick feedback.
.. _`#pelican on Freenode`: irc://irc.freenode.net/pelican .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
.. _contribute: http://docs.getpelican.com/en/latest/contribute.html .. _contribute: http://docs.getpelican.com/en/latest/contribute.html
.. _webassets: https://github.com/miracle2k/webassets

View file

@ -23,7 +23,6 @@ Pelican currently supports:
* Publication of articles in multiple languages * Publication of articles in multiple languages
* Atom/RSS feeds * Atom/RSS feeds
* Code syntax highlighting * Code syntax highlighting
* Asset management with `webassets`_ (optional)
* Import from WordPress, Dotclear, or RSS feeds * Import from WordPress, Dotclear, or RSS feeds
* Integration with external tools: Twitter, Google Analytics, etc. (optional) * Integration with external tools: Twitter, Google Analytics, etc. (optional)
@ -80,4 +79,3 @@ A French version of the documentation is available at :doc:`fr/index`.
.. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
.. _`#pelican on Freenode`: irc://irc.freenode.net/pelican .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
.. _webassets: https://github.com/miracle2k/webassets

26
tox.ini
View file

@ -5,7 +5,7 @@
# #
# Now we must tell tox about this package, otherwise tox would load the old # Now we must tell tox about this package, otherwise tox would load the old
# libraries from PyPi. # libraries from PyPi.
# #
# Run tox from the libraries source tree. It will save its package in # 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. # the distshare directory from where the tests here will pick it up.
# #
@ -15,19 +15,11 @@
# and typogrify: # and typogrify:
# https://github.com/dmdm/typogrify/tree/py3k # https://github.com/dmdm/typogrify/tree/py3k
# #
# and webassets:
# https://github.com/dmdm/webassets/tree/py3k
#
#
# CAVEAT: # CAVEAT:
# ------- # -------
# #
# 1/ # Please be aware that my port of typogrify is just 2to3'd.
# Please be aware that my ports of typogrify and webassets are just 2to3'd. # It is not backwards compatible with Python 2.
# They are not backwards compatible with Python 2.
#
# 2/
# Webassets still has unresolved issues, so I deactivated it for Py32 tests.
[tox] [tox]
@ -35,41 +27,31 @@ envlist = py27,py32,py33
[testenv] [testenv]
commands = commands =
unit2 discover [] python -m unittest discover
nosetests -s pelican
deps = deps =
[testenv:py27] [testenv:py27]
deps = deps =
nose
unittest2
mock mock
Markdown Markdown
BeautifulSoup4 BeautifulSoup4
feedgenerator feedgenerator
typogrify typogrify
webassets
[testenv:py32] [testenv:py32]
deps = deps =
nose
unittest2py3k
mock mock
Markdown Markdown
BeautifulSoup4 BeautifulSoup4
feedgenerator feedgenerator
# {distshare}/smartypants-1.6.0.3.zip # {distshare}/smartypants-1.6.0.3.zip
# {distshare}/typogrify-2.0.0.zip # {distshare}/typogrify-2.0.0.zip
# {distshare}/webassets-0.8.dev.zip
[testenv:py33] [testenv:py33]
deps = deps =
nose
unittest2py3k
mock mock
Markdown Markdown
BeautifulSoup4 BeautifulSoup4
feedgenerator feedgenerator
# {distshare}/smartypants-1.6.0.3.zip # {distshare}/smartypants-1.6.0.3.zip
# {distshare}/typogrify-2.0.0.zip # {distshare}/typogrify-2.0.0.zip
# {distshare}/webassets-0.8.dev.zip