diff options
| author | Stephen Finucane <sfinucan@redhat.com> | 2018-04-03 15:40:14 +0100 |
|---|---|---|
| committer | Stephen Finucane <sfinucan@redhat.com> | 2018-07-23 11:04:39 +0100 |
| commit | 8ea9d9262de318bf24d32246e6891d7a39d4b91b (patch) | |
| tree | 7eae0dcbd4ee510c3db7b10f2f180a90c4bae7e8 /pbr/packaging.py | |
| parent | 6f5c1ee8e4e9c1c05f16b7dfe57c3245ad38b0cf (diff) | |
| download | pbr-8ea9d9262de318bf24d32246e6891d7a39d4b91b.tar.gz | |
packaging: Remove support for pyN requirement files
Change-Id: I7f915ecdc819bc4d3c6811949f12bdadb108a1ab
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
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 8656a6c..9c4ee0a 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') |