diff options
| author | Monty Taylor <mordred@inaugust.com> | 2014-07-21 07:41:38 -0700 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2014-07-21 08:00:27 -0700 |
| commit | c2aab3b27f03887606b49711a7db9a21b72a60c1 (patch) | |
| tree | b5c97c8d2606a3e0f4decbeaa41fdb36a4af8845 | |
| parent | 8d4c553a78a4970fde06b491b173bac85108491e (diff) | |
| download | pbr-c2aab3b27f03887606b49711a7db9a21b72a60c1.tar.gz | |
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
| -rw-r--r-- | pbr/packaging.py | 2 | ||||
| -rw-r--r-- | pbr/tests/test_setup.py | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py index dc256a0..f88f54f 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -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(): diff --git a/pbr/tests/test_setup.py b/pbr/tests/test_setup.py index 0ded02b..1a35b34 100644 --- a/pbr/tests/test_setup.py +++ b/pbr/tests/test_setup.py @@ -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: |