Merge lp:~corey.bryant/sahara/2015.1-b2-0ubuntu1 into lp:~ubuntu-server-dev/sahara/kilo

[Corey Bryant]

[lp:~corey.bryant/sahara/2015.1-b2-0ubuntu1]

4. By Corey Bryant on 2015-02-12

Add dash to python-oslo-* dependencies

5. By Corey Bryant on 2015-02-13

Drop python-bashate

[Martin Pitt (pitti)]

wily has a newer version 3.0.0-0ubuntu1 so this looks obsolete.

Unmerged revisions

5. By Corey Bryant on 2015-02-13

Drop python-bashate

4. By Corey Bryant on 2015-02-12

Add dash to python-oslo-* dependencies

3. By Corey Bryant on 2015-02-11

* New upstream release.
  - d/control: Align with upstream dependencies.
  - d/p/disable-migration-tests.patch: Dropped. Tests disabled upstream.

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-07 15:17:50 +0000
+++ debian/changelog	2015-02-13 15:20:24 +0000
@@ -1,3 +1,11 @@
+sahara (2015.1~b2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - d/control: Align with upstream dependencies.
+    - d/p/disable-migration-tests.patch: Dropped. Tests disabled upstream.
+
+ -- Corey Bryant <[e-mail]>  Fri, 06 Feb 2015 10:10:13 -0500
+
 sahara (2015.1~b1-0ubuntu1) vivid; urgency=medium
 
   * Sync with Debian experimental.

=== modified file 'debian/control'
--- debian/control	2015-01-07 15:17:50 +0000
+++ debian/control	2015-02-13 15:20:24 +0000
@@ -12,50 +12,54 @@
                python-all (>= 2.6.6-3~),
                python-pbr (>= 0.6),
                python-sphinx (>= 1.2.1)
-Build-Depends-Indep: alembic (>= 0.7.1),
+Build-Depends-Indep: alembic (>= 0.7.2),
                      openssh-client,
+                     pylint (>= 1.3.0),
                      python-babel (>= 1.3),
                      python-cinderclient (>= 1:1.1.0),
                      python-coverage (>= 3.6),
-                     python-eventlet (>= 0.15.2),
+                     python-eventlet (>= 0.16.1),
                      python-fixtures (>= 0.3.14),
                      python-flask (>= 0.10),
-                     python-hacking,
+                     python-hacking (>= 0.9.2),
                      python-heatclient (>= 0.2.9),
                      python-iso8601 (>= 0.1.9),
                      python-jsonschema (>= 2.0.0),
-                     python-keystoneclient (>= 1:0.11.1),
-                     python-keystonemiddleware,
+                     python-keystoneclient (>= 1:1.0.0),
+                     python-keystonemiddleware (>= 1.0.0),
                      python-lockfile,
                      python-migrate (>= 0.9.1),
                      python-mock (>= 1.0),
                      python-mysqldb,
-                     python-neutronclient (>= 2.3.6),
+                     python-neutronclient (>= 1:2.3.6),
                      python-novaclient (>= 1:2.18.0),
+                     python-oslo-concurrency (>= 1.4.1),
+                     python-oslo-config (>= 1:1.6.0),
                      python-oslo-context (>= 0.1.0),
-                     python-oslo.concurrency (>= 0.3.0),
-                     python-oslo.config (>= 1.4.0.0),
-                     python-oslo.db (>= 1.1.0),
-                     python-oslo.i18n (>= 1.0.0),
-                     python-oslo.messaging (>= 1.4.1),
-                     python-oslo.middleware (>= 0.1.0),
-                     python-oslo.rootwrap (>= 1.3.0),
-                     python-oslo.serialization (>= 1.0.0),
-                     python-oslo.utils (>= 1.1.0),
-                     python-oslosphinx (>= 2.2.0.0),
-                     python-oslotest (>= 1.2.0),
+                     python-oslo-db (>= 1.4.1),
+                     python-oslo-i18n (>= 1.3.0),
+                     python-oslo-log (>= 0.1.0),
+                     python-oslo-messaging (>= 1.6.0),
+                     python-oslo-middleware (>= 0.3.0),
+                     python-oslo-rootwrap (>= 1.5.0),
+                     python-oslo-serialization (>= 1.2.0),
+                     python-oslo-utils (>= 1.2.0),
+                     python-oslosphinx (>= 2.2.0),
+                     python-oslotest (>= 1:1.2.0),
                      python-paramiko (>= 1.13.0),
                      python-posix-ipc,
                      python-psycopg2,
                      python-requests (>= 2.2.0),
                      python-saharaclient (>= 0.7.6),
                      python-six (>= 1.7.0),
+                     python-sphinx (>= 1.1.2),
                      python-sphinxcontrib-httpdomain,
                      python-sqlalchemy (>= 0.9.7),
                      python-stevedore (>= 1.1.0),
                      python-swiftclient (>= 1:2.2.0),
+                     python-tempest-lib (>= 0.1.0),
                      python-testscenarios (>= 0.4),
-                     python-testtools (>= 0.9.34),
+                     python-testtools (>= 0.9.36),
                      python-webob (>= 1.2.3),
                      subunit (>= 0.0.18),
                      testrepository (>= 0.0.18)
@@ -68,30 +72,31 @@
 Architecture: all
 Section: python
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: alembic (>= 0.7.1),
+Depends: alembic (>= 0.7.2),
          python-babel (>= 1.3),
          python-cinderclient (>= 1:1.1.0),
-         python-eventlet (>= 0.15.2),
+         python-eventlet (>= 0.16.1),
          python-flask (>= 0.10),
          python-heatclient (>= 0.2.9),
          python-iso8601 (>= 0.1.9),
          python-jsonschema (>= 2.0.0),
-         python-keystoneclient (>= 1:0.11.1),
-         python-keystonemiddleware,
+         python-keystoneclient (>= 1:1.0.0),
+         python-keystonemiddleware (>= 1.0.0),
          python-lockfile,
          python-mysqldb,
-         python-neutronclient (>= 2.3.6),
+         python-neutronclient (>= 1:2.3.6),
          python-novaclient (>= 1:2.18.0),
+         python-oslo-concurrency (>= 1.4.1),
+         python-oslo-config (>= 1:1.6.0),
          python-oslo-context (>= 0.1.0),
-         python-oslo.concurrency (>= 0.3.0),
-         python-oslo.config (>= 1.4.0.0),
-         python-oslo.db (>= 1.1.0),
-         python-oslo.i18n (>= 1.0.0),
-         python-oslo.messaging (>= 1.4.1),
-         python-oslo.middleware (>= 0.1.0),
-         python-oslo.rootwrap (>= 1.3.0),
-         python-oslo.serialization (>= 1.0.0),
-         python-oslo.utils (>= 1.1.0),
+         python-oslo-db (>= 1.4.1),
+         python-oslo-i18n (>= 1.3.0),
+         python-oslo-log (>= 0.1.0),
+         python-oslo-messaging (>= 1.6.0),
+         python-oslo-middleware (>= 0.3.0),
+         python-oslo-rootwrap (>= 1.5.0),
+         python-oslo-serialization (>= 1.2.0),
+         python-oslo-utils (>= 1.2.0),
          python-paramiko (>= 1.13.0),
          python-pbr (>= 0.6),
          python-posix-ipc,

=== 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 @@
-Description: Disable Migration Tests
- The migration tests in oslo.db currently have a hard requirement
- on configured and running MySQL and PostgreSQL instances.
- .
- This should really be opportunistic, so disable for now.
-Author: James Page <[e-mail]>
-Forwarded: not-needed
-
---- a/sahara/tests/unit/db/migration/test_migrations.py
-+++ b/sahara/tests/unit/db/migration/test_migrations.py
-@@ -451,8 +451,7 @@ class TestMigrations(base.BaseWalkMigrat
-         self.assertColumnsExists(engine, 'cluster_events', events_columns)
- 
- 
--class TestMigrationsMySQL(TestMigrations, base.MySQLTestsMixIn,
--                          base.TestModelsMigrationsSync):
-+class TestMigrationsMySQL(TestMigrations, base.MySQLTestsMixIn):
-     def get_engine(self):
-         conn_string = ("mysql+mysqldb://%s:%s@localhost/%s"
-                        % (self.USER, self.PASSWD, self.DATABASE))
-@@ -460,8 +459,7 @@ class TestMigrationsMySQL(TestMigrations
-         return engine
- 
- 
--class TestMigrationsPostgresql(TestMigrations, base.PostgresqlTestsMixIn,
--                               base.TestModelsMigrationsSync):
-+class TestMigrationsPostgresql(TestMigrations, base.PostgresqlTestsMixIn):
-     def get_engine(self):
-         conn_string = ("postgresql+psycopg2://%s:%s@localhost/%s"
-                        % (self.USER, self.PASSWD, self.DATABASE))

=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2015-02-13 15:20:24 +0000
@@ -0,0 +1,10 @@
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -5,7 +5,6 @@
+ hacking>=0.10.0,<0.11
+ 
+ MySQL-python
+-bashate>=0.2 # Apache-2.0
+ coverage>=3.6
+ discover
+ fixtures>=0.3.14

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-01-07 14:54:50 +0000
+++ debian/patches/series	2015-02-13 15:20:24 +0000
@@ -1,3 +1,3 @@
+fix-requirements.patch
 fix-alembic-migration-for-sqlite-1.patch
 fix-wrong-MANIFEST.in.patch
-disable-migration-tests.patch