[arch-commits] Commit in python-glanceclient/repos/community-any (3 files)

Felix Yan felixonmars at archlinux.org
Fri Aug 19 04:24:44 UTC 2016


    Date: Friday, August 19, 2016 @ 04:24:44
  Author: felixonmars
Revision: 186993

archrelease: copy trunk to community-any

Added:
  python-glanceclient/repos/community-any/PKGBUILD
    (from rev 186992, python-glanceclient/trunk/PKGBUILD)
Deleted:
  python-glanceclient/repos/community-any/PKGBUILD
  python-glanceclient/repos/community-any/warlock-1.3.patch

-------------------+
 PKGBUILD          |  127 +++++++++++++++++++++++------------------------
 warlock-1.3.patch |  139 ----------------------------------------------------
 2 files changed, 62 insertions(+), 204 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-19 04:24:28 UTC (rev 186992)
+++ PKGBUILD	2016-08-19 04:24:44 UTC (rev 186993)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-
-pkgbase=python-glanceclient
-pkgname=(python-glanceclient python2-glanceclient)
-pkgver=2.3.0
-pkgrel=1
-pkgdesc="OpenStack Image API Client Library"
-arch=('any')
-url="http://docs.openstack.org/developer/python-glanceclient"
-license=('Apache')
-makedepends=('git' 'python-setuptools' 'python2-setuptools' 'python-pbr' 'python2-pbr'
-             'python-babel' 'python2-babel' 'python-prettytable' 'python2-prettytable'
-             'python-keystoneclient' 'python2-keystoneclient' 'python-requests'
-             'python2-requests' 'python-warlock' 'python2-warlock' 'python-oslo-utils'
-             'python2-oslo-utils' 'python-oslo-i18n' 'python2-oslo-i18n')
-checkdepends=('python-oslotest' 'python2-oslotest' 'python-requests-mock'
-              'python2-requests-mock')
-options=('!emptydirs')
-source=("git+https://git.openstack.org/openstack/python-glanceclient#tag=$pkgver"
-        warlock-1.3.patch)
-md5sums=('SKIP'
-         'c653fff631fcb402f3db69810644ba23')
-
-prepare() {
-  (cd python-glanceclient; patch -p1 -i ../warlock-1.3.patch)
-  cp -a python-glanceclient{,-py2}
-}
-
-build() {
-  cd "$srcdir"/python-glanceclient
-  python setup.py build
-
-  cd "$srcdir"/python-glanceclient-py2
-  python2 setup.py build
-}
-
-check() {
-  cd "$srcdir"/python-glanceclient
-  python setup.py testr
-
-  cd "$srcdir"/python-glanceclient-py2
-  PYTHON=python2 python2 setup.py testr
-}
-
-package_python-glanceclient() {
-  depends=('python-six' 'python-pbr' 'python-babel' 'python-prettytable' 'python-keystoneclient'
-           'python-requests' 'python-warlock' 'python-oslo-utils' 'python-oslo-i18n')
-
-  cd "$srcdir"/python-glanceclient
-  python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-package_python2-glanceclient() {
-  depends=('python2-six' 'python2-pbr' 'python2-babel' 'python2-prettytable' 'python2-keystoneclient'
-           'python2-requests' 'python2-warlock' 'python2-oslo-utils' 'python2-oslo-i18n')
-
-  cd "$srcdir"/python-glanceclient-py2
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-
-  mv "$pkgdir"/usr/bin/glance{,2}
-}
-
-# vim:set ts=2 sw=2 et:

Copied: python-glanceclient/repos/community-any/PKGBUILD (from rev 186992, python-glanceclient/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2016-08-19 04:24:44 UTC (rev 186993)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+
+pkgbase=python-glanceclient
+pkgname=(python-glanceclient python2-glanceclient)
+pkgver=2.4.0
+pkgrel=1
+pkgdesc="OpenStack Image API Client Library"
+arch=('any')
+url="http://docs.openstack.org/developer/python-glanceclient"
+license=('Apache')
+makedepends=('git' 'python-setuptools' 'python2-setuptools' 'python-pbr' 'python2-pbr'
+             'python-babel' 'python2-babel' 'python-prettytable' 'python2-prettytable'
+             'python-keystoneclient' 'python2-keystoneclient' 'python-requests'
+             'python2-requests' 'python-warlock' 'python2-warlock' 'python-oslo-utils'
+             'python2-oslo-utils' 'python-oslo-i18n' 'python2-oslo-i18n')
+checkdepends=('python-oslotest' 'python2-oslotest' 'python-requests-mock'
+              'python2-requests-mock')
+options=('!emptydirs')
+source=("git+https://git.openstack.org/openstack/python-glanceclient#tag=$pkgver")
+md5sums=('SKIP')
+
+prepare() {
+  cp -a python-glanceclient{,-py2}
+}
+
+build() {
+  cd "$srcdir"/python-glanceclient
+  python setup.py build
+
+  cd "$srcdir"/python-glanceclient-py2
+  python2 setup.py build
+}
+
+check() {
+  cd "$srcdir"/python-glanceclient
+  python setup.py testr
+
+  cd "$srcdir"/python-glanceclient-py2
+  PYTHON=python2 python2 setup.py testr
+}
+
+package_python-glanceclient() {
+  depends=('python-six' 'python-pbr' 'python-babel' 'python-prettytable' 'python-keystoneclient'
+           'python-requests' 'python-warlock' 'python-oslo-utils' 'python-oslo-i18n')
+
+  cd "$srcdir"/python-glanceclient
+  python setup.py install --root="$pkgdir/" --optimize=1
+}
+
+package_python2-glanceclient() {
+  depends=('python2-six' 'python2-pbr' 'python2-babel' 'python2-prettytable' 'python2-keystoneclient'
+           'python2-requests' 'python2-warlock' 'python2-oslo-utils' 'python2-oslo-i18n')
+
+  cd "$srcdir"/python-glanceclient-py2
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+
+  mv "$pkgdir"/usr/bin/glance{,2}
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: warlock-1.3.patch
===================================================================
--- warlock-1.3.patch	2016-08-19 04:24:28 UTC (rev 186992)
+++ warlock-1.3.patch	2016-08-19 04:24:44 UTC (rev 186993)
@@ -1,139 +0,0 @@
-From d7db97c92605a11e312d17cdcdd8ac363bc10924 Mon Sep 17 00:00:00 2001
-From: Sabari Kumar Murugesan <smurugesan at vmware.com>
-Date: Wed, 06 Jul 2016 18:02:28 -0700
-Subject: [PATCH] Fix warlock model creation
-
-Commands like glance md-namespace-show <namespace> fail because
-of a breaking change in warlock 1.3.0's model creation factory
-method.
-
-Warlock introduced a new kwarg 'resolver' in model_factory method
-but changed its position with the 'base_class' kwarg. Since we
-were calling the model_factory method with positional arg, this
-broke the model creation.
-
-Closes-Bug: #1596573
-
-Change-Id: Ic7821f4fdb1b752e0c7ed2bc486299a06bf485c1
----
-
-diff --git a/glanceclient/tests/unit/v2/test_schemas.py b/glanceclient/tests/unit/v2/test_schemas.py
-index 60442a8..c01d8bd 100644
---- a/glanceclient/tests/unit/v2/test_schemas.py
-+++ b/glanceclient/tests/unit/v2/test_schemas.py
-@@ -130,7 +130,7 @@
-     def setUp(self):
-         super(TestSchemaBasedModel, self).setUp()
-         self.model = warlock.model_factory(_SCHEMA.raw(),
--                                           schemas.SchemaBasedModel)
-+                                           base_class=schemas.SchemaBasedModel)
- 
-     def test_patch_should_replace_missing_core_properties(self):
-         obj = {
-diff --git a/glanceclient/v2/image_tags.py b/glanceclient/v2/image_tags.py
-index bcecd01..deebce2 100644
---- a/glanceclient/v2/image_tags.py
-+++ b/glanceclient/v2/image_tags.py
-@@ -27,7 +27,8 @@
-     @utils.memoized_property
-     def model(self):
-         schema = self.schema_client.get('image')
--        return warlock.model_factory(schema.raw(), schemas.SchemaBasedModel)
-+        return warlock.model_factory(schema.raw(),
-+                                     base_class=schemas.SchemaBasedModel)
- 
-     def update(self, image_id, tag_value):
-         """Update an image with the given tag.
-diff --git a/glanceclient/v2/images.py b/glanceclient/v2/images.py
-index a9a5e99..f69fed5 100644
---- a/glanceclient/v2/images.py
-+++ b/glanceclient/v2/images.py
-@@ -39,16 +39,16 @@
-     @utils.memoized_property
-     def model(self):
-         schema = self.schema_client.get('image')
--        warlock_model = warlock.model_factory(schema.raw(),
--                                              schemas.SchemaBasedModel)
-+        warlock_model = warlock.model_factory(
-+            schema.raw(), base_class=schemas.SchemaBasedModel)
-         return warlock_model
- 
-     @utils.memoized_property
-     def unvalidated_model(self):
-         """A model which does not validate the image against the v2 schema."""
-         schema = self.schema_client.get('image')
--        warlock_model = warlock.model_factory(schema.raw(),
--                                              schemas.SchemaBasedModel)
-+        warlock_model = warlock.model_factory(
-+            schema.raw(), base_class=schemas.SchemaBasedModel)
-         warlock_model.validate = lambda *args, **kwargs: None
-         return warlock_model
- 
-diff --git a/glanceclient/v2/metadefs.py b/glanceclient/v2/metadefs.py
-index 28d0db6..4bee224 100644
---- a/glanceclient/v2/metadefs.py
-+++ b/glanceclient/v2/metadefs.py
-@@ -34,7 +34,8 @@
-     @utils.memoized_property
-     def model(self):
-         schema = self.schema_client.get('metadefs/namespace')
--        return warlock.model_factory(schema.raw(), schemas.SchemaBasedModel)
-+        return warlock.model_factory(schema.raw(),
-+                                     base_class=schemas.SchemaBasedModel)
- 
-     def create(self, **kwargs):
-         """Create a namespace.
-@@ -186,7 +187,8 @@
-     @utils.memoized_property
-     def model(self):
-         schema = self.schema_client.get('metadefs/resource_type')
--        return warlock.model_factory(schema.raw(), schemas.SchemaBasedModel)
-+        return warlock.model_factory(schema.raw(),
-+                                     base_class=schemas.SchemaBasedModel)
- 
-     def associate(self, namespace, **kwargs):
-         """Associate a resource type with a namespace."""
-@@ -234,7 +236,8 @@
-     @utils.memoized_property
-     def model(self):
-         schema = self.schema_client.get('metadefs/property')
--        return warlock.model_factory(schema.raw(), schemas.SchemaBasedModel)
-+        return warlock.model_factory(schema.raw(),
-+                                     base_class=schemas.SchemaBasedModel)
- 
-     def create(self, namespace, **kwargs):
-         """Create a property.
-@@ -314,7 +317,8 @@
-     @utils.memoized_property
-     def model(self):
-         schema = self.schema_client.get('metadefs/object')
--        return warlock.model_factory(schema.raw(), schemas.SchemaBasedModel)
-+        return warlock.model_factory(schema.raw(),
-+                                     base_class=schemas.SchemaBasedModel)
- 
-     def create(self, namespace, **kwargs):
-         """Create an object.
-@@ -397,7 +401,8 @@
-     @utils.memoized_property
-     def model(self):
-         schema = self.schema_client.get('metadefs/tag')
--        return warlock.model_factory(schema.raw(), schemas.SchemaBasedModel)
-+        return warlock.model_factory(schema.raw(),
-+                                     base_class=schemas.SchemaBasedModel)
- 
-     def create(self, namespace, tag_name):
-         """Create a tag.
-diff --git a/glanceclient/v2/tasks.py b/glanceclient/v2/tasks.py
-index f9c8826..dd94e9e 100644
---- a/glanceclient/v2/tasks.py
-+++ b/glanceclient/v2/tasks.py
-@@ -35,7 +35,8 @@
-     @utils.memoized_property
-     def model(self):
-         schema = self.schema_client.get('task')
--        return warlock.model_factory(schema.raw(), schemas.SchemaBasedModel)
-+        return warlock.model_factory(schema.raw(),
-+                                     base_class=schemas.SchemaBasedModel)
- 
-     def list(self, **kwargs):
-         """Retrieve a listing of Task objects.



More information about the arch-commits mailing list