Bug#1055586: python-scrypt: Enable tests

[Corey Bryant]

Package: python-scrypt
Version: 0.8.20
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  [ Steve Langasek ]
  * d/rules: re-enable build-time tests, which have been made to pass in
Ubuntu.

  [ James Page ]
  * d/rules: Add some extra cleaning of .so files to dh_auto_clean.
  * d/source/options: Set a sensible exclusion for .egg-info/*
mutations.


Thanks for considering the patch.


-- System Information:
Debian Release: bookworm/sid
  APT prefers jammy-updates
  APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'), 
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.2.0-34-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_DIE, TAINT_WARN, 
TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-scrypt-0.8.20/debian/rules python-scrypt-0.8.20/debian/rules
--- python-scrypt-0.8.20/debian/rules   2022-10-16 16:16:02.0 -0400
+++ python-scrypt-0.8.20/debian/rules   2023-11-08 09:36:25.0 -0500
@@ -9,5 +9,6 @@
 %:
dh $@ --buildsystem=pybuild
 
-override_dh_auto_test:
-   :  # TODO: skip tests, they were never run before anyway
+override_dh_auto_clean:
+   dh_auto_clean --buildsystem=pybuild
+   rm -f *.so
diff -Nru python-scrypt-0.8.20/debian/source/options 
python-scrypt-0.8.20/debian/source/options
--- python-scrypt-0.8.20/debian/source/options  1969-12-31 18:00:00.0 
-0600
+++ python-scrypt-0.8.20/debian/source/options  2023-11-08 09:36:25.0 
-0500
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"

Bug#1054454: openstack-pkg-tools: Should-Start services are only added to AFTER= and should be added to WANTS= as well.

[Corey Bryant]

Thanks to Mauricio Faria de Oliveira  for reporting this.

On Mon, Oct 23, 2023 at 5:06 PM Corey Bryant 
wrote:

> Package: openstack-pkg-tools
> Version: 125
> Severity: normal
> Tags: patch
> User: ubuntu-de...@lists.ubuntu.com
> Usertags: origin-ubuntu  ubuntu-patch
>
> Dear Maintainer,
>
> This adds Should-Start services to WANTS=. They're currently only added to
> AFTER=.
>
> Thanks for considering the patch.
>
>
> -- System Information:
> Debian Release: bookworm/sid
>   APT prefers jammy-updates
>   APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500,
> 'jammy'), (100, 'jammy-backports')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
>
> Kernel: Linux 6.2.0-34-generic (SMP w/16 CPU threads; PREEMPT)
> Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_DIE, TAINT_WARN,
> TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
> Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE
> not set
> Shell: /bin/sh linked to /usr/bin/dash
> Init: systemd (via /run/systemd/system)
> LSM: AppArmor: enabled
>

Bug#1054454: openstack-pkg-tools: Should-Start services are only added to AFTER= and should be added to WANTS= as well.

[Corey Bryant]

Package: openstack-pkg-tools
Version: 125
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu  ubuntu-patch

Dear Maintainer,

This adds Should-Start services to WANTS=. They're currently only added to 
AFTER=.

Thanks for considering the patch.


-- System Information:
Debian Release: bookworm/sid
  APT prefers jammy-updates
  APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'), 
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.2.0-34-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_DIE, TAINT_WARN, 
TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru openstack-pkg-tools-125/init-template/pkgos-gen-systemd-unit 
openstack-pkg-tools-126/init-template/pkgos-gen-systemd-unit
--- openstack-pkg-tools-125/init-template/pkgos-gen-systemd-unit
2023-08-25 04:22:20.0 -0400
+++ openstack-pkg-tools-126/init-template/pkgos-gen-systemd-unit
2023-10-23 16:59:58.0 -0400
@@ -50,6 +50,7 @@
 if [ -n "${SHOULD_START}" ] ; then
for i in ${SHOULD_START} ; do
AFTER="${AFTER}${i}.service "
+   WANTS="${WANTS}${i}.service "
done
 fi
 

Bug#1051814: neutron-vpnaas-dashboard: Fix unit test failures for Django 4.x

[Corey Bryant]

Package: neutron-vpnaas-dashboard
Version: Fix unit test failures for Django 4.x
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu mantic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/fix-test-failures-with-Django-4.x.patch: Fix unit tests
that are failing with Django 4.2.4.


Thanks for considering the patch.


-- System Information:
Debian Release: bookworm/sid
  APT prefers jammy-updates
  APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'), 
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.2.0-31-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru 
neutron-vpnaas-dashboard-8.0.0/debian/patches/fix-test-failures-with-Django-4.x.patch
 
neutron-vpnaas-dashboard-8.0.0/debian/patches/fix-test-failures-with-Django-4.x.patch
--- 
neutron-vpnaas-dashboard-8.0.0/debian/patches/fix-test-failures-with-Django-4.x.patch
   1969-12-31 18:00:00.0 -0600
+++ 
neutron-vpnaas-dashboard-8.0.0/debian/patches/fix-test-failures-with-Django-4.x.patch
   2023-09-12 17:18:27.0 -0400
@@ -0,0 +1,72 @@
+From 9c46ffe619fe948363d0d8b1a533ae7214e65c60 Mon Sep 17 00:00:00 2001
+From: Corey Bryant 
+Date: Tue, 12 Sep 2023 17:13:51 -0400
+Subject: [PATCH] Fix unit test failures for Django 4.x
+
+These tests have started failing with Django 4.2.4 due to
+comparison of objects with strings. This change just compares
+the repr(object) with the existing strings.
+
+Closes-Bug: #2034952
+Change-Id: Ifce3ab76a659931a6753d4fa796ea2164f9accd8
+---
+ .../dashboards/project/vpn/tests.py   | 15 ++-
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/neutron_vpnaas_dashboard/dashboards/project/vpn/tests.py 
b/neutron_vpnaas_dashboard/dashboards/project/vpn/tests.py
+index 9ba235e..b169a5a 100644
+--- a/neutron_vpnaas_dashboard/dashboards/project/vpn/tests.py
 b/neutron_vpnaas_dashboard/dashboards/project/vpn/tests.py
+@@ -255,7 +255,8 @@ class VPNTests(test.TestCase):
+ self.assertEqual(workflow.name, workflows.AddVPNService.name)
+ 
+ expected_objs = ['', ]
+-self.assertQuerysetEqual(workflow.steps, expected_objs)
++actual_objs = [repr(step) for step in workflow.steps]
++self.assertQuerysetEqual(actual_objs, expected_objs)
+ 
+ self.mock_network_list_for_tenant.assert_called_once_with(
+ helpers.IsHttpRequest(), self.tenant.id)
+@@ -331,7 +332,8 @@ class VPNTests(test.TestCase):
+ self.assertEqual(workflow.name, workflows.AddEndpointGroup.name)
+ 
+ expected_objs = ['', ]
+-self.assertQuerysetEqual(workflow.steps, expected_objs)
++actual_objs = [repr(step) for step in workflow.steps]
++self.assertQuerysetEqual(actual_objs, expected_objs)
+ self.mock_network_list_for_tenant.assert_called_once_with(
+ helpers.IsHttpRequest(), self.tenant.id)
+ 
+@@ -389,7 +391,8 @@ class VPNTests(test.TestCase):
+ self.assertEqual(workflow.name, workflows.AddIKEPolicy.name)
+ 
+ expected_objs = ['', ]
+-self.assertQuerysetEqual(workflow.steps, expected_objs)
++actual_objs = [repr(step) for step in workflow.steps]
++self.assertQuerysetEqual(actual_objs, expected_objs)
+ 
+ @helpers.create_mocks({api_vpn: ('ikepolicy_create', )})
+ def test_add_ikepolicy_post(self):
+@@ -448,7 +451,8 @@ class VPNTests(test.TestCase):
+ self.assertEqual(workflow.name, workflows.AddIPsecPolicy.name)
+ 
+ expected_objs = ['', ]
+-self.assertQuerysetEqual(workflow.steps, expected_objs)
++actual_objs = [repr(step) for step in workflow.steps]
++self.assertQuerysetEqual(actual_objs, expected_objs)
+ 
+ @helpers.create_mocks({api_vpn: ('ipsecpolicy_create', )})
+ def test_add_ipsecpolicy_post(self):
+@@ -525,7 +529,8 @@ class VPNTests(test.TestCase):
+  'addipsecsiteconnectionaction>',
+  '', ]
+-self.assertQuerysetEqual(workflow.steps, expected_objs)
++actual_objs = [repr(step) for step in workflow.steps]
++self.assertQuerysetEqual(actual_objs, expected_objs)
+ 
+ self.mock_ikepolicy_list.assert_called_once_with(
+ helpers.IsHttpRequest(),
+-- 
+2.34.1
+
diff -Nru neutron-vpnaas-dashboard-8.0.0/debian/patches/series 
neutron-vpnaas-dashboard-8.0.0/debian/patches/series
--- neutron-vpnaas-dashboard-8.0.0/debian/patches/series2023-06-19 
10:42:42.0 -0400
+++ neutron-vpnaas-dashboard-8.0.0/debian/patches/series2023-09-12 
17:18:33.0 -0400
@@ -1 +

Bug#1031902: dh-python: Generate cpython3_fallback during build

[Corey Bryant]

Ah, I didn't realize it needed network. Thanks for checking.

On Fri, Feb 24, 2023 at 4:12 PM Piotr Ożarowski  wrote:

> Generating these files requires network so it cannot be enabled on
> Debian. Dunno what policy Ubuntu has in that regard but I added --ubuntu
> option for ./pydist/generate_fallback_list.py - let me know if Contents
> URL needs an update, BTW
>

Bug#1031902: dh-python: Generate cpython3_fallback during build

[Corey Bryant]

Package: dh-python
Version: Can cpython3_fallback be generated at build time?
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu lunar ubuntu-patch

Dear Maintainer,

dh-python is synced to Ubuntu and therefore Ubuntu inherits the manually
generated cpython3_fallback file. This file appears to be generated on Debian,
as expected. However, if it is generated on Ubuntu, the contents will differ.
I've attached the Ubuntu delta (it is not a patch) just for reference.

Would you object to generating cpython3_fallback on the fly during the package
build? If so I'm happy to submit a patch.

Thanks for considering.

Corey


-- System Information:
Debian Release: bookworm/sid
  APT prefers lunar
  APT policy: (500, 'lunar')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.19.0-23-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru dh-python-5.20230130/pydist/cpython3_fallback 
dh-python-5.20230130ubuntu1/pydist/cpython3_fallback
--- dh-python-5.20230130/pydist/cpython3_fallback   2023-01-30 
11:30:45.0 -0500
+++ dh-python-5.20230130ubuntu1/pydist/cpython3_fallback2023-02-24 
14:33:19.0 -0500
@@ -57,7 +57,6 @@
 EbookLib python3-ebooklib
 Editobj3 python3-editobj3
 EditorConfig python3-editorconfig
-Electrum python3-electrum
 Endgame_Singularity singularity
 ExifRead python3-exifread
 Extractor python3-extractor
@@ -96,7 +95,6 @@
 Flask_Session python3-flask-session
 Flask_Silk python3-flask-silk
 Flask_SocketIO python3-flask-socketio
-Flask_Sockets python3-flask-sockets
 Flask_Testing python3-flask-testing
 Flask_WTF python3-flaskext.wtf
 Flor python3-flor
@@ -133,7 +131,6 @@
 JUBE jube
 Jinja2 python3-jinja2
 Kaptive kaptive
-Keras python3-keras
 Keras_Applications python3-keras-applications
 Keras_Preprocessing python3-keras-preprocessing
 Kivy python3-kivy
@@ -144,7 +141,6 @@
 LibAppArmor python3-libapparmor
 LinkChecker linkchecker
 Logbook python3-logbook
-Loom brz-loom
 M2Crypto python3-m2crypto
 MACS2 macs
 MDAnalysis python3-mdanalysis
@@ -183,9 +179,10 @@
 Mopidy_SomaFM mopidy-somafm
 Mopidy_SoundCloud mopidy-soundcloud
 Mopidy_TuneIn mopidy-tunein
-Mopidy_dLeyna mopidy-dleyna
 Morfessor python3-morfessor
 MutatorMath python3-mutatormath
+MythTV libmyth-python
+NEURON python3-neuron
 NanoFilt nanofilt
 NanoLyse nanolyse
 NanoSV nanosv
@@ -197,11 +194,11 @@
 OMEMO python3-omemo
 OWSLib python3-owslib
 OdooRPC python3-odoorpc
-Oldmemo python3-oldmemo
 Onionbalance onionbalance
 OpenLP openlp
 OpenMM python3-simtk
 OptimiR optimir
+Othman python3-othman
 PAM python3-pam
 PGPy python3-pgpy
 PHCpy python3-phcpy
@@ -238,11 +235,13 @@
 PyChromecast python3-pychromecast
 PyCifRW python3-pycifrw
 PyDispatcher python3-pydispatch
+PyDrive python3-pydrive
 PyDrive2 python3-pydrive2
 PyGObject python3-gi
 PyGithub python3-github
 PyGnuplot python3-pygnuplot
 PyGreSQL python3-pygresql
+PyHST2_2020c python3-pyhst2-cuda
 PyHamcrest python3-hamcrest
 PyHoca_CLI pyhoca-cli
 PyHoca_GUI pyhoca-gui
@@ -295,6 +294,7 @@
 PyXRD python3-pyxrd
 PyYAML python3-yaml
 PyZoltan python3-pyzoltan
+Pycluster cluster3
 Pygments python3-pygments
 Pymacs pymacs
 Pyment python3-pyment
@@ -310,6 +310,7 @@
 QuantLib quantlib-python
 ROPGadget python3-ropgadget
 RPi.bme280 python3-bme280
+RTIMULib python3-rtimulib
 Radicale python3-radicale
 ReParser python3-reparser
 Recoll python3-recoll
@@ -327,7 +328,6 @@
 SQLAlchemy_i18n python3-sqlalchemy-i18n
 SQLObject python3-sqlobject
 SaltPyLint python3-saltpylint
-SciPy python3-scipy
 Scrapy python3-scrapy
 SecretStorage python3-secretstorage
 SecureString python3-securestring
@@ -343,15 +343,13 @@
 Stetl python3-stetl
 Sublist3r sublist3r
 Supysonic supysonic
-TPOT python3-tpot
 Telethon python3-telethon
 Tempita python3-tempita
-Theano python3-theano
 TkinterTreectrl python3-tktreectrl
 Trac trac
 Trololio python3-trololio
+Tubes python3-tubes
 Twisted python3-twisted
-Twomemo python3-twomemo
 TxSNI python3-txsni
 URLObject python3-urlobject
 Unidecode python3-unidecode
@@ -360,13 +358,11 @@
 VF_1 vf1
 VMDKstream python3-vmdkstream
 VirtualMailManager vmm
-WALinuxAgent waagent
+WALinuxAgent walinuxagent
 WSGIProxy2 python3-wsgiproxy
 WSME python3-wsme
 WTForms python3-wtforms
-WTForms_Alchemy python3-wtforms-alchemy
 WTForms_Components python3-wtforms-components
-WTForms_JSON python3-wtforms-json
 WTForms_Test python3-wtforms-test
 Wand python3-wand
 WebOb python3-webob
@@ -442,7 +438,6 @@
 actionlib_tools python3-actionlib-tools
 activipy python3-activipy
 adal python3-adal
-adapt_parser python3-adapt
 adios_mpi python3-adios
 admesh python3-admesh
 advocate python3-advocate
@@ -458,7 +453,7 @@
 aio_pika python3-aio-pika
 aioamqp 

Bug#1028606: python-zeroconf: Explicitly depend on python3-async-timeout.

[Corey Bryant]

Package: python-zeroconf
Version: d/control: Add explicit dependency on python3-async-timeout.
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu lunar ubuntu-patch

Dear Maintainer,

A package build of ironic in Ubuntu antelope was installing python3-zeroconf
but python3-async-timeout wasn't getting installed. I think it *may* be due
to the pipe logic in python3-zeroconf 0.47.1 (see package build):
Depends: python3-async-timeout (>= 4.0.1) | python3 (>> 3.11)

In a package build for ubuntu antelope, at least currently, py3.10 and py3.11 
exist.
I'm assuming that python3.11 is installed at the time and therefore the 
dependency
is assumed to be satisifed by it.

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Add explicit dependency on python3-async-timeout.


Thanks for considering the patch.


-- System Information:
Debian Release: bookworm/sid
  APT prefers lunar
  APT policy: (500, 'lunar')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.19.0-23-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-zeroconf-0.47.1/debian/control 
python-zeroconf-0.47.1/debian/control
--- python-zeroconf-0.47.1/debian/control   2022-12-22 05:28:48.0 
-0500
+++ python-zeroconf-0.47.1/debian/control   2023-01-12 19:47:19.0 
-0500
@@ -28,7 +28,10 @@
 
 Package: python3-zeroconf
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends:
+ python3-async-timeout (>= 4.0.1),
+ ${misc:Depends},
+ ${python3:Depends},
 Breaks: python3-pychromecast (<< 4.2.0~)
 Description: Pure Python implementation of multicast DNS service discovery 
(Python3)
  This is an implementation of the multicast DNS Service Discover Library

Bug#1014931: openstack-pkg-tools: * Set umask in init-script-template to ensure log files are created

[Corey Bryant]

Package: openstack-pkg-tools
Version: update log creation permissions and pkgos_adduser shell
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu kinetic ubuntu-patch

In Ubuntu, the attached patch was applied to achieve the following:


  * Set umask in init-script-template to ensure log files are created
with 0640 mode bits.
  * Update pkgos_adduser to use /usr/sbin/nologin instead of /bin/false
when creating system accounts that do not run a shell.


Thanks for considering the patch.


-- System Information:
Debian Release: bookworm/sid
  APT prefers kinetic
  APT policy: (500, 'kinetic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.15.0-37-generic (SMP w/4 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru openstack-pkg-tools-119/init-template/init-script-template 
openstack-pkg-tools-119ubuntu1/init-template/init-script-template
--- openstack-pkg-tools-119/init-template/init-script-template  2021-02-09 
08:44:31.0 -0500
+++ openstack-pkg-tools-119ubuntu1/init-template/init-script-template   
2022-07-08 15:12:01.0 -0400
@@ -181,6 +181,8 @@
 }
 
 do_systemd_start() {
+   # Set umask to ensure log files are created with 0640 mode bits
+   umask 0026
if [ -n "${PYARGV}" ] ; then
exec $DAEMON $DAEMON_ARGS --pyargv "${PYARGV}"
else
diff -Nru openstack-pkg-tools-119/pkgos_func 
openstack-pkg-tools-119ubuntu1/pkgos_func
--- openstack-pkg-tools-119/pkgos_func  2021-02-09 08:44:31.0 -0500
+++ openstack-pkg-tools-119ubuntu1/pkgos_func   2022-07-08 15:12:01.0 
-0400
@@ -838,7 +838,7 @@
VAR_UG_SHELL=${2}
 
if [ -z "${VAR_UG_SHELL}" ] ; then
-   VAR_UG_SHELL='/bin/false'
+   VAR_UG_SHELL='/usr/sbin/nologin'
fi
 
# These are reserved UID/GID allocation

Bug#1008261: nb2plots: Fix collections import for py310

[Corey Bryant]

Package: nb2plots
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu jammy ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/fix-collections-sequence-py310.patch: Use collections.abc.Sequence
for Python 3.10.


Thanks for considering the patch.


-- System Information:
Debian Release: bookworm/sid
  APT prefers jammy
  APT policy: (500, 'jammy')
Architecture: amd64 (x86_64)

Kernel: Linux 5.15.0-22-generic (SMP w/4 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru nb2plots-0.6/debian/patches/fix-collections-sequence-py310.patch 
nb2plots-0.6/debian/patches/fix-collections-sequence-py310.patch
--- nb2plots-0.6/debian/patches/fix-collections-sequence-py310.patch
1969-12-31 19:00:00.0 -0500
+++ nb2plots-0.6/debian/patches/fix-collections-sequence-py310.patch
2022-03-25 09:05:48.0 -0400
@@ -0,0 +1,29 @@
+From 79234885fe50937cadd9291894f3f33a9b598672 Mon Sep 17 00:00:00 2001
+From: Jerry James 
+Date: Wed, 30 Oct 2019 08:28:50 -0600
+Subject: [PATCH] Import Sequence from either its new or its old location
+
+---
+ nb2plots/nbplots.py | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/nb2plots/nbplots.py b/nb2plots/nbplots.py
+index 0c459a9..2ad9c8f 100644
+--- a/nb2plots/nbplots.py
 b/nb2plots/nbplots.py
+@@ -177,7 +177,11 @@ from __future__ import (absolute_import, division, 
print_function,
+ 
+ import six
+ 
+-from collections import defaultdict, Sequence
++try:
++from collections.abc import Sequence
++except ImportError:
++from collections import Sequence
++from collections import defaultdict
+ import sys, os, shutil, io, re, textwrap
+ from os.path import (relpath, abspath, join as pjoin, dirname, exists,
+  basename, splitext, isdir)
+-- 
+2.34.1
+
diff -Nru nb2plots-0.6/debian/patches/series nb2plots-0.6/debian/patches/series
--- nb2plots-0.6/debian/patches/series  1969-12-31 19:00:00.0 -0500
+++ nb2plots-0.6/debian/patches/series  2022-03-25 09:06:41.0 -0400
@@ -0,0 +1 @@
+fix-collections-sequence-py310.patch

Bug#1008043: vitrage-tempest-plugin: dh-python is automatically generating a dependency on python-ceilometerclient

[Corey Bryant]

Package: vitrage-tempest-plugin
Version: Ensure dh-python ignores python-ceilometerclient
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu jammy ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/py3dist-overrides: Ignore python-ceilometerclient (LP: #1836142).


Thanks for considering the patch.


-- System Information:
Debian Release: bookworm/sid
  APT prefers jammy
  APT policy: (500, 'jammy')
Architecture: amd64 (x86_64)

Kernel: Linux 5.15.0-22-generic (SMP w/4 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru vitrage-tempest-plugin-5.4.0/debian/py3dist-overrides 
vitrage-tempest-plugin-5.4.0/debian/py3dist-overrides
--- vitrage-tempest-plugin-5.4.0/debian/py3dist-overrides   1969-12-31 
19:00:00.0 -0500
+++ vitrage-tempest-plugin-5.4.0/debian/py3dist-overrides   2022-03-21 
08:15:47.0 -0400
@@ -0,0 +1 @@
+python-ceilometerclient

Bug#1003905: python-cryptography 3.4.8-1 regression vs upstream 3.4.8

[Corey Bryant]

Package: python-cryptography
Version: 3.4.8-1
Severity: normal

Dear Maintainer,

dump_certificate_request() for an unsigned CSR is failing on 3.4.8-1 in distro
but is successful against upstream 3.4.8.

I have a test here that can be run against upstream as well as distro packages.
https://github.com/coreycb/cryptography-regression-test

Thank you,
Corey

Bug#1001078: sqlalchemy: setup.cfg defines extra pg8000>=1.16.6

[Corey Bryant]

Package: sqlalchemy
Version: sqlalchemy-1.4.23+ds1
Severity: normal

Dear Maintainer,

When attempting to re-enable autopkgtests for sqlalchemy-utils [1] tests fail 
due to pg8000
not being 1.16.6 or greater:

/usr/lib/python3/dist-packages/sqlalchemy/engine/create.py:561: in create_engine
dialect = dialect_cls(**dialect_args)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
self = , client_encoding = None, kwargs = {'compiler_linting': 1, 
'dbapi': }
def __init__(self, client_encoding=None, **kwargs):
PGDialect.__init__(self, **kwargs)
self.client_encoding = client_encoding

if self._dbapi_version < (1, 16, 6):
>   raise NotImplementedError("pg8000 1.16.6 or greater is required")
>   E   NotImplementedError: pg8000 1.16.6 or greater is 
> required
>
>   *** Reporter, please consider answering these questions, where 
> appropriate ***

[1] requires addition of:
psql -c "ALTER USER postgres PASSWORD 'password';" -U postgres
and
export SQLALCHEMY_UTILS_TEST_POSTGRESQL_PASSWORD="password"

-- System Information:
Debian Release: bookworm/sid
  APT prefers jammy
  APT policy: (500, 'jammy')
Architecture: amd64 (x86_64)

Kernel: Linux 5.13.0-19-generic (SMP w/4 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Bug#966075: zaqar needs python3-pymongo in Depends

[Corey Bryant]

Package: zaqar
Version: 10.0.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu groovy ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Add python3-pymongo to Depends.

Thanks for considering the patch.


-- System Information:
Debian Release: bullseye/sid
  APT prefers groovy
  APT policy: (500, 'groovy')
Architecture: amd64 (x86_64)

Kernel: Linux 5.4.0-26-generic (SMP w/4 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru zaqar-10.0.0/debian/control zaqar-10.0.0/debian/control
--- zaqar-10.0.0/debian/control 2020-05-13 13:23:19.0 -0400
+++ zaqar-10.0.0/debian/control 2020-07-22 13:29:35.0 -0400
@@ -98,6 +98,7 @@
  python3-oslo.utils,
  python3-osprofiler,
  python3-pbr,
+ python3-pymongo,
  python3-requests,
  python3-six,
  python3-sqlalchemy,

Bug#952691: openstack-pkg-tools: Ensure AFTER and WANTS are initialized when either Should-Start or Required-Start are specified

[Corey Bryant]

Package: openstack-pkg-tools
Version: 109
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * pkgos-gen-systemd-unit: Ensure AFTER and WANTS are initialized when
one of Should-Start or Required-Start are specified.

Thanks for considering the patch.


-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)

Kernel: Linux 5.4.0-14-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru openstack-pkg-tools-108/init-template/pkgos-gen-systemd-unit 
openstack-pkg-tools-109/init-template/pkgos-gen-systemd-unit
--- openstack-pkg-tools-108/init-template/pkgos-gen-systemd-unit
2020-02-14 08:54:31.0 -0500
+++ openstack-pkg-tools-109/init-template/pkgos-gen-systemd-unit
2020-02-27 10:37:44.0 -0500
@@ -42,12 +42,15 @@
 X_START_BEFORE=$(cat ${INIT_TEMPLATE} | grep "# X-Start-Before:" | sed 's/# 
X-Start-Before://')
 REQUIRED_START=$(cat ${INIT_TEMPLATE} | grep "# Required-Start:" | sed 's/# 
Required-Start://')
 
-if [ -n "${SHOULD_START}" ] ; then
+if [ -n "${SHOULD_START}" ] || [ -n "${REQUIRED_START}" ] ; then
AFTER="After="
+   WANTS="Wants="
+fi
+
+if [ -n "${SHOULD_START}" ] ; then
for i in ${SHOULD_START} ; do
AFTER="${AFTER}${i}.service "
done
-   WANTS="Wants="
 fi
 
 for i in $(cat ${INIT_TEMPLATE} | grep "# Required-Start:" | sed 's/# 
Required-Start://' ) ; do

Bug#951124: serpent: Fix __version__ for 1.30

[Corey Bryant]

Package: serpent
Version: 1.30-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/update-version-1.30.patch: Update __version__ to prevent import
failure. Only needed for 1.30 release.

Thanks for considering the patch.


-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)

Kernel: Linux 5.4.0-12-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru serpent-1.30/debian/patches/series serpent-1.30/debian/patches/series
--- serpent-1.30/debian/patches/series  2020-01-31 11:51:15.0 -0500
+++ serpent-1.30/debian/patches/series  2020-02-11 08:24:35.0 -0500
@@ -1 +1,2 @@
 python3.patch
+update-version-1.30.patch
diff -Nru serpent-1.30/debian/patches/update-version-1.30.patch 
serpent-1.30/debian/patches/update-version-1.30.patch
--- serpent-1.30/debian/patches/update-version-1.30.patch   1969-12-31 
19:00:00.0 -0500
+++ serpent-1.30/debian/patches/update-version-1.30.patch   2020-02-11 
08:24:26.0 -0500
@@ -0,0 +1,19 @@
+Description: Switch __version__ to 1.30. This is fixed in upstream master,
+  and therefore likely can be dropped on the next upstream (point) release.
+  Without this change, imports of serpent are failing with:
+  invalid literal for int() with base 10: 'dev0'
+Author: Corey Bryant 
+Bug: https://github.com/irmen/Serpent/issues/35
+Forwarded: no
+
+--- a/serpent.py
 b/serpent.py
+@@ -58,7 +58,7 @@
+ from collections.abc import KeysView, ValuesView, ItemsView
+ 
+ 
+-__version__ = "1.30.dev0"
++__version__ = "1.30"
+ __all__ = ["dump", "dumps", "load", "loads", "register_class", 
"unregister_class", "tobytes"]
+ 
+ 

Bug#948625: networkx 2.4-3 failing to build on unstable

[Corey Bryant]

Package: networkx
Version: 2.4-3
Severity: normal

Dear Maintainer,

I tried building networkx 2.4-3 and it fails with the following. I noticed 
there are a number of py3 related
patches upstream since the 2.4 release. Perhaps some changes could be picked. 
Seems perhaps we're running
some examples with py2 and that's why they're unable to import graphviz.


The HTML pages are in build/html.
Examples failing as expected:
/build/networkx-2.4/examples/advanced/plot_parallel_betweenness.py failed 
leaving traceback:
Traceback (most recent call last):
  File "/build/networkx-2.4/examples/advanced/plot_parallel_betweenness.py", 
line 77, in 
bt = betweenness_centrality_parallel(G)
  File "/build/networkx-2.4/examples/advanced/plot_parallel_betweenness.py", 
line 57, in betweenness_centrality_parallel
node_chunks))
  File "/usr/lib/python3.7/multiprocessing/pool.py", line 268, in map
return self._map_async(func, iterable, mapstar, chunksize).get()
  File "/usr/lib/python3.7/multiprocessing/pool.py", line 657, in get
raise self._value
  File "/usr/lib/python3.7/multiprocessing/pool.py", line 431, in _handle_tasks
put(task)
  File "/usr/lib/python3.7/multiprocessing/connection.py", line 206, in send
self._send_bytes(_ForkingPickler.dumps(obj))
  File "/usr/lib/python3.7/multiprocessing/reduction.py", line 51, in dumps
cls(buf, protocol).dump(obj)
_pickle.PicklingError: Can't pickle : 
attribute lookup _betmap on __main__ failed


Exception occurred:
  File "/usr/lib/python3/dist-packages/sphinx_gallery/gen_gallery.py", line 
313, in sumarize_failing_examples
"\n" + "-" * 79)
ValueError: Here is a summary of the problems encountered when running the 
examples

Unexpected failing examples:
/build/networkx-2.4/examples/drawing/plot_circular_tree.py failed leaving 
traceback:
Traceback (most recent call last):
  File "/build/networkx-2.4/examples/drawing/plot_circular_tree.py", line 23, 
in 
pos = graphviz_layout(G, prog='twopi', args='')
TypeError: graphviz_layout() got an unexpected keyword argument 'args'


/build/networkx-2.4/examples/pygraphviz/plot_pygraphviz_attributes.py failed 
leaving traceback:
Traceback (most recent call last):
  File "/build/networkx-2.4/examples/pygraphviz/plot_pygraphviz_attributes.py", 
line 34, in 
A = nx.nx_agraph.to_agraph(G)
  File "/build/networkx-2.4/build/lib/networkx/drawing/nx_agraph.py", line 136, 
in to_agraph
'http://pygraphviz.github.io/')
ImportError: ('requires pygraphviz ', 'http://pygraphviz.github.io/')


/build/networkx-2.4/examples/pygraphviz/plot_pygraphviz_simple.py failed 
leaving traceback:
Traceback (most recent call last):
  File "/build/networkx-2.4/examples/pygraphviz/plot_pygraphviz_simple.py", 
line 27, in 
A = nx.nx_agraph.to_agraph(G)# convert to a graphviz graph
  File "/build/networkx-2.4/build/lib/networkx/drawing/nx_agraph.py", line 136, 
in to_agraph
'http://pygraphviz.github.io/')
ImportError: ('requires pygraphviz ', 'http://pygraphviz.github.io/')


/build/networkx-2.4/examples/pygraphviz/plot_pygraphviz_draw.py failed leaving 
traceback:
Traceback (most recent call last):
  File "/build/networkx-2.4/examples/pygraphviz/plot_pygraphviz_draw.py", line 
27, in 
A = nx.nx_agraph.to_agraph(G)# convert to a graphviz graph
  File "/build/networkx-2.4/build/lib/networkx/drawing/nx_agraph.py", line 136, 
in to_agraph
'http://pygraphviz.github.io/')
ImportError: ('requires pygraphviz ', 'http://pygraphviz.github.io/')


---
The full traceback has been saved in /tmp/sphinx-err-cnbjaocp.log, if you want 
to report the issue to the developers.
Please also report this if it was a user error, so that a better error message 
can be provided next time.
A bug report can be filed in the tracker at 
. Thanks!
make[2]: *** [Makefile:46: html] Error 2
make[2]: Leaving directory '/build/networkx-2.4/doc'
make[1]: *** [debian/rules:52: override_dh_sphinxdoc] Error 2
make[1]: Leaving directory '/build/networkx-2.4'
make: *** [debian/rules:7: binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit 
status 2


Regards,
Corey

Bug#942531: sahara: Sahara plugins were split into separate projects in Stein

[Corey Bryant]

Package: sahara
Version: 1:10.0.0-3
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu  ubuntu-patch

Dear Maintainer,

The sahara plugins were split [1] into separate projects in Stein and 
unfortunately I think this may render the stand-alone sahara package useless 
for Stein and Train.

[1] 
https://specs.openstack.org/openstack/sahara-specs/specs/rocky/plugins-outside-sahara-core.html

This was reported by Tobias Urdin.

CLI results in:
/usr/bin/openstack dataprocessing node group template create --format shell 
--name worker --plugin vanilla --plugin-version 2.7.1 --auto-security-group 
--flavor m1.micro --processes datanode nodemanager
WARNING: Failed to import plugin clustering.
Sahara doesn't contain plugin with name 'vanilla'
Error ID: 18cb47b6-e1f1-4e45-8a0f-2be3c167dc11

Thank you for your consideration.


-- System Information:
Debian Release: buster/sid
  APT prefers eoan
  APT policy: (500, 'eoan')
Architecture: amd64 (x86_64)

Kernel: Linux 5.3.0-18-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled


sahara_1:10.0.0-3ubuntu1.debdiff
Description: inode/empty

Bug#942466: zvmcloudconnector: Enable unit tests

[Corey Bryant]

Package: zvmcloudconnector
Version: 1.4.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu eoan ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/rules: Enable unit test execution during package build.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers eoan
  APT policy: (500, 'eoan')
Architecture: amd64 (x86_64)

Kernel: Linux 5.3.0-18-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru zvmcloudconnector-1.4.1/debian/rules 
zvmcloudconnector-1.4.1/debian/rules
--- zvmcloudconnector-1.4.1/debian/rules2019-09-23 08:08:53.0 
-0400
+++ zvmcloudconnector-1.4.1/debian/rules2019-10-16 16:26:20.0 
-0400
@@ -35,10 +35,9 @@
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-   # NOTE(coreycb): Currently there are only unit tests for the smutLayer
-   # https://bugs.launchpad.net/bugs/1787611
-   @echo "===> Disabled tests"
-#  set -e ; for pyvers in $(PYTHON3S); do \
-#  PYTHONPATH=. PYTHON=python$$pyvers python$$pyvers -m unittest 
discover -v ; \
-#  done
+   @echo "===> Running tests"
+   set -e ; for pyvers in $(PYTHON3S); do \
+   PYTHONPATH=. PYTHON=python$$pyvers python$$pyvers -m unittest 
discover -v -s $(CURDIR)/zvmsdk/tests/unit; \
+   PYTHONPATH=. PYTHON=python$$pyvers python$$pyvers -m unittest 
discover -v -s $(CURDIR)/smutLayer/tests/unit; \
+   done
 endif

Bug#930161: python-oslo.versionedobjects: Add more testing coverage

[Corey Bryant]

Package: python-oslo.versionedobjects
Version: 1.35.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu eoan ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Enable autopkgtest-pkg-python testsuite.
  * d/rules: Run all unit tests.
  * d/t/python-ostestr: Run unit tests for dep8.

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers eoan
  APT policy: (500, 'eoan')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.0.0-15-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-oslo.versionedobjects-1.35.1/debian/control 
python-oslo.versionedobjects-1.35.1/debian/control
--- python-oslo.versionedobjects-1.35.1/debian/control  2019-03-22 
04:17:11.0 -0400
+++ python-oslo.versionedobjects-1.35.1/debian/control  2019-06-07 
14:40:44.0 -0400
@@ -42,6 +42,7 @@
 Vcs-Browser: 
https://salsa.debian.org/openstack-team/oslo/python-oslo.versionedobjects.git
 Vcs-Git: 
https://salsa.debian.org/openstack-team/oslo/python-oslo.versionedobjects.git
 Homepage: https://github.com/openstack/oslo.versionedobjects
+Testsuite: autopkgtest-pkg-python
 
 Package: python-oslo.versionedobjects-doc
 Section: doc
diff -Nru python-oslo.versionedobjects-1.35.1/debian/rules 
python-oslo.versionedobjects-1.35.1/debian/rules
--- python-oslo.versionedobjects-1.35.1/debian/rules2019-03-22 
04:17:11.0 -0400
+++ python-oslo.versionedobjects-1.35.1/debian/rules2019-06-07 
14:40:44.0 -0400
@@ -17,7 +17,7 @@
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-   pkgos-dh_auto_test --no-py2 
'^(?!('"oslo_versionedobjects.tests.test_objects.TestObject.test_load_in_base.*|oslo_versionedobjects.tests.test_objects.TestRemoteObject.test_load_in_base.*"'))'
+   pkgos-dh_auto_test --no-py2
 endif
 
 override_dh_sphinxdoc:
diff -Nru python-oslo.versionedobjects-1.35.1/debian/tests/control 
python-oslo.versionedobjects-1.35.1/debian/tests/control
--- python-oslo.versionedobjects-1.35.1/debian/tests/control1969-12-31 
19:00:00.0 -0500
+++ python-oslo.versionedobjects-1.35.1/debian/tests/control2019-06-07 
14:40:44.0 -0400
@@ -0,0 +1,3 @@
+Tests: python-ostestr
+Depends: @, @builddeps@, python3-os-testr
+Restrictions: allow-stderr, needs-recommends
diff -Nru python-oslo.versionedobjects-1.35.1/debian/tests/python-ostestr 
python-oslo.versionedobjects-1.35.1/debian/tests/python-ostestr
--- python-oslo.versionedobjects-1.35.1/debian/tests/python-ostestr 
1969-12-31 19:00:00.0 -0500
+++ python-oslo.versionedobjects-1.35.1/debian/tests/python-ostestr 
2019-06-07 14:40:44.0 -0400
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -ex
+
+for py in $(py3versions -r 2>/dev/null) $(pyversions -r 2>/dev/null); do
+echo "Testing with $py:"
+PYTHON=$py ostestr
+rm -rf .stestr
+done

Bug#930086: python-openstacksdk: testing updates from ubuntu

[Corey Bryant]

Package: python-openstacksdk
Version: 0.26.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu eoan ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Enable autopkgtest-pkg-python testsuite.
  * d/rules: Run tests with OS_LOG_CAPTURE=true.

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers eoan
  APT policy: (500, 'eoan')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.0.0-15-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-openstacksdk-0.26.0/debian/control 
python-openstacksdk-0.26.0/debian/control
--- python-openstacksdk-0.26.0/debian/control   2019-03-23 17:52:20.0 
-0400
+++ python-openstacksdk-0.26.0/debian/control   2019-06-06 13:03:05.0 
-0400
@@ -48,6 +48,7 @@
 Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-openstacksdk
 Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-openstacksdk.git
 Homepage: https://github.com/stackforge/python-openstacksdk
+Testsuite: autopkgtest-pkg-python
 
 Package: python-openstacksdk-doc
 Build-Profiles: 
diff -Nru python-openstacksdk-0.26.0/debian/rules 
python-openstacksdk-0.26.0/debian/rules
--- python-openstacksdk-0.26.0/debian/rules 2019-03-23 17:52:20.0 
-0400
+++ python-openstacksdk-0.26.0/debian/rules 2019-06-06 13:03:31.0 
-0400
@@ -16,8 +16,7 @@
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-   echo "Unit testing is taking forever and produces a 100MB+ log, so it's 
disabled..."
-   #pkgos-dh_auto_test --no-py2 
'openstack.tests.unit(?!(.*cloud.*|.*test_resource\.TestWaitForStatus.*))'
+   OS_LOG_CAPTURE=true pkgos-dh_auto_test --no-py2
 endif
 
 override_dh_sphinxdoc:

Bug#915938: migrate: Enable compatability with sqlite >= 3.26

[Corey Bryant]

Package: migrate
Version: 0.11.0-3
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/use-legacy-alter-sqlite.patch: Cherry-picked from upstream
gerrit review (https://review.openstack.org/#/c/623564/) to ensure
compatability with sqlite >= 3.26 (LP: #1807262).

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers disco
  APT policy: (500, 'disco'), (500, 'cosmic-security'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru migrate-0.11.0/debian/patches/series 
migrate-0.11.0/debian/patches/series
--- migrate-0.11.0/debian/patches/series2018-04-27 04:29:21.0 
-0400
+++ migrate-0.11.0/debian/patches/series2018-12-07 14:16:55.0 
-0500
@@ -2,3 +2,4 @@
 keep_empty_modules.patch
 disable_issuetracker.patch
 remove-tempest-lib-build-depends-from-upstream.patch
+use-legacy-alter-sqlite.patch
diff -Nru migrate-0.11.0/debian/patches/use-legacy-alter-sqlite.patch 
migrate-0.11.0/debian/patches/use-legacy-alter-sqlite.patch
--- migrate-0.11.0/debian/patches/use-legacy-alter-sqlite.patch 1969-12-31 
19:00:00.0 -0500
+++ migrate-0.11.0/debian/patches/use-legacy-alter-sqlite.patch 2018-12-07 
14:16:14.0 -0500
@@ -0,0 +1,53 @@
+From f73dac34f00f3c783c6a824c93f86a756aa5cf64 Mon Sep 17 00:00:00 2001
+From: Corey Bryant 
+Date: Fri, 7 Dec 2018 13:49:20 -0500
+Subject: [PATCH] Use legacy_alter_table ON in sqlite recreate_table
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use "PRAGMA legacy_alter_table = ON" with sqlite >= 3.26 when
+using "ALTER TABLE RENAME TO migration_tmp" to maintain legacy
+behavior.
+
+As of sqlite version 3.26, when a table is renamed using
+"ALTER TABLE RENAME TO", REFERENCES clauses that refer to the
+table will be updated. To maintain legacy (3.24 and earlier)
+behavior, "PRAGMA legacy_alter_table" can be set to true and
+"PRAGMA foreign_keys" can be set to false. [1]
+
+[1] https://www.sqlite.org/src/info/ae9638e9c0ad0c36
+
+Thanks to "László Böszörményi (GCS)"  for
+providing the code for this patch, which has since been
+slightly modified.
+
+Change-Id: I539988ab2ad6df6c8f423ecec15364ad8fcc7267
+Closes-Bug: 1807262
+---
+ migrate/changeset/databases/sqlite.py | 7 +++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/migrate/changeset/databases/sqlite.py 
b/migrate/changeset/databases/sqlite.py
+index 92d42f2..568a329 100644
+--- a/migrate/changeset/databases/sqlite.py
 b/migrate/changeset/databases/sqlite.py
+@@ -96,8 +96,15 @@ class SQLiteHelper(SQLiteCommon):
+ if omit_constraints is None or cons.name not in omit_constraints
+ ])
+ 
++tup = sqlite3.sqlite_version_info
++if tup[0] > 3 or (tup[0] == 3 and tup[1] >= 26):
++self.append('PRAGMA legacy_alter_table = ON')
++self.execute()
+ self.append('ALTER TABLE %s RENAME TO migration_tmp' % table_name)
+ self.execute()
++if tup[0] > 3 or (tup[0] == 3 and tup[1] >= 26):
++self.append('PRAGMA legacy_alter_table = OFF')
++self.execute()
+ 
+ insertion_string = self._modify_table(table, column, delta)
+ 
+-- 
+2.19.1
+

Bug#913232: pkgos-dh_auto_test: Add support for --no-py36

[Corey Bryant]

Package: openstack-pkg-tools
Version: 88
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * pkgos-dh_auto_test: Add support for --no-py36.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers disco
  APT policy: (500, 'disco'), (500, 'cosmic-security'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-10-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru openstack-pkg-tools-88/build-tools/pkgos-dh_auto_test 
openstack-pkg-tools-88ubuntu1/build-tools/pkgos-dh_auto_test
--- openstack-pkg-tools-88/build-tools/pkgos-dh_auto_test   2018-10-31 
05:20:44.0 -0400
+++ openstack-pkg-tools-88ubuntu1/build-tools/pkgos-dh_auto_test
2018-11-08 09:58:29.0 -0500
@@ -6,6 +6,7 @@
 # Config vars
 PKGOS_USE_PY2=yes
 PKGOS_USE_PY3=yes
+PKGOS_USE_PY36=yes
 PKGOS_TEST_PARALLEL=yes
 
 # Vars used in commands
@@ -23,10 +24,14 @@
PKGOS_USE_PY2=no
shift
;;
-"--no-parallel")
-PKGOS_TEST_PARALLEL=no
-shift
-;;
+   "--no-py36")
+   PKGOS_USE_PY36=no
+   shift
+   ;;
+   "--no-parallel")
+   PKGOS_TEST_PARALLEL=no
+   shift
+   ;;
*)
;;
esac
@@ -37,6 +42,9 @@
 fi
 if [ "${PKGOS_USE_PY3}" = "yes" ] ; then
PYTHON3S=$(py3versions -vr 2>/dev/null)
+   if [ "${PKGOS_USE_PY36}" = "no" ] ; then
+   PYTHON3S=$(echo "$PYTHON3S" | sed -r 's/3.6//g')
+   fi
 fi
 if [ "${PKGOS_TEST_PARALLEL}" = "no" ] ; then
TEST_PARALLEL_OPT=""

Bug#911409: octavia-api fails to start

[Corey Bryant]

Package: octavia
Version: 3.0.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu  ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/octavia-api.init.in: Drop UWSGI settings as API is not being run under
uwsgi (LP: #1798891).

This is probably not the fix that's desired in Debian but I figured I'd submit 
the patch
along with the bug. The init file isn't running the uwsgi binary. It's running 
the
octavia-api binary and attempting to pass it uwsgi options.

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-10-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru octavia-3.0.0/debian/octavia-api.init.in 
octavia-3.0.0/debian/octavia-api.init.in
--- octavia-3.0.0/debian/octavia-api.init.in2018-09-05 14:09:46.0 
-0400
+++ octavia-3.0.0/debian/octavia-api.init.in2018-10-19 16:14:23.0 
-0400
@@ -17,6 +17,3 @@
 DESC="OpenStack Octavia API (octavia-api)"
 PROJECT_NAME=octavia
 NAME=${PROJECT_NAME}-api
-UWSGI_PORT=9876
-UWSGI_INI_PATH=/etc/octavia/octavia-api-uwsgi.ini
-UWSGI_INI_APP=/usr/bin/octavia-wsgi
diff -Nru octavia-3.0.0/debian/octavia-api.install 
octavia-3.0.0/debian/octavia-api.install
--- octavia-3.0.0/debian/octavia-api.install2018-09-05 14:09:46.0 
-0400
+++ octavia-3.0.0/debian/octavia-api.install1969-12-31 19:00:00.0 
-0500
@@ -1 +0,0 @@
-debian/octavia-api-uwsgi.ini   /etc/octavia
diff -Nru octavia-3.0.0/debian/octavia-api-uwsgi.ini 
octavia-3.0.0/debian/octavia-api-uwsgi.ini
--- octavia-3.0.0/debian/octavia-api-uwsgi.ini  2018-09-05 14:09:46.0 
-0400
+++ octavia-3.0.0/debian/octavia-api-uwsgi.ini  1969-12-31 19:00:00.0 
-0500
@@ -1,60 +0,0 @@
-[uwsgi]
-
-### Generic UWSGI config ###
-
-
-# Override the default size for headers from the 4k default.
-buffer-size = 65535
-
-# This avoids error 104: "Connection reset by peer"
-rem-header = Content-Length
-
-# This is running standalone
-master = true
-
-# Threads and processes
-enable-threads = true
-
-processes = 4
-
-# uwsgi recommends this to prevent thundering herd on accept.
-thunder-lock = true
-
-plugins = python3
-
-# This ensures that file descriptors aren't shared between the WSGI 
application processes.
-lazy-apps = true
-
-# Log from the wsgi application: needs python3-pastescript as runtime depends.
-paste-logger = true
-
-# automatically kill workers if master dies
-no-orphans = true
-
-# exit instead of brutal reload on SIGTERM
-die-on-term = true
-
-##
-### OpenStack service specific ###
-##
-
-# This is the standard port for the WSGI application, listening on all 
available IPs
-logto = /var/log/octavia/octavia-api.log
-name = octavia-api
-uid = octavia
-gid = octavia
-chdir = /var/lib/octavia
-wsgi-file = /usr/bin/octavia-wsgi
-
-# This is controled by the init script using the --http-socket
-# or using the --https thing. https will be activated if a file
-# /etc/nova/ssl/private/*.pem is found. In both case, port 9292
-# on all IPs will be used.
-# The partern to search for the private key file is:
-# find /etc/nova/ssl/private -type f -iname '*.pem' | head -n 1
-# and for the certificate:
-# find /etc/nova/ssl/private -type f -iname '*.crt' | head -n 1
-# just drop files there and restart the daemon, and you'll have
-# SSL up and running.
-#http-socket = :8778
-#https-socket = 0.0.0.0:8778,foobar.crt,foobar.key

Bug#908758: python-osc-placement: Add copyright from setup.py to debian/copyright

[Corey Bryant]

Package: python-osc-placement
Version: 1.3.0-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/copyright: Add copyright from setup.py.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.17.0-9-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-osc-placement-1.3.0/debian/copyright 
python-osc-placement-1.3.0/debian/copyright
--- python-osc-placement-1.3.0/debian/copyright 2018-08-29 07:20:22.0 
-0600
+++ python-osc-placement-1.3.0/debian/copyright 2018-09-13 07:39:40.0 
-0600
@@ -4,6 +4,7 @@
 
 Files: *
 Copyright: (c) 2016-2018, OpenStack Foundation 

+   (c) 2013, Hewlett-Packard Development Company, L.P.
 License: Apache-2
 
 Files: debian/*

Bug#902023: openstack-trove: Multiple calls to pkgos_rabbit_write_conf fail, and other fixes from Ubuntu.

[Corey Bryant]

Package: openstack-trove
Version: 1:9.0.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

Multiple calls to pkgos_rabbit_write_conf cause the trove-common.postinst
script to fail: https://paste.ubuntu.com/p/BT4n6GXy3p/

Additionally, in Ubuntu, the attached patch was applied to achieve the 
following:

  * d/rules: Align test execution with upstream, including ostestr --serial.
  * d/p/fix-usage-of-gettext.install: Fix gettext.install() calls for py3.x.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-23-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru openstack-trove-9.0.0/debian/patches/fix-usage-of-gettext.install 
openstack-trove-9.0.0/debian/patches/fix-usage-of-gettext.install
--- openstack-trove-9.0.0/debian/patches/fix-usage-of-gettext.install   
1969-12-31 19:00:00.0 -0500
+++ openstack-trove-9.0.0/debian/patches/fix-usage-of-gettext.install   
2018-06-21 11:54:58.0 -0400
@@ -0,0 +1,112 @@
+From 08d581fd5c4dcd91cf5999fa270d32e6fe6edf43 Mon Sep 17 00:00:00 2001
+From: Corey Bryant 
+Date: Mon, 18 Jun 2018 09:10:57 -0400
+Subject: [PATCH] py3.x: Fix usage of gettext.install
+
+This needed to be updated to get py3.x to work.
+
+Change-Id: I987854c0266566e1e7722478dbb3e27bcffbb08b
+Closes-Bug: #1777440
+---
+ integration/tests/integration/int_tests.py   | 6 +-
+ integration/tests/integration/tests/colorizer.py | 6 +-
+ trove/cmd/common.py  | 4 
+ trove/cmd/guest.py   | 3 ---
+ trove/cmd/manage.py  | 5 -
+ 5 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/integration/tests/integration/int_tests.py 
b/integration/tests/integration/int_tests.py
+index b139820a..1e73a224 100644
+--- a/integration/tests/integration/int_tests.py
 b/integration/tests/integration/int_tests.py
+@@ -45,6 +45,7 @@ import logging
+ import os
+ import time
+ import unittest
++import six
+ import sys
+ import proboscis
+ 
+@@ -73,7 +74,10 @@ def add_support_for_localization():
+ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+ sys.path.insert(0, possible_topdir)
+ 
+-gettext.install('nova', unicode=1)
++if six.PY2:
++gettext.install('nova', unicode=1)
++else:
++gettext.install('nova')
+ 
+ 
+ MAIN_RUNNER = None
+diff --git a/integration/tests/integration/tests/colorizer.py 
b/integration/tests/integration/tests/colorizer.py
+index 31cdb201..7defd0c2 100644
+--- a/integration/tests/integration/tests/colorizer.py
 b/integration/tests/integration/tests/colorizer.py
+@@ -59,10 +59,14 @@ import heapq
+ import logging
+ import os
+ import unittest
++import six
+ import sys
+ import time
+ 
+-gettext.install('nova', unicode=1)
++if six.PY2:
++gettext.install('nova', unicode=1)
++else:
++gettext.install('nova')
+ 
+ from nose import config
+ from nose import core
+diff --git a/trove/cmd/common.py b/trove/cmd/common.py
+index 1e756e81..1267ed9f 100644
+--- a/trove/cmd/common.py
 b/trove/cmd/common.py
+@@ -15,10 +15,6 @@
+ 
+ 
+ def initialize(extra_opts=None, pre_logging=None):
+-# Initialize localization support (the underscore character).
+-import gettext
+-gettext.install('trove', unicode=1)
+-
+ # Import only the modules necessary to initialize logging and determine if
+ # debug_utils are enabled.
+ import sys
+diff --git a/trove/cmd/guest.py b/trove/cmd/guest.py
+index 687cebe2..d4f90b83 100644
+--- a/trove/cmd/guest.py
 b/trove/cmd/guest.py
+@@ -13,9 +13,6 @@
+ #License for the specific language governing permissions and limitations
+ #under the License.
+ 
+-import gettext
+-gettext.install('trove', unicode=1)
+-
+ import sys
+ 
+ from oslo_config import cfg as openstack_cfg
+diff --git a/trove/cmd/manage.py b/trove/cmd/manage.py
+index 76500d31..dc44d0f5 100644
+--- a/trove/cmd/manage.py
 b/trove/cmd/manage.py
+@@ -13,14 +13,9 @@
+ #License for the specific language governing permissions and limitations
+ #under the License.
+ 
+-import gettext
+ import inspect
+ import sys
+ 
+-
+-gettext.install('trove', unicode=1)
+-
+-
+ from oslo_log import log as logging
+ 
+ from trove.common import cfg
+-- 
+2.17.1
+
diff -Nru openstack-trove-9.0.0/debian/patches/series 
openstack-trove-9.0.0/debian/patches/series
--- openstack-trove-9.0.0/debian/patches/series 2018-02-19 06:13:48.0 
-0500
+++ openstack-trove-9.0.0/debian/patches/series 2018-06-21 11:54:58.0 
-0400
@@ -10,3 +10,4 @@
 #py3-fix.patch

Bug#902019: python-tooz: Enable unit tests

[Corey Bryant]

Package: python-tooz
Version: 1.58.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/rules: Enable unit test execution.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-23-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-tooz-1.58.0/debian/rules python-tooz-1.58.0/debian/rules
--- python-tooz-1.58.0/debian/rules 2017-11-01 21:20:02.0 -0400
+++ python-tooz-1.58.0/debian/rules 2018-06-21 10:54:55.0 -0400
@@ -11,23 +11,10 @@
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-   echo "Temporarily not run unit tests until feedback from upstream"
-#  chmod +x $(CURDIR)/debian/check-memcached-off 
$(CURDIR)/debian/check-memcached-runs
-#  $(CURDIR)/debian/check-memcached-runs
-#  @echo "===> Running tests"
-#  set -e ; set -x ; for i in 2.7 ${PYTHON3S} ; do \
-#  rm -rf /tmp/groups ; \
-#  PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
-#  echo "===> Testing with python$$i (python$$PYMAJOR)" ; \
-#  rm -rf .testrepository ; \
-#  testr-python$$PYMAJOR init ; \
-#  TEMP_REZ=`mktemp -t` ; \
-#  PYTHONPATH=$(CURDIR) PYTHON=python$$i bash 
./debian/setup-tests.sh testr-python$$PYMAJOR run --subunit | tee $$TEMP_REZ | 
subunit2pyunit ; \
-#  cat $$TEMP_REZ | subunit-filter -s --no-passthrough | 
subunit-stats ; \
-#  rm -f $$TEMP_REZ ; \
-#  testr-python$$PYMAJOR slowest ; \
-#  done
-#  $(CURDIR)/debian/check-memcached-off
+   chmod +x $(CURDIR)/debian/check-memcached-off 
$(CURDIR)/debian/check-memcached-runs
+   $(CURDIR)/debian/check-memcached-runs
+   TOOZ_TEST_URL="ipc://" pkgos-dh_auto_test
+   $(CURDIR)/debian/check-memcached-off
 endif
 
 override_dh_clean:

Bug#902016: mistral: Add mistral-event-engine binary package and init template

[Corey Bryant]

Package: mistral
Version: 6.0.0-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control, d/mistral-event-engine.init.in: Add mistral-event-engine
binary package and init template.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-23-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru mistral-6.0.0/debian/control mistral-6.0.0/debian/control
--- mistral-6.0.0/debian/control2018-03-26 12:50:46.0 -0400
+++ mistral-6.0.0/debian/control2018-06-21 09:39:30.0 -0400
@@ -161,6 +161,27 @@
  .
  This package contains the Engine.
 
+Package: mistral-event-engine
+Architecture: all
+Depends:
+ adduser,
+ mistral-common (= ${source:Version}),
+ ${misc:Depends},
+ ${ostack-lsb-base},
+ ${python3:Depends},
+Description: OpenStack Workflow service - Event Engine
+ Mistral is a workflow service. Most business processes consist of multiple
+ distinct interconnected steps that need to be executed in a particular order
+ in a distributed environment. One can describe such process as a set of tasks
+ and task relations and upload such description to Mistral so that it takes
+ care of state management, correct execution order, parallelism,
+ synchronization and high availability. Mistral also provides flexible task
+ scheduling so that it can run a process according to a specified schedule
+ (i.e. every Sunday at 4.00pm) instead of running it immediately. Such set of
+ tasks and relations between them is called a workflow.
+ .
+ This package contains the Event Engine.
+
 Package: mistral-executor
 Architecture: all
 Depends:
diff -Nru mistral-6.0.0/debian/mistral-event-engine.init.in 
mistral-6.0.0/debian/mistral-event-engine.init.in
--- mistral-6.0.0/debian/mistral-event-engine.init.in   1969-12-31 
19:00:00.0 -0500
+++ mistral-6.0.0/debian/mistral-event-engine.init.in   2018-06-21 
09:39:30.0 -0400
@@ -0,0 +1,20 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:  mistral-event-engine
+# Required-Start:$network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Should-Start:  postgresql mysql keystone rabbitmq-server ntp
+# Should-Stop:   postgresql mysql keystone rabbitmq-server ntp
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: Mistral event engine
+# Description:   Mistral event engine
+### END INIT INFO
+
+# Author: Corey Bryant 
+
+DESC="OpenStack Mistral Event Engine"
+PROJECT_NAME=mistral
+NAME=${PROJECT_NAME}-event-engine
+DAEMON=/usr/bin/mistral-server
+DAEMON_ARGS="--server event-engine"

Bug#902014: manila: Fix typo in manila-share.init.in

[Corey Bryant]

Package: manila
Version: 1:6.0.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/manila-share.init.in: Fix typo.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-23-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru manila-6.0.0/debian/manila-share.init.in 
manila-6.0.0/debian/manila-share.init.in
--- manila-6.0.0/debian/manila-share.init.in2018-03-26 12:49:49.0 
-0400
+++ manila-6.0.0/debian/manila-share.init.in2018-06-21 09:35:17.0 
-0400
@@ -12,6 +12,6 @@
 ### END INIT INFO
 
 # Author: Thomas Goirand 
-DESC="OpenStack Manila API"
+DESC="OpenStack Manila Share"
 PROJECT_NAME=manila
 NAME=${PROJECT_NAME}-share

Bug#902013: manila: Add manila-data binary package and init template

[Corey Bryant]

Package: manila
Version: 1:6.0.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control, d/manila-data.init.in: Add manila-data binary package
and init template.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-23-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru manila-6.0.0/debian/control manila-6.0.0/debian/control
--- manila-6.0.0/debian/control 2018-03-26 12:49:49.0 -0400
+++ manila-6.0.0/debian/control 2018-06-21 09:29:50.0 -0400
@@ -124,6 +124,23 @@
  .
  This package contains commons components for Manila.
 
+Package: manila-data
+Architecture: all
+Depends:
+ manila-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${ostack-lsb-base},
+ ${python3:Depends},
+Description: Manila storage service - Data service
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Manila is the OpenStack shared filesystem service.
+ .
+ This package contains the Manila Data service.
+
 Package: manila-doc
 Section: doc
 Architecture: all
diff -Nru manila-6.0.0/debian/manila-data.init.in 
manila-6.0.0/debian/manila-data.init.in
--- manila-6.0.0/debian/manila-data.init.in 1969-12-31 19:00:00.0 
-0500
+++ manila-6.0.0/debian/manila-data.init.in 2018-06-21 09:30:27.0 
-0400
@@ -0,0 +1,20 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:  manila-data
+# Required-Start:$network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Should-Start:  postgresql mysql keystone rabbitmq-server ntp
+# Should-Stop:   postgresql mysql keystone rabbitmq-server ntp
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: Manila Data Service
+# Description:   Shared filesytem services for instances
+### END INIT INFO
+
+# Author: Corey Bryant 
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="OpenStack Manila Data Service"
+PROJECT_NAME=manila
+NAME=${PROJECT_NAME}-data

Bug#900904: closed by Thomas Goirand (Re: Bug#900904: magnum: Updates from Ubuntu (python2, autopkgtests))

[Corey Bryant]

By the way, do you want the other fixes included in this bug? I can
continue to send the non-py2 fixes if you want them. Just let me know
what's relevant for you.

Corey

On Wed, Jun 6, 2018 at 1:16 PM, Corey Bryant 
wrote:

> Fair enough. We'll be dual stack in Ubuntu until we can drop all py2 at
> once. That will likely be when upstream claims full supported for py3 -
> https://wiki.openstack.org/wiki/Python3.
>
> Thanks,
> Corey
>
> On Wed, Jun 6, 2018 at 12:54 PM, Debian Bug Tracking System <
> ow...@bugs.debian.org> wrote:
>
>> This is an automatic notification regarding your Bug report
>> which was filed against the magnum package:
>>
>> #900904: magnum: Updates from Ubuntu (python2, autopkgtests)
>>
>> It has been closed by Thomas Goirand .
>>
>> Their explanation is attached below along with your original report.
>> If this explanation is unsatisfactory and you have not received a
>> better one in a separate message then please contact Thomas Goirand <
>> z...@debian.org> by
>> replying to this email.
>>
>>
>> --
>> 900904: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900904
>> Debian Bug Tracking System
>> Contact ow...@bugs.debian.org with problems
>>
>>
>> -- Forwarded message --
>> From: Thomas Goirand 
>> To: 900904-d...@bugs.debian.org
>> Cc:
>> Bcc:
>> Date: Wed, 6 Jun 2018 18:52:10 +0200
>> Subject: Re: Bug#900904: magnum: Updates from Ubuntu (python2,
>> autopkgtests)
>> On 06/06/2018 04:38 PM, Corey Bryant wrote:
>> > Package: magnum
>> > Version: 6.0.1-2
>> > Severity: normal
>> > Tags: patch
>> > User: ubuntu-de...@lists.ubuntu.com
>> > Usertags: origin-ubuntu cosmic ubuntu-patch
>> >
>> > Dear Maintainer,
>> >
>> > In Ubuntu, the attached patch was applied to achieve the following:
>> >
>> >   * Merge from Debian unstable.  Remaining changes:
>> > - d/control, d/rules: Add Python 2.7 support and python-magnum
>> package.
>> > - d/control: Support Python 2.7 first and Python 3.x as alternative.
>> >   magnum-common depends on python-magnum by default and
>> python3-magnum
>> >   as alternative. magnum-api does the same for
>> python-openstackclient.
>> > - d/control: Drop ${python3:Depends} from magnum-* binary packages
>> >   as it's covered in python3-magnum.
>> > - d/control: move python(3)-openstackclient dependency from
>> magnum-api
>> >   Depends to python(3)-magnum Depends.
>> > - d/control: Enable autopkgtest-pkg-python testsuite.
>> > - d/rules: Add Python 2.7 support.
>> > - d/rules: Install to package build directories rather than
>> debian/tmp.
>> > - d/rules: Use pkgos-dh_auto_install instead of python setup.py
>> install.
>> >   This helps name binaries for update-alternatives.
>> > - d/python(3)-magnum.post*, d/python(3)-magnum.prerm:
>> update-alternatives
>> >   is used to enable correct shebangs for Python binaries.
>> > - d/python3-magnum.install: Dropped. Not needed.
>> > - d/tests/*: Add autopkgtests for magnum daemons and shebangs.
>> > - d/watch: Get tarball from tarballs.openstack.org.
>> >
>> > Thanks for considering the patch.
>>
>> Hi Corey,
>>
>> Thanks for your patch.
>>
>> Once we've re-added python 2 support, then we would remove it? Is that
>> the plan? I'm sorry, but I don't feel like moving to a dual-stack Python
>> support is the way to go. Already, Debian packages are passing all
>> functional tests using puppet-openstack (well, one single functional
>> test fails, and I'm currently working on it). So I don't see the need to
>> add extra complexity for no return.
>>
>> The current Debian plan is to completely remove Python 2 support when
>> Buster is released (including in clients, and all...). Hopefully,
>> there's going to be more visibility on the Ubuntu side of things by that
>> time. Anyway, please let me know what's going on. :)
>>
>> Cheers,
>>
>> Thomas Goirand (zigo)
>>
>> -- Forwarded message --
>> From: Corey Bryant 
>> To: Debian Bug Tracking System 
>> Cc:
>> Bcc:
>> Date: Wed, 06 Jun 2018 10:38:28 -0400
>> Subject: magnum: Updates from Ubuntu (python2, autopkgtests)
>> Package: magnum
>> Version: 6.0.1-2
>> Severity: normal
>> Tags: patch
>> User: ubuntu-de...@lists.ubuntu.com
>> Use

Bug#900904: closed by Thomas Goirand (Re: Bug#900904: magnum: Updates from Ubuntu (python2, autopkgtests))

[Corey Bryant]

Fair enough. We'll be dual stack in Ubuntu until we can drop all py2 at
once. That will likely be when upstream claims full supported for py3 -
https://wiki.openstack.org/wiki/Python3.

Thanks,
Corey

On Wed, Jun 6, 2018 at 12:54 PM, Debian Bug Tracking System <
ow...@bugs.debian.org> wrote:

> This is an automatic notification regarding your Bug report
> which was filed against the magnum package:
>
> #900904: magnum: Updates from Ubuntu (python2, autopkgtests)
>
> It has been closed by Thomas Goirand .
>
> Their explanation is attached below along with your original report.
> If this explanation is unsatisfactory and you have not received a
> better one in a separate message then please contact Thomas Goirand <
> z...@debian.org> by
> replying to this email.
>
>
> --
> 900904: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900904
> Debian Bug Tracking System
> Contact ow...@bugs.debian.org with problems
>
>
> -- Forwarded message --
> From: Thomas Goirand 
> To: 900904-d...@bugs.debian.org
> Cc:
> Bcc:
> Date: Wed, 6 Jun 2018 18:52:10 +0200
> Subject: Re: Bug#900904: magnum: Updates from Ubuntu (python2,
> autopkgtests)
> On 06/06/2018 04:38 PM, Corey Bryant wrote:
> > Package: magnum
> > Version: 6.0.1-2
> > Severity: normal
> > Tags: patch
> > User: ubuntu-de...@lists.ubuntu.com
> > Usertags: origin-ubuntu cosmic ubuntu-patch
> >
> > Dear Maintainer,
> >
> > In Ubuntu, the attached patch was applied to achieve the following:
> >
> >   * Merge from Debian unstable.  Remaining changes:
> > - d/control, d/rules: Add Python 2.7 support and python-magnum
> package.
> > - d/control: Support Python 2.7 first and Python 3.x as alternative.
> >   magnum-common depends on python-magnum by default and
> python3-magnum
> >   as alternative. magnum-api does the same for
> python-openstackclient.
> > - d/control: Drop ${python3:Depends} from magnum-* binary packages
> >   as it's covered in python3-magnum.
> > - d/control: move python(3)-openstackclient dependency from
> magnum-api
> >   Depends to python(3)-magnum Depends.
> > - d/control: Enable autopkgtest-pkg-python testsuite.
> > - d/rules: Add Python 2.7 support.
> > - d/rules: Install to package build directories rather than
> debian/tmp.
> > - d/rules: Use pkgos-dh_auto_install instead of python setup.py
> install.
> >   This helps name binaries for update-alternatives.
> > - d/python(3)-magnum.post*, d/python(3)-magnum.prerm:
> update-alternatives
> >   is used to enable correct shebangs for Python binaries.
> > - d/python3-magnum.install: Dropped. Not needed.
> > - d/tests/*: Add autopkgtests for magnum daemons and shebangs.
> > - d/watch: Get tarball from tarballs.openstack.org.
> >
> > Thanks for considering the patch.
>
> Hi Corey,
>
> Thanks for your patch.
>
> Once we've re-added python 2 support, then we would remove it? Is that
> the plan? I'm sorry, but I don't feel like moving to a dual-stack Python
> support is the way to go. Already, Debian packages are passing all
> functional tests using puppet-openstack (well, one single functional
> test fails, and I'm currently working on it). So I don't see the need to
> add extra complexity for no return.
>
> The current Debian plan is to completely remove Python 2 support when
> Buster is released (including in clients, and all...). Hopefully,
> there's going to be more visibility on the Ubuntu side of things by that
> time. Anyway, please let me know what's going on. :)
>
> Cheers,
>
> Thomas Goirand (zigo)
>
> -- Forwarded message --
> From: Corey Bryant 
> To: Debian Bug Tracking System 
> Cc:
> Bcc:
> Date: Wed, 06 Jun 2018 10:38:28 -0400
> Subject: magnum: Updates from Ubuntu (python2, autopkgtests)
> Package: magnum
> Version: 6.0.1-2
> Severity: normal
> Tags: patch
> User: ubuntu-de...@lists.ubuntu.com
> Usertags: origin-ubuntu cosmic ubuntu-patch
>
> Dear Maintainer,
>
> In Ubuntu, the attached patch was applied to achieve the following:
>
>   * Merge from Debian unstable.  Remaining changes:
> - d/control, d/rules: Add Python 2.7 support and python-magnum package.
> - d/control: Support Python 2.7 first and Python 3.x as alternative.
>   magnum-common depends on python-magnum by default and python3-magnum
>   as alternative. magnum-api does the same for python-openstackclient.
> - d/control: Drop ${python3:Depends} from magnum-* binary packages
>   as it's covered in python3-magnum.
> - d/control: move python(

Bug#900904: magnum: Updates from Ubuntu (python2, autopkgtests)

[Corey Bryant]

Package: magnum
Version: 6.0.1-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Merge from Debian unstable.  Remaining changes:
- d/control, d/rules: Add Python 2.7 support and python-magnum package.
- d/control: Support Python 2.7 first and Python 3.x as alternative.
  magnum-common depends on python-magnum by default and python3-magnum
  as alternative. magnum-api does the same for python-openstackclient.
- d/control: Drop ${python3:Depends} from magnum-* binary packages
  as it's covered in python3-magnum.
- d/control: move python(3)-openstackclient dependency from magnum-api
  Depends to python(3)-magnum Depends.
- d/control: Enable autopkgtest-pkg-python testsuite.
- d/rules: Add Python 2.7 support.
- d/rules: Install to package build directories rather than debian/tmp.
- d/rules: Use pkgos-dh_auto_install instead of python setup.py install.
  This helps name binaries for update-alternatives.
- d/python(3)-magnum.post*, d/python(3)-magnum.prerm: update-alternatives
  is used to enable correct shebangs for Python binaries.
- d/python3-magnum.install: Dropped. Not needed.
- d/tests/*: Add autopkgtests for magnum daemons and shebangs.
- d/watch: Get tarball from tarballs.openstack.org.

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru magnum-6.0.1/debian/control magnum-6.0.1/debian/control
--- magnum-6.0.1/debian/control 2018-03-06 17:28:24.0 -0500
+++ magnum-6.0.1/debian/control 2018-06-06 10:32:46.0 -0400
@@ -9,6 +9,9 @@
  dh-python,
  openstack-pkg-tools (>= 70~),
  po-debconf,
+ python-all,
+ python-pbr (>= 2.0.0),
+ python-setuptools (>= 24.0.0),
  python3-all,
  python3-pbr (>= 2.0.0),
  python3-setuptools (>= 24.0.0),
@@ -16,6 +19,64 @@
 Build-Depends-Indep:
  alembic (>= 0.8.10),
  bandit,
+ python-babel,
+ python-barbicanclient (>= 4.0.0),
+ python-cliff (>= 2.8.0),
+ python-coverage,
+ python-cryptography (>= 1.9),
+ python-decorator (>= 3.4.0),
+ python-doc8,
+ python-docker (>= 2.4.2),
+ python-eventlet,
+ python-fixtures,
+ python-glanceclient (>= 1:2.8.0),
+ python-hacking (>= 0.10.0),
+ python-heatclient (>= 1.10.0),
+ python-iso8601 (>= 0.1.11),
+ python-jsonpatch (>= 1.19+really1.16),
+ python-keystoneauth1 (>= 3.3.0),
+ python-keystoneclient (>= 3.8.0),
+ python-keystonemiddleware (>= 4.17.0),
+ python-kubernetes (>= 4.0.0),
+ python-marathon (>= 0.8.6),
+ python-mock,
+ python-netaddr (>= 0.7.13),
+ python-neutronclient (>= 1:6.3.0),
+ python-novaclient (>= 2:9.1.0),
+ python-openstackdocstheme (>= 1.17.0),
+ python-os-api-ref (>= 1.4.0),
+ python-os-testr (>= 1.0.0),
+ python-oslo.concurrency (>= 3.20.0),
+ python-oslo.config (>= 1:5.1.0),
+ python-oslo.context (>= 2.19.2),
+ python-oslo.db (>= 4.27.0),
+ python-oslo.i18n (>= 3.15.3),
+ python-oslo.log (>= 3.30.0),
+ python-oslo.messaging (>= 5.29.0),
+ python-oslo.middleware (>= 3.31.0),
+ python-oslo.policy (>= 1.30.0),
+ python-oslo.reports (>= 1.18.0),
+ python-oslo.serialization (>= 2.18.0),
+ python-oslo.service (>= 1.24.0),
+ python-oslo.utils (>= 3.33.0),
+ python-oslo.versionedobjects (>= 1.28.0),
+ python-oslotest (>= 1:1.10.0),
+ python-osprofiler (>= 1.4.0),
+ python-pecan,
+ python-pep8,
+ python-pycadf (>= 1.1.0),
+ python-requests (>= 2.14.2),
+ python-six,
+ python-sqlalchemy,
+ python-stevedore (>= 1.20.0),
+ python-taskflow (>= 2.7.0),
+ python-testscenarios,
+ python-testtools (>= 2.2.0),
+ python-tz,
+ python-webob (>= 1.7.1),
+ python-werkzeug,
+ python-wsme (>= 0.8),
+ python-yaml,
  python3-babel,
  python3-barbicanclient (>= 4.0.0),
  python3-cliff (>= 2.8.0),
@@ -77,20 +138,19 @@
  subunit,
  testrepository,
 Standards-Version: 4.1.3
 Vcs-Browser: https://salsa.debian.org/openstack-team/services/magnum
 Vcs-Git: https://salsa.debian.org/openstack-team/services/magnum.git
 Homepage: https://github.com/openstack/magnum
+Testsuite: autopkgtest-pkg-python
 
 Package: magnum-api
 Architecture: all
 Depends:
  adduser,
  magnum-common (= ${binary:Version}),
- python3-openstackclient,
  q-text-as-data,
  ${misc:Depends},
  ${ostack-lsb-base},
- ${python3:Depends},
 Description: OpenStack containers as a service
  Magnum is an OpenStack project which offers container orchestration engines
  for deploying and managing containers as first class resources in OpenStack.
@@ -109,9 +169,8 @@
  adduser,
  dbconfig-common,
  debconf,
- python3-magnum (= 

Bug#899415: zzzeeksphinx: Cherry-picked upstream patches required for zzzeeksphinx to work with sphinx >= 1.7.0

[Corey Bryant]

Package: zzzeeksphinx
Version: 1.0.20-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/sphinx-has-deprecated-Directive.patch,
d/p/use-regular-python-tokenize.patch,
d/p/remove-find-the-docstring.patch,
d/p/more-updates-for-sphinx.patch: Cherry-picked patches from upstream
to handled code removed from sphinx as of 1.7.0.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru zzzeeksphinx-1.0.20/debian/patches/more-updates-for-sphinx.patch 
zzzeeksphinx-1.0.20/debian/patches/more-updates-for-sphinx.patch
--- zzzeeksphinx-1.0.20/debian/patches/more-updates-for-sphinx.patch
1969-12-31 16:00:00.0 -0800
+++ zzzeeksphinx-1.0.20/debian/patches/more-updates-for-sphinx.patch
2018-05-23 10:36:34.0 -0700
@@ -0,0 +1,45 @@
+From d7a89f115fdb3ab1431161a446d636eaad3185c7 Mon Sep 17 00:00:00 2001
+From: Mike Bayer 
+Date: Fri, 16 Feb 2018 13:33:55 -0500
+Subject: [PATCH] - more updates for sphinx
+
+---
+ zzzeeksphinx/viewsource.py | 9 +
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/zzzeeksphinx/viewsource.py b/zzzeeksphinx/viewsource.py
+index 7ee590b..8b20c43 100644
+--- a/zzzeeksphinx/viewsource.py
 b/zzzeeksphinx/viewsource.py
+@@ -100,7 +100,7 @@ def _view_source_node(env, text, state):
+ code = analyzer.code
+ 
+ if state is not None:
+-docstring = _find_mod_docstring(analyzer)
++docstring = _find_mod_docstring(pathname)
+ if docstring:
+ # get rid of "foo.py" at the top
+ docstring = re.sub(r"^[a-zA-Z_0-9]+\.py", "", docstring)
+@@ -155,15 +155,16 @@ def _view_source_node(env, text, state):
+ return return_node
+ 
+ 
+-def _find_mod_docstring(analyzer):
++def _find_mod_docstring(pathname):
+ """attempt to locate the module-level docstring.
+ 
+ Note that sphinx autodoc just uses ``__doc__``.  But we don't want
+ to import the module, so we need to parse for it.
+ 
+ """
+-analyzer.tokenize()
+-for type_, parsed_line, start_pos, end_pos, raw_line in analyzer.tokens:
++fhandle = open(pathname, 'rb')
++for type_, parsed_line, start_pos, end_pos, raw_line in \
++token.tokenize(fhandle.readline):
+ if type_ == token.COMMENT:
+ continue
+ elif type_ == token.STRING:
+-- 
+2.17.0
+
diff -Nru zzzeeksphinx-1.0.20/debian/patches/remove-find-the-docstring.patch 
zzzeeksphinx-1.0.20/debian/patches/remove-find-the-docstring.patch
--- zzzeeksphinx-1.0.20/debian/patches/remove-find-the-docstring.patch  
1969-12-31 16:00:00.0 -0800
+++ zzzeeksphinx-1.0.20/debian/patches/remove-find-the-docstring.patch  
2018-05-23 10:36:34.0 -0700
@@ -0,0 +1,113 @@
+From 0e2d505df24d4478030592d59c2abe07ccfc03cf Mon Sep 17 00:00:00 2001
+From: Mike Bayer 
+Date: Fri, 16 Feb 2018 16:40:33 -0500
+Subject: [PATCH] - remove the "find the docstring" aspect of this code that
+ doesn't seem to be doing anything and is breaking on old Pythons, new
+ sphinxes, too much.
+
+---
+ zzzeeksphinx/viewsource.py | 67 +++---
+ 1 file changed, 11 insertions(+), 56 deletions(-)
+
+diff --git a/zzzeeksphinx/viewsource.py b/zzzeeksphinx/viewsource.py
+index 8b20c43..9fc6e2c 100644
+--- a/zzzeeksphinx/viewsource.py
 b/zzzeeksphinx/viewsource.py
+@@ -5,9 +5,7 @@ import imp
+ import re
+ from docutils.parsers.rst import Directive
+ import os
+-from docutils.statemachine import StringList
+ from sphinx.environment import NoUri
+-import tokenize as token
+ import warnings
+ from . import util
+ 
+@@ -99,20 +97,6 @@ def _view_source_node(env, text, state):
+ else:
+ code = analyzer.code
+ 
+-if state is not None:
+-docstring = _find_mod_docstring(pathname)
+-if docstring:
+-# get rid of "foo.py" at the top
+-docstring = re.sub(r"^[a-zA-Z_0-9]+\.py", "", docstring)
+-
+-# strip
+-docstring = docstring.strip()
+-
+-# yank only first paragraph
+-docstring = docstring.split("\n\n")[0].strip()
+-else:
+-docstring = None
+-
+ pagename = '_modules/' + modname.replace('.', '/')
+ try:
+ refuri = urito(env.docname, pagename)
+@@ -127,52 +111,23 @@ def _view_source_node(env, text, state):
+ entry = code, analyzer.tags, {}
+ env._viewcode_modules[modname] = 

Bug#898766: closed by Thomas Goirand <z...@debian.org> (Re: [PKG-Openstack-devel] Bug#898766: stevedore: If possible, please can you update the epoch for stevedore to 1?)

[Corey Bryant]

On Thu, May 17, 2018 at 4:57 PM, Debian Bug Tracking System <
ow...@bugs.debian.org> wrote:

> This is an automatic notification regarding your Bug report
> which was filed against the stevedore package:
>
> #898766: stevedore: If possible, please can you update the epoch for
> stevedore to 1?
>
> It has been closed by Thomas Goirand <z...@debian.org>.
>
> Their explanation is attached below along with your original report.
> If this explanation is unsatisfactory and you have not received a
> better one in a separate message then please contact Thomas Goirand <
> z...@debian.org> by
> replying to this email.
>
>
> --
> 898766: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898766
> Debian Bug Tracking System
> Contact ow...@bugs.debian.org with problems
>
>
> -- Forwarded message --
> From: Thomas Goirand <z...@debian.org>
> To: 898766-d...@bugs.debian.org
> Cc:
> Bcc:
> Date: Thu, 17 May 2018 22:54:49 +0200
> Subject: Re: [PKG-Openstack-devel] Bug#898766: stevedore: If possible,
> please can you update the epoch for stevedore to 1?
> On 05/15/2018 08:05 PM, Corey Bryant wrote:
> > Package: stevedore
> > Version: 1.28.0-2
> > Severity: normal
> > User: ubuntu-de...@lists.ubuntu.com
> > Usertags: origin-ubuntu cosmic
> >
> > Dear Maintainer,
> >
> > In Ubuntu we have stevedore version 1:1.28.0-0ubunut1. If possible, can
> > the stevedore version in Debian be bumped to epoch 1?
> >
> > Thanks for considering this change.
>
> Hi,
>
> I'm sorry, but no. That's too painful to do, stevedore is *everywhere*
> and I have no time for that. Besides this, I don't really see why I
> should help Ubuntu as you aren't committing anything to Debian's Git
> repository anymore.
>

Well you wonder why. :) But it's not true anyway, as I'm sending patches
that are useful.

Thanks!
Corey


> However, since you still have write access to Git, if you're willing to
> mass-commit and upload an EPOC bump to all Debian packages, feel free to
> do it. In the mean time, I'll just close this bug.
>
> Cheers,
>
> Thomas Goirand (zigo)
>
> -- Forwarded message --
> From: Corey Bryant <corey.bry...@canonical.com>
> To: Debian Bug Tracking System <sub...@bugs.debian.org>
> Cc:
> Bcc:
> Date: Tue, 15 May 2018 14:05:53 -0400
> Subject: stevedore: If possible, please can you update the epoch for
> stevedore to 1?
> Package: stevedore
> Version: 1.28.0-2
> Severity: normal
> User: ubuntu-de...@lists.ubuntu.com
> Usertags: origin-ubuntu cosmic
>
> Dear Maintainer,
>
> In Ubuntu we have stevedore version 1:1.28.0-0ubunut1. If possible, can
> the stevedore version in Debian be bumped to epoch 1?
>
> Thanks for considering this change.
>
> -- System Information:
> Debian Release: buster/sid
>   APT prefers cosmic
>   APT policy: (500, 'cosmic'), (500, 'bionic-security')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
>
> Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
> Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
> LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
> LSM: AppArmor: enabled
>
>

Bug#898766: stevedore: If possible, please can you update the epoch for stevedore to 1?

[Corey Bryant]

Package: stevedore
Version: 1.28.0-2
Severity: normal
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic

Dear Maintainer,

In Ubuntu we have stevedore version 1:1.28.0-0ubunut1. If possible, can
the stevedore version in Debian be bumped to epoch 1?

Thanks for considering this change.

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled


stevedore_1:1.28.0-2ubuntu1.debdiff
Description: inode/empty

Bug#898740: python-tooz: Updates from Ubuntu

[Corey Bryant]

Package: python-tooz
Version: 1.58.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Enable autopkgtest-pkg-python dep8 tests.
  * d/control: Add python{3}-sysv-ipc to Suggests for IPC driver.

Thanks for considering the patch.

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-tooz-1.58.0/debian/control python-tooz-1.58.0/debian/control
--- python-tooz-1.58.0/debian/control   2017-11-01 21:20:02.0 -0400
+++ python-tooz-1.58.0/debian/control   2018-05-15 10:45:52.0 -0400
@@ -75,6 +75,7 @@
 Vcs-Browser: https://anonscm.debian.org/cgit/openstack/libs/python-tooz.git
 Vcs-Git: https://anonscm.debian.org/git/openstack/libs/python-tooz.git
 Homepage: https://github.com/openstack/tooz
+Testsuite: autopkgtest-pkg-python
 
 Package: python-tooz
 Architecture: all
@@ -99,6 +100,7 @@
  python-zake,
  ${misc:Depends},
  ${python:Depends},
+Suggests: python-sysv-ipc,
 Description: coordination library for distributed systems - Python 2.x
  The Tooz project centralizes the most common distributed primitives like group
  membership protocol, lock service and leader election by providing a
@@ -140,6 +142,7 @@
  python3-zake,
  ${misc:Depends},
  ${python3:Depends},
+Suggests: python3-sysv-ipc,
 Description: coordination library for distributed systems - Python 3.x
  The Tooz project centralizes the most common distributed primitives like group
  membership protocol, lock service and leader election by providing a

Bug#898733: python-pyeclib: dep8 test updates to account for libisal2 unavailable on non-amd64

[Corey Bryant]

Package: python-pyeclib
Version: 1.5.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/tests/*: Don't run encode/decode tests for isa_* ec types on non-amd64
architures because libisal2 is not available for non-amd64 architectures.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-pyeclib-1.5.0/debian/tests/control 
python-pyeclib-1.5.0/debian/tests/control
--- python-pyeclib-1.5.0/debian/tests/control   2018-05-14 07:01:11.0 
-0400
+++ python-pyeclib-1.5.0/debian/tests/control   2018-05-15 10:13:11.0 
-0400
@@ -24,17 +24,17 @@
 # ISA-L RS VAND
 Test-Command: python debian/tests/encode-decode.py isa_l_rs_vand
 Depends: python-pyeclib,
- libisal2,
+ libisal2 [amd64],
 
 Test-Command: python3 debian/tests/encode-decode.py isa_l_rs_vand
 Depends: python3-pyeclib,
- libisal2,
+ libisal2 [amd64],
 
 # ISA-L RS Cauchy
 Test-Command: python debian/tests/encode-decode.py isa_l_rs_cauchy
 Depends: python-pyeclib,
- libisal2,
+ libisal2 [amd64],
 
 Test-Command: python3 debian/tests/encode-decode.py isa_l_rs_cauchy
 Depends: python3-pyeclib,
- libisal2,
+ libisal2 [amd64],
diff -Nru python-pyeclib-1.5.0/debian/tests/encode-decode.py 
python-pyeclib-1.5.0/debian/tests/encode-decode.py
--- python-pyeclib-1.5.0/debian/tests/encode-decode.py  2018-05-14 
07:01:11.0 -0400
+++ python-pyeclib-1.5.0/debian/tests/encode-decode.py  2018-05-15 
10:13:11.0 -0400
@@ -1,20 +1,26 @@
 from __future__ import print_function
+import platform
 from pyeclib.ec_iface import ECDriver
 import sys
 
-input = b'test'
+# libisal2 is not available for non-amd64 architectures
+arch = platform.machine()
+if sys.argv[1].startswith('isa_') and arch != 'x86_64':
+print("Skipping {} test for {} architecture".format(sys.argv[1], arch))
+else:
+input = b'test'
 
-# Init
-print("init:", end=" ")
-ec = ECDriver(k=3, m=3, hd=3, ec_type=sys.argv[1])
-print("OK")
+# Init
+print("init:", end=" ")
+ec = ECDriver(k=3, m=3, hd=3, ec_type=sys.argv[1])
+print("OK")
 
-# Encode
-print("encode:", end=" ")
-fragments = ec.encode(input)
-print("OK")
+# Encode
+print("encode:", end=" ")
+fragments = ec.encode(input)
+print("OK")
 
-# Decode
-print("decode:", end=" ")
-assert ec.decode(fragments[0:ec.k]) == input
-print("OK")
+# Decode
+print("decode:", end=" ")
+assert ec.decode(fragments[0:ec.k]) == input
+print("OK")

Bug#898732: python-cliff: Updates from Ubuntu package

[Corey Bryant]

Package: python-cliff
Version: 2.11.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control, d/compat: Set debhelper>=10.
  * d/control: Enable autopkgtest-pkg-python tests.
  * d/control: Drop (Build-)Depends on python3-unicodecsv as its only
needed for Python 2 (LP: #1736717).
  * d/p/align-parsed-call-with-cmd2-versions-0.7.3.patch: Cherry-picked
from https://review.openstack.org/#/c/548626/ to fix AttributeError
exception with use of cmd2 parsed() method (LP: #1751822).


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-cliff-2.11.0/debian/compat python-cliff-2.11.0/debian/compat
--- python-cliff-2.11.0/debian/compat   2018-03-03 11:52:29.0 -0500
+++ python-cliff-2.11.0/debian/compat   2018-05-15 10:01:20.0 -0400
@@ -1 +1 @@
-9
+10
diff -Nru python-cliff-2.11.0/debian/control python-cliff-2.11.0/debian/control
--- python-cliff-2.11.0/debian/control  2018-03-03 11:52:29.0 -0500
+++ python-cliff-2.11.0/debian/control  2018-05-15 10:01:20.0 -0400
@@ -6,7 +6,7 @@
  Jan Dittberner <ja...@debian.org>,
  Thomas Goirand <z...@debian.org>,
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
  dh-python,
  openstack-pkg-tools,
  python-all,
@@ -42,12 +42,12 @@
  python3-stevedore (>= 1.20.0),
  python3-testscenarios,
  python3-testtools (>= 2.2.0),
- python3-unicodecsv,
  python3-yaml,
 Standards-Version: 4.1.3
 Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-cliff
 Vcs-Git: https://salsa.debian.org/openstack-team/python/python-cliff.git
 Homepage: https://github.com/dreamhost/cliff
+Testsuite: autopkgtest-pkg-python
 
 Package: python-cliff
 Architecture: all
@@ -103,7 +103,6 @@
  python3-pyparsing,
  python3-six,
  python3-stevedore (>= 1.20.0),
- python3-unicodecsv,
  ${misc:Depends},
  ${python3:Depends},
 Recommends:
diff -Nru 
python-cliff-2.11.0/debian/patches/align-parsed-call-with-cmd2-versions-0.7.3.patch
 
python-cliff-2.11.0/debian/patches/align-parsed-call-with-cmd2-versions-0.7.3.patch
--- 
python-cliff-2.11.0/debian/patches/align-parsed-call-with-cmd2-versions-0.7.3.patch
 1969-12-31 19:00:00.0 -0500
+++ 
python-cliff-2.11.0/debian/patches/align-parsed-call-with-cmd2-versions-0.7.3.patch
 2018-05-15 10:01:20.0 -0400
@@ -0,0 +1,35 @@
+From a63cfc3aa9cbd5ade625317b1fb2d5c75b9a8b82 Mon Sep 17 00:00:00 2001
+From: Corey Bryant <corey.bry...@canonical.com>
+Date: Wed, 28 Feb 2018 10:49:24 -0500
+Subject: [PATCH] Align parsed() call with cmd2 versions >= 0.7.3
+
+In version 0.7.3, cmd2 moved the parsed method from class Cmd()
+to class ParserManager().
+
+Change-Id: Ie0c057ffaeaa05c4f5e0f3599aab850245c55066
+Closes-Bug: #1751822
+---
+ cliff/interactive.py | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/cliff/interactive.py b/cliff/interactive.py
+index 74b5f54..9aaba97 100644
+--- a/cliff/interactive.py
 b/cliff/interactive.py
+@@ -111,7 +111,12 @@ class InteractiveApp(cmd2.Cmd):
+ # Dispatch to the underlying help command,
+ # which knows how to provide help for extension
+ # commands.
+-self.default(self.parsed('help ' + arg))
++try:
++# NOTE(coreycb): This try path can be removed once
++# global-requirements has cmd2 >= 0.7.3.
++self.default(self.parsed('help ' + arg))
++except AttributeError:
++self.default(self.parser_manager.parsed('help ' + arg))
+ else:
+ cmd2.Cmd.do_help(self, arg)
+ cmd_names = sorted([n for n, v in self.command_manager])
+-- 
+2.15.1
+
diff -Nru python-cliff-2.11.0/debian/patches/series 
python-cliff-2.11.0/debian/patches/series
--- python-cliff-2.11.0/debian/patches/series   1969-12-31 19:00:00.0 
-0500
+++ python-cliff-2.11.0/debian/patches/series   2018-05-15 10:01:20.0 
-0400
@@ -0,0 +1 @@
+align-parsed-call-with-cmd2-versions-0.7.3.patch

Bug#898663: Bug #898663 in python-testtools marked as pending

[Corey Bryant]

On Tue, May 15, 2018 at 5:19 AM, Simon McVittie  wrote:

> On Tue, 15 May 2018 at 08:46:24 +, z...@debian.org wrote:
> >   * Apply debdiff from Ubuntu (Closes: #898663):
> > - d/p/fix-test-run.py.patch: Dropped. No longer needed.
>
> This part seemed OK, but the changelog is a bit misleading: "no longer
> applied since x.y.z" would perhaps be better?
>
>
I don't know that I'd call this changelog message misleading. With the
current package version, the tests now run successfully without this patch.


> > - d/tests/control: Drop python-testscenarios from Depends.
> > - d/tests/testsuite-*: Set PYTHONPATH when running tests.
>
> As discussed on the bug, these two points seem to be invalid. Please
> revert those changes.
>
>
Yes, agreed.

Thanks,
Corey


> smcv
>
>

Bug#898663: python-testtools: Updates from Ubuntu

[Corey Bryant]

On Mon, May 14, 2018 at 4:25 PM, Thomas Goirand <z...@debian.org> wrote:

> On 05/14/2018 08:36 PM, Corey Bryant wrote:
> > Package: python-testtools
> > Version: 2.3.0-4
> > Severity: normal
> > Tags: patch
> > User: ubuntu-de...@lists.ubuntu.com
> > Usertags: origin-ubuntu cosmic ubuntu-patch
> >
> > Dear Maintainer,
> >
> > In Ubuntu, the attached patch was applied to achieve the following:
> >
> >   - d/control: Enable execution of autopkgtests.
> >   - d/p/fix-test-run.py.patch: Dropped. No longer needed.
> >   - d/tests/control: Drop python-testscenarios from Depends.
> >   - d/tests/testsuite-*: Set PYTHONPATH when running tests.
> >
> > Thanks for considering the patch.
>
> Thanks for this, however, this:
>
> +XS-Testsuite: autopkgtest
>
> is to be removed in Debian (it produces a lintian warning). Is this
> still in use in Ubuntu?
>

I think you're right that it's obsolete now. Please disregard.

Thanks,
Corey


>
> Cheers,
>
> Thomas Goirand (zigo)
>

Bug#898663: python-testtools: Updates from Ubuntu

[Corey Bryant]

Package: python-testtools
Version: 2.3.0-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  - d/control: Enable execution of autopkgtests.
  - d/p/fix-test-run.py.patch: Dropped. No longer needed.
  - d/tests/control: Drop python-testscenarios from Depends.
  - d/tests/testsuite-*: Set PYTHONPATH when running tests.

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-testtools-2.3.0/debian/control 
python-testtools-2.3.0/debian/control
--- python-testtools-2.3.0/debian/control   2018-04-13 10:37:46.0 
-0400
+++ python-testtools-2.3.0/debian/control   2018-05-14 14:34:30.0 
-0400
@@ -41,6 +41,7 @@
 Vcs-Git: https://salsa.debian.org/openstack-team/python/python-testtools.git
 Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-testtools
 Homepage: https://github.com/testing-cabal/testtools
+XS-Testsuite: autopkgtest
 
 Package: python-testtools
 Architecture: all
diff -Nru python-testtools-2.3.0/debian/patches/fix-test-run.py.patch 
python-testtools-2.3.0/debian/patches/fix-test-run.py.patch
--- python-testtools-2.3.0/debian/patches/fix-test-run.py.patch 2018-04-13 
10:37:46.0 -0400
+++ python-testtools-2.3.0/debian/patches/fix-test-run.py.patch 1969-12-31 
19:00:00.0 -0500
@@ -1,38 +0,0 @@
-Description: Do not run test_run_list_failed_import
- This test is broken, let's just remove it.
-Author: Thomas Goirand 
-Forwarded: no
-Last-Update: 2015-07-09
-
 python-testtools-1.8.0.orig/testtools/tests/test_run.py
-+++ python-testtools-1.8.0/testtools/tests/test_run.py
-@@ -191,29 +191,6 @@ class TestRun(TestCase):
- testtools.runexample.TestFoo.test_quux
- """, out.getvalue())
- 
--def test_run_list_failed_import(self):
--broken = self.useFixture(SampleTestFixture(broken=True))
--out = StringIO()
--# XXX: http://bugs.python.org/issue22811
--unittest2.defaultTestLoader._top_level_dir = None
--exc = self.assertRaises(
--SystemExit,
--run.main, ['prog', 'discover', '-l', broken.package.base, 
'*.py'], out)
--self.assertEqual(2, exc.args[0])
--self.assertThat(out.getvalue(), DocTestMatches("""\
--Failed to import test module: runexample
--Traceback (most recent call last):
--  File ".../loader.py", line ..., in _find_test_path
--package = self._get_module_from_name(name)
--  File ".../loader.py", line ..., in _get_module_from_name
--__import__(name)
--  File ".../runexample/__init__.py", line 1
--class not in
--...^...
--SyntaxError: invalid syntax
--
--""", doctest.ELLIPSIS))
--
- def test_run_orders_tests(self):
- self.useFixture(SampleTestFixture())
- out = StringIO()
diff -Nru python-testtools-2.3.0/debian/patches/series 
python-testtools-2.3.0/debian/patches/series
--- python-testtools-2.3.0/debian/patches/series2018-04-13 
10:37:46.0 -0400
+++ python-testtools-2.3.0/debian/patches/series2018-05-14 
14:33:56.0 -0400
@@ -1,2 +1 @@
 neutralize-failing-test.patch
-#fix-test-run.py.patch
diff -Nru python-testtools-2.3.0/debian/tests/control 
python-testtools-2.3.0/debian/tests/control
--- python-testtools-2.3.0/debian/tests/control 2018-04-13 10:37:46.0 
-0400
+++ python-testtools-2.3.0/debian/tests/control 2018-05-14 14:34:06.0 
-0400
@@ -1,7 +1,7 @@
 Tests: testsuite-py2
-Depends: python-testtools, python-testscenarios
+Depends: python-testtools
 Restrictions: allow-stderr
 
 Tests: testsuite-py3
-Depends: python3-testtools, python3-testscenarios
+Depends: python3-testtools
 Restrictions: allow-stderr
diff -Nru python-testtools-2.3.0/debian/tests/testsuite-py2 
python-testtools-2.3.0/debian/tests/testsuite-py2
--- python-testtools-2.3.0/debian/tests/testsuite-py2   2018-04-13 
10:37:46.0 -0400
+++ python-testtools-2.3.0/debian/tests/testsuite-py2   2018-05-14 
14:34:14.0 -0400
@@ -1,2 +1,2 @@
 #!/bin/sh -e
-python -m testtools.run testtools.tests.test_suite
+PYTHONPATH=`pwd` python -m testtools.run testtools.tests.test_suite
diff -Nru python-testtools-2.3.0/debian/tests/testsuite-py3 
python-testtools-2.3.0/debian/tests/testsuite-py3
--- python-testtools-2.3.0/debian/tests/testsuite-py3   2018-04-13 
10:37:46.0 -0400
+++ python-testtools-2.3.0/debian/tests/testsuite-py3   2018-05-14 
14:34:14.0 -0400
@@ -1,2 +1,2 @@
 #!/bin/sh -e
-python3 -m testtools.run 

Bug#898656: python-stestr updates from ubuntu

[Corey Bryant]

Package: python-stestr
Version: 1.1.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  - d/rules: Continue to run tests as we did in the past.
  - d/p/argparse-empty-array.patch: Deal with [] instead of 'None'
when list is called with no additional parameters.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-stestr-1.1.0/debian/patches/argparse-empty-array.patch 
python-stestr-1.1.0/debian/patches/argparse-empty-array.patch
--- python-stestr-1.1.0/debian/patches/argparse-empty-array.patch   
1969-12-31 19:00:00.0 -0500
+++ python-stestr-1.1.0/debian/patches/argparse-empty-array.patch   
2018-05-14 13:52:24.0 -0400
@@ -0,0 +1,18 @@
+Description: Deal with [] instead of 'None'
+ argparse returns an empty array for any unknown arguments; detect
+ this situation and default filters to None in this instance as
+ already performed in the 'run' cli module.
+Author: James Page 
+Forwarded: https://github.com/mtreinish/stestr/pull/129
+
+--- a/stestr/commands/list.py
 b/stestr/commands/list.py
+@@ -48,7 +48,7 @@ def set_cli_opts(parser):
+ 
+ def run(arguments):
+ args = arguments[0]
+-filters = arguments[1]
++filters = arguments[1] or None
+ return list_command(config=args.config, repo_type=args.repo_type,
+ repo_url=args.repo_url, group_regex=args.group_regex,
+ test_path=args.test_path, top_dir=args.top_dir,
diff -Nru python-stestr-1.1.0/debian/patches/series 
python-stestr-1.1.0/debian/patches/series
--- python-stestr-1.1.0/debian/patches/series   2018-03-03 13:24:52.0 
-0500
+++ python-stestr-1.1.0/debian/patches/series   2018-05-14 13:52:24.0 
-0400
@@ -1 +1,2 @@
 remove-privacy-breach-in-README.rst.patch
+argparse-empty-array.patch
diff -Nru python-stestr-1.1.0/debian/rules python-stestr-1.1.0/debian/rules
--- python-stestr-1.1.0/debian/rules2018-03-03 13:24:52.0 -0500
+++ python-stestr-1.1.0/debian/rules2018-05-14 13:52:24.0 -0400
@@ -7,27 +7,25 @@
dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
 
 export PATH:=$(PATH):$(CURDIR)/debian/bin
+export HOME:=/tmp
 
 override_dh_auto_install:
pkgos-dh_auto_install
 
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-   cp debian/bin/pythonX-stestr debian/bin/stestr ;
-   sed -i s/z/2.7/ debian/bin/stestr ;
-   
PYTHONPATH=$(CURDIR)/debian/python-stestr/usr/lib/python2.7/dist-packages 
PYTHON=python2.7 stestr init ;
-   HOME=$(CURDIR) 
PYTHONPATH=$(CURDIR)/debian/python-stestr/usr/lib/python2.7/dist-packages 
PYTHON=python2.7 stestr run --subunit 
'stestr\.tests\.(?!(.*repository\.test_file\.TestFileRepository\.test_get_test_run_unexpected_ioerror_errno.*))'
 | subunit2pyunit ;
-   set -x ; set -e ; for i in $(PYTHON3S); do \
-   cp debian/bin/pythonX-stestr debian/bin/stestr ; \
-   sed -i s/z/$$i/ debian/bin/stestr ; \
-   
PYTHONPATH=$(CURDIR)/debian/python3-stestr/usr/lib/python3/dist-packages 
PYTHON=python$$i stestr init ; \
-   HOME=$(CURDIR) 
PYTHONPATH=$(CURDIR)/debian/python3-stestr/usr/lib/python3/dist-packages 
PYTHON=python$$i stestr run --subunit 
'stestr\.tests\.(?!(.*repository\.test_file\.TestFileRepository\.test_get_test_run_unexpected_ioerror_errno.*))'
 | subunit2pyunit ; \
-   done
-endif
-
 override_dh_python3:
dh_python3 --shebang=/usr/bin/python3
 
 override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+   set -x ; set -e ; for pyvers in $(PYTHONS) $(PYTHON3S); do \
+   PYMAJOR=`echo $$pyvers | cut -d'.' -f1` ; \
+   echo "===> Testing with python$$pyvers (python$$PYMAJOR)" ; \
+   cp debian/bin/pythonX-stestr debian/bin/stestr ; \
+   sed -i s/z/$$pyvers/ debian/bin/stestr ; \
+   PYTHONPATH=$(CURDIR) PYTHON=python$$pyvers python$$pyvers -m 
stestr.cli init ; \
+   PYTHONPATH=$(CURDIR) PYTHON=python$$pyvers python$$pyvers -m 
stestr.cli run --subunit | subunit2pyunit ; \
+   done
+endif
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))

Bug#898455: python-pyeclib: Move python3-six to python3-pyeclib's Depends

[Corey Bryant]

Package: python-pyeclib
Version: 1.5.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Move python3-six from python-pyeclib Depends to
python3-pyeclib Depends.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-pyeclib-1.5.0/debian/control 
python-pyeclib-1.5.0/debian/control
--- python-pyeclib-1.5.0/debian/control 2017-08-06 09:12:33.0 -0400
+++ python-pyeclib-1.5.0/debian/control 2018-05-11 16:04:01.0 -0400
@@ -27,7 +27,6 @@
 Architecture: any
 Depends:
  python-six (>= 1.9.0),
- python3-six (>= 1.9.0),
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends},
@@ -49,6 +48,7 @@
 Package: python3-pyeclib
 Architecture: any
 Depends:
+ python3-six (>= 1.9.0),
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends},

Bug#898421: python-cotyledon: Run all tests in tests directory

[Corey Bryant]

Package: python-cotyledon
Version: 1.6.8-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/rules: Run all tests in the tests directory.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-cotyledon-1.6.8/debian/rules 
python-cotyledon-1.6.8/debian/rules
--- python-cotyledon-1.6.8/debian/rules 2017-10-29 14:55:26.0 -0400
+++ python-cotyledon-1.6.8/debian/rules 2018-05-11 08:48:54.0 -0400
@@ -12,7 +12,7 @@
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-   pkgos-dh_auto_test 'cotyledon\.tests\.test_unit.*'
+   PYTHONPATH=$(CURDIR) pkgos-dh_auto_test
 endif
 
 

Bug#898420: python-futurist: Get tarball from tarballs.openstack.org

[Corey Bryant]

Package: python-futurist
Version: 1.6.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/watch: Get tarball from tarballs.openstack.org.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-futurist-1.6.0/debian/watch python-futurist-1.6.0/debian/watch
--- python-futurist-1.6.0/debian/watch  2018-02-25 17:56:30.0 -0500
+++ python-futurist-1.6.0/debian/watch  2018-05-11 08:44:47.0 -0400
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/futurist/tags .*/(\d[\d\.]+)\.tar\.gz
+http://tarballs.openstack.org/futurist/ futurist-(\d.*)\.tar\.gz

