Patch-out upper constraints of SQLAlchemy

Change-Id: I991d30453e57786f581cd836bd2204b76172af7b
This commit is contained in:
Ondřej Nový 2017-01-20 11:35:15 +01:00
parent f9dd6002cc
commit b64ca2b292
6 changed files with 21 additions and 14 deletions

5
debian/changelog vendored
View File

@ -1,9 +1,10 @@
ironic-inspector (4.2.0-2) UNRELEASED; urgency=medium
ironic-inspector (4.2.0-2) unstable; urgency=medium
* Bumped debhelper compat version to 10
* Added lsb-base to depends
* Patch-out upper constraints of SQLAlchemy
-- Ondřej Nový <onovy@debian.org> Wed, 23 Nov 2016 23:58:49 +0100
-- Ondřej Nový <onovy@debian.org> Fri, 20 Jan 2017 11:34:27 +0100
ironic-inspector (4.2.0-1) unstable; urgency=medium

2
debian/control vendored
View File

@ -91,7 +91,7 @@ Package: ironic-inspector
Architecture: all
Depends: adduser,
python-ironic-inspector (= ${binary:Version}),
lsb-base,
${ostack-lsb-base},
${misc:Depends},
${python:Depends},
Description: discovering hardware properties for OpenStack Ironic - Daemon

1
debian/debian_control_vars vendored Normal file
View File

@ -0,0 +1 @@
ostack-lsb-base= lsb-base

View File

@ -0,0 +1,8 @@
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,4 +24,4 @@
oslo.utils>=3.16.0 # Apache-2.0
six>=1.9.0 # MIT
stevedore>=1.16.0 # Apache-2.0
-SQLAlchemy<1.1.0,>=1.0.10 # MIT
+SQLAlchemy>=1.0.10 # MIT

View File

@ -3,11 +3,9 @@ Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2015-10-30
Index: deb-ironic-inspector/ironic_inspector/firewall.py
===================================================================
--- deb-ironic-inspector.orig/ironic_inspector/firewall.py
+++ deb-ironic-inspector/ironic_inspector/firewall.py
@@ -66,7 +66,7 @@ def init():
--- a/ironic_inspector/firewall.py
+++ b/ironic_inspector/firewall.py
@@ -67,7 +67,7 @@
INTERFACE = CONF.firewall.dnsmasq_interface
CHAIN = CONF.firewall.firewall_chain
NEW_CHAIN = CHAIN + '_temp'
@ -16,11 +14,9 @@ Index: deb-ironic-inspector/ironic_inspector/firewall.py
CONF.rootwrap_config, 'iptables',)
# -w flag makes iptables wait for xtables lock, but it's not supported
Index: deb-ironic-inspector/ironic_inspector/test/unit/test_firewall.py
===================================================================
--- deb-ironic-inspector.orig/ironic_inspector/test/unit/test_firewall.py
+++ deb-ironic-inspector/ironic_inspector/test/unit/test_firewall.py
@@ -54,7 +54,7 @@ class TestFirewall(test_base.NodeTest):
--- a/ironic_inspector/test/unit/test_firewall.py
+++ b/ironic_inspector/test/unit/test_firewall.py
@@ -54,7 +54,7 @@
for (args, call) in zip(init_expected_args, call_args_list):
self.assertEqual(args, call[0])
@ -29,7 +25,7 @@ Index: deb-ironic-inspector/ironic_inspector/test/unit/test_firewall.py
'iptables', '-w')
self.assertEqual(expected, firewall.BASE_COMMAND)
@@ -76,7 +76,7 @@ class TestFirewall(test_base.NodeTest):
@@ -76,7 +76,7 @@
for (args, call) in zip(init_expected_args, call_args_list):
self.assertEqual(args, call[0])

View File

@ -1 +1,2 @@
fix-path-to-rootwrap.patch
allow_newer_sqlalchemy.patch