Sahara

Merge lp:~corey.bryant/sahara/kilo-3 into lp:~ubuntu-server-dev/sahara/kilo

  1. kilo-3
  2. Merge into kilo
Proposed by Corey Bryant
Status: Merged
Merged at revision: 3
Proposed branch: lp:~corey.bryant/sahara/kilo-3
Merge into: lp:~ubuntu-server-dev/sahara/kilo
Diff against target: 179 lines (+45/-60)
4 files modified
debian/changelog (+8/-0)
debian/control (+37/-29)
debian/patches/disable-migration-tests.patch (+0/-30)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~corey.bryant/sahara/kilo-3
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+253732@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-01-07 15:17:50 +0000
+++ debian/changelog 2015-03-20 19:13:21 +0000
@@ -1,3 +1,11 @@
1sahara (2015.1~b3-0ubuntu1) UNRELEASED; urgency=medium
2
3 * New upstream release.
4 - d/control: Align with upstream dependencies.
5 - d/p/disable-migration-tests.patch: Dropped. Tests are passed by upstream.
6
7 -- Corey Bryant <corey.bryant@canonical.com> Fri, 20 Mar 2015 15:08:54 -0400
8
1sahara (2015.1~b1-0ubuntu1) vivid; urgency=medium9sahara (2015.1~b1-0ubuntu1) vivid; urgency=medium
210
3 * Sync with Debian experimental.11 * Sync with Debian experimental.
412
=== modified file 'debian/control'
--- debian/control 2015-01-07 15:17:50 +0000
+++ debian/control 2015-03-20 19:13:21 +0000
@@ -15,45 +15,50 @@
15Build-Depends-Indep: alembic (>= 0.7.1),15Build-Depends-Indep: alembic (>= 0.7.1),
16 openssh-client,16 openssh-client,
17 python-babel (>= 1.3),17 python-babel (>= 1.3),
18 python-barbicanclient (>= 3.0.1),
18 python-cinderclient (>= 1:1.1.0),19 python-cinderclient (>= 1:1.1.0),
19 python-coverage (>= 3.6),20 python-coverage (>= 3.6),
20 python-eventlet (>= 0.15.2),21 python-eventlet (>= 0.15.2),
21 python-fixtures (>= 0.3.14),22 python-fixtures (>= 0.3.14),
22 python-flask (>= 0.10),23 python-flask (>= 0.10),
23 python-hacking,24 python-hacking,
24 python-heatclient (>= 0.2.9),25 python-heatclient (>= 0.3.0),
25 python-iso8601 (>= 0.1.9),26 python-iso8601 (>= 0.1.9),
27 python-jinja2 (>= 2.6),
26 python-jsonschema (>= 2.0.0),28 python-jsonschema (>= 2.0.0),
27 python-keystoneclient (>= 1:0.11.1),29 python-keystoneclient (>= 1:1.1.0),
28 python-keystonemiddleware,30 python-keystonemiddleware,
29 python-lockfile,31 python-lockfile,
30 python-migrate (>= 0.9.1),32 python-mako (>= 0.4.0),
33 python-migrate (>= 0.9.5),
31 python-mock (>= 1.0),34 python-mock (>= 1.0),
32 python-mysqldb,35 python-mysqldb,
33 python-neutronclient (>= 2.3.6),36 python-neutronclient (>= 2.3.11),
34 python-novaclient (>= 1:2.18.0),37 python-novaclient (>= 1:2.18.0),
35 python-oslo-context (>= 0.1.0),38 python-oslo-config (>= 1.9.0),
36 python-oslo.concurrency (>= 0.3.0),39 python-oslo-context (>= 0.2.0),
37 python-oslo.config (>= 1.4.0.0),40 python-oslo-db (>= 1.5.0),
38 python-oslo.db (>= 1.1.0),41 python-oslo-log (>= 0.4.0),
39 python-oslo.i18n (>= 1.0.0),42 python-oslo-i18n (>= 1.0.0),
40 python-oslo.messaging (>= 1.4.1),43 python-oslo-messaging (>= 1.4.1),
41 python-oslo.middleware (>= 0.1.0),44 python-oslo-middleware (>= 0.1.0),
42 python-oslo.rootwrap (>= 1.3.0),45 python-oslo-rootwrap (>= 1.3.0),
43 python-oslo.serialization (>= 1.0.0),46 python-oslo-serialization (>= 1.0.0),
44 python-oslo.utils (>= 1.1.0),47 python-oslo-utils (>= 1.1.0),
45 python-oslosphinx (>= 2.2.0.0),48 python-oslosphinx (>= 2.2.0.0),
46 python-oslotest (>= 1.2.0),49 python-oslotest (>= 1.2.0),
47 python-paramiko (>= 1.13.0),50 python-paramiko (>= 1.13.0),
48 python-posix-ipc,51 python-posix-ipc,
52 python-prettytable (>= 0.7),
49 python-psycopg2,53 python-psycopg2,
50 python-requests (>= 2.2.0),54 python-requests (>= 2.2.0),
51 python-saharaclient (>= 0.7.6),55 python-saharaclient (>= 0.7.6),
52 python-six (>= 1.7.0),56 python-six (>= 1.9.0),
53 python-sphinxcontrib-httpdomain,57 python-sphinxcontrib-httpdomain,
54 python-sqlalchemy (>= 0.9.7),58 python-sqlalchemy (>= 0.9.7),
55 python-stevedore (>= 1.1.0),59 python-stevedore (>= 1.1.0),
56 python-swiftclient (>= 1:2.2.0),60 python-swiftclient (>= 1:2.2.0),
61 python-tempest-lib (>= 0.3.0),
57 python-testscenarios (>= 0.4),62 python-testscenarios (>= 0.4),
58 python-testtools (>= 0.9.34),63 python-testtools (>= 0.9.34),
59 python-webob (>= 1.2.3),64 python-webob (>= 1.2.3),
@@ -70,33 +75,36 @@
70Pre-Depends: dpkg (>= 1.15.6~)75Pre-Depends: dpkg (>= 1.15.6~)
71Depends: alembic (>= 0.7.1),76Depends: alembic (>= 0.7.1),
72 python-babel (>= 1.3),77 python-babel (>= 1.3),
78 python-barbicanclient (>= 3.0.1),
73 python-cinderclient (>= 1:1.1.0),79 python-cinderclient (>= 1:1.1.0),
74 python-eventlet (>= 0.15.2),80 python-eventlet (>= 0.15.2),
75 python-flask (>= 0.10),81 python-flask (>= 0.10),
76 python-heatclient (>= 0.2.9),82 python-heatclient (>= 0.3.0),
77 python-iso8601 (>= 0.1.9),83 python-iso8601 (>= 0.1.9),
84 python-jinja2 (>= 2.6),
78 python-jsonschema (>= 2.0.0),85 python-jsonschema (>= 2.0.0),
79 python-keystoneclient (>= 1:0.11.1),86 python-keystoneclient (>= 1:1.1.0),
80 python-keystonemiddleware,87 python-keystonemiddleware,
81 python-lockfile,88 python-lockfile,
82 python-mysqldb,89 python-mysqldb,
83 python-neutronclient (>= 2.3.6),90 python-neutronclient (>= 2.3.11),
84 python-novaclient (>= 1:2.18.0),91 python-novaclient (>= 1:2.18.0),
85 python-oslo-context (>= 0.1.0),92 python-oslo-concurrency (>= 0.3.0),
86 python-oslo.concurrency (>= 0.3.0),93 python-oslo-config (>= 1.9.0),
87 python-oslo.config (>= 1.4.0.0),94 python-oslo-context (>= 0.2.0),
88 python-oslo.db (>= 1.1.0),95 python-oslo-db (>= 1.5.0),
89 python-oslo.i18n (>= 1.0.0),96 python-oslo-i18n (>= 1.0.0),
90 python-oslo.messaging (>= 1.4.1),97 python-oslo-log (>= 0.4.0),
91 python-oslo.middleware (>= 0.1.0),98 python-oslo-messaging (>= 1.4.1),
92 python-oslo.rootwrap (>= 1.3.0),99 python-oslo-middleware (>= 0.1.0),
93 python-oslo.serialization (>= 1.0.0),100 python-oslo-rootwrap (>= 1.3.0),
94 python-oslo.utils (>= 1.1.0),101 python-oslo-serialization (>= 1.0.0),
102 python-oslo-utils (>= 1.1.0),
95 python-paramiko (>= 1.13.0),103 python-paramiko (>= 1.13.0),
96 python-pbr (>= 0.6),104 python-pbr (>= 0.6),
97 python-posix-ipc,105 python-posix-ipc,
98 python-requests (>= 2.2.0),106 python-requests (>= 2.2.0),
99 python-six (>= 1.7.0),107 python-six (>= 1.9.0),
100 python-sqlalchemy (>= 0.9.7),108 python-sqlalchemy (>= 0.9.7),
101 python-stevedore (>= 1.1.0),109 python-stevedore (>= 1.1.0),
102 python-swiftclient (>= 1:2.2.0),110 python-swiftclient (>= 1:2.2.0),
103111
=== removed file 'debian/patches/disable-migration-tests.patch'
--- debian/patches/disable-migration-tests.patch 2015-01-07 14:54:50 +0000
+++ debian/patches/disable-migration-tests.patch 1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
1Description: Disable Migration Tests
2 The migration tests in oslo.db currently have a hard requirement
3 on configured and running MySQL and PostgreSQL instances.
4 .
5 This should really be opportunistic, so disable for now.
6Author: James Page <james.page@ubuntu.com>
7Forwarded: not-needed
8
9--- a/sahara/tests/unit/db/migration/test_migrations.py
10+++ b/sahara/tests/unit/db/migration/test_migrations.py
11@@ -451,8 +451,7 @@ class TestMigrations(base.BaseWalkMigrat
12 self.assertColumnsExists(engine, 'cluster_events', events_columns)
13
14
15-class TestMigrationsMySQL(TestMigrations, base.MySQLTestsMixIn,
16- base.TestModelsMigrationsSync):
17+class TestMigrationsMySQL(TestMigrations, base.MySQLTestsMixIn):
18 def get_engine(self):
19 conn_string = ("mysql+mysqldb://%s:%s@localhost/%s"
20 % (self.USER, self.PASSWD, self.DATABASE))
21@@ -460,8 +459,7 @@ class TestMigrationsMySQL(TestMigrations
22 return engine
23
24
25-class TestMigrationsPostgresql(TestMigrations, base.PostgresqlTestsMixIn,
26- base.TestModelsMigrationsSync):
27+class TestMigrationsPostgresql(TestMigrations, base.PostgresqlTestsMixIn):
28 def get_engine(self):
29 conn_string = ("postgresql+psycopg2://%s:%s@localhost/%s"
30 % (self.USER, self.PASSWD, self.DATABASE))
310
=== modified file 'debian/patches/series'
--- debian/patches/series 2015-01-07 14:54:50 +0000
+++ debian/patches/series 2015-03-20 19:13:21 +0000
@@ -1,3 +1,2 @@
1fix-alembic-migration-for-sqlite-1.patch1fix-alembic-migration-for-sqlite-1.patch
2fix-wrong-MANIFEST.in.patch2fix-wrong-MANIFEST.in.patch
3disable-migration-tests.patch

Subscribers

People subscribed via source and target branches