Tests should pass for the tarball distributed on PyPI; issue 267

5 files changed, 15 insertions, 11 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 4e302ff..d81a64d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,11 @@ Changelog
 =========
 
 
+1.5.x (unreleased)
+------------------
+
+
+
 1.5.2 (2014-04-04)
 ------------------
 
diff --git a/pep8.py b/pep8.py
index 8ed9469..43ff43a 100755
--- a/pep8.py
+++ b/pep8.py
@@ -46,7 +46,7 @@ W warnings
 """
 from __future__ import with_statement
 
-__version__ = '1.5.2'
+__version__ = '1.5.3a0'
 
 import os
 import sys
diff --git a/setup.cfg b/setup.cfg
index 5e40900..65ca96d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,7 @@
 [wheel]
 universal = 1
+
+[pep8]
+select =
+ignore = E226,E24
+max_line_length = 79
diff --git a/testsuite/test_shell.py b/testsuite/test_shell.py
index 66d4174..e1205cc 100644
--- a/testsuite/test_shell.py
+++ b/testsuite/test_shell.py
@@ -82,11 +82,10 @@ class ShellTestCase(unittest.TestCase):
             self.assertEqual(x, str(num))
             self.assertEqual(y, str(col))
             self.assertTrue(msg.startswith(' E11'))
-        # Config file read from the pep8's setup.cfg or tox.ini
-        config_filenames = self._config_filenames
-        self.assertEqual(len(config_filenames), 2)
-        self.assertTrue(config_filenames[0].endswith('setup.cfg'))
-        self.assertTrue(config_filenames[1].endswith('tox.ini'))
+        # Config file read from the pep8's setup.cfg
+        config_filenames = [os.path.basename(p)
+                            for p in self._config_filenames]
+        self.assertTrue('setup.cfg' in config_filenames)
 
     def test_check_stdin(self):
         pep8.PROJECT_CONFIG = ()
diff --git a/tox.ini b/tox.ini
index 214441f..50a0d00 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,3 @@ commands =
 	{envpython} pep8.py --statistics pep8.py
 	{envpython} pep8.py --doctest
 	{envpython} -m testsuite.test_all
-
-[pep8]
-select =
-ignore = E226,E24
-max_line_length = 79