From 8a3b4b9c37b17c47b0b88ca2d0c6deead54f64c2 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 29 Jan 2014 13:11:40 +0100 Subject: [PATCH] require py>=1.2.20 --- setup.py | 2 +- testing/test_assertrewrite.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index fd579e06d..06b81912a 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ classifiers=['Development Status :: 6 - Mature', long_description = open("README.rst").read() def main(): - install_requires = ["py>=1.4.20.dev2"] + install_requires = ["py>=1.4.20"] if sys.version_info < (2,7): install_requires.append("argparse") if sys.platform == "win32": diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py index 040dd0743..121121fb8 100644 --- a/testing/test_assertrewrite.py +++ b/testing/test_assertrewrite.py @@ -411,8 +411,8 @@ def test_rewritten(): testdir.tmpdir.join("test_newlines.py").write(b, "wb") assert testdir.runpytest().ret == 0 - @pytest.mark.skipif(sys.version_info[0] == 2, - reason='packages without __init__.py not supported on python 2') + @pytest.mark.skipif(sys.version_info < (3,3), + reason='packages without __init__.py not supported on python 2') def test_package_without__init__py(self, testdir): pkg = testdir.mkdir('a_package_without_init_py') pkg.join('module.py').ensure()