--- a/components/python/pbr/Makefile Wed Sep 07 14:48:34 2016 -0700
+++ b/components/python/pbr/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -26,24 +26,25 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= pbr
-COMPONENT_VERSION= 0.11.0
+COMPONENT_VERSION= 1.8.1
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:d7f0d69aef367a764d69a4728afd966025ce9394d6029a924ef838ecdf592f6d
+ sha256:e2127626a91e6c885db89668976db31020f0af2da728924b56480fc7ccf09649
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= http://pypi.python.org/pypi/pbr/
+COMPONENT_PROJECT_URL= http://docs.openstack.org/developer/pbr/
COMPONENT_BUGDB= python-mod/pbr
-TPNO= 25746
+TPNO= 27908
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
COMPONENT_POST_INSTALL_ACTION = \
- (cd $(PROTO_DIR)/usr/bin ; $(MV) -f pbr pbr-$(PYTHON_VERSION))
+ (cd $(PROTO_DIR)/usr/bin ; $(MV) -f pbr pbr-$(PYTHON_VERSION))
COMPONENT_TEST_DIR = $(SOURCE_DIR)
COMPONENT_TEST_ARGS = setup.py test
@@ -56,5 +57,4 @@
# Tests require tox and testr which haven't been integrated yet.
test: $(NO_TESTS)
-system-test: $(NO_TESTS)
-
+system-test: $(NO_TESTS)
--- a/components/python/pbr/patches/testr.patch Wed Sep 07 14:48:34 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-From 946cf80b750f3735a5d3b0c2173f4eaa7fad4a81 Mon Sep 17 00:00:00 2001
-From: Akihiro Motoki <[email protected]>
-Date: Mon, 29 Sep 2014 07:36:19 +0900
-Subject: [PATCH] Make setup.py --help-commands work without testrepository
-
-testr command is registered by pbr.hooks.commands if
-testrepository is installed, so there is no need to
-setup the entry point in setup.cfg.
-
-Change-Id: I95aae12d1ac810b6d1d09b71f2a0d87be5ccb6ab
-Closes-Bug: #1375048
----
- pbr/packaging.py | 24 +++++++++---------------
- pbr/testr_command.py | 27 ++++++++++++++++++++++++---
- 2 files changed, 33 insertions(+), 18 deletions(-)
-
---- a/pbr/packaging.py
-+++ b/pbr/packaging.py
-@@ -39,6 +39,7 @@
- from pbr import git
- from pbr import options
- import pbr.pbr_json
-+from pbr import testr_command
- from pbr import version
-
- REQUIREMENTS_FILES = ('requirements.txt', 'tools/pip-requires')
-@@ -250,24 +250,16 @@
--try:
-- from pbr import testr_command
--
-- class TestrTest(testr_command.Testr, _PipInstallTestRequires):
-- """Make setup.py test do the right thing."""
--
-- command_name = 'test'
--
-- def run(self):
-- self.pre_run()
-- # Can't use super - base class old-style class
-- testr_command.Testr.run(self)
-+class TestrTest(testr_command.Testr, _PipInstallTestRequires):
-+ """Make setup.py test do the right thing."""
-
-- _have_testr = True
-+ command_name = 'test'
-
--except ImportError:
-- _have_testr = False
-+ def run(self):
-+ # Can't use super - base class old-style class
-+ testr_command.Testr.run(self)
-
-
- def have_testr():
-- return _have_testr
-+ return testr_command.have_testr
-+
-
- try:
- from nose import commands
---- a/pbr/testr_command.py
-+++ b/pbr/testr_command.py
-@@ -44,12 +44,10 @@
- import os
- import sys
-
--from testrepository import commands
--
- logger = logging.getLogger(__name__)
-
-
--class Testr(cmd.Command):
-+class TestrReal(cmd.Command):
-
- description = "Run unit tests using testr"
-
-@@ -133,3 +131,26 @@ def _coverage_after(self):
- logger.debug("_coverage_after called")
- os.system("coverage combine")
- os.system("coverage html -d ./cover %s" % self.omit)
-+
-+
-+class TestrFake(cmd.Command):
-+ description = "Run unit tests using testr"
-+ user_options = []
-+
-+ def initialize_options(self):
-+ pass
-+
-+ def finalize_options(self):
-+ pass
-+
-+ def run(self):
-+ print("Install testrepository to run 'testr' command properly.")
-+
-+
-+try:
-+ from testrepository import commands
-+ have_testr = True
-+ Testr = TestrReal
-+except ImportError:
-+ have_testr = False
-+ Testr = TestrFake
--- a/components/python/pbr/pbr-PYVER.p5m Wed Sep 07 14:48:34 2016 -0700
+++ b/components/python/pbr/pbr-PYVER.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -46,8 +46,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pbr-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pbr-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pbr-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
-file path=usr/lib/python$(PYVER)/vendor-packages/pbr-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pbr-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pbr/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/pbr/builddoc.py
@@ -69,24 +67,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pbr/testr_command.py
file path=usr/lib/python$(PYVER)/vendor-packages/pbr/util.py
file path=usr/lib/python$(PYVER)/vendor-packages/pbr/version.py
+#
license pbr.license license="Apache v2.0, BSD"
# force a group dependency on the optional nose; pkgdepend work is needed to
# flush this out.
depend type=group fmri=library/python/nose-$(PYV)
-# force a group dependency on the optional pip; pkgdepend work is needed to
-# flush this out.
-depend type=group fmri=library/python/pip-$(PYV)
-
# force the rename with an optional dependency on the old name
depend type=optional \
fmri=library/python-2/pbr-$(PYV)@0.5.21,5.12-5.12.0.0.0.41.0
-# force a dependency on the Python runtime
-depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
- pkg.debug.depend.path=usr/bin
-
# force a dependency on the pbr package
depend type=require \
fmri=library/python/pbr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pbr/pbr.license Wed Sep 07 14:48:34 2016 -0700
+++ b/components/python/pbr/pbr.license Wed Sep 07 14:48:35 2016 -0700
@@ -1,3 +1,5 @@
+
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -173,7 +175,8 @@
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
---------------------------------------------------------------------------
+==============================================================================
+Additional licenses/copyrights seen:
Copyright (C) 2005 Association of Universities for Research in Astronomy (AURA)
@@ -185,7 +188,7 @@
2. Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
+ disclaimer in the documentation and/or other materials provided
with the distribution.
3. The name of AURA and its representatives may not be used to
@@ -194,82 +197,62 @@
THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
---------------------------------------------------------------------------
-
-Copyright (C) 2013 Association of Universities for Research in Astronomy
- (AURA)
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
+==============================================================================
- 3. The name of AURA and its representatives may not be used to
- endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-
---------------------------------------------------------------------------
-
-Copyright (C) 2013 Association of Universities for Research in Astronomy
- (AURA)
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+#
+# Copyright (c) 2013 Testrepository Contributors
+#
+# Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
+# license at the users choice. A copy of both licenses are available in the
+# project source as Apache-2.0 and BSD. You may not use this file except in
+# compliance with one of these two licences.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# license you chose for the specific language governing permissions and
+# limitations under that license.
+==============================================================================
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- 3. The name of AURA and its representatives may not be used to
- endorse or promote products derived from this software without
- specific prior written permission.
+#
+# Copyright (C) 2013 Association of Universities for Research in Astronomy
+# (AURA)
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of AURA and its representatives may not be used to
+# endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
-THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-
---------------------------------------------------------------------------
-
-
-Copyright (c) 2013 Testrepository Contributors
-
-Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
-license at the users choice. A copy of both licenses are available in the
-project source as Apache-2.0 and BSD. You may not use this file except in
-compliance with one of these two licences.
-
-Unless required by applicable law or agreed to in writing, software
-distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-license you chose for the specific language governing permissions and
-limitations under that license.
+==============================================================================