Skip to content

Commit b049088

Browse files
committed
Tests should pass for the tarball distributed on PyPI; issue 267
1 parent e669131 commit b049088

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

CHANGES.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ Changelog
22
=========
33

44

5+
1.5.x (unreleased)
6+
------------------
7+
8+
9+
510
1.5.2 (2014-04-04)
611
------------------
712

pep8.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"""
4747
from __future__ import with_statement
4848

49-
__version__ = '1.5.2'
49+
__version__ = '1.5.3a0'
5050

5151
import os
5252
import sys

setup.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
[wheel]
22
universal = 1
3+
4+
[pep8]
5+
select =
6+
ignore = E226,E24
7+
max_line_length = 79

testsuite/test_shell.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,10 @@ def test_check_simple(self):
8282
self.assertEqual(x, str(num))
8383
self.assertEqual(y, str(col))
8484
self.assertTrue(msg.startswith(' E11'))
85-
# Config file read from the pep8's setup.cfg or tox.ini
86-
config_filenames = self._config_filenames
87-
self.assertEqual(len(config_filenames), 2)
88-
self.assertTrue(config_filenames[0].endswith('setup.cfg'))
89-
self.assertTrue(config_filenames[1].endswith('tox.ini'))
85+
# Config file read from the pep8's setup.cfg
86+
config_filenames = [os.path.basename(p)
87+
for p in self._config_filenames]
88+
self.assertTrue('setup.cfg' in config_filenames)
9089

9190
def test_check_stdin(self):
9291
pep8.PROJECT_CONFIG = ()

tox.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,3 @@ commands =
1313
{envpython} pep8.py --statistics pep8.py
1414
{envpython} pep8.py --doctest
1515
{envpython} -m testsuite.test_all
16-
17-
[pep8]
18-
select =
19-
ignore = E226,E24
20-
max_line_length = 79

0 commit comments

Comments
 (0)