diff options
| -rw-r--r-- | .zuul.yaml | 1 | ||||
| -rw-r--r-- | pbr/tests/testpackage/setup.cfg | 2 | ||||
| -rw-r--r-- | pbr/util.py | 1 | ||||
| -rw-r--r-- | playbooks/legacy/pbr-installation-devstack/run.yaml | 1 | ||||
| -rw-r--r-- | playbooks/legacy/pbr-installation-upstream-devstack/run.yaml | 1 | ||||
| -rw-r--r-- | setup.cfg | 2 |
6 files changed, 3 insertions, 5 deletions
@@ -34,7 +34,6 @@ - openstack/manila - openstack/manila-ui - openstack/neutron - - openstack/neutron-fwaas - openstack/neutron-vpnaas - openstack/nova - openstack/octavia diff --git a/pbr/tests/testpackage/setup.cfg b/pbr/tests/testpackage/setup.cfg index 3929f0d..ab31e95 100644 --- a/pbr/tests/testpackage/setup.cfg +++ b/pbr/tests/testpackage/setup.cfg @@ -15,7 +15,7 @@ description-file = README.txt CHANGES.txt description-content-type = text/plain; charset=UTF-8 -requires-python = >=2.5 +python-requires = >=2.5 requires-dist = setuptools diff --git a/pbr/util.py b/pbr/util.py index 60b7cd7..89f5088 100644 --- a/pbr/util.py +++ b/pbr/util.py @@ -114,6 +114,7 @@ D1_D2_SETUP_ARGS = { "install_requires": ("metadata", "requires_dist"), "setup_requires": ("metadata", "setup_requires_dist"), "python_requires": ("metadata",), + "requires_python": ("metadata", "python_requires"), "provides": ("metadata", "provides_dist"), # ** "provides_extras": ("metadata",), "obsoletes": ("metadata", "obsoletes_dist"), # ** diff --git a/playbooks/legacy/pbr-installation-devstack/run.yaml b/playbooks/legacy/pbr-installation-devstack/run.yaml index 96f863a..b22cce2 100644 --- a/playbooks/legacy/pbr-installation-devstack/run.yaml +++ b/playbooks/legacy/pbr-installation-devstack/run.yaml @@ -62,7 +62,6 @@ export PROJECTS="openstack/manila-ui $PROJECTS" export PROJECTS="openstack/zaqar $PROJECTS" export PROJECTS="openstack/neutron $PROJECTS" - export PROJECTS="openstack/neutron-fwaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" export PROJECTS="openstack/neutron-vpnaas $PROJECTS" export PROJECTS="openstack/nova $PROJECTS" diff --git a/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml b/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml index 544dd43..06a38e6 100644 --- a/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml +++ b/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml @@ -62,7 +62,6 @@ export PROJECTS="openstack/manila-ui $PROJECTS" export PROJECTS="openstack/zaqar $PROJECTS" export PROJECTS="openstack/neutron $PROJECTS" - export PROJECTS="openstack/neutron-fwaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" export PROJECTS="openstack/neutron-vpnaas $PROJECTS" export PROJECTS="openstack/nova $PROJECTS" @@ -11,7 +11,7 @@ project_urls = Bug Tracker = https://bugs.launchpad.net/pbr/ Documentation = https://docs.openstack.org/pbr/ Source Code = https://git.openstack.org/cgit/openstack-dev/pbr/ -requires-python = >=2.6 +python-requires = >=2.6 classifier = Development Status :: 5 - Production/Stable Environment :: Console |