diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-06 21:14:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-06 21:14:59 +0000 |
| commit | 32bfe7808f7c988c1d1b9acccd6fd437894c6e3d (patch) | |
| tree | 2d90e362410db307e4b7e2efadc1c36903f4213a /pbr/packaging.py | |
| parent | 36da1a13c0197b3daf02003188cbae93509a644f (diff) | |
| parent | 8ea9d9262de318bf24d32246e6891d7a39d4b91b (diff) | |
| download | pbr-32bfe7808f7c988c1d1b9acccd6fd437894c6e3d.tar.gz | |
Merge "packaging: Remove support for pyN requirement files"
Diffstat (limited to 'pbr/packaging.py')
| -rw-r--r-- | pbr/packaging.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py index dc0b60c..d8d3737 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -81,14 +81,16 @@ def _any_existing(file_list): def get_reqs_from_files(requirements_files): existing = _any_existing(requirements_files) + # TODO(stephenfin): Remove this in pbr 6.0+ deprecated = [f for f in existing if f in PY_REQUIREMENTS_FILES] if deprecated: warnings.warn('Support for \'-pyN\'-suffixed requirements files is ' - 'deprecated in pbr 4.0 and will be removed in 5.0. ' + 'removed in pbr 5.0 and these files are now ignored. ' 'Use environment markers instead. Conflicting files: ' '%r' % deprecated, DeprecationWarning) + existing = [f for f in existing if f not in PY_REQUIREMENTS_FILES] for requirements_file in existing: with open(requirements_file, 'r') as fil: return fil.read().split('\n') |