openstack
/
pbr
Code Issues Proposed changes

Stop filtering out argparse 

Back in the day, attempting to install argparse on python 2.7 would
result in failure, as the setup.py of argparse failed hard if it was
attempted. That seems to be fixed, and when we do filter it out of
the list now, we cause problems with python 2.6 and wheels (if we make
a wheel on 2.6 and it depends on argparse, the pbr code means that
argparse doesn't get added properly)

Remove the filtering so that our wheels can be universal.

Closes-bug: #1346357
Change-Id: I49d539ac6fb8ee75f8d32fdfbd20129b13d36499
This commit is contained in:
Monty Taylor 2014-07-21 07:41:38 -07:00
parent 8d4c553a78
commit c2aab3b27f
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pbr/packaging.py
View File

@ -51,7 +51,7 @@ REQUIREMENTS_FILES = ('requirements.txt', 'tools/pip-requires')
TEST_REQUIREMENTS_FILES = ('test-requirements.txt', 'tools/test-requires')
# part of the standard library starting with 2.7
# adding it to the requirements list screws distro installs
BROKEN_ON_27 = ('argparse', 'importlib', 'ordereddict')
BROKEN_ON_27 = ('importlib', 'ordereddict')
def get_requirements_files():

6
pbr/tests/test_setup.py
View File

@ -304,12 +304,6 @@ class ParseRequirementsTest(base.BaseTestCase):
fh.write("-f foobar")
self.assertEqual([], packaging.parse_requirements([self.tmp_file]))
def test_parse_requirements_removes_argparse(self):
with open(self.tmp_file, 'w') as fh:
fh.write("argparse")
if sys.version_info >= (2, 7):
self.assertEqual([], packaging.parse_requirements([self.tmp_file]))
def test_parse_requirements_removes_versioned_ordereddict(self):
self.useFixture(fixtures.MonkeyPatch('sys.version_info', (2, 7)))
with open(self.tmp_file, 'w') as fh: