From: Chris Alfonso <calfonso@redhat.com>
Date: Wed, 25 Apr 2012 13:39:39 +0000 (-0400)
Subject: Removing nova from pip requires
X-Git-Tag: 2014.1~1928
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0a9d87e28ddebe77ee3be4399533214b80c377b0;p=openstack-build%2Fheat-build.git

Removing nova from pip requires
---

diff --git a/heat/db/sqlalchemy/session.py b/heat/db/sqlalchemy/session.py
index c5b89d52..066ebe68 100644
--- a/heat/db/sqlalchemy/session.py
+++ b/heat/db/sqlalchemy/session.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 """Session Handling for SQLAlchemy backend."""
-import nova.exception
 import sqlalchemy.interfaces
 import sqlalchemy.orm
 from sqlalchemy.exc import DisconnectionError
@@ -34,8 +33,6 @@ def get_session(autocommit=True, expire_on_commit=False):
         _MAKER = get_maker(_ENGINE, autocommit, expire_on_commit)
 
     session = _MAKER()
-    session.query = nova.exception.wrap_db_error(session.query)
-    session.flush = nova.exception.wrap_db_error(session.flush)
     return session
 
 
diff --git a/tools/pip-requires b/tools/pip-requires
index a59073c7..83636526 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -15,5 +15,4 @@ sqlalchemy-migrate>=0.7
 httplib2
 kombu
 iso8601>=0.1.4
-python-novaclient
-nova
+ython-novaclient