Permalink
Browse files

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

  • Loading branch information...
1 parent e669131 commit b04908899886273f32e82b8a3ce85c1014e24304 @florentx florentx committed Apr 4, 2014
Showing with 15 additions and 11 deletions.
  1. +5 −0 CHANGES.txt
  2. +1 −1 pep8.py
  3. +5 −0 setup.cfg
  4. +4 −5 testsuite/test_shell.py
  5. +0 −5 tox.ini
View
@@ -2,6 +2,11 @@ Changelog
=========
+1.5.x (unreleased)
+------------------
+
+
+
1.5.2 (2014-04-04)
------------------
View
@@ -46,7 +46,7 @@
"""
from __future__ import with_statement
-__version__ = '1.5.2'
+__version__ = '1.5.3a0'
import os
import sys
View
@@ -1,2 +1,7 @@
[wheel]
universal = 1
+
+[pep8]
+select =
+ignore = E226,E24
+max_line_length = 79
View
@@ -82,11 +82,10 @@ def test_check_simple(self):
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 = ()
View
@@ -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

0 comments on commit b049088

Please sign in to comment.