(codename Kong, released on September 12th 2009)
--HG--
branch : trunk
diff --git a/CHANGES b/CHANGES
index 380a7c3..f4b7333 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,7 @@
Version 2.2
-----------
-(codename unknown, release date yet unknown)
+(codename Kong, released on September 12th 2009)
- Include statements can now be marked with ``ignore missing`` to skip
non existing templates.
diff --git a/docs/intro.rst b/docs/intro.rst
index e290655..a412740 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -39,7 +39,9 @@
If you don't have a working C compiler and you are trying to install the source
release you will get a compiler error. This however can be circumvented by
-passing the ``--without-speedups`` command line argument to the setup script.
+passing the ``--without-speedups`` command line argument to the setup script::
+
+ $ python setup.py install --without-speedups
For more details about that have a look at the :ref:`disable-speedups`
section below.
@@ -58,8 +60,8 @@
You can install the most recent Jinja2 version using `easy_install`_ or `pip`_::
- sudo easy_install Jinja2
- sudo pip install Jinja2
+ easy_install Jinja2
+ pip install Jinja2
This will install a Jinja2 egg in your Python installation's site-packages
directory.
@@ -121,7 +123,9 @@
sudo python setup.py install --without-speedups
-You can also pass this parameter to `easy_install` or `pip`.
+You can also pass this parameter to `pip`::
+
+ $ pip install --install-option='--without-speedups' Jinja2
Basic API Usage
diff --git a/setup.cfg b/setup.cfg
index f739d86..2d74c58 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,9 +4,3 @@
[aliases]
release = egg_info -RDb ''
-
-[nosetests]
-#verbosity=2
-detailed-errors=1
-cover-package=nose
-where=tests
diff --git a/setup.py b/setup.py
index 439ce9f..2284f2e 100644
--- a/setup.py
+++ b/setup.py
@@ -47,38 +47,9 @@
from distutils.errors import CCompilerError, DistutilsPlatformError
-#: don't change the variable and assignment. the fabfile parses this
-#: file to get the version for deployment from it.
-VERSION = '2.2'
-
-
-data_files = []
-documentation_path = 'docs/_build/html'
-if os.path.exists(documentation_path):
- documentation_files = []
- for fn in os.listdir(documentation_path):
- if not fn.startswith('.'):
- fn = os.path.join(documentation_path, fn)
- if os.path.isfile(fn):
- documentation_files.append(fn)
- data_files.append(('docs', documentation_files))
-
-
-def get_terminal_width():
- """Return the current terminal dimensions."""
- try:
- from struct import pack, unpack
- from fcntl import ioctl
- from termios import TIOCGWINSZ
- s = pack('HHHH', 0, 0, 0, 0)
- return unpack('HHHH', ioctl(sys.stdout.fileno(), TIOCGWINSZ, s))[1]
- except:
- return 80
-
-
setup(
name='Jinja2',
- version=VERSION,
+ version='2.2',
url='http://jinja.pocoo.org/',
license='BSD',
author='Armin Ronacher',
@@ -86,8 +57,7 @@
description='A small but fast and easy to use stand-alone template '
'engine written in pure python.',
long_description=__doc__,
- # jinja is egg safe. But because we distribute the documentation
- # in form of html and txt files it's a better idea to extract the files
+ # jinja is egg safe. But we hate eggs
zip_safe=False,
classifiers=[
'Development Status :: 5 - Production/Stable',