Removing nova from pip requires

diff --git a/heat/db/sqlalchemy/session.py b/heat/db/sqlalchemy/session.py
index c5b89d52455f61f1245de7cf1f0653ebecdea098..066ebe68a596af74b0ad4229d49ef52498cba66a 100644 (file)
--- 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 a59073c76306714fd07d62485819619a6a0538d5..836365263fdec6a0dbc0eb9644ae79856d639a72 100644 (file)
--- 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