Bug#895826: conntrack-tools: Default conntrackd run-time to 'Systemd on'

[Corey Bryant]

Package: conntrack-tools
Version: 1:1.4.4+snapshot20161117-6
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:
  * d/p/enable-runtime-systemd.patch: Enable systemd runtime support by
default since the package is compiled with --enable-systemd
(LP: #1761994).

Thanks for considering the patch.

-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-13-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru 
conntrack-tools-1.4.4+snapshot20161117/debian/patches/enable-runtime-systemd.patch
 
conntrack-tools-1.4.4+snapshot20161117/debian/patches/enable-runtime-systemd.patch
--- 
conntrack-tools-1.4.4+snapshot20161117/debian/patches/enable-runtime-systemd.patch
  1969-12-31 19:00:00.0 -0500
+++ 
conntrack-tools-1.4.4+snapshot20161117/debian/patches/enable-runtime-systemd.patch
  2018-04-16 09:21:40.0 -0400
@@ -0,0 +1,114 @@
+Description: Enable systemd runtime support by default since the
+  package is compiled with --enable-systemd. This reverts
+  "conntrackd: Disable runtime systemd support by default" from
+  commit c01d0d9138112ec95ee316385ea2687dd94fa4e3.
+Author: Corey Bryant <corey.bry...@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1761994
+Forwarded: not-needed
+Last-Update: 2018-04-16
+
+---
+ conntrackd.conf.5|  4 ++--
+ doc/stats/conntrackd.conf|  4 ++--
+ doc/sync/alarm/conntrackd.conf   |  4 ++--
+ doc/sync/ftfw/conntrackd.conf|  4 ++--
+ doc/sync/notrack/conntrackd.conf |  4 ++--
+ src/read_config_yy.y | 10 --
+ 6 files changed, 18 insertions(+), 12 deletions(-)
+
+--- a/conntrackd.conf.5
 b/conntrackd.conf.5
+@@ -457,9 +457,9 @@
+ 
+ Note: \fBsystemd(1)\fP watchdog is supported as well.
+ 
+-Example: Systemd on
++Example: Systemd off
+ 
+-By default runtime support is disabled.
++By default runtime support is activated.
+ 
+ .TP
+ .BI "Nice "
+--- a/doc/stats/conntrackd.conf
 b/doc/stats/conntrackd.conf
+@@ -6,9 +6,9 @@
+   # Enable systemd support. If conntrackd is compiled with the proper
+   # configuration, you can use a systemd service unit of Type=notify
+   # and use conntrackd with systemd watchdog as well.
+-  # Default is: off
++  # Default is: on
+   #
+-  #Systemd on
++  #Systemd off
+ 
+   #
+   # Set the nice value of the daemon. This value goes from -20
+--- a/doc/sync/alarm/conntrackd.conf
 b/doc/sync/alarm/conntrackd.conf
+@@ -221,9 +221,9 @@
+   # Enable systemd support. If conntrackd is compiled with the proper
+   # configuration, you can use a systemd service unit of Type=notify
+   # and use conntrackd with systemd watchdog as well.
+-  # Default is: off
++  # Default is: on
+   #
+-  #Systemd on
++  #Systemd off
+ 
+   #
+   # Set the nice value of the daemon, this value goes from -20
+--- a/doc/sync/ftfw/conntrackd.conf
 b/doc/sync/ftfw/conntrackd.conf
+@@ -244,9 +244,9 @@
+   # Enable systemd support. If conntrackd is compiled with the proper
+   # configuration, you can use a systemd service unit of Type=notify
+   # and use conntrackd with systemd watchdog as well.
+-  # Default is: off
++  # Default is: on
+   #
+-  #Systemd on
++  #Systemd off
+ 
+   #
+   # Set the nice value of the daemon, this value goes from -20
+--- a/doc/sync/notrack/conntrackd.conf
 b/doc/sync/notrack/conntrackd.conf
+@@ -283,9 +283,9 @@
+   # Enable systemd support. If conntrackd is compiled with the proper
+   # configuration, you can use a systemd service unit of Type=notify
+   # and use conntrackd with systemd watchdog as well.
+-  # Default is: off
++  # Default is: on
+   #
+-  #Systemd on
++  #Systemd off
+ 
+   #
+   # Set the nice value of the daemon, this value goes from -20
+--- a/src/read_config_yy.y
 b/src/read_config_yy.y
+@@ -1112,8 +1112,11 @@
+   | systemd
+   ;
+ 
+-systemd: T_SYSTEMD T_ON   { conf.systemd = 1; };
+-systemd: T_SYSTEMD T_OFF  { conf.systemd = 0; };
++systemd: T_SYSTEMD T_ON { /* already enabled in init_config() */ };
++systemd: T_SYSTEMD T_OFF
++{
++  conf.systemd = 0;
++};
+ 
+ netlink_buffer_size: T_BUFFER_SIZE T_NUMBER
+ {
+@@ -1820,6 +1823,9 @@
+   CONFIG(stats).syslog_facility = -1;
+   CONFIG(netlink).subsys_id = -1;
+ 
++  /* enable systemd by default */
++  CONFIG(systemd) = 1;
++
+   /* Initialize list of user-space helpers

Bug#895468: ryu: Fix test_0_call_bytearray failure

[Corey Bryant]

Package: ryu
Version: 4.21+dfsg1-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/test_rpc-Adopt-to-msgpack-python-0.50.patch: Cherry-picked from
upstream to fix test failure "test_0_call_bytearray() did not raise
TypeError".


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-13-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru ryu-4.21+dfsg1/debian/patches/remove-failing-test.patch 
ryu-4.21+dfsg1/debian/patches/remove-failing-test.patch
--- ryu-4.21+dfsg1/debian/patches/remove-failing-test.patch 2018-03-18 
17:00:30.0 -0400
+++ ryu-4.21+dfsg1/debian/patches/remove-failing-test.patch 1969-12-31 
19:00:00.0 -0500
@@ -1,23 +0,0 @@
-Description: Remove failing test
- This test fails for an unknown reasons, let's just remove it.
-Author: Thomas Goirand 
-Forwarded: no
-Last-Update: 2018-02-16
-
 ryu-4.21+dfsg1.orig/ryu/tests/unit/lib/test_rpc.py
-+++ ryu-4.21+dfsg1/ryu/tests/unit/lib/test_rpc.py
-@@ -138,14 +138,6 @@ class Test_rpc(unittest.TestCase):
- assert result == obj
- assert isinstance(result, numbers.Integral)
- 
--@raises(TypeError)
--def test_0_call_bytearray(self):
--c = rpc.Client(self._client_sock)
--obj = bytearray(b'foo')
--result = c.call('resp', [obj])
--assert result == obj
--assert isinstance(result, str)
--
- def test_1_shutdown_wr(self):
- # test if the server shutdown on disconnect
- self._client_sock.shutdown(socket.SHUT_WR)
diff -Nru ryu-4.21+dfsg1/debian/patches/series 
ryu-4.21+dfsg1/debian/patches/series
--- ryu-4.21+dfsg1/debian/patches/series2018-03-18 17:00:30.0 
-0400
+++ ryu-4.21+dfsg1/debian/patches/series2018-04-11 16:24:30.0 
-0400
@@ -1,2 +1,2 @@
 remove-test-requirements-units.patch
-remove-failing-test.patch
+test_rpc-Adopt-to-msgpack-python-0.50.patch
diff -Nru 
ryu-4.21+dfsg1/debian/patches/test_rpc-Adopt-to-msgpack-python-0.50.patch 
ryu-4.21+dfsg1/debian/patches/test_rpc-Adopt-to-msgpack-python-0.50.patch
--- ryu-4.21+dfsg1/debian/patches/test_rpc-Adopt-to-msgpack-python-0.50.patch   
1969-12-31 19:00:00.0 -0500
+++ ryu-4.21+dfsg1/debian/patches/test_rpc-Adopt-to-msgpack-python-0.50.patch   
2018-04-11 16:24:09.0 -0400
@@ -0,0 +1,44 @@
+From 81cdd4f0d76952c16d6e65e6af8da82702175220 Mon Sep 17 00:00:00 2001
+From: IWASE Yusuke 
+Date: Thu, 11 Jan 2018 16:02:40 +0900
+Subject: [PATCH] test_rpc: Adopt to msgpack-python>=0.50
+
+msgpack-python version 0.50 or later supports bytearray objects, this
+patch fixes to adopt to this change.
+
+Signed-off-by: IWASE Yusuke 
+Signed-off-by: FUJITA Tomonori 
+---
+ ryu/tests/unit/lib/test_rpc.py | 13 +
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/ryu/tests/unit/lib/test_rpc.py b/ryu/tests/unit/lib/test_rpc.py
+index 2df123ee..4fba5068 100644
+--- a/ryu/tests/unit/lib/test_rpc.py
 b/ryu/tests/unit/lib/test_rpc.py
+@@ -138,13 +138,18 @@ class Test_rpc(unittest.TestCase):
+ assert result == obj
+ assert isinstance(result, numbers.Integral)
+ 
+-@raises(TypeError)
+ def test_0_call_bytearray(self):
+ c = rpc.Client(self._client_sock)
+ obj = bytearray(b'foo')
+-result = c.call('resp', [obj])
+-assert result == obj
+-assert isinstance(result, str)
++# Note: msgpack-python version 0.50 or later supports bytearray
++# objects, here ignores TypeError for the backward compatibility.
++try:
++result = c.call('resp', [obj])
++except TypeError:
++# Case with msgpack-python version 0.4.x or earlier.
++return
++self.assertEqual(obj, result)
++self.assertIsInstance(result, six.binary_type)
+ 
+ def test_1_shutdown_wr(self):
+ # test if the server shutdown on disconnect
+-- 
+2.15.1
+

Bug#894296: lasso: Add symbols file for liblasso3 shared library

[Corey Bryant]

Package: lasso
Version: 2.5.0-5
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/liblasso3.symbols. Add symbols file for liblasso3 shared library.


In the future the symbols file can be updated by following the steps at:
https://wiki.debian.org/UsingSymbolsFiles.

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-12-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru lasso-2.5.0/debian/liblasso3.symbols 
lasso-2.5.0/debian/liblasso3.symbols
--- lasso-2.5.0/debian/liblasso3.symbols1969-12-31 19:00:00.0 
-0500
+++ lasso-2.5.0/debian/liblasso3.symbols2018-03-28 10:18:14.0 
-0400
@@ -0,0 +1,560 @@
+liblasso.so.3 liblasso3 #MINVER#
+ lasso_assertion_query_add_attribute_request@Base 2.3.5
+ lasso_assertion_query_build_request_msg@Base 2.3.5
+ lasso_assertion_query_build_response_msg@Base 2.3.5
+ lasso_assertion_query_destroy@Base 2.3.5
+ lasso_assertion_query_get_request_type@Base 2.3.5
+ lasso_assertion_query_get_type@Base 2.3.5
+ lasso_assertion_query_init_request@Base 2.3.5
+ lasso_assertion_query_new@Base 2.3.5
+ lasso_assertion_query_process_request_msg@Base 2.3.5
+ lasso_assertion_query_process_response_msg@Base 2.3.5
+ lasso_assertion_query_validate_request@Base 2.3.5
+ lasso_build_unique_id@Base 2.3.5
+ lasso_check_version@Base 2.3.5
+ lasso_defederation_build_notification_msg@Base 2.3.5
+ lasso_defederation_destroy@Base 2.3.5
+ lasso_defederation_get_type@Base 2.3.5
+ lasso_defederation_init_notification@Base 2.3.5
+ lasso_defederation_new@Base 2.3.5
+ lasso_defederation_process_notification_msg@Base 2.3.5
+ lasso_defederation_validate_notification@Base 2.3.5
+ lasso_ds_key_info_get_type@Base 2.3.5
+ lasso_ds_key_info_new@Base 2.3.5
+ lasso_ds_key_value_get_type@Base 2.3.5
+ lasso_ds_key_value_get_x509_data@Base 2.5.0
+ lasso_ds_key_value_new@Base 2.3.5
+ lasso_ds_key_value_set_x509_data@Base 2.5.0
+ lasso_ds_rsa_key_value_get_type@Base 2.3.5
+ lasso_ds_rsa_key_value_new@Base 2.3.5
+ lasso_ds_x509_data_get_certificate@Base 2.5.0
+ lasso_ds_x509_data_get_crl@Base 2.5.0
+ lasso_ds_x509_data_get_subject_name@Base 2.5.0
+ lasso_ds_x509_data_get_type@Base 2.5.0
+ lasso_ds_x509_data_new@Base 2.5.0
+ lasso_ds_x509_data_set_certificate@Base 2.5.0
+ lasso_ds_x509_data_set_crl@Base 2.5.0
+ lasso_ds_x509_data_set_subject_name@Base 2.5.0
+ lasso_ecp_destroy@Base 2.3.5
+ lasso_ecp_get_endpoint_url_by_entity_id@Base 2.5.0
+ lasso_ecp_get_type@Base 2.3.5
+ lasso_ecp_has_sp_idplist@Base 2.5.0
+ lasso_ecp_is_idp_entry_known_idp_supporting_ecp@Base 2.5.0
+ lasso_ecp_is_provider_in_sp_idplist@Base 2.5.0
+ lasso_ecp_new@Base 2.3.5
+ lasso_ecp_process_authn_request_msg@Base 2.5.0
+ lasso_ecp_process_response_msg@Base 2.5.0
+ lasso_ecp_process_sp_idp_list@Base 2.5.0
+ lasso_ecp_relay_state_get_type@Base 2.5.0
+ lasso_ecp_relay_state_new@Base 2.5.0
+ lasso_ecp_relay_state_validate@Base 2.5.0
+ lasso_ecp_request_get_type@Base 2.5.0
+ lasso_ecp_request_new@Base 2.5.0
+ lasso_ecp_request_validate@Base 2.5.0
+ lasso_ecp_response_get_type@Base 2.5.0
+ lasso_ecp_response_new@Base 2.5.0
+ lasso_ecp_response_validate@Base 2.5.0
+ lasso_ecp_set_known_sp_provided_idp_entries_supporting_ecp@Base 2.5.0
+ lasso_federation_build_local_name_identifier@Base 2.3.5
+ lasso_federation_destroy@Base 2.3.5
+ lasso_federation_get_type@Base 2.3.5
+ lasso_federation_new@Base 2.3.5
+ lasso_federation_verify_name_identifier@Base 2.3.5
+ lasso_flag_add_signature@Base 2.3.5
+ lasso_flag_memory_debug@Base 2.3.5
+ lasso_flag_sign_messages@Base 2.3.5
+ lasso_flag_strict_checking@Base 2.3.5
+ lasso_flag_thin_sessions@Base 2.5.0
+ lasso_flag_verify_signature@Base 2.3.5
+ lasso_get_prefix_for_dst_service_href@Base 2.3.5
+ lasso_get_prefix_for_idwsf2_dst_service_href@Base 2.3.5
+ lasso_identity_destroy@Base 2.3.5
+ lasso_identity_dump@Base 2.3.5
+ lasso_identity_get_federation@Base 2.3.5
+ lasso_identity_get_type@Base 2.3.5
+ lasso_identity_new@Base 2.3.5
+ lasso_identity_new_from_dump@Base 2.3.5
+ lasso_init@Base 2.3.5
+ lasso_key_get_type@Base 2.5.0
+ lasso_key_new_for_signature_from_base64_string@Base 2.5.0
+ lasso_key_new_for_signature_from_file@Base 2.5.0
+ lasso_key_new_for_signature_from_memory@Base 2.5.0
+ lasso_key_query_sign@Base 2.5.0
+ lasso_key_query_verify@Base 2.5.0
+ lasso_key_saml2_xml_sign@Base 2.5.0
+ lasso_key_saml2_xml_verify@Base 2.5.0
+ lasso_lecp_build_authn_request_envelope_msg@Base 2.3.5
+ lasso_lecp_build_authn_request_msg@Base 2.3.5
+ 

Bug#892112: python-cryptography appears to intend to install python-cffi as a dependency, but it isn't installed

[Corey Bryant]

Tristan,

Agreed this is not looking like a dependency issue. I wasn't able to
recreate with a small script that takes the same path as the traceback. For
now I've moved the Ubuntu bug to Incomplete until we can recreate.

Thanks,
Corey

On Mon, Mar 5, 2018 at 4:26 PM, Corey Bryant <corey.bry...@canonical.com>
wrote:

>
>
> On Mon, Mar 5, 2018 at 3:07 PM, Tristan Seligmann <mithra...@mithrandi.net
> > wrote:
>
>> On Mon, 5 Mar 2018 at 20:12 Corey Bryant <corey.bry...@canonical.com>
>> wrote:
>>
>>>Installation of python-cryptography doesn't install python-cffi. This
>>>is on Ubuntu Bionic. The following bug has some more details:
>>>https://bugs.launchpad.net/ubuntu/+source/python-cryptograp
>>> hy/+bug/1752660
>>>
>>>The package currently has 'dh_python(2|3) --depends=cffi' but that is
>>>apparently not working, at least on bionic.
>>>
>>
>> In Debian, python-cffi is only required at build time. At runtime, it is
>> not required (only python-cffi-backend is required). This is mostly
>> driven by the python-cffi package itself: see 
>> /usr/share/python/dist/python-cffi
>> for details.
>>
>> I don't immediately know why or if this would be different in Ubuntu, and
>> I don't immediately see what the stack trace in the Ubuntu bug report has
>> to do with cffi being installed or not.
>>
>
> Thanks for the quick feedback. For now I've asked the reporter if they'd
> be able to test with package version that has python-cffi added to binary
> Depends.
>

Bug#892112: python-cryptography appears to intend to install python-cffi as a dependency, but it isn't installed

[Corey Bryant]

On Mon, Mar 5, 2018 at 3:07 PM, Tristan Seligmann <mithra...@mithrandi.net>
wrote:

> On Mon, 5 Mar 2018 at 20:12 Corey Bryant <corey.bry...@canonical.com>
> wrote:
>
>>Installation of python-cryptography doesn't install python-cffi. This
>>is on Ubuntu Bionic. The following bug has some more details:
>>https://bugs.launchpad.net/ubuntu/+source/python-
>> cryptography/+bug/1752660
>>
>>The package currently has 'dh_python(2|3) --depends=cffi' but that is
>>apparently not working, at least on bionic.
>>
>
> In Debian, python-cffi is only required at build time. At runtime, it is
> not required (only python-cffi-backend is required). This is mostly
> driven by the python-cffi package itself: see 
> /usr/share/python/dist/python-cffi
> for details.
>
> I don't immediately know why or if this would be different in Ubuntu, and
> I don't immediately see what the stack trace in the Ubuntu bug report has
> to do with cffi being installed or not.
>

Thanks for the quick feedback. For now I've asked the reporter if they'd be
able to test with package version that has python-cffi added to binary
Depends.

Bug#892112:

[Corey Bryant]

I tested version 2.1.4 and 1.2.3-1 and both had the same behavior. py2 and
py3 versions don't install python(3)-cffi.

Bug#892112: python-cryptography appears to intend to install python-cffi as a dependency, but it isn't installed

[Corey Bryant]

Package: python-cryptography
Version: 2.1.4-1build2
Severity: important

Dear Maintainer,

   Installation of python-cryptography doesn't install python-cffi. This
   is on Ubuntu Bionic. The following bug has some more details:
   https://bugs.launchpad.net/ubuntu/+source/python-cryptography/+bug/1752660

   The package currently has 'dh_python(2|3) --depends=cffi' but that is
   apparently not working, at least on bionic.

-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-10-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages python-cryptography depends on:
ii  libc62.27-0ubuntu2
ii  libssl1.11.1.0g-2ubuntu2
ii  python   2.7.14-4
ii  python-asn1crypto0.24.0-1
pn  python-cffi-backend-api-max  
pn  python-cffi-backend-api-min  
ii  python-enum341.1.6-2
ii  python-idna  2.6-1
ii  python-ipaddress 1.0.17-1
ii  python-six   1.11.0-2

python-cryptography recommends no packages.

Versions of packages python-cryptography suggests:
pn  python-cryptography-doc  
pn  python-cryptography-vectors  

-- no debconf information

Bug#891145: pytest: Add trailing tilde to pypy-hypothesis min version dependency

[Corey Bryant]

Package: pytest
Version: 3.2.5-2
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Add trailing tilde to pypy-hypothesis min version to enable
backport to Ubuntu cloud-archive: pypy-hypothesis (>= 3.44.1-2~).


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-32-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru pytest-3.2.5/debian/control pytest-3.2.5/debian/control
--- pytest-3.2.5/debian/control 2018-02-16 04:47:47.0 -0500
+++ pytest-3.2.5/debian/control 2018-02-22 13:03:52.0 -0500
@@ -8,7 +8,7 @@
  debhelper (>= 11),
  dh-python,
  pypy,
- pypy-hypothesis (>= 3.44.1-2) ,
+ pypy-hypothesis (>= 3.44.1-2~) ,
  pypy-py (>= 1.4.29),
  pypy-setuptools,
  pypy-setuptools-scm,

Bug#891019: python-kubernetes: Drop unused BDs python-randomize and python-recommonmark

[Corey Bryant]

Package: python-kubernetes
Version: 2.0.0-2
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Drop python-randomize and python-recommonmark from BDs
as they're not used at this time.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-32-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-kubernetes-2.0.0/debian/control 
python-kubernetes-2.0.0/debian/control
--- python-kubernetes-2.0.0/debian/control  2017-11-01 21:04:30.0 
-0400
+++ python-kubernetes-2.0.0/debian/control  2018-02-21 09:57:20.0 
-0500
@@ -22,8 +22,6 @@
  python-oauth2client,
  python-pluggy,
  python-py,
- python-randomize,
- python-recommonmark,
  python-six,
  python-urllib3,
  python-websocket,
@@ -35,8 +33,6 @@
  python3-oauth2client,
  python3-pluggy,
  python3-py,
- python3-randomize,
- python3-recommonmark,
  python3-six,
  python3-urllib3,
  python3-websocket,

Bug#890511: python-jmespath: Add autopkgtests to python-jmespath

[Corey Bryant]

Package: python-jmespath
Version: 0.9.3-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/tests: Add basic autopkgtests to test module imports.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-32-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-jmespath-0.9.3/debian/tests/control 
python-jmespath-0.9.3/debian/tests/control
--- python-jmespath-0.9.3/debian/tests/control  1969-12-31 19:00:00.0 
-0500
+++ python-jmespath-0.9.3/debian/tests/control  2018-02-14 15:22:36.0 
-0500
@@ -0,0 +1,3 @@
+Tests: python-jmespath python3-jmespath
+Depends: python-jmespath, python3-jmespath
+Restrictions: needs-root
diff -Nru python-jmespath-0.9.3/debian/tests/python3-jmespath 
python-jmespath-0.9.3/debian/tests/python3-jmespath
--- python-jmespath-0.9.3/debian/tests/python3-jmespath 1969-12-31 
19:00:00.0 -0500
+++ python-jmespath-0.9.3/debian/tests/python3-jmespath 2018-02-14 
15:22:36.0 -0500
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-
+# Testing python3-jmespath
+#-
+set -e
+
+result=$(python3 `dirname $0`/test_import_jmespath.py 2>&1)
+if [ "$result" ]; then
+echo "ERROR: PYTHON3-JMESPATH MODULE CANNOT BE IMPORTED"
+exit 1
+else
+echo "OK"
+exit 0
+fi
diff -Nru python-jmespath-0.9.3/debian/tests/python-jmespath 
python-jmespath-0.9.3/debian/tests/python-jmespath
--- python-jmespath-0.9.3/debian/tests/python-jmespath  1969-12-31 
19:00:00.0 -0500
+++ python-jmespath-0.9.3/debian/tests/python-jmespath  2018-02-14 
15:22:36.0 -0500
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-
+# Testing python-jmespath
+#-
+set -e
+
+result=$(python2 `dirname $0`/test_import_jmespath.py 2>&1)
+if [ "$result" ]; then
+echo "ERROR: PYTHON-JMESPATH MODULE CANNOT BE IMPORTED"
+exit 1
+else
+echo "OK"
+exit 0
+fi
diff -Nru python-jmespath-0.9.3/debian/tests/test_import_jmespath.py 
python-jmespath-0.9.3/debian/tests/test_import_jmespath.py
--- python-jmespath-0.9.3/debian/tests/test_import_jmespath.py  1969-12-31 
19:00:00.0 -0500
+++ python-jmespath-0.9.3/debian/tests/test_import_jmespath.py  2018-02-14 
15:22:36.0 -0500
@@ -0,0 +1,4 @@
+try:
+import jmespath
+except ImportError as e:
+print("ERROR IMPORTING MODULE")

Bug#890512: python-munch: Add autopkgtests to python-munch

[Corey Bryant]

Package: python-munch
Version: 2.2.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/tests: Add basic autopkgtests to test module imports.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-32-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-munch-2.2.0/debian/tests/control 
python-munch-2.2.0/debian/tests/control
--- python-munch-2.2.0/debian/tests/control 1969-12-31 19:00:00.0 
-0500
+++ python-munch-2.2.0/debian/tests/control 2018-02-14 15:14:07.0 
-0500
@@ -0,0 +1,3 @@
+Tests: python-munch python3-munch
+Depends: python-munch, python3-munch
+Restrictions: needs-root
diff -Nru python-munch-2.2.0/debian/tests/python3-munch 
python-munch-2.2.0/debian/tests/python3-munch
--- python-munch-2.2.0/debian/tests/python3-munch   1969-12-31 
19:00:00.0 -0500
+++ python-munch-2.2.0/debian/tests/python3-munch   2018-02-14 
15:14:07.0 -0500
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-
+# Testing python3-munch
+#-
+set -e
+
+result=$(python3 `dirname $0`/test_import_munch.py 2>&1)
+if [ "$result" ]; then
+echo "ERROR: PYTHON3-MUNCH MODULE CANNOT BE IMPORTED"
+exit 1
+else
+echo "OK"
+exit 0
+fi
diff -Nru python-munch-2.2.0/debian/tests/python-munch 
python-munch-2.2.0/debian/tests/python-munch
--- python-munch-2.2.0/debian/tests/python-munch1969-12-31 
19:00:00.0 -0500
+++ python-munch-2.2.0/debian/tests/python-munch2018-02-14 
15:14:07.0 -0500
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-
+# Testing python-munch
+#-
+set -e
+
+result=$(python2 `dirname $0`/test_import_munch.py 2>&1)
+if [ "$result" ]; then
+echo "ERROR: PYTHON-MUNCH MODULE CANNOT BE IMPORTED"
+exit 1
+else
+echo "OK"
+exit 0
+fi
diff -Nru python-munch-2.2.0/debian/tests/test_import_munch.py 
python-munch-2.2.0/debian/tests/test_import_munch.py
--- python-munch-2.2.0/debian/tests/test_import_munch.py1969-12-31 
19:00:00.0 -0500
+++ python-munch-2.2.0/debian/tests/test_import_munch.py2018-02-14 
15:14:07.0 -0500
@@ -0,0 +1,4 @@
+try:
+import munch
+except ImportError as e:
+print("ERROR IMPORTING MODULE")

Bug#890438: python-munch: Add python(3)-six to BDs

[Corey Bryant]

Package: python-munch
Version: 2.2.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Add python(3)-six to BDs.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-32-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-munch-2.2.0/debian/control python-munch-2.2.0/debian/control
--- python-munch-2.2.0/debian/control   2018-02-12 16:07:43.0 -0500
+++ python-munch-2.2.0/debian/control   2018-02-14 14:03:18.0 -0500
@@ -10,8 +10,10 @@
  dh-python,
  python-all,
  python-setuptools,
+ python-six,
  python3-all,
  python3-setuptools,
+ python3-six,
 Standards-Version: 4.1.3
 Vcs-Git: https://salsa.debian.org/python-team/modules/python-munch.git
 Vcs-Browser: https://salsa.debian.org/python-team/modules/python-munch

Bug#809762: lasso: Here's a patch to enable tests during build

[Corey Bryant]

Package: lasso
Version: 2.5.0-5
Followup-For: Bug #809762
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control, d/rules: Enable test execution during build.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-32-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru lasso-2.5.0/debian/control lasso-2.5.0/debian/control
--- lasso-2.5.0/debian/control  2017-11-02 01:36:18.0 -0400
+++ lasso-2.5.0/debian/control  2018-02-05 16:26:12.343664245 -0500
@@ -5,6 +5,7 @@
 XSBC-Original-Maintainer: Frederic Peters 
 Build-Depends: debhelper (>= 8),
 dh-python,
+liberror-perl,
 libxml2-dev,
 libxslt1-dev,
 libxmlsec1-dev,
diff -Nru lasso-2.5.0/debian/control.in lasso-2.5.0/debian/control.in
--- lasso-2.5.0/debian/control.in   2017-11-02 01:36:18.0 -0400
+++ lasso-2.5.0/debian/control.in   2018-02-05 16:22:17.942022704 -0500
@@ -5,6 +5,7 @@
 XSBC-Original-Maintainer: Frederic Peters 
 Build-Depends: debhelper (>= 8),
 dh-python,
+liberror-perl,
 libxml2-dev,
 libxslt1-dev,
 libxmlsec1-dev,
diff -Nru lasso-2.5.0/debian/rules lasso-2.5.0/debian/rules
--- lasso-2.5.0/debian/rules2016-05-05 05:08:20.0 -0400
+++ lasso-2.5.0/debian/rules2018-02-05 16:16:35.782381565 -0500
@@ -99,6 +99,9 @@
  $(MAKE) -C bindings/python$$v; \
done
 
+   # Run tests
+   $(MAKE) check
+
touch build-stamp
 
 clean:

Bug#884875: cmd2: Drop import of gtk along with move of pyperclip to use gi (GTK+3)

[Corey Bryant]

Package: cmd2
Version: 0.7.7-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/drop-import-gtk.patch: Drop import of gtk now that pyperclip uses gi.
NOTE: This requires the corresponding patch to python-pyperclip in
Bug#884873 (python-pyperclip: move to gtk+3 to avoid use of mutual
exclusive gtk+2/gtk+3 modules).


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-19-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru cmd2-0.7.7/debian/patches/drop-import-gtk.patch 
cmd2-0.7.7/debian/patches/drop-import-gtk.patch
--- cmd2-0.7.7/debian/patches/drop-import-gtk.patch 1969-12-31 
19:00:00.0 -0500
+++ cmd2-0.7.7/debian/patches/drop-import-gtk.patch 2017-12-19 
16:47:30.0 -0500
@@ -0,0 +1,25 @@
+Description: Drop import of gtk now that pyperclip uses gi (GTK+3).
+Author: Corey Bryant <corey.bry...@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1722553
+Origin: https://github.com/python-cmd2/cmd2/pull/242
+Forwarded: yes
+
+--- a/cmd2.py
 b/cmd2.py
+@@ -46,16 +46,6 @@
+ import pyparsing
+ import pyperclip
+ 
+-# On some systems, pyperclip will import gtk for its clipboard functionality.
+-# The following code is a workaround for gtk interfering with printing from a 
background
+-# thread while the CLI thread is blocking in raw_input() in Python 2 on Linux.
+-try:
+-# noinspection PyUnresolvedReferences
+-import gtk
+-gtk.set_interactive(0)
+-except ImportError:
+-pass
+-
+ # next(it) gets next item of iterator it. This is a replacement for calling 
it.next() in Python 2 and next(it) in Py3
+ from six import next
+ 
diff -Nru cmd2-0.7.7/debian/patches/series cmd2-0.7.7/debian/patches/series
--- cmd2-0.7.7/debian/patches/series2017-08-27 08:30:40.0 -0400
+++ cmd2-0.7.7/debian/patches/series2017-12-19 16:45:41.0 -0500
@@ -0,0 +1 @@
+drop-import-gtk.patch

Bug#884873: python-pyperclip: move to gtk+3 to avoid use of mutual exclusive gtk+2/gtk+3 modules

[Corey Bryant]

Package: python-pyperclip
Version: 1.5.32-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/move-to-gtk3.patch: Use GTK+3 instead of GTK+2 (LP: #1722553).

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-19-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-pyperclip-1.5.32/debian/control 
python-pyperclip-1.5.32/debian/control
--- python-pyperclip-1.5.32/debian/control  2017-11-03 03:05:14.0 
-0400
+++ python-pyperclip-1.5.32/debian/control  2017-12-19 16:25:22.0 
-0500
@@ -13,7 +13,7 @@
 
 Package: python-pyperclip
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xclip | xsel | 
python-gtk2 | python-qt4
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xclip | xsel | 
python-gi | python-qt4
 Description: Cross-platform clipboard module for Python
  This module is a cross-platform Python module for copy and paste clipboard
  functions.
@@ -22,7 +22,7 @@
 
 Package: python3-pyperclip
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, xclip | xsel 
| python3-pyqt4
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, xclip | xsel 
| python3-gi | python3-pyqt4
 Description: Cross-platform clipboard module for Python3
  This module is a cross-platform Python3 module for copy and paste clipboard
  functions.
diff -Nru python-pyperclip-1.5.32/debian/patches/move-to-gtk3.patch 
python-pyperclip-1.5.32/debian/patches/move-to-gtk3.patch
--- python-pyperclip-1.5.32/debian/patches/move-to-gtk3.patch   1969-12-31 
19:00:00.0 -0500
+++ python-pyperclip-1.5.32/debian/patches/move-to-gtk3.patch   2017-12-19 
16:25:22.0 -0500
@@ -0,0 +1,97 @@
+Description: Switch from GTK+2 to GTK+3 to avoid import of mutually exclusive
+  modules that resulted in the following error:
+  AttributeError: When using gi.repository you must not import static modules 
like
+  "gobject". Please change all occurrences of "import gobject" to
+  "from gi.repository import GObject". See:
+  https://bugzilla.gnome.org/show_bug.cgi?id=709183
+Author: Corey Bryant <corey.bry...@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1722553
+Origin: https://github.com/asweigart/pyperclip/pull/111
+Forwarded: yes
+
+--- a/pyperclip/__init__.py
 b/pyperclip/__init__.py
+@@ -20,12 +20,13 @@
+ sudo apt-get install xclip
+ sudo apt-get install xsel
+ 
+-Otherwise on Linux, you will need the gtk or PyQt5/PyQt4 modules installed.
++Otherwise on Linux, you will need the gi (GTK+ 3) or PyQt5/PyQt4 modules 
installed.
++gtk (GTK +2) is still supported as an older alternative to gi.
+ 
+ gtk and PyQt4 modules are not available for Python 3,
+ and this module does not work with PyGObject yet.
+ 
+-Note: There seem sto be a way to get gtk on Python 3, according to:
++Note: There seems to be a way to get gtk on Python 3, according to:
+ 
https://askubuntu.com/questions/697397/python3-is-not-supporting-gtk-module
+ 
+ Cygwin is currently not supported.
+@@ -104,11 +105,18 @@
+ # Setup for the LINUX platform:
+ if HAS_DISPLAY:
+ try:
+-import gtk  # check if gtk is installed
++import gi  # check if gi is installed (for GTK+ 3)
+ except ImportError:
+-pass # We want to fail fast for all non-ImportError exceptions.
++try:
++import gtk  # check if gtk is installed (fallback to GTK+ 2)
++except ImportError:
++pass # We want to fail fast for all non-ImportError 
exceptions.
++else:
++return init_gtk_clipboard()
+ else:
+-return init_gtk_clipboard()
++if gi.version_info[0] >= 3:
++return init_gi_clipboard()
++pass
+ 
+ if _executable_exists("xclip"):
+ return init_xclip_clipboard()
+@@ -161,6 +169,7 @@
+ clipboard_types = {'pbcopy': init_osx_pbcopy_clipboard,
+'pyobjc': init_osx_pyobjc_clipboard,
+'gtk': init_gtk_clipboard,
++   'gi': init_gi_clipboard,
+'qt': init_qt_clipboard, # TODO - split this into 
'qtpy', 'pyqt4', and 'pyqt5'
+'xclip': init_xclip_clipboard,
+'xsel': init_xsel_clipboard,
+--- a/pyperclip/clipboards.py
 b/pyperclip/clipboards.py
+@@ -57,7 +57,6 @@
+ import gtk

Bug#882876: python-daiquiri: Add Dep8 depends for python3-daiquiri

[Corey Bryant]

Package: python-daiquiri
Version: 1.3.0-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/tests/control: Add depends for python3-daiquiri.

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-daiquiri-1.3.0/debian/tests/control 
python-daiquiri-1.3.0/debian/tests/control
--- python-daiquiri-1.3.0/debian/tests/control  2017-09-20 03:29:15.0 
-0400
+++ python-daiquiri-1.3.0/debian/tests/control  2017-11-27 13:30:14.0 
-0500
@@ -1,2 +1,3 @@
 Tests: 0001-smoketest
 Restrictions: allow-stderr
+Depends: python3-daiquiri

Bug#876931: psycopg2 FTBFS with Sphinx 1.6: Could not import extension dbapi_extension

[Corey Bryant]

Package: psycopg2
Version: 2.7.3-2
Followup-For: Bug #876931
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/0001-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch:
Cherry-picked from upstream master branch after hitting build failure:
"Could not import extension dbapi_extension (exception: cannot import
 name 'make_admonition')."


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic'), (500, 'artful-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u psycopg2-2.7.3/debian/patches/series 
psycopg2-2.7.3/debian/patches/series
--- psycopg2-2.7.3/debian/patches/series
+++ psycopg2-2.7.3/debian/patches/series
@@ -1,0 +2 @@
+0001-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch
only in patch2:
unchanged:
--- 
psycopg2-2.7.3.orig/debian/patches/0001-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch
+++ 
psycopg2-2.7.3/debian/patches/0001-Make-dbapi_extension.py-compatible-with-Sphinx-1.6.patch
@@ -0,0 +1,46 @@
+From 1ccb61fe18ddc1fbb498ee90f182c44066aefb36 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev 
+Date: Thu, 12 Oct 2017 13:08:24 +0300
+Subject: [PATCH] Make dbapi_extension.py compatible with Sphinx 1.6
+
+In Sphinx commit 1a821b89e9952fc2, the deprecated make_admonition()
+function was removed. This commit updates the code to use the modern
+API instead.
+---
+ doc/src/tools/lib/dbapi_extension.py | 13 ++---
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/doc/src/tools/lib/dbapi_extension.py 
b/doc/src/tools/lib/dbapi_extension.py
+index cb3fec4..7ab656f 100755
+--- a/doc/src/tools/lib/dbapi_extension.py
 b/doc/src/tools/lib/dbapi_extension.py
+@@ -12,7 +12,7 @@
+ from docutils import nodes
+ 
+ from sphinx.locale import _
+-from sphinx.util.compat import Directive, make_admonition
++from docutils.parsers.rst import Directive
+ 
+ class extension_node(nodes.Admonition, nodes.Element): pass
+ 
+@@ -29,12 +29,11 @@ class Extension(Directive):
+ option_spec = {}
+ 
+ def run(self):
+-nodes = make_admonition(extension_node,
+-self.name, [_('DB API extension')], self.options,
+-self.content, self.lineno, self.content_offset,
+-self.block_text, self.state, self.state_machine)
+-nodes[0]['classes'].append('dbapi-extension')
+-return nodes
++node = extension_node('\n'.join(self.content))
++node += nodes.title(_('DB API extension'), _('DB API extension'))
++self.state.nested_parse(self.content, self.content_offset, node)
++node['classes'].append('dbapi-extension')
++return [node]
+ 
+ 
+ def visit_extension_node(self, node):
+-- 
+2.14.1
+

Bug#881287: python-daiquiri: Add python2 support

[Corey Bryant]

On Mon, Nov 20, 2017 at 2:49 AM, Chris Lamb  wrote:

> Chris Lamb wrote:
>
> > Alas your patch doesn't seem to work properly here:
>
> [..]
>
> Gentle ping on this? :)
>
>
>
Sorry, I don't know how I missed your previous message. If you don't mind I
don't think we should add the py2 support. I'm fine with that.

Thanks,
Corey

Bug#881819: d/tests/control: Execution of dep8 tests requires python(3)-testscenarios

[Corey Bryant]

Package: python-testtools
Version: 2.3.0-2
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/tests/control: Execution of dep8 tests requires python(3)-testscenarios.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-testtools-2.3.0/debian/tests/control 
python-testtools-2.3.0/debian/tests/control
--- python-testtools-2.3.0/debian/tests/control 2017-11-01 18:39:28.0 
-0400
+++ python-testtools-2.3.0/debian/tests/control 2017-11-15 09:46:14.0 
-0500
@@ -1,5 +1,5 @@
 Tests: testsuite-py2
-Depends: python-testtools
+Depends: python-testtools, python-testscenarios
 
 Tests: testsuite-py3
-Depends: python3-testtools
+Depends: python3-testtools, python3-testscenarios

Bug#881287: python-daiquiri: Add python2 support

[Corey Bryant]

On Thu, Nov 9, 2017 at 3:24 PM, Chris Lamb  wrote:

> Hi Corey,
>
>
Hi Chris,


> > In Ubuntu, the attached patch was applied to achieve the following:
>
> Thanks for the patch. However, is Python 2 support explicitly required by
> a user or reverse-dependency?
>
>
Good point. I think we just need to get moving on our end. We currently
only ship py2 for core openstack packages because upstream hasn't
completely moved to py3. Anyway I think we can start moving some of them
over to py3 only and gnocchi is one of them (it needs daiquiri). So feel
free to nack this bug and I'll fix up our gnocchi package to be py3 only.

Thanks,
Corey

I would like to avoid introducing further Python 2 packages into the
> world - just another we will have to remove later...
>
>
> Best wishes,
>
> --
>   ,''`.
>  : :'  : Chris Lamb
>  `. `'`  la...@debian.org / chris-lamb.co.uk
>`-
>

Bug#881287: python-daiquiri: Add python2 support

[Corey Bryant]

Package: python-daiquiri
Version: 1.3.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control, d/rules, d/tests/*: Add python 2 support.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-daiquiri-1.3.0/debian/control 
python-daiquiri-1.3.0/debian/control
--- python-daiquiri-1.3.0/debian/control2017-09-20 03:29:15.0 
-0400
+++ python-daiquiri-1.3.0/debian/control2017-11-09 10:17:33.0 
-0500
@@ -5,6 +5,10 @@
 Build-Depends:
  debhelper (>= 10),
  dh-python,
+ python-all,
+ python-pbr,
+ python-testtools,
+ python-setuptools,
  python3-all,
  python3-pbr,
  python3-testtools,
@@ -15,6 +19,32 @@
 Vcs-Browser: https://github.com/lamby/pkg-python-daiquiri
 Homepage: https://github.com/jd/daiquiri
 
+Package: python-daiquiri
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+Description: Python library to easily setup basic logging functionality
+ The daiquiri library provides an easy way to configure logging. It also
+ provides some custom formatters and handlers.
+ .
+ Its promise is to setup a complete standard Python logging system with just
+ one function call. Nothing more, nothing less. The interesting features are:
+ .
+  * Logs to stderr by default.
+  * Use colors if logging to a terminal.
+  * Support file logging.
+  * Use program name as the name of the logging file so providing just a
+directory for logging will work.
+  * Support syslog.
+  * Support journald.
+  * JSON output support.
+  * Support of arbitrary key/value context information providing.
+  * Capture the warnings emitted by the warnings module.
+  * Native logging of any exception.
+ .
+ This is the Python 2 version of the package.
+
 Package: python3-daiquiri
 Architecture: all
 Depends:
diff -Nru python-daiquiri-1.3.0/debian/rules python-daiquiri-1.3.0/debian/rules
--- python-daiquiri-1.3.0/debian/rules  2017-09-20 03:29:15.0 -0400
+++ python-daiquiri-1.3.0/debian/rules  2017-11-09 10:17:33.0 -0500
@@ -5,7 +5,7 @@
 export PBR_VERSION = $(DEB_VERSION_UPSTREAM)
 
 %:
-   dh $@ --with python3 --buildsystem=pybuild
+   dh $@ --with python2,python3 --buildsystem=pybuild
 
 override_dh_auto_test:
# Tests require python-json-logger, which is not yet packaged for
diff -Nru python-daiquiri-1.3.0/debian/tests/0001-smoketest 
python-daiquiri-1.3.0/debian/tests/0001-smoketest
--- python-daiquiri-1.3.0/debian/tests/0001-smoketest   2017-09-20 
03:29:15.0 -0400
+++ python-daiquiri-1.3.0/debian/tests/0001-smoketest   1969-12-31 
19:00:00.0 -0500
@@ -1,11 +0,0 @@
-#!/usr/bin/env python3
-
-import daiquiri
-
-daiquiri.setup()
-
-logger = daiquiri.getLogger(__name__)
-
-logger.info("Info")
-logger.warning("Warning")
-logger.error("Error")
diff -Nru python-daiquiri-1.3.0/debian/tests/0001-smoketest-python2 
python-daiquiri-1.3.0/debian/tests/0001-smoketest-python2
--- python-daiquiri-1.3.0/debian/tests/0001-smoketest-python2   1969-12-31 
19:00:00.0 -0500
+++ python-daiquiri-1.3.0/debian/tests/0001-smoketest-python2   2017-11-09 
10:17:33.0 -0500
@@ -0,0 +1,11 @@
+#!/usr/bin/env python2
+
+import daiquiri
+
+daiquiri.setup()
+
+logger = daiquiri.getLogger(__name__)
+
+logger.info("Info")
+logger.warning("Warning")
+logger.error("Error")
diff -Nru python-daiquiri-1.3.0/debian/tests/0001-smoketest-python3 
python-daiquiri-1.3.0/debian/tests/0001-smoketest-python3
--- python-daiquiri-1.3.0/debian/tests/0001-smoketest-python3   1969-12-31 
19:00:00.0 -0500
+++ python-daiquiri-1.3.0/debian/tests/0001-smoketest-python3   2017-11-09 
10:17:33.0 -0500
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+
+import daiquiri
+
+daiquiri.setup()
+
+logger = daiquiri.getLogger(__name__)
+
+logger.info("Info")
+logger.warning("Warning")
+logger.error("Error")
diff -Nru python-daiquiri-1.3.0/debian/tests/control 
python-daiquiri-1.3.0/debian/tests/control
--- python-daiquiri-1.3.0/debian/tests/control  2017-09-20 03:29:15.0 
-0400
+++ python-daiquiri-1.3.0/debian/tests/control  2017-11-09 10:17:33.0 
-0500
@@ -1,2 +1,2 @@
-Tests: 0001-smoketest
+Tests: 0001-smoketest-python2 0001-smoketest-python3
 Restrictions: allow-stderr

Bug#880611: python-oslo.cache: Align with Ubuntu

[Corey Bryant]

Package: python-oslo.cache
Version: 1.25.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

- d/gbp.conf: Retain git-buildpackage config, including use of pristine-tar.
- d/watch: Use tarballs.openstack.org.


Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-oslo.cache-1.25.0/debian/gbp.conf 
python-oslo.cache-1.25.0/debian/gbp.conf
--- python-oslo.cache-1.25.0/debian/gbp.conf1969-12-31 19:00:00.0 
-0500
+++ python-oslo.cache-1.25.0/debian/gbp.conf2017-11-02 09:03:34.0 
-0400
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -Nru python-oslo.cache-1.25.0/debian/watch 
python-oslo.cache-1.25.0/debian/watch
--- python-oslo.cache-1.25.0/debian/watch   2017-10-31 05:32:59.0 
-0400
+++ python-oslo.cache-1.25.0/debian/watch   2017-11-02 09:03:34.0 
-0400
@@ -1,4 +1,3 @@
 version=3
 opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/oslo.cache/tags .*/(\d[\d\.]+)\.tar\.gz
-
+http://tarballs.openstack.org/oslo.cache/ oslo.cache-(\d.*)\.tar\.gz

Bug#880609: python-oslo.config: Align with Ubuntu

[Corey Bryant]

Package: python-oslo.config
Version: 1:4.11.0-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

- d/gbp.conf: Retain git-buildpackage config, including use of pristine-tar.
- d/control: Retain Breaks/Replaces.
- debian/watch: Use tarballs.openstack.org.


Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-oslo.config-4.11.0/debian/control 
python-oslo.config-4.11.0/debian/control
--- python-oslo.config-4.11.0/debian/control2017-11-01 17:27:17.0 
-0400
+++ python-oslo.config-4.11.0/debian/control2017-11-02 10:27:45.0 
-0400
@@ -71,6 +71,8 @@
  python-yaml,
  ${misc:Depends},
  ${python:Depends},
+Breaks: python-oslo.config (>= 1:3.22.0),
+Replaces: python-oslo.config (>= 1:3.22.0),
 Description: Common code for Openstack Projects (configuration API) - Python 
2.x
  The OpenStack Oslo project provides Python libraries containing
  infrastructure code shared by OpenStack projects.
@@ -109,6 +111,8 @@
  python3-yaml,
  ${misc:Depends},
  ${python3:Depends},
+Breaks: python3-oslo.config (>= 1:3.22.0),
+Replaces: python3-oslo.config (>= 1:3.22.0),
 Description: Common code for Openstack Projects (configuration API) - Python 
3.x
  The OpenStack Oslo project provides Python libraries containing
  infrastructure code shared by OpenStack projects.
diff -Nru python-oslo.config-4.11.0/debian/gbp.conf 
python-oslo.config-4.11.0/debian/gbp.conf
--- python-oslo.config-4.11.0/debian/gbp.conf   1969-12-31 19:00:00.0 
-0500
+++ python-oslo.config-4.11.0/debian/gbp.conf   2017-11-02 10:27:45.0 
-0400
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -Nru python-oslo.config-4.11.0/debian/watch 
python-oslo.config-4.11.0/debian/watch
--- python-oslo.config-4.11.0/debian/watch  2017-11-01 17:27:17.0 
-0400
+++ python-oslo.config-4.11.0/debian/watch  2017-11-02 10:27:45.0 
-0400
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/oslo.config/tags .*/(\d[\d\.]+)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://tarballs.openstack.org/oslo.config/ oslo.config-(\d.*)\.tar\.gz

Bug#880605: python-oslo.context: Align with Ubuntu

[Corey Bryant]

Please can you also update the package version to 1:2.17.0-2?  Thanks.

On Thu, Nov 2, 2017 at 2:31 PM, Corey Bryant <corey.bry...@canonical.com>
wrote:

> Package: python-oslo.context
> Version: 2.17.0-2
> Severity: normal
> Tags: patch
> User: ubuntu-de...@lists.ubuntu.com
> Usertags: origin-ubuntu bionic ubuntu-patch
>
> Dear Maintainer,
>
> In Ubuntu, the attached patch was applied to achieve the following:
>
> - d/gbp.conf: Retain git-buildpackage config, including use of
> pristine-tar.
> - d/watch: Use tarballs.openstack.org.
> - d/control: Retain Breaks/Replaces.
> - d/p/remove-privacy-breach-in-README.rst.patch: Fix description
> field.
>
>
> Thanks for considering the patch.
>
>
> -- System Information:
> Debian Release: stretch/sid
>   APT prefers bionic
>   APT policy: (500, 'bionic')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
>
> Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
> Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
> LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
>

Bug#880605: python-oslo.context: Align with Ubuntu

[Corey Bryant]

Package: python-oslo.context
Version: 2.17.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

- d/gbp.conf: Retain git-buildpackage config, including use of pristine-tar.
- d/watch: Use tarballs.openstack.org.
- d/control: Retain Breaks/Replaces.
- d/p/remove-privacy-breach-in-README.rst.patch: Fix description field.


Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-oslo.context-2.17.0/debian/control 
python-oslo.context-2.17.0/debian/control
--- python-oslo.context-2.17.0/debian/control   2017-10-29 12:49:17.0 
-0400
+++ python-oslo.context-2.17.0/debian/control   2017-11-02 10:41:21.0 
-0400
@@ -42,6 +42,8 @@
  python-positional,
  ${misc:Depends},
  ${python:Depends},
+Replaces: python-oslo-context (<< 0.3.0-1~),
+Breaks: python-oslo-context (<< 0.3.0-1~),
 Description: WSGI context helpers for OpenStack - Python 2.x
  The Oslo context library has helpers to maintain useful information
  about a request context. The request context is usually populated
@@ -70,6 +72,8 @@
  python3-positional,
  ${misc:Depends},
  ${python3:Depends},
+Replaces: python3-oslo-context (<< 0.3.0-1~),
+Breaks: python3-oslo-context (<< 0.3.0-1~),
 Description: WSGI context helpers for OpenStack - Python 3.x
  The Oslo context library has helpers to maintain useful information
  about a request context. The request context is usually populated
diff -Nru python-oslo.context-2.17.0/debian/gbp.conf 
python-oslo.context-2.17.0/debian/gbp.conf
--- python-oslo.context-2.17.0/debian/gbp.conf  1969-12-31 19:00:00.0 
-0500
+++ python-oslo.context-2.17.0/debian/gbp.conf  2017-11-02 10:41:21.0 
-0400
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -Nru 
python-oslo.context-2.17.0/debian/patches/remove-privacy-breach-in-README.rst.patch
 
python-oslo.context-2.17.0/debian/patches/remove-privacy-breach-in-README.rst.patch
--- 
python-oslo.context-2.17.0/debian/patches/remove-privacy-breach-in-README.rst.patch
 2017-10-29 12:49:17.0 -0400
+++ 
python-oslo.context-2.17.0/debian/patches/remove-privacy-breach-in-README.rst.patch
 2017-11-02 10:41:21.0 -0400
@@ -1,4 +1,4 @@
-escription: Remove privacy breach in docs
+Description: Remove privacy breach in docs
 Author: Thomas Goirand 
 Forwarded: not-needed
 Last-Update: 2017-08-04
diff -Nru python-oslo.context-2.17.0/debian/watch 
python-oslo.context-2.17.0/debian/watch
--- python-oslo.context-2.17.0/debian/watch 2017-10-29 12:49:17.0 
-0400
+++ python-oslo.context-2.17.0/debian/watch 2017-11-02 10:41:21.0 
-0400
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/oslo.context/tags .*/(\d[\d\.]+)\.tar\.gz
+http://tarballs.openstack.org/oslo.context/ oslo.context-(\d.*)\.tar\.gz

Bug#880602: python-oslo.db: Align with Ubuntu

[Corey Bryant]

Package: python-oslo.db
Version: 4.25.0-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

- d/control, d/tests/*: MySQL autopkgtests.
- d/control: Retain Breaks/Replaces.
- d/gbp.conf: Retain git-buildpackage config, including use of pristine-tar.
- d/watch: Use tarballs.openstack.org.


Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-oslo.db-4.25.0/debian/control 
python-oslo.db-4.25.0/debian/control
--- python-oslo.db-4.25.0/debian/control2017-11-01 18:23:20.0 
-0400
+++ python-oslo.db-4.25.0/debian/control2017-11-02 10:51:11.0 
-0400
@@ -64,6 +64,7 @@
 Vcs-Browser: https://anonscm.debian.org/cgit/openstack/oslo/python-oslo.db.git
 Vcs-Git: https://anonscm.debian.org/git/openstack/oslo/python-oslo.db.git
 Homepage: https://launchpad.net/oslo
+XS-Testsuite: autopkgtest
 
 Package: python-oslo.db
 Architecture: all
@@ -80,6 +81,8 @@
  python-stevedore (>= 1.20.0),
  ${misc:Depends},
  ${python:Depends},
+Breaks: python-oslo-db (<< 1.10.0-1~),
+Replaces: python-oslo-db (<< 1.10.0-1~),
 Description: database connectivity to the different backends and helper utils 
- Python 2.x
  The Oslo database handling library is part of the OpenStack project. It
  provides database connectivity to the different backends and also provides
@@ -115,6 +118,8 @@
  python3-stevedore (>= 1.20.0),
  ${misc:Depends},
  ${python3:Depends},
+Breaks: python3-oslo-db (<< 1.10.0-1~),
+Replaces: python3-oslo-db (<< 1.10.0-1~),
 Description: database connectivity to the different backends and helper utils 
- Python 3.x
  The Oslo database handling library is part of the OpenStack project. It
  provides database connectivity to the different backends and also provides
diff -Nru python-oslo.db-4.25.0/debian/gbp.conf 
python-oslo.db-4.25.0/debian/gbp.conf
--- python-oslo.db-4.25.0/debian/gbp.conf   1969-12-31 19:00:00.0 
-0500
+++ python-oslo.db-4.25.0/debian/gbp.conf   2017-11-02 10:51:11.0 
-0400
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -Nru python-oslo.db-4.25.0/debian/tests/control 
python-oslo.db-4.25.0/debian/tests/control
--- python-oslo.db-4.25.0/debian/tests/control  1969-12-31 19:00:00.0 
-0500
+++ python-oslo.db-4.25.0/debian/tests/control  2017-11-02 10:51:11.0 
-0400
@@ -0,0 +1,7 @@
+Tests: mysql
+Depends: alembic, python-babel, python-alembic, python-debtcollector, 
python-oslo.i18n, 
+ python-oslo.config, python-oslo.context, python-oslo.utils, python-sqlalchemy,
+ python-migrate, python-stevedore, python-six, python-fixtures, python-mock,
+ python-oslotest, python-os-testr, python-tox, python-oslo.db, 
mysql-server-5.7,
+ python-testresources, python-pymysql, python-mysql.connector
+Restrictions: allow-stderr needs-root breaks-testbed
diff -Nru python-oslo.db-4.25.0/debian/tests/mysql 
python-oslo.db-4.25.0/debian/tests/mysql
--- python-oslo.db-4.25.0/debian/tests/mysql1969-12-31 19:00:00.0 
-0500
+++ python-oslo.db-4.25.0/debian/tests/mysql2017-11-02 10:51:11.0 
-0400
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -ex
+
+debconf-set-selections 

Bug#880598: python-openstackdocstheme: Align with Ubuntu

[Corey Bryant]

Package: python-openstackdocstheme
Version: 1.16.1-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

- d/gbp.conf: Retain git-buildpackage config, including use of pristine-tar.
- d/watch: Get orig tarballs from tarballs.openstack.org.


Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-openstackdocstheme-1.16.1/debian/gbp.conf 
python-openstackdocstheme-1.16.1/debian/gbp.conf
--- python-openstackdocstheme-1.16.1/debian/gbp.conf1969-12-31 
19:00:00.0 -0500
+++ python-openstackdocstheme-1.16.1/debian/gbp.conf2017-11-02 
09:54:22.0 -0400
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -Nru python-openstackdocstheme-1.16.1/debian/watch 
python-openstackdocstheme-1.16.1/debian/watch
--- python-openstackdocstheme-1.16.1/debian/watch   2017-11-01 
17:21:29.0 -0400
+++ python-openstackdocstheme-1.16.1/debian/watch   2017-11-02 
09:54:22.0 -0400
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/\.(b|rc)/~$1/",dversionmangle=s/\+dfsg\d+$// \
-https://github.com/openstack/openstackdocstheme/tags .*/(\d[\d\.]+)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://tarballs.openstack.org/openstackdocstheme/ 
openstackdocstheme-(\d.*)\.tar\.gz

Bug#880597: python-oslo.concurrency: Align with Ubuntu

[Corey Bryant]

Package: python-oslo.concurrency
Version: 3.21.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,


In Ubuntu, the attached patch was applied to achieve the following:

- d/rules: Run all tests.
- d/control: Retain Breaks/Replaces.
- d/gbp.conf: Retain git-buildpackage config, including use of pristine-tar.
- d/p/lock-path-tempfile.patch: Cherry picked from upstream to set default
  of lock_file to a tempfile if OSLO_LOCK_PATH isn't set (LP: #1550188).
- d/p/fix-tests-i386.patch: Fix tests that fail on i386 builds.
- d/watch: Use tarballs.openstack.org.


Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-oslo.concurrency-3.21.0/debian/control 
python-oslo.concurrency-3.21.0/debian/control
--- python-oslo.concurrency-3.21.0/debian/control   2017-11-01 
17:10:59.0 -0400
+++ python-oslo.concurrency-3.21.0/debian/control   2017-11-02 
10:19:29.0 -0400
@@ -62,6 +62,8 @@
  python-six,
  ${misc:Depends},
  ${python:Depends},
+Breaks: python-oslo-concurrency (<< 1.10.0-1~),
+Replaces: python-oslo-concurrency (<< 1.10.0-1~),
 Suggests:
  python-oslo.concurrency-doc,
 Description: concurrency and locks for OpenStack projects - Python 2.x
@@ -95,6 +97,8 @@
  python3-six,
  ${misc:Depends},
  ${python3:Depends},
+Breaks: python3-oslo-concurrency (<< 1.10.0-1~),
+Replaces: python3-oslo-concurrency (<< 1.10.0-1~),
 Suggests:
  python-oslo.concurrency-doc,
 Description: oslo.concurrency library - Python 3.x
diff -Nru python-oslo.concurrency-3.21.0/debian/gbp.conf 
python-oslo.concurrency-3.21.0/debian/gbp.conf
--- python-oslo.concurrency-3.21.0/debian/gbp.conf  1969-12-31 
19:00:00.0 -0500
+++ python-oslo.concurrency-3.21.0/debian/gbp.conf  2017-11-02 
10:19:29.0 -0400
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -Nru python-oslo.concurrency-3.21.0/debian/patches/fix-tests-i386.patch 
python-oslo.concurrency-3.21.0/debian/patches/fix-tests-i386.patch
--- python-oslo.concurrency-3.21.0/debian/patches/fix-tests-i386.patch  
1969-12-31 19:00:00.0 -0500
+++ python-oslo.concurrency-3.21.0/debian/patches/fix-tests-i386.patch  
2017-11-02 10:19:29.0 -0400
@@ -0,0 +1,18 @@
+Description: Strip long integer suffix from strings. A proper fix would be
+ more involved so I've opened a bug upstream.
+Bug: https://bugs.launchpad.net/bugs/1552690
+Author: Corey Bryant <corey.bry...@canonical.com>
+Forwarded: no
+
+--- a/oslo_concurrency/tests/unit/test_processutils.py
 b/oslo_concurrency/tests/unit/test_processutils.py
+@@ -795,7 +795,8 @@
+ args = [sys.executable, '-c', code]
+ stdout, stderr = processutils.execute(*args, prlimit=prlimit)
+ expected = (value, value)
+-self.assertEqual(str(expected), stdout.rstrip())
++self.assertEqual(str(expected).replace('L',''),
++ stdout.rstrip().replace('L',''))
+ 
+ def test_address_space(self):
+ prlimit = self.limit_address_space()
diff -Nru 
python-oslo.concurrency-3.21.0/debian/patches/lock-path-tempfile.patch 
python-oslo.concurrency-3.21.0/debian/patches/lock-path-tempfile.patch
--- python-oslo.concurrency-3.21.0/debian/patches/lock-path-tempfile.patch  
1969-12-31 19:00:00.0 -0500
+++ python-oslo.concurrency-3.21.0/debian/patches/lock-path-tempfile.patch  
2017-11-02 10:19:29.0 -0400
@@ -0,0 +1,57 @@
+From 5021ef82fd8f0323b82d6d010bff9dab8a0cbcec Mon Sep 17 00:00:00 2001
+From: "Sean M. Collins" <s...@coreitpro.com>
+Date: Wed, 24 Feb 2016 16:25:52 -0500
+Subject: [PATCH] Use tempfile.tempdir for lock_path if OSLO_LOCK_PATH is not
+ set
+
+DevStack spends a lot of time setting lock_path in a bunch of
+locations.
+
+http://codesearch.openstack.org/?q=oslo_concurrency%20lock_path=nope==
+
+The default for lock_path is an environment variable
+OSLO_LOCK_PATH.
+
+http://codesearch.openstack.org/?q=OSLO_LOCK_PATH=nope==
+
+Since the default is to consult an environment variable, which may not
+even be set, this means that really there is no default. If you do
+not set it - you end up getting errors like:
+
+http://paste.openstack.org/show/488108/
+
+Ideally - a library should have a reasonable default, where if a user
+doesn't set something, the default will at least work. So, let's use
+Python's built in tempfile module, which has fairly complex rules for
+determining a sane d

Bug#878750: ITP: python-monasca-statsd -- monasca statsd Python client

[Corey Bryant]

On Tue, Oct 31, 2017 at 6:36 AM, Thomas Goirand  wrote:

> On 10/31/2017 01:58 AM, Jeremy Bicha wrote:
> > python-monasca-statsd is currently packaged in Ubuntu as source:
> monasca-statsd
> >
> > The biggest difference is that the Ubuntu package ships a
> > documentation package and the Debian package also ships the Python 3
> > module.
> >
> > https://launchpad.net/ubuntu/+source/monasca-statsd
> >
> > Thanks,
> > Jeremy Bicha
>

Hi Jeremy,

Thanks and feel free to report bugs against LP for OpenStack-related
packages as well.


>
> Hi,
>
> Thanks Jeremy, that's a good catch, and I'm happy to know. A few
> comments here though.


> Having a doc package here is silly, if you consider that the generated
> doc is nearly empty. The only thing it will contain is the index.rst
> that contains a long description of the package, which is also available
> in debian/control, plus where to find upstream source, also described in
> debian/control (homepage field), and that's about it.
>
> The Python 3 module is important to me, so I wont remove it, maybe
> Canonical should catch up on it.
>

Will do.


>
> Now, more in general. I don't even understand why it wasn't uploaded to
> Debian by the Ubuntu team. Ubuntu people have always claimed they wanted
> to collaborate with Debian people for the OpenStack stuff, yet when
> there's nobody outside of Canonical to do the work, no upload happens in
> Debian, it goes only to Ubuntu. So I'm tempted to say it's you guys
> fault here... Time to reboot the Ubuntu workflow for OpenStack? Maybe
> Corey should attempt to become a DD and do the work in Debian? If
> nothing happens to go that direction, I'm not sure I want to do any
> effort either. I've done enough in the past and got frustrated enough.
>

We've gone above and beyond to collaborate. Prior to this past year we
aligned with Debian as much as possible on OpenStack dependencies. In fact
I spent a significant amount of time a few cycles back dropping any delta
from Ubuntu deps to align with Debian. Unfortunately we can't align on the
core packages until we can come to an agreement there. For example, Debian
packages don't use pristine-tar and they use debconf prompts to users for
configuration - whereas we use pristine-tar and don't prompt users in
Ubuntu.  This past year, and possibly part of the year before, Debian
development on OpenStack ceased for a long stretch of time until just
recently.  That forced us to completely change our workflow to an Ubuntu
focus. If we shared all packages that could've been a different story.

Regards,
Corey


> Cheers,
>
> Thomas Goirand (zigo)
>

Bug#873137: python-asn1crypto: Please enable tests for asn1crypto once they are provided in released tarballs

[Corey Bryant]

Package: python-asn1crypto
Version: 0.22.0-1
Severity: normal

Dear Maintainer,

I know you want to enable tests for this package.

This is just a note that the following bug is tracking inclusion of the
upstream tests in the released tarballs.

https://github.com/wbond/asn1crypto/issues/59

Thanks,
Corey


-- System Information:
Debian Release: stretch/sid
  APT prefers artful
  APT policy: (500, 'artful')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.11.0-10-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages python-asn1crypto depends on:
ii  python  2.7.13-2

python-asn1crypto recommends no packages.

python-asn1crypto suggests no packages.

-- no debconf information

Bug#850283: sahara-common: package sahara-common post-installation script returned error exit status 1

[Corey Bryant]

Package: sahara-common
Version: 1:5.0.0-1
Severity: normal

Dear Maintainer,

sahara-common fails to install when debconf configures the databases.
For more details please see:
https://bugs.launchpad.net/ubuntu/+source/sahara/+bug/1652490


-- System Information:
Debian Release: stretch/sid
  APT prefers zesty-proposed
  APT policy: (500, 'zesty-proposed'), (500, 'zesty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Bug#833180: python-setproctitle: Also enable py3 tests

[Corey Bryant]

Package: python-setproctitle
Version: 1.1.8-2
Followup-For: Bug #833180
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/rules: Enable tests for py2 and py3.

Thanks for considering the patch.

Corey Bryant


-- System Information:
Debian Release: stretch/sid
  APT prefers yakkety
  APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-31-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-setproctitle-1.1.8/debian/rules python-setproctitle-1.1.8/debian/rules
--- python-setproctitle-1.1.8/debian/rules	2014-03-05 14:37:54.0 -0500
+++ python-setproctitle-1.1.8/debian/rules	2016-08-02 09:26:24.0 -0400
@@ -16,22 +16,25 @@
 #	dh_strip --dbg-package=python-setproctitle-dbg
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-#
-#override_dh_auto_test: $(PYTHON2:%=test-%-stamp) $(PYTHON3:%=test-%-stamp)
-#test-%-stamp:	
-#	mkdir -p build/test-$*
-#	python$* setup.py build
-#	python$* setup.py install_lib -d build/test-$*
-#ifeq (,$(findstring kfreebsd,$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)))
-#	PYTHONPATH=build/test-$* python$* /usr/bin/nosetests -v tests
-#endif
-#	touch test-python-$*-stamp
-#
-test-python%:
-	true
-#	python$* nosetests-$* -v tests
 
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+override_dh_auto_test:
+	set -e ; for pyvers in $(PYTHON2) $(PYTHON3); do \
+		mkdir -p build/test-$$pyvers; \
+		python$$pyvers setup.py build; \
+		python$$pyvers setup.py install_lib -d build/test-$$pyvers; \
+	done
+ifeq (,$(findstring kfreebsd,$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)))
+	set -e ; for pyvers in $(PYTHON2); do \
+		$(CC) tests/pyrun.c $$(python$$pyvers-config --includes --libs) -o tests/pyrun2; \
+		PYTHONPATH=build/test-$$pyvers python$$pyvers /usr/bin/nosetests -v tests; \
+	done
+	set -e ; for pyvers in $(PYTHON3); do \
+		2to3 -w --no-diffs tests/setproctitle_test.py; \
+		$(CC) tests/pyrun.c $$(python$$pyvers-config --includes --libs) -o tests/pyrun3; \
+		PYTHONPATH=build/test-$$pyvers python$$pyvers /usr/bin/nosetests3 -v tests; \
+	done
+endif
+
 endif
 
 build-python%:

Bug#833180: python-setproctitle: Enable py2 tests for setproctitle and fix Linitian copyright error

[Corey Bryant]

Package: python-setproctitle
Version: 1.1.8-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:
  * d/rules: Enable tests for py2. Tests are still disabled for py3, see:
https://github.com/dvarrazzo/py-setproctitle/issues/50
  * d/copyright: Drop (s) from Upstream Author(s) to fix Lintian error.

Thanks for considering the patch.
Corey Bryant


-- System Information:
Debian Release: stretch/sid
  APT prefers yakkety
  APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-31-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-setproctitle-1.1.8/debian/copyright python-setproctitle-1.1.8/debian/copyright
--- python-setproctitle-1.1.8/debian/copyright	2014-03-05 14:37:54.0 -0500
+++ python-setproctitle-1.1.8/debian/copyright	2016-08-01 14:49:48.0 -0400
@@ -4,7 +4,7 @@
 
 It was downloaded from http://pypi.python.org/pypi/setproctitle/
 
-Upstream Author(s):
+Upstream Author:
 
 Daniele Varrazzo <daniele.varra...@gmail.com>
 
diff -Nru python-setproctitle-1.1.8/debian/rules python-setproctitle-1.1.8/debian/rules
--- python-setproctitle-1.1.8/debian/rules	2014-03-05 14:37:54.0 -0500
+++ python-setproctitle-1.1.8/debian/rules	2016-08-01 14:49:54.0 -0400
@@ -16,22 +16,23 @@
 #	dh_strip --dbg-package=python-setproctitle-dbg
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-#
-#override_dh_auto_test: $(PYTHON2:%=test-%-stamp) $(PYTHON3:%=test-%-stamp)
-#test-%-stamp:	
-#	mkdir -p build/test-$*
-#	python$* setup.py build
-#	python$* setup.py install_lib -d build/test-$*
-#ifeq (,$(findstring kfreebsd,$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)))
-#	PYTHONPATH=build/test-$* python$* /usr/bin/nosetests -v tests
-#endif
-#	touch test-python-$*-stamp
-#
-test-python%:
-	true
+
+override_dh_auto_test: $(PYTHON2:%=test-%-stamp) #$(PYTHON3:%=test-%-stamp)
+test-%-stamp:	
+	mkdir -p build/test-$*
+	python$* setup.py build
+	python$* setup.py install_lib -d build/test-$*
+	$(CC) tests/pyrun.c $$(python$*-config --includes --libs) -o tests/pyrun2
+ifeq (,$(findstring kfreebsd,$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)))
+	PYTHONPATH=build/test-$* python$* /usr/bin/nosetests -v tests
+endif
+	touch test-python-$*-stamp
+
+#test-python%:
+#	true
 #	python$* nosetests-$* -v tests
 
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+#override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
 endif
 
 build-python%:

Bug#831836: python-django: Add pymysql support

[Corey Bryant]

On Wed, Jul 20, 2016 at 5:27 PM, Raphael Hertzog <hert...@debian.org> wrote:

> On Wed, 20 Jul 2016, Corey Bryant wrote:
> > This was originally driven as a result of upstream OpenStack's decision
> to
> > move to PyMySQL [1].  Only one client is typically supported in Ubuntu
> > main, so we decided to go with python-pymysql.  As a result, any Ubuntu
> > main packages that had a dependency on python-mysqldb had to be moved to
> > python-pymysql, and python-django was one of those.
>
> Thanks for the explanation.
>
> Strictly speaking, the package has no "dependency" on python-mysqldb, only
> a "suggests". It can be used with other database drivers as well.
>
> While I understand your reasoning, I believe that this change must happen
> at the upstream level first. Debian has no similar restriction and I thus
> don't see the need to diverge from upstream on this specific point.
>

Fair enough and I agree to getting this change upstream.  I guess I don't
have context on what the core issue of this discussion is though.  Is
Jeremy blocked on this or was he just trying to get rid of the delta
between the Debian and Ubuntu packages?  It's perfectly normal for Ubuntu
to carry a delta on top of what Debian has.


>
> Jeremy, alternatively, you could possibly create a
> python-pymsql-as-mysqldb that would "Provide: python-mysqldb" and would
> contain the corresponding Python package but built on top of
> python-pymysql (and would conflict with python-mysqldb). That might be
> something upstreamable in pymysql or in the Debian package of
> python-pymysql.
>
> I see that many Openstack packages in Debian depend on both
> python-mysqldb and python-pymysql. I guess in Ubuntu they depend only in
> python-pymysql? Is the difference explained by this Django patch only?


Upstream OpenStack hasn't completed moved away from python-mysqldb yet.  I
assume once they've completely moved to py3 (which they haven't yet)
they'll drop python-mysqldb support.

