Skip to content

Commit

Permalink
Tests should pass for the tarball distributed on PyPI; issue 267
Browse files Browse the repository at this point in the history
  • Loading branch information
florentx committed Apr 4, 2014
1 parent e669131 commit b049088
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ Changelog
========= =========




1.5.x (unreleased)
------------------



1.5.2 (2014-04-04) 1.5.2 (2014-04-04)
------------------ ------------------


Expand Down
2 changes: 1 addition & 1 deletion pep8.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
""" """
from __future__ import with_statement from __future__ import with_statement


__version__ = '1.5.2' __version__ = '1.5.3a0'


import os import os
import sys import sys
Expand Down
5 changes: 5 additions & 0 deletions setup.cfg
Original file line number Original file line Diff line number Diff line change
@@ -1,2 +1,7 @@
[wheel] [wheel]
universal = 1 universal = 1

[pep8]
select =
ignore = E226,E24
max_line_length = 79
9 changes: 4 additions & 5 deletions testsuite/test_shell.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -82,11 +82,10 @@ def test_check_simple(self):
self.assertEqual(x, str(num)) self.assertEqual(x, str(num))
self.assertEqual(y, str(col)) self.assertEqual(y, str(col))
self.assertTrue(msg.startswith(' E11')) self.assertTrue(msg.startswith(' E11'))
# Config file read from the pep8's setup.cfg or tox.ini # Config file read from the pep8's setup.cfg
config_filenames = self._config_filenames config_filenames = [os.path.basename(p)
self.assertEqual(len(config_filenames), 2) for p in self._config_filenames]
self.assertTrue(config_filenames[0].endswith('setup.cfg')) self.assertTrue('setup.cfg' in config_filenames)
self.assertTrue(config_filenames[1].endswith('tox.ini'))


def test_check_stdin(self): def test_check_stdin(self):
pep8.PROJECT_CONFIG = () pep8.PROJECT_CONFIG = ()
Expand Down
5 changes: 0 additions & 5 deletions tox.ini
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,8 +13,3 @@ commands =
{envpython} pep8.py --statistics pep8.py {envpython} pep8.py --statistics pep8.py
{envpython} pep8.py --doctest {envpython} pep8.py --doctest
{envpython} -m testsuite.test_all {envpython} -m testsuite.test_all

[pep8]
select =
ignore = E226,E24
max_line_length = 79

0 comments on commit b049088

Please sign in to comment.