summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-11-12 11:27:42 +0200
committerholger krekel <holger@merlinux.eu>2013-11-12 11:27:42 +0200
commit12c229a216b3fb51e990613d88104b607b39f0cb (patch)
tree0e277c37705d6f2dc666e4fa956eb11196502ada
parentd0dab5fd7caaf90e25d85def4d7e5cf47265bef4 (diff)
downloadtox-12c229a216b3fb51e990613d88104b607b39f0cb.tar.gz
fix issue132: removing zip_safe setting (so it defaults to false)
to allow installation of tox via easy_install/eggs. Thanks Jenisys.
-rwxr-xr-xCHANGELOG4
-rw-r--r--setup.py1
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7ae0301..aeb8b05 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
1.6.2.dev
---------
+- fix issue132: removing zip_safe setting (so it defaults to false)
+ to allow installation of tox
+ via easy_install/eggs. Thanks Jenisys.
+
- fix issue126: depend on virtualenv>=1.10.1 so that we can rely
(hopefully) on a pip version which supports --pre. (tox by default
uses to --pre). Note that tox also vendors an older virtualenv
diff --git a/setup.py b/setup.py
index 193cbd4..2d0114c 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,6 @@ def main():
tests_require=['tox'],
cmdclass={"test": Tox},
install_requires=install_requires,
- zip_safe=True,
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',