Looking at the reverse dependencies in Ubuntu, only three packages have
reverse Depends on python-mysqldb: python-trove python-sahara
python-murano, all of which are in universe. Note: this doesn't include
Build-Depends since build depends can now live in universe.

⟫ apt-cache rdepends python-pymysql
python-pymysql
Reverse Depends:
  python-taskflow
  python-nova
  python-neutron
  python-keystone
  python-aodh
  python-barbican
  python-ironic
  python-trove
  python-neutron
  python-heat
  python-keystone
  python-nova
  python-heat
  python-nova
  python-trove
  python-tornado
  python-sahara
  python-rally
  python-murano
  python-mistral
  python-ironic
  python-gnocchi
  python-django16
  python-barbican
  python-aodh
  jeepyb
  python-tooz
  python-django
  python-sqlalchemy
  python-nova
  python-neutron
  python-moinmoin
  python-keystone
  python-heat

⟫ apt-cache rdepends python-mysqldb
python-mysqldb
Reverse Depends:
  emma
  python-trove
  mytharchive
  libmyth-python
  viewvc-query
  rddmarc
  python3-biopython
 |python-webpy
  python-trove
 |python-storm-dbg
 |python-storm
  python-sqlobject
  python-sqlkit
 |python-sqlkit
  python-sql
  python-springpython
  python-scrapy
  python-sahara
  python-rally
  python-pyevolve
  python-murano
  python-biopython-sql
  python-biopython
  python-authkit
  python-adodb
  pysieved
  pyrit
  pyicqt
  pyaimt
  pwman3
  puddletag
  patator
  papercut
  openmolar
  mercurial-common
 |ibid
  griffith
  graphite-web
  epigrass
  python-mysqldb-dbg
 |djagios
  dhcpy6d
  blogofile-converters
  bley
  bibus
  bcfg2-web
 |bauble
 |bauble
  automx
  auth2db

