From 3097cde2f06874c7b821ab9598ff64648e26edc0 Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Sat, 29 Oct 2016 13:47:54 +0300 Subject: [PATCH] [MOS 10.0] Update python-django-openstack-auth package Version: 2.4.1-1~u16.04+mos0 Fix (build-)dependencies. Change-Id: I0a24907faced5a437aefde38fe6410a7fef06e37 --- xenial/debian/changelog | 33 +++++++++++++++++++++++++++++++++ xenial/debian/control | 14 +++++++------- xenial/debian/rules | 16 ++-------------- xenial/debian/source/options | 1 + 4 files changed, 43 insertions(+), 21 deletions(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 6586309..f98b658 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -1,9 +1,42 @@ +python-django-openstack-auth (2.4.1-1~u16.04+mos0) mos10.0; urgency=medium + + * Fix (build-)dependencies. + + -- Ivan Udovichenko Sat, 29 Oct 2016 13:47:48 +0300 + +python-django-openstack-auth (2.4.1-2) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Tue, 04 Oct 2016 10:50:47 +0200 + +python-django-openstack-auth (2.4.1-1) experimental; urgency=medium + + [ Ondřej Nový ] + * d/s/options: extend-diff-ignore of .gitreview + * d/control: Using OpenStack's Gerrit as VCS URLs. + + [ Thomas Goirand ] + * New upstream release. + * Fixed (build-)depends for this release. + * Add Add-is_authenticated-and-is_anonymous-properties.patch. + + -- Thomas Goirand Wed, 28 Sep 2016 14:54:49 +0200 + python-django-openstack-auth (2.4.0-1~u16.04+mos0) mos10.0; urgency=medium * Fix (build-)dependencies. -- Ivan Udovichenko Tue, 16 Aug 2016 20:31:49 +0300 +python-django-openstack-auth (2.3.0-2) experimental; urgency=medium + + * Fix FTBFS with Django 1.10 (Closes: #828670). + * Using pkgos-dh_auto_install from openstack-pkg-tools >= 52~. + * Testing using Py3 as well. + + -- Thomas Goirand Tue, 19 Jul 2016 07:28:10 +0000 + python-django-openstack-auth (2.3.0-1~u16.04+mos0) mos10.0; urgency=medium * Source: http://newton-xenial.pkgs.mirantis.com/debian/pool/xenial-newton-backports/main/p/python-django-openstack-auth/python-django-openstack-auth_2.3.0-1~bpo16.04+1.dsc diff --git a/xenial/debian/control b/xenial/debian/control index 9eddfbd..f37e6ad 100644 --- a/xenial/debian/control +++ b/xenial/debian/control @@ -7,7 +7,7 @@ Uploaders: Thomas Goirand , Corey Bryant , Build-Depends: debhelper (>= 9), dh-python, - openstack-pkg-tools, + openstack-pkg-tools (>= 52~), python-all, python-pbr (>= 1.8), python-setuptools, @@ -20,7 +20,7 @@ Build-Depends-Indep: python-babel (>= 2.3.4), python-django (>= 1.8), python-hacking (>= 0.10.0), python-keystoneauth1 (>= 2.10.0), - python-keystoneclient (>= 1:1.7.0), + python-keystoneclient (>= 1:2.0.0), python-mock (>= 2.0), python-mox3 (>= 0.7.0), python-oslo.config (>= 1:3.14.0), @@ -31,7 +31,7 @@ Build-Depends-Indep: python-babel (>= 2.3.4), python3-babel (>= 2.3.4), python3-django (>= 1.8), python3-keystoneauth1 (>= 2.10.0), - python3-keystoneclient (>= 1:1.7.0), + python3-keystoneclient (>= 1:2.0.0), python3-mock (>= 2.0), python3-mox3 (>= 0.7.0), python3-oslo.config (>= 1:3.14.0), @@ -39,15 +39,15 @@ Build-Depends-Indep: python-babel (>= 2.3.4), python3-six (>= 1.9.0), python3-testscenarios (>= 0.4), Standards-Version: 3.9.8 -Vcs-Git: https://anonscm.debian.org/git/openstack/python-django-openstack-auth.git -Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-django-openstack-auth.git/ +Vcs-Git: https://git.openstack.org/openstack/deb-python-django-openstack-auth -b debian/newton +Vcs-Browser: https://git.openstack.org/cgit/openstack/deb-python-django-openstack-auth?h=debian%2Fnewton Homepage: https://pypi.python.org/pypi/django_openstack_auth Package: python-django-openstack-auth Architecture: all Depends: python-django (>= 1.8), python-keystoneauth1 (>= 2.10.0), - python-keystoneclient (>= 1:1.7.0), + python-keystoneclient (>= 1:2.0.0), python-oslo.config (>= 1:3.14.0), python-oslo.policy (>= 1.9.0), python-pbr (>= 1.8), @@ -83,7 +83,7 @@ Package: python3-django-openstack-auth Architecture: all Depends: python3-django (>= 1.8), python3-keystoneauth1 (>= 2.10.0), - python3-keystoneclient (>= 1:1.7.0), + python3-keystoneclient (>= 1:2.0.0), python3-oslo.config (>= 1:3.14.0), python3-oslo.policy (>= 1.9.0), python3-pbr (>= 1.8), diff --git a/xenial/debian/rules b/xenial/debian/rules index 160f8e6..18279f9 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -1,29 +1,17 @@ #!/usr/bin/make -f -PYTHONS:=$(shell pyversions -vr) -PYTHON3S:=$(shell py3versions -vr) - UPSTREAM_GIT := https://github.com/openstack/django_openstack_auth.git include /usr/share/openstack-pkg-tools/pkgos.make -export OSLO_PACKAGE_VERSION=$(VERSION) - %: dh $@ --with python2,python3 override_dh_auto_install: - set -e ; for pyvers in $(PYTHONS); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python-django-openstack-auth; \ - done - set -e ; for pyvers in $(PYTHON3S); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python3-django-openstack-auth; \ - done + pkgos-dh_auto_install ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - set -e ; for pyversion in 2.7 ; do \ + set -e ; for pyversion in 2.7 $(PYTHON3S) ; do \ NOSE_WITH_OPENSTACK=1 \ NOSE_OPENSTACK_COLOR=1 \ NOSE_OPENSTACK_RED=0.05 \ diff --git a/xenial/debian/source/options b/xenial/debian/source/options index cb61fa5..9122245 100644 --- a/xenial/debian/source/options +++ b/xenial/debian/source/options @@ -1 +1,2 @@ extend-diff-ignore = "^[^/]*[.]egg-info/" +extend-diff-ignore = "^[.]gitreview$" -- 2.32.3