summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-06-13 13:51:47 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-06-13 13:52:31 -0400
commit033be90621759bf79c6d2eea139e183b4bf2c029 (patch)
treeb00aa482417257e60c61cc32acba2dde0a251db8
parentfdbf2c8e78621ee5ba3f8b319569ea2164431f2b (diff)
parent35f41aa03285180e380274ba95e882906f4cbbc8 (diff)
downloaddogpile-cache-033be90621759bf79c6d2eea139e183b4bf2c029.tar.gz
Merge branch 'mako-test-dependency' of https://bitbucket.org/wichert/dogpile.cache/branch/mako-test-dependency
-rw-r--r--docs/build/changelog.rst7
-rw-r--r--setup.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/build/changelog.rst b/docs/build/changelog.rst
index 1d33bf4..0f2b4c7 100644
--- a/docs/build/changelog.rst
+++ b/docs/build/changelog.rst
@@ -6,6 +6,13 @@ Changelog
.. change::
:tags: bug
+ :pullreq: 19
+
+ Added missing Mako test dependency to setup.py.
+ Pull request courtesy Wichert Akkerman.
+
+ .. change::
+ :tags: bug
:tickets: 58
:pullreq: 20
diff --git a/setup.py b/setup.py
index b10e9c2..119833d 100644
--- a/setup.py
+++ b/setup.py
@@ -35,5 +35,5 @@ setup(name='dogpile.cache',
zip_safe=False,
install_requires=['dogpile.core>=0.4.1'],
test_suite='nose.collector',
- tests_require=['nose', 'mock'],
+ tests_require=['nose', 'mock', 'Mako'],
)