-- 
Regards,
Corey

Bug#824661: ITP: python-microversion-parse -- Python library for OpenStack microversion header parsing

[Corey Bryant]

Package: python-microversion-parse
Version: 0.1.3
Severity: wishlist

* Package name: python-microversion-parse
  Version : 0.1.3
* URL : https://github.com/openstack/microversion-parse
* License : Apache 2.0
  Programming Lang: Python
  Description : Python library for OpenStack microversion header parsing

This package provides a simple parser for OpenStack microversion headers.

-- System Information:
Debian Release: stretch/sid
  APT prefers yakkety
  APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Bug#818388: voluptuous: Enable py3 tests for voluptuous

[Corey Bryant]

Package: voluptuous
Version: 0.8.8-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/rules: Enable tests for python3.

Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-6-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru voluptuous-0.8.8/debian/rules voluptuous-0.8.8/debian/rules
--- voluptuous-0.8.8/debian/rules	2016-03-11 10:28:28.0 -0500
+++ voluptuous-0.8.8/debian/rules	2016-03-16 13:34:55.0 -0400
@@ -11,7 +11,15 @@
 	uscan --download-current-version --rename --destdir ../tarballs
 
 override_dh_auto_test:
+	# Run Python 2 nosetests
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_DISABLE_python3=test \
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="nosetests --verbose --with-doctest {build_dir}/ README.md tests.md" dh_auto_test
+	# Run Python 3 nosetests
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_DISABLE_python2=test \
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="nosetests3 --verbose --with-doctest {build_dir}/ README.md tests.md" dh_auto_test
 
 .PHONY: get-orig-source override_dh_auto_test

