--- a/components/python/oslo.policy/Makefile Wed Sep 07 14:48:33 2016 -0700
+++ b/components/python/oslo.policy/Makefile Wed Sep 07 14:48:33 2016 -0700
@@ -26,19 +26,19 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= oslo.policy
-COMPONENT_VERSION= 0.3.2
+COMPONENT_VERSION= 1.6.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:e69a5c559f95bcbf91eb0ea9f16aa65f0fe5fccc7fa03693d4cc991b76e969a6
+ sha256:24d5ecdf4e10f33a9fb2e8784876f73276637d8663c33f594e8efc99e179016a
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= https://launchpad.net/oslo.policy
+COMPONENT_PROJECT_URL= http://docs.openstack.org/developer/oslo.policy/
COMPONENT_BUGDB= python-mod/oslo.policy
-TPNO= 25889
+TPNO= 28452
# Depends on oslo.serialization which is not Python 3 ready.
-PYTHON_VERSIONS = $(PYTHON2_VERSIONS)
+PYTHON_VERSIONS = $(PYTHON2_VERSIONS)
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
@@ -51,8 +51,10 @@
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)
+
+REQUIRED_PACKAGES += library/python/oslo.serialization-27
--- a/components/python/oslo.policy/oslo.policy-PYVER.p5m Wed Sep 07 14:48:33 2016 -0700
+++ b/components/python/oslo.policy/oslo.policy-PYVER.p5m Wed Sep 07 14:48:33 2016 -0700
@@ -25,8 +25,9 @@
set name=pkg.fmri \
value=pkg:/library/python/oslo.policy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
- value="The Oslo Policy library provides support for RBAC policy enforcement across all Openstack services"
+set name=pkg.summary value="Oslo Policy Library"
+set name=pkg.description \
+ value="The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
set name=com.oracle.info.description value="the Python oslo.policy module"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
@@ -45,21 +46,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.policy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.policy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/_cache_handler.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/_checks.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/_i18n.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/_parser.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/openstack/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/openstack/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/openstack/common/fileutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/fixture.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/opts.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/policy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_policy/shell.py
#
license oslo.policy.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 oslo.config; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.config-$(PYV)
@@ -70,5 +67,8 @@
depend type=require \
fmri=library/python/oslo.policy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-# force a dependency on oslo.serialization; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/oslo.serialization-$(PYV)
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
+# force a dependency on six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/six-$(PYV)
--- a/components/python/oslo.policy/oslo.policy.license Wed Sep 07 14:48:33 2016 -0700
+++ b/components/python/oslo.policy/oslo.policy.license Wed Sep 07 14:48:33 2016 -0700
@@ -8,7 +8,6 @@
See the License for the specific language governing permissions and limitations under the License.
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -183,30 +182,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.