Skip to content

Commit

Permalink
- [bug] Changed setup.py to skip installing markupsafe
Browse files Browse the repository at this point in the history
  if Python version is < 2.6 or is between 3.0 and
  less than 3.3, as Markupsafe now only supports 2.6->2.X,
  3.3->3.X. [ticket:216]
  • Loading branch information
zzzeek committed May 24, 2013
1 parent 7052605 commit 4acc7ec
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
0.8.1
- [bug] Changed setup.py to skip installing markupsafe
if Python version is < 2.6 or is between 3.0 and
less than 3.3, as Markupsafe now only supports 2.6->2.X,
3.3->3.X. [ticket:216]

- [bug] Fixed regression where "entity" filter wasn't
converted for py3k properly (added tests.)
[ticket:214]
Expand Down
2 changes: 1 addition & 1 deletion mako/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# the MIT License: http://www.opensource.org/licenses/mit-license.php


__version__ = '0.8.0'
__version__ = '0.8.1'

19 changes: 13 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@

readme = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()

markupsafe_installs = (
sys.version_info >= (2, 6) and sys.version_info < (3, 0)
) or sys.version_info >= (3, 3)

if markupsafe_installs:
install_requires = ['MarkupSafe>=0.9.2']
else:
install_requires = []

setup(name='Mako',
version=VERSION,
description="A super-fast templating language that borrows the \
Expand All @@ -31,13 +40,11 @@
license='MIT',
packages=find_packages('.', exclude=['examples*', 'test*']),
scripts=['scripts/mako-render'],
tests_require = ['nose >= 0.11'],
test_suite = "nose.collector",
tests_require=['nose >= 0.11'],
test_suite="nose.collector",
zip_safe=False,
install_requires=[
'MarkupSafe>=0.9.2',
],
extras_require = {'beaker':['Beaker>=1.1']},
install_requires=install_requires,
extras_require={'beaker': ['Beaker>=1.1']},
entry_points="""
[python.templating.engines]
mako = mako.ext.turbogears:TGPlugin
Expand Down

0 comments on commit 4acc7ec

Please sign in to comment.