Bug#808039: python-hypothesis: Tests don't run because tarball is missing tests directory

[Corey Bryant]

Source: python-hypothesis
Version: 1.16.0-1
Severity: normal

Dear Maintainer,

Tests currently don't run for hypothesis during package builds. This is because
hypothesis tarballs from pypi don't include several files and directories,
including the tests directory. For more on that:
https://github.com/DRMacIver/hypothesis/issues/237

Getting the orig tarball from github is an option, however there are then
several failing tests and missing dependencies.

# cat d/watch
version=3
opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/hypothesis-$1\.tar\.gz/ \
  https://github.com/DRMacIver/hypothesis/tags .*/v?(\d\S*)\.tar\.gz

-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.2.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Bug#800463: ryu improvements - enable tests, uncap pbr, and align dependencies

[Corey Bryant]

Package: ryu
Version: 3.24-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:
  * d/p/uncap-pbr-version.patch: Drop requirement of pbr<1.0.
  * d/rules: Run tests during build.
  * d/control: Align dependencies with upstream.


Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily'), 
(100, 'wily-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.2.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2015-03-22 19:37:52 +
+++ debian/control	2015-09-29 18:00:51 +
@@ -1,18 +1,22 @@
 Source: ryu
 Section: net
 Priority: optional
-Maintainer: Dariusz Dwornikowski 
+Maintainer: Ubuntu Developers 
+XSBC-Original-Maintainer: Dariusz Dwornikowski 
 Build-Depends: debhelper (>= 9), python-all (>= 2.6), python-sphinx, sphinx-common, dh-python
 Build-Depends-Indep:
- python-eventlet,
+ python-eventlet (>= 0.15),
+ python-formencode,
  python-lxml,
+ python-mock,
  python-msgpack (>= 0.3.0),
  python-netaddr,
- python-oslo.config (>= 1:1.2.0),
+ python-nose,
+ python-oslo.config (>= 1:1.6.0),
  python-paramiko,
  python-routes,
  python-six (>= 1.4.0),
- python-webob (>=1.2),
+ python-webob (>= 1.2),
  python-setuptools,
  python-pbr
 Standards-Version: 3.9.6
@@ -25,15 +29,15 @@
 Architecture: all
 Section: python
 Depends:
- python-eventlet,
+ python-eventlet (>= 0.15),
  python-lxml,
  python-msgpack (>= 0.3.0),
  python-netaddr,
- python-oslo.config (>= 1:1.2.0),
+ python-oslo.config (>= 1:1.6.0),
  python-paramiko,
  python-routes,
  python-six (>= 1.4.0),
- python-webob (>=1.2),
+ python-webob (>= 1.2),
  ${misc:Depends},
  ${python:Depends}
 Suggests: python-ryu-doc

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +
+++ debian/patches/series	2015-09-29 15:28:16 +
@@ -0,0 +1 @@
+uncap-pbr-version.patch

=== added file 'debian/patches/uncap-pbr-version.patch'
--- debian/patches/uncap-pbr-version.patch	1970-01-01 00:00:00 +
+++ debian/patches/uncap-pbr-version.patch	2015-09-29 15:27:47 +
@@ -0,0 +1,28 @@
+From 992bf7318d06090cc96a21521dbeba62f148d079 Mon Sep 17 00:00:00 2001
+From: IWAMOTO Toshihiro 
+Date: Fri, 11 Sep 2015 10:33:01 +0900
+Subject: [PATCH] Uncap pbr version
+
+This reverts commit 9414322f307fe607f7fefb8611871bbf810b5ee4,
+as the workaround for readthedocs seems to be no longer necessary.
+
+Signed-off-by: IWAMOTO Toshihiro 
+Signed-off-by: FUJITA Tomonori 
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 4fc4d45..cf2a404 100644
+--- a/setup.py
 b/setup.py
+@@ -26,5 +26,5 @@ import ryu.hooks
+ 
+ ryu.hooks.save_orig()
+ setuptools.setup(name='ryu',
+- setup_requires=['pbr<1.0'],
++ setup_requires=['pbr'],
+  pbr=True)
+-- 
+2.5.0
+

=== modified file 'debian/rules'
--- debian/rules	2015-07-30 20:55:33 +
+++ debian/rules	2015-09-29 15:47:47 +
@@ -34,3 +34,6 @@
 	rm -rf ryu.egg-info/
 	rm -rf debian/ryu-manager.8 debian/ryu.8
 	dh_auto_clean
+
+override_dh_auto_test:
+	./run_tests.sh -N -P

Bug#800463: ryu improvements - enable tests, uncap pbr, and align dependencies

[Corey Bryant]

On Tue, Sep 29, 2015 at 3:14 PM, Dariusz Dwornikowski <
dariusz.dwornikow...@cs.put.poznan.pl> wrote:

> On 29.09.15 14:02:02, Corey Bryant wrote:
> > Package: ryu
> > Version: 3.24-1
> > Severity: normal
> > Tags: patch
> > User: ubuntu-de...@lists.ubuntu.com
> > Usertags: origin-ubuntu wily ubuntu-patch
> >
> > Dear Maintainer,
> >
> > In Ubuntu, the attached patch was applied to achieve the following:
> >   * d/p/uncap-pbr-version.patch: Drop requirement of pbr<1.0.
> >   * d/rules: Run tests during build.
> >   * d/control: Align dependencies with upstream.
> >
> >
> > Thanks for considering the patch.
> >
> >
>
>
> Thanks for the patch, have you seen [1] bug ? It is an NMU which is
> comming into Debian, and seems to cover the same changes.
>
>
> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800011
>
> --
> Dariusz Dwornikowski,
>   Institute of Computing Science, Poznań University of Technology
>   www.cs.put.poznan.pl/ddwornikowski/
>   room 1.6.2 BTiCW | tel. +48 61 665 23 71
>

I hadn't seen that patch before, but yeah you may want to apply zigo's
patch first and if any of my changes aren't in his patch then apply those
too?  I'm fine with running tests the way he's running them, by the way.

-- 
Regards,
Corey

Bug#796983: moin: Use pymysql as a drop-in replacement for MySQLdb.

[Corey Bryant]

Package: moin
Version: 1.9.7-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/pymysql-replacement.patch: Use pymysql as drop in
replacement for MySQLdb.
  * debian/control: Drop python-mysqldb in favor of python-pymysql.

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers vivid-updates
  APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), 
(100, 'vivid-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.19.0-26-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru moin-1.9.7/debian/patches/pymysql-replacement.patch moin-1.9.7/debian/patches/pymysql-replacement.patch
--- moin-1.9.7/debian/patches/pymysql-replacement.patch	1969-12-31 19:00:00.0 -0500
+++ moin-1.9.7/debian/patches/pymysql-replacement.patch	2015-08-25 15:30:13.0 -0400
@@ -0,0 +1,16 @@
+Description: Use pymysql as a drop-in replacement for MySQLdb.
+Author: Corey Bryant corey.bry...@canonical.com
+Forwarded: not-needed
+
+--- a/MoinMoin/auth/mysql_group.py
 b/MoinMoin/auth/mysql_group.py
+@@ -8,6 +8,9 @@
+ @license: GNU GPL, see COPYING for details.
+ 
+ 
++import pymysql
++pymysql.install_as_MySQLdb()
++
+ import MySQLdb
+ 
+ from MoinMoin import log
diff -Nru moin-1.9.7/debian/patches/series moin-1.9.7/debian/patches/series
--- moin-1.9.7/debian/patches/series	2015-08-24 09:39:40.0 -0400
+++ moin-1.9.7/debian/patches/series	2015-08-25 15:28:38.0 -0400
@@ -7,3 +7,4 @@
 mail-verification.patch
 external_account_creation_check.patch
 avoid_empty_dir_creation.patch
+pymysql-replacement.patch

Bug#796983: moin: Here's an additional patch.

[Corey Bryant]

Package: moin
Version: 1.9.7-2
Followup-For: Bug #796983
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/control: Drop python-mysqldb in favor of python-pymysql.

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers vivid-updates
  APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), 
(100, 'vivid-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.19.0-26-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
=== modified file 'debian/control'
--- debian/control	2014-08-04 14:34:11 +
+++ debian/control	2015-08-26 14:43:07 +
@@ -20,7 +20,7 @@
 Depends: ${python:Depends}, ${misc:Depends}, python-werkzeug, python-pygments, python-parsedatetime, python-recaptcha, python-passlib
 Provides: python2.6-moinmoin, python2.7-moinmoin
 Recommends: default-mta | mail-transport-agent, python-xapian, python-xappy, libapache2-mod-wsgi | httpd-cgi
-Suggests: python-flup, python-4suite-xml, python-gdchart, python-docutils, python-pyxmpp, python-openid, python-tz, python-ldap, python-mysqldb, miscfiles | wordlist, antiword, catdoc, cifs-utils, poppler-utils | xpdf-utils, docbook-dsssl, fckeditor
+Suggests: python-flup, python-4suite-xml, python-gdchart, python-docutils, python-pyxmpp, python-openid, python-tz, python-ldap, python-pymysql, miscfiles | wordlist, antiword, catdoc, cifs-utils, poppler-utils | xpdf-utils, docbook-dsssl, fckeditor
 Description: Python clone of WikiWiki - library
  A WikiWikiWeb is a collaborative hypertext environment, with an
  emphasis on easy access to and modification of information. MoinMoin

Bug#796983: moin: Use pymysql as a drop-in replacement for MySQLdb.

[Corey Bryant]

On Wed, Aug 26, 2015 at 10:46 AM, Steve McIntyre st...@einval.com wrote:

 On Wed, Aug 26, 2015 at 10:38:34AM -0400, Corey Bryant wrote:
 Package: moin
 Version: 1.9.7-2
 Severity: normal
 Tags: patch
 User: ubuntu-de...@lists.ubuntu.com
 Usertags: origin-ubuntu wily ubuntu-patch
 
 Dear Maintainer,
 
 In Ubuntu, the attached patch was applied to achieve the following:
 
   * debian/patches/pymysql-replacement.patch: Use pymysql as drop in
 replacement for MySQLdb.
   * debian/control: Drop python-mysqldb in favor of python-pymysql.

 Hi Corey,

 I'm missing one thing here - what's the benefit of doing this?



We're moving to python-pymysql in Ubuntu and this is a delta in our
packaging vs debian.  To be honest I don't know whether Debian wants to do
the same or not, but I submitted it to try and keep the packages in sync.


-- 
Regards,
Corey

Bug#796010: python-pymysql: The attached patch fixes the failing tests for python-pymysql.

[Corey Bryant]

Package: python-pymysql
Version: 0.6.2-1
Followup-For: Bug #796010
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/test-issue-36.patch: Added to fix failing test, test_issue_36().
  * d/p/test-datatypes.patch: Added to fix failing test, test_datatypes.

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers vivid-updates
  APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), 
(100, 'vivid-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.19.0-26-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +
+++ debian/patches/series	2015-08-24 20:56:08 +
@@ -0,0 +1,2 @@
+test-datatypes.patch
+test-issue-36.patch

=== added file 'debian/patches/test-datatypes.patch'
--- debian/patches/test-datatypes.patch	1970-01-01 00:00:00 +
+++ debian/patches/test-datatypes.patch	2015-08-24 20:58:36 +
@@ -0,0 +1,27 @@
+Description: Partial cherry-pick from upstream commit f43aeeaf
+ to fix failing test, test_datatypes().
+Author: Corey Bryant corey.bry...@canonical.com
+Forwarded: not-needed
+
+--- a/pymysql/tests/test_basic.py
 b/pymysql/tests/test_basic.py
+@@ -18,16 +18,13 @@
+ c.execute(create table test_datatypes (b bit, i int, l bigint, f real, s varchar(32), u varchar(32), bb blob, d date, dt datetime, ts timestamp, td time, t time, st datetime))
+ try:
+ # insert values
+-v = (True, -3, 123456789012, 5.7, hello'\ world, uEspa\xc3\xb1ol, binary\x00data.encode(conn.charset), datetime.date(1988,2,2), datetime.datetime.now(), datetime.timedelta(5,6), datetime.time(16,32), time.localtime())
++
++v = (True, -3, 123456789012, 5.7, hello'\ world, uEspa\xc3\xb1ol, binary\x00data.encode(conn.charset), datetime.date(1988,2,2), datetime.datetime(2014, 5, 15, 7, 45, 57), datetime.timedelta(5,6), datetime.time(16,32), time.localtime())
+ c.execute(insert into test_datatypes (b,i,l,f,s,u,bb,d,dt,td,t,st) values (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s), v)
+ c.execute(select b,i,l,f,s,u,bb,d,dt,td,t,st from test_datatypes)
+ r = c.fetchone()
+ self.assertEqual(util.int2byte(1), r[0])
+-self.assertEqual(v[1:8], r[1:8])
+-# mysql throws away microseconds so we need to check datetimes
+-# specially. additionally times are turned into timedeltas.
+-self.assertEqual(datetime.datetime(*v[8].timetuple()[:6]), r[8])
+-self.assertEqual(v[9], r[9]) # just timedeltas
++self.assertEqual(v[1:10], r[1:10])
+ self.assertEqual(datetime.timedelta(0, 60 * (v[10].hour * 60 + v[10].minute)), r[10])
+ self.assertEqual(datetime.datetime(*v[-1][:6]), r[-1])
+ 

=== added file 'debian/patches/test-issue-36.patch'
--- debian/patches/test-issue-36.patch	1970-01-01 00:00:00 +
+++ debian/patches/test-issue-36.patch	2015-08-24 20:57:30 +
@@ -0,0 +1,16 @@
+Description: Partial cherry-pick from upstream commit eb172754
+ to fix failing test, test_issue_36().
+Author: Corey Bryant corey.bry...@canonical.com
+Forwarded: not-needed
+
+--- a/pymysql/tests/test_issues.py
 b/pymysql/tests/test_issues.py
+@@ -197,7 +197,7 @@
+ kill_id = id
+ break
+ # now nuke the connection
+-conn.kill(kill_id)
++self.connections[1].kill(kill_id)
+ # make sure this connection has broken
+ try:
+ c.execute(show tables)

Bug#796394: bandit: Update (build-)depends and dh_override_auto_test

[Corey Bryant]

Package: bandit
Version: 0.12.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Update dependencies to align with upstream
  * Run tests with output and fail the build if test failure

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers vivid-updates
  APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), 
(100, 'vivid-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.19.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2015-07-22 09:01:39 +
+++ debian/control	2015-08-21 17:17:06 +
@@ -1,17 +1,26 @@
 Source: bandit
 Maintainer: PKG OpenStack openstack-de...@lists.alioth.debian.org
 Uploaders: Dave Walker (Daviey) em...@daviey.com
 Section: python
 Priority: extra
-Build-Depends: debhelper (= 7.4.3),
+Build-Depends: debhelper (= 9),
dh-python,
openstack-pkg-tools,
-   python-all (= 2.6.6-3),
+   python-all,
python-pbr,
-   python-setuptools (= 0.6b3),
-   python-stevedore,
-   python-yaml,
-   testrepository
+   python-setuptools,
+Build-Depends-Indep: python-coverage,
+ python-fixtures,
+ python-hacking (= 0.9.2),
+ python-mock,
+ python-six (= 1.9.0),
+ python-stevedore,
+ python-testscenarios,
+ python-testtools (= 0.9.36),
+ python-yaml,
+ subunit,
+ testrepository,
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/bandit.git
 Vcs-Git: git://anonscm.debian.org/openstack/bandit.git
@@ -19,7 +28,11 @@
 
 Package: bandit
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: python-six (= 1.9.0),
+ python-stevedore,
+ python-yaml,
+ ${misc:Depends},
+ ${python:Depends},
 Description: Security oriented static analyzer for python code
  Bandit is a tool designed to find common security issues in Python code. To
  do this Bandit processes each file, builds an Abstract Syntaxt Tree (AST),

=== modified file 'debian/rules'
--- debian/rules	2015-07-22 09:01:39 +
+++ debian/rules	2015-08-21 15:34:29 +
@@ -8,9 +8,20 @@
 %:
 	dh $@ --with python2 --buildsystem=pybuild
 
+override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
-	PYTHONPATH=$(CURDIR) python setup.py testr --testr-args='--subunit  '
+	@echo === Running tests
+	set -e ; set -x ; for i in 2.7 $(PYTHON3S) ; do \
+		PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
+		echo === Testing with python$$i (python$$PYMAJOR) ; \
+		rm -rf .testrepository ; \
+		testr-python$$PYMAJOR init ; \
+		TEMP_REZ=`mktemp -t` ; \
+		PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit | tee $$TEMP_REZ | subunit2pyunit ; \
+		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
+		rm -f $$TEMP_REZ ; \
+		testr-python$$PYMAJOR slowest ; \
+	done
 endif
 
 override_dh_install:

Bug#796462: python-mistralclient: Updates to python-mistralclient

[Corey Bryant]

Package: python-mistralclient
Version: 1:1.0.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Drop python-nose-exclude from BDs, and add
${sphinxdoc:Depends} to Depends.
  * d/rules: Run functional tests during build, and skip tests
that require tempest.


Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers vivid-updates
  APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), 
(100, 'vivid-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.19.0-26-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2015-07-30 14:08:47 +
+++ debian/control	2015-08-21 21:54:28 +
@@ -1,7 +1,8 @@
 Source: python-mistralclient
 Section: python
 Priority: extra
Maintainer: PKG OpenStack openstack-de...@lists.alioth.debian.org
 Uploaders: Thomas Goirand z...@debian.org
 Build-Depends: debhelper (= 9),
dh-python,
@@ -16,7 +17,6 @@
  python-keystoneclient (= 1:1.6.0),
  python-mock,
  python-nose,
- python-nose-exclude,
  python-requests (= 2.5.2),
  python-tempest-lib (= 0.4.0),
  python-testtools (= 1.4.0),
@@ -36,6 +36,7 @@
  python-yaml,
  ${misc:Depends},
  ${python:Depends},
+ ${sphinxdoc:Depends},
 Description: OpenStack Workflow as a Service client - Python 2.x
  Mistral is a task management service. It is also known as Workflow as a
  Service. Most business processes consist of multiple distinct interconnected

=== modified file 'debian/rules'
--- debian/rules	2015-05-04 20:11:37 +
+++ debian/rules	2015-08-21 21:42:38 +
@@ -24,7 +24,7 @@
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	nosetests -v --exclude-dir=mistralclient/tests/functional
+	nosetests -v -I cli_multi_tenancy_tests.py -I cli_tests_v2.py
 #	set -e ; for i in $(PYTHONS) $(PYTHON3S) ; do \
 #		PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
 #		echo === Testing with python$$i (python$$PYMAJOR) ; \

Bug#791586: python-cliff: Bump python-cliff to version 1.13.0

[Corey Bryant]

Package: python-cliff
Version: 1.10.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to bump python-cliff to
version 1.13.0:

  [ Corey Bryant ]
  * New upstream release:
- d/control: Align (Build-)Depends with upstream.
- d/p/skip-tests.patch: Skip failing test.

  [ James Page ]
  * Update watch file to use Debian pypi redirector.


Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers vivid-updates
  APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), 
(100, 'vivid-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.19.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru python-cliff-1.10.1/AUTHORS python-cliff-1.13.0/AUTHORS
--- python-cliff-1.10.1/AUTHORS	2015-03-09 09:58:50.0 -0400
+++ python-cliff-1.13.0/AUTHORS	2015-06-09 12:23:57.0 -0400
@@ -1,4 +1,5 @@
 Andrea Frittoli andrea.fritt...@hp.com
+Andrew Spiers and...@andrewspiers.net
 Cedric Brandily zze...@gmail.com
 ChangBo Guo(gcb) eric@easystack.cn
 Christian Berendt bere...@b1-systems.de
@@ -26,6 +27,7 @@
 Sascha Peilicke sasc...@gmx.de
 Terry Howe terrylh...@gmail.com
 TerryHowe terrylh...@gmail.com
+Thomas Bechtold tbecht...@suse.com
 Tomaz Muraus to...@tomaz.me
 Yalei Wang yalei.w...@intel.com
 heavenshell heavenshell...@gmail.com
diff -Nru python-cliff-1.10.1/ChangeLog python-cliff-1.13.0/ChangeLog
--- python-cliff-1.10.1/ChangeLog	2015-03-09 09:58:50.0 -0400
+++ python-cliff-1.13.0/ChangeLog	2015-06-09 12:23:57.0 -0400
@@ -1,9 +1,37 @@
 CHANGES
 ===
 
+1.13.0
+--
+
+* Fix object has no attribute debug error
+* Add some docs for list value formatter
+* Add value format for list command
+* Updated from global requirements
+* Remove run_cross_tests.sh
+* fix author contact details
+* Print help on help command
+
+1.12.0
+--
+
+* Do not check requirements when loading plugins
+
+1.11.0
+--
+
+* Catch and ignore error when locale can not be set
+* Uncap library requirements for liberty
+* Add documentation for the value formatter
+* Sort the fuzzy matches
+* Defer interactive import
+* Updated from global requirements
+* Update links to setuptools doc
+
 1.10.1
 --
 
+* Pass user command text to the Command object
 * Document print_help_if_requested method
 
 1.10.0
@@ -12,6 +40,7 @@
 * Allow to call initialize_app when running --help
 * Hide prompt in batch/pipe mode
 * Correct completion in interactive mode
+* Change the argument passed to __init__ for help
 * Fix pep8 tests for lambda
 * Updated from global requirements
 * Fix git repo urls in tox.ini
diff -Nru python-cliff-1.10.1/cliff/app.py python-cliff-1.13.0/cliff/app.py
--- python-cliff-1.10.1/cliff/app.py	2015-03-09 09:58:33.0 -0400
+++ python-cliff-1.13.0/cliff/app.py	2015-06-09 12:23:37.0 -0400
@@ -3,6 +3,7 @@
 
 import argparse
 import codecs
+import inspect
 import locale
 import logging
 import logging.handlers
@@ -11,7 +12,6 @@
 
 from .complete import CompleteCommand
 from .help import HelpAction, HelpCommand
-from .interactive import InteractiveApp
 
 # Make sure the cliff library has a logging handler
 # in case the app developer doesn't set up logging.
@@ -64,7 +64,7 @@
 
 def __init__(self, description, version, command_manager,
  stdin=None, stdout=None, stderr=None,
- interactive_app_factory=InteractiveApp,
+ interactive_app_factory=None,
  deferred_help=False):
 Initialize the application.
 
@@ -79,7 +79,10 @@
 self.interpreter = None
 
 def _set_streams(self, stdin, stdout, stderr):
-locale.setlocale(locale.LC_ALL, '')
+try:
+locale.setlocale(locale.LC_ALL, '')
+except locale.Error:
+pass
 if sys.version_info[:2] == (2, 6):
 # Configure the input and output streams. If a stream is
 # provided, it must be configured correctly by the
@@ -206,7 +209,7 @@
 
 if self.deferred_help and self.options.deferred_help:
 action = HelpAction(None, None, default=self)
-action(self.parser, self.parser, None, None)
+action(self.parser, self.options, None, None)
 
 def run(self, argv):
 Equivalent to the main program for the application.
@@ -271,6 +274,11 @@
 return
 
 def interact(self):
+# Defer importing .interactive as cmd2 is a slow import
+from .interactive import InteractiveApp
+
+if self.interactive_app_factory is None:
+self.interactive_app_factory = InteractiveApp
 self.interpreter = self.interactive_app_factory(self

Bug#779030: python-eventlet: Fall back to old behavior if SSLContext() not available.

[Corey Bryant]

Package: python-eventlet
Version: 0.13.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu vivid ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/sslwrap.diff: Fall back to old behavior if SSLContext
not available (LP: #1423675).

Thanks for considering the patch.

-- System Information:
Debian Release: jessie/sid
  APT prefers utopic-updates
  APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500, 
'utopic'), (100, 'utopic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-30-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/patches/sslwrap.diff'
--- debian/patches/sslwrap.diff	2014-10-08 16:22:45 +
+++ debian/patches/sslwrap.diff	2015-02-20 14:48:24 +
@@ -1,8 +1,6 @@
-Index: b/eventlet/green/ssl.py
-===
 --- a/eventlet/green/ssl.py
 +++ b/eventlet/green/ssl.py
-@@ -238,14 +238,14 @@ class GreenSSLSocket(__ssl.SSLSocket):
+@@ -238,17 +238,30 @@
  if self._sslobj:
  raise ValueError(attempt to connect already-connected SSLSocket!)
  self._socket_connect(addr)
@@ -10,18 +8,33 @@
 -self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
 -self.cert_reqs, self.ssl_version,
 -self.ca_certs, self.ciphers)
--else:
++try:
++ctx = SSLContext(self.ssl_version)
++except:
++if has_ciphers:
++self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
++self.cert_reqs, self.ssl_version,
++self.ca_certs, self.ciphers)
++else:
++self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
++self.cert_reqs, self.ssl_version,
++self.ca_certs)
+ else:
 -self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
 -self.cert_reqs, self.ssl_version,
 -self.ca_certs)
-+ctx = SSLContext(self.ssl_version)
-+if self.keyfile or self.certfile:
-+ctx.load_cert_chain(self.certfile, self.keyfile)
-+if self.ca_certs:
-+ctx.load_verify_locations(self.ca_certs)
-+if has_ciphers and self.ciphers:
-+ctx.set_ciphers(self.ciphers)
-+self._sslobj = ctx._wrap_socket(self._sock, server_side=False)
++if self.keyfile or self.certfile:
++ctx.load_cert_chain(self.certfile, self.keyfile)
++if self.ca_certs:
++ctx.load_verify_locations(self.ca_certs)
++if has_ciphers and self.ciphers:
++ctx.set_ciphers(self.ciphers)
++self._sslobj = ctx._wrap_socket(self._sock, server_side=False)
++
  if self.do_handshake_on_connect:
  self.do_handshake()
  
++
+ def accept(self):
+ Accepts a new connection from a remote client, and returns
+ a tuple containing that new connection wrapped with a server-side

Bug#777604: python-elasticsearch: Enable tests during package build

[Corey Bryant]

Package: python-elasticsearch
Version: 1.2.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu vivid ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

Enable tests to run during package builds.

Note: Tests get several tracebacks since packaging isn't running with a
cluster, but tests still pass.

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers utopic-updates
  APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500, 
'utopic'), (100, 'utopic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-29-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/rules'
--- debian/rules	2014-09-03 13:17:06 +
+++ debian/rules	2015-02-10 13:42:46 +
@@ -19,5 +19,5 @@
 override_dh_installchangelogs:
 	dh_installchangelogs Changelog.rst
 
-#Tests are disabled right now as they fail and spam about missing network.
 override_dh_auto_test:
+	python setup.py test

Bug#777562: python-nose-exclude: Enable tests during build of python-nose-exclude

[Corey Bryant]

This bug can be cancelled.  I didn't realize it at the time, but tests were
already being run.

On Mon, Feb 9, 2015 at 5:04 PM, Corey Bryant corey.bry...@canonical.com
wrote:

 Package: python-nose-exclude
 Version: 0.2.0-3
 Severity: normal
 Tags: patch
 User: ubuntu-de...@lists.ubuntu.com
 Usertags: origin-ubuntu vivid ubuntu-patch

 Dear Maintainer,

 In Ubuntu, the attached patch was applied to enable tests to run during
 build of python-nose-exclude.

 Thanks for considering the patch.


 -- System Information:
 Debian Release: jessie/sid
   APT prefers utopic-updates
   APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500,
 'utopic'), (100, 'utopic-backports')
 Architecture: amd64 (x86_64)
 Foreign Architectures: i386

 Kernel: Linux 3.16.0-29-generic (SMP w/4 CPU cores)
 Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
 Shell: /bin/sh linked to /bin/dash




-- 
Regards,
Corey

Bug#777606: sphinxcontrib-pecanwsme: Drop python-pip from Build-Depends

[Corey Bryant]

Package: sphinxcontrib-pecanwsme
Version: 0.8.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu vivid ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/control: Drop python-pip from Build-Depends.

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers utopic-updates
  APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500, 
'utopic'), (100, 'utopic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-29-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/control'
--- debian/control	2014-06-26 15:32:48 +
+++ debian/control	2015-02-10 16:00:04 +
@@ -9,7 +10,6 @@
openstack-pkg-tools,
python-all (= 2.6.6-3~),
python-pbr,
-   python-pip,
python-setuptools
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/sphinxcontrib-pecanwsme.git

Bug#777562: python-nose-exclude: Enable tests during build of python-nose-exclude

[Corey Bryant]

Package: python-nose-exclude
Version: 0.2.0-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu vivid ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to enable tests to run during
build of python-nose-exclude.

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers utopic-updates
  APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500, 
'utopic'), (100, 'utopic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-29-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/rules'
--- debian/rules	2014-06-19 12:01:29 +
+++ debian/rules	2015-02-09 21:59:20 +
@@ -7,3 +7,6 @@
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_auto_test:
+	python setup.py test

Bug#774892: python-pint package updates

[Corey Bryant]

Package: python-pint
Version: 0.5.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu vivid ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Add python-numpy and python3-numpy to Build-Depends
to enable more tests to run (tests are skipped otherwise).
  * d/rules: Updated to download latest upstream source.

Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers utopic-updates
  APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500, 
'utopic'), (100, 'utopic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-28-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/control'
--- debian/control	2014-09-05 23:26:05 +
+++ debian/control	2015-01-08 18:03:07 +
@@ -1,16 +1,19 @@
 Source: python-pint
 Section: python
 Priority: optional
-Maintainer: PKG OpenStack openstack-de...@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: PKG OpenStack openstack-de...@lists.alioth.debian.org
 Uploaders: Thomas Goirand z...@debian.org
 Build-Depends: debhelper (= 9),
python-all (= 2.6.6-3~),
python-nose,
+   python-numpy,
python-setuptools,
python-sphinx,
python-yaml,
python3-all,
python3-nose,
+   python3-numpy,
python3-setuptools,
python3-yaml
 Standards-Version: 3.9.5

=== modified file 'debian/watch'
--- debian/watch	2014-09-05 23:26:05 +
+++ debian/watch	2015-01-07 15:48:34 +
@@ -1,3 +1,3 @@
 version=3
-http://pypi.python.org/packages/source/P/Pint Pint-(.*).tar.gz
-
+opts=uversionmangle=s/.zip// \
+ http://pypi.python.org/packages/source/P/Pint/ Pint-(.*).zip

Bug#763781: python-pyscss: Removed python-pyscss.postrm and python3-pyscss.postrm due to Lintian error.

[Corey Bryant]

Package: python-pyscss
Version: 1.2.0.post3-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/python-pyscss.postrm: Removed due to Lintian error, and
python-pyscss.prerm already removes the alternative.
  * d/python3-pyscss.postrm: Removed due to Lintian error, and
python3-pyscss.prerm already removes the alternative.


Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0-35-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/changelog'

=== removed file 'debian/python-pyscss.postrm'
--- debian/python-pyscss.postrm	2014-06-26 12:10:36 +
+++ debian/python-pyscss.postrm	1970-01-01 00:00:00 +
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ $1 = remove ] || [ $1 = disappear ]; then
-	update-alternatives --remove pyscss /usr/bin/python2-pyscss
-fi
-
-#DEBHELPER#
-
-exit 0

=== removed file 'debian/python3-pyscss.postrm'
--- debian/python3-pyscss.postrm	2014-06-26 12:10:36 +
+++ debian/python3-pyscss.postrm	1970-01-01 00:00:00 +
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ $1 = remove ] || [ $1 = disappear ]; then
-	update-alternatives --remove pyscss /usr/bin/python3-pyscss
-fi
-
-#DEBHELPER#
-
-exit 0

Bug#762115: [PKG-Openstack-devel] Bug#762115: python-glance-store: This patch fixes failing tests.

[Corey Bryant]

On Fri, Sep 19, 2014 at 3:16 AM, Thomas Goirand z...@debian.org wrote:

 On 09/18/2014 11:30 PM, Corey Bryant wrote:
  Package: python-glance-store
  Version: 0.1.8-1
  Severity: important
  Tags: patch
  User: corey.bry...@canonical.com
  Usertags: origin-ubuntu utopic ubuntu-patch
 
  Dear Maintainer,
 
 We want to sync python-glance-store into Ubuntu but that is being
 prevented
 by failing tests.
 
 I've updated the package and tests now run 100% successfully with the
 fixes.
 
  In Ubuntu, the attached patch was applied to achieve the following:
 
* New upstream release.
* debian/control: Add python-mox to Build-Depends-Indep to fix test
 failure.
* debian/p/fix-tests.patch: Added temporary patch to fix test failures.
* debian/watch: Update package path.
 
 
  Thanks for considering the patch!
 
  Corey Bryant

 Hi!

 Thanks a lot for forwarding Ubuntu changes. This is very much
 appreciated, especially since it didn't happen with Chuck, and as I'm
 doing most of the Python module packaging.

 I will happily apply your patch, though please have a quick look at it:
 it contains lots of things which shouldn't be there, like modifications
 to the egg-info and such. If you have time to filter this out, please do
 so (otherwise I'll have to do the work). Or at least, can you confirm
 that only the debian/patches file is the relevant change?

 Thanks again for the patch,

 Thomas Goirand (zigo)


Hi Thomas!

Thanks for the feedback and also thanks for all the work you've been doing!

In terms of debian/ changes, it includes:

* debian/changelog: New upstream release.
* debian/control: Add python-mox to Build-Depends-Indep to fix test failure.
* debian/watch: Update package path.
* debian/p/fix-tests.patch: Added temporary patch to fix tests.

The reason for the other branch changes (the non debian/ changes) is
because I had to import the new upstream release changes into the branch
(e.g. bzr merge-upstream ../*.dsc).

-- 
Regards,
Corey

Bug#762115: python-glance-store: This patch fixes failing tests.

[Corey Bryant]

Package: python-glance-store
Version: 0.1.8-1
Severity: important
Tags: patch
User: corey.bry...@canonical.com
Usertags: origin-ubuntu utopic ubuntu-patch

Dear Maintainer,

   We want to sync python-glance-store into Ubuntu but that is being prevented
   by failing tests.

   I've updated the package and tests now run 100% successfully with the fixes.

In Ubuntu, the attached patch was applied to achieve the following:

  * New upstream release.
  * debian/control: Add python-mox to Build-Depends-Indep to fix test failure.
  * debian/p/fix-tests.patch: Added temporary patch to fix test failures.
  * debian/watch: Update package path.


Thanks for considering the patch!

Corey Bryant


-- System Information:
Debian Release: jessie/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0-35-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== removed file '.gitignore'
--- .gitignore	2014-09-05 10:54:04 +
+++ .gitignore	1970-01-01 00:00:00 +
@@ -1,23 +0,0 @@
-*~
-*.pyc
-*.dat
-TAGS
-*.egg-info
-*.egg
-build
-.coverage
-.tox
-cover
-venv
-.venv
-output.xml
-*.sublime-workspace
-*.sqlite
-*.html
-.*.swp
-.DS_Store
-.testrepository
-versioninfo
-var/*
-ChangeLog
-AUTHORS

=== removed file '.gitreview'
--- .gitreview	2014-09-05 10:54:04 +
+++ .gitreview	1970-01-01 00:00:00 +
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=openstack/glance_store.git

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-09-05 10:54:04 +
+++ .pc/applied-patches	2014-09-18 15:12:35 +
@@ -0,0 +1 @@
+fix-tests.patch

=== added file 'AUTHORS'
--- AUTHORS	1970-01-01 00:00:00 +
+++ AUTHORS	2014-09-18 15:11:41 +
@@ -0,0 +1,3 @@
+Andreas Jaeger a...@suse.de
+Flavio Percoco flape...@gmail.com
+Jeremy Stanley fu...@yuggoth.org

=== added file 'ChangeLog'
--- ChangeLog	1970-01-01 00:00:00 +
+++ ChangeLog	2014-09-18 15:11:41 +
@@ -0,0 +1,110 @@
+CHANGES
+===
+
+0.1.8
+-
+
+* Align swift's store API
+
+0.1.7
+-
+
+* Add `OPTIONS` attribute to swift.Store function
+
+0.1.5
+-
+
+* Add missing stores to setup.cfg
+* Set group for DeprecatedOpts
+* Complete random_access for the filesystem store
+
+0.1.3
+-
+
+* Register store's configs w/o creating instances
+
+0.1.2
+-
+
+* Add deprecated options support for storage drivers
+* Rename locale files for glance_store rename
+* Update .gitreview for project rename
+
+0.1.1
+-
+
+* Rename glance.store to glance_store
+* Port of 97882f796c0e8969c606ae723d14b6b443e2e2f9
+* Port of 502be24afa122eef08186001e54c1e1180114ccf
+* Fix collection order issues and unit test failures
+
+0.1.0
+-
+
+
+0.0.1a2
+---
+
+* Fix development classifier
+* Imported Translations from Transifex
+* Package glance's package entirely
+
+0.0.1a1
+---
+
+* Split CHUNKSIZE into WRITE/READ_CHUNKSIZE
+* Port swift store
+* Add validate_location
+* Fix some Exceptions incompatibilities
+* Imported Translations from Transifex
+* Setup for glance.store for translation
+* Set the right classifiers in setup.cfg
+* Remove version string from setup.cfg
+* Add .gitreview to the repo
+* Fix flake8 errors
+* Adopt oslo.i18n
+* Pull multipath support from glance/master
+* Update from oslo-incubator
+* Pass offset and chunk_size to the `get` method
+* Migrate vmware store
+* Move FakeHTTPResponse to a common utils module
+* Removed commented code
+* Remove deprecated _schedule_delayed_delete_from_backend function
+* BugFix: Point to the exceptions module
+* BugFix: define scheme outside the `try` block
+* Add a way to register store options
+* Update functions signatures w/ optional context
+* Remove old scrubber options
+* Move exceptions out of common and add backends.py
+* Use exception
+* Remove dependency on oslo-log
+* Add offset and chunk_size to the get method
+* Migrate the rbd store
+* Use register_store_schemes everywhere
+* Add missing context keyword to the s3 store
+* Migrate cinder store
+* Remove location_strategy, it belongs to Glance
+* S3 store ported
+* Move options registration to __init__
+* GridFS Store
+* Port sheepdog and its test suite
+* Update from oslo-inc and added processutils
+* Fix http store tests
+* Added fake driver, restored base tests, fixed load driver issue
+* Use context when needed
+* Add context=None to http store methods
+* Remove old exceptions
+* HTTP migrated
+* Accept a message keyword in exceptions
+* Filesystem driver restored
+* Move drivers under _driver
+* Added testr
+* Config  Import fixes
+* Move base test to glance/store
+* Deprecate old options, make the list shorter
+* Add glance.store common
+* Add tests w/ some fixes, although they don't run yet
+* Update gitignore
+* Add requirements and testr
+* Add oslo-inc modules