Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23119301 Upgrade pycadf to 2.2.0
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:35 -0700
changeset 6818 4079d968549c
parent 6817 e4a26f447d0c
child 6819 dde264c0ac6e
23119301 Upgrade pycadf to 2.2.0
components/python/pycadf/Makefile file | annotate | diff | comparison | revisions
components/python/pycadf/pycadf-GENFRAG.p5m file | annotate | diff | comparison | revisions
components/python/pycadf/pycadf-PYVER.p5m file | annotate | diff | comparison | revisions
components/python/pycadf/pycadf.license file | annotate | diff | comparison | revisions 
--- a/components/python/pycadf/Makefile	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/python/pycadf/Makefile	Wed Sep 07 14:48:35 2016 -0700
@@ -26,18 +26,17 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pycadf
-COMPONENT_VERSION=	0.8.0
+COMPONENT_VERSION=	2.2.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	\
-    sha256:240d7775682a0f49fb580310dd6459e8a8b5f5619dfdc687f043c3fe21b48ba1
+COMPONENT_ARCHIVE_HASH=	sha256:bdb3427a28d318c6ce073b54993c2f4cc9148be498b30ad1b362ade45eb4f7fb
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
-COMPONENT_PROJECT_URL=	https://launchpad.net/pycadf
+COMPONENT_PROJECT_URL=	http://docs.openstack.org/developer/pycadf/
 COMPONENT_BUGDB=	python-mod/pycadf
 
-TPNO=			25747
+TPNO=			27909
 
-# Depends on oslo.messaging which is not Python 3 ready.
+# Depends on oslo.serialization which is not Python 3 ready.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
 
 include $(WS_MAKE_RULES)/prep.mk
@@ -53,4 +52,4 @@
 
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test:	$(NO_TESTS)
--- a/components/python/pycadf/pycadf-GENFRAG.p5m	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/python/pycadf/pycadf-GENFRAG.p5m	Wed Sep 07 14:48:35 2016 -0700
@@ -20,9 +20,12 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
+#
+file path=etc/pycadf/ceilometer_api_audit_map.conf mode=0644 overlay=allow \
+    preserve=true
 file path=etc/pycadf/cinder_api_audit_map.conf mode=0644 overlay=allow \
     preserve=true
 file path=etc/pycadf/glance_api_audit_map.conf mode=0644 overlay=allow \
@@ -31,5 +34,7 @@
     preserve=true
 file path=etc/pycadf/nova_api_audit_map.conf mode=0644 overlay=allow \
     preserve=true
+file path=etc/pycadf/trove_api_audit_map.conf mode=0644 overlay=allow \
+    preserve=true
 #
-license LICENSE license="Apache v2.0"
+license pycadf.license license="Apache v2.0"
--- a/components/python/pycadf/pycadf-PYVER.p5m	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/python/pycadf/pycadf-PYVER.p5m	Wed Sep 07 14:48:35 2016 -0700
@@ -38,10 +38,6 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2014/329
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=usr/lib/python$(PYVER)/vendor-packages/etc/pycadf/cinder_api_audit_map.conf
-file path=usr/lib/python$(PYVER)/vendor-packages/etc/pycadf/glance_api_audit_map.conf
-file path=usr/lib/python$(PYVER)/vendor-packages/etc/pycadf/neutron_api_audit_map.conf
-file path=usr/lib/python$(PYVER)/vendor-packages/etc/pycadf/nova_api_audit_map.conf
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -52,8 +48,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/_i18n.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/attachment.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/audit/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/audit/api.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/cadftaxonomy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/cadftype.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/credential.py
@@ -67,10 +61,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/identifier.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/measurement.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/metric.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/middleware/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/middleware/audit.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/middleware/base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/middleware/notifier.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/path.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/reason.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/reporterstep.py
@@ -85,20 +75,18 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
+# force a dependency on debtcollector; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/debtcollector-$(PYV)
+
 # force a dependency on oslo.config; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.config-$(PYV)
 
-# force a dependency on oslo.context; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/oslo.context-$(PYV)
-
 # force a dependency on oslo.i18n; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.i18n-$(PYV)
 
-# force a dependency on oslo.messaging; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python/oslo.messaging-$(PYV)
-
-# force a dependency on oslo.serialization; pkgdepend work is needed to flush this out.
+# 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 the pycadf package
@@ -110,6 +98,3 @@
 
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/webob-$(PYV)
--- a/components/python/pycadf/pycadf.license	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/python/pycadf/pycadf.license	Wed Sep 07 14:48:35 2016 -0700
@@ -8,7 +8,9 @@
 
 See the License for the specific language governing permissions and limitations under the License.
 
-		                 Apache License
+		       The following attribution text was taken from Component pycadf Version 2.2.0
+
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -183,29 +185,31 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+--- License for python-keystoneclient versions prior to 2.1 ---
 
-   APPENDIX: How to apply the Apache License to your work.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-      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.
+    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.
 
-   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
+    3. Neither the name of this project nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
 
-       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.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
upstream/oracle/userland-gate