--- a/components/python/oslo.context/Makefile	Wed Sep 07 14:48:31 2016 -0700
+++ b/components/python/oslo.context/Makefile	Wed Sep 07 14:48:32 2016 -0700
@@ -26,16 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		oslo.context
-COMPONENT_VERSION=	0.2.0
+COMPONENT_VERSION=	2.2.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:30bee9680a2bf5f947227cfd5996cebb17fd8c8e3013e5a594f7a7accb2947dd
+    sha256:8c9fbbf56d3f37cf00a039cac3455cffeb6588f61537e36a36ce9447c4be72ec
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
-COMPONENT_PROJECT_URL=	https://launchpad.net/oslo.context
+COMPONENT_PROJECT_URL=	http://docs.openstack.org/developer/oslo.context/
 COMPONENT_BUGDB=	python-mod/oslo.context
 
-TPNO=			25739
+TPNO=			28365
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -48,8 +48,8 @@
 
 install:	$(INSTALL_NO_ARCH)
 
-# see $(COMPONENT_SRC)/test-requirements.txt for the python modules
+# See $(COMPONENT_SRC)/test-requirements.txt for the Python modules
 # required to execute unittests.
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test:	$(NO_TESTS)

--- a/components/python/oslo.context/oslo.context-PYVER.p5m	Wed Sep 07 14:48:31 2016 -0700
+++ b/components/python/oslo.context/oslo.context-PYVER.p5m	Wed Sep 07 14:48:32 2016 -0700
@@ -51,9 +51,10 @@
 #
 license oslo.context.license license="Apache v2.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 oslo.context package
 depend type=require \
     fmri=library/python/oslo.context@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pbr-$(PYV)

--- a/components/python/oslo.context/oslo.context.license	Wed Sep 07 14:48:31 2016 -0700
+++ b/components/python/oslo.context/oslo.context.license	Wed Sep 07 14:48:32 2016 -0700
@@ -8,7 +8,8 @@
 
 See the License for the specific language governing permissions and limitations under the License.
 
-		                 Apache License
+
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -182,32 +183,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-