v0.4.2 , fixes around hooks conditional imports

ubeliciousgrace · Mar 20, 2015 · e122888 · e122888
1 parent 0b5ad86
commit e122888
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/airflow/__init__.py b/airflow/__init__.py
@@ -1,3 +1,3 @@
 from models import DAG
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
diff --git a/airflow/operators/sensors.py b/airflow/operators/sensors.py
@@ -4,8 +4,7 @@
 from time import sleep
 
 from airflow import settings
-from airflow.hooks import HiveMetastoreHook
-from airflow.hooks import S3Hook
+from airflow import hooks
 from airflow.models import BaseOperator
 from airflow.models import Connection as DB
 from airflow.models import State
@@ -178,7 +177,8 @@ def __init__(
         if not partition:
             partition = "ds='{{ ds }}'"
         self.metastore_conn_id = metastore_conn_id
-        self.hook = HiveMetastoreHook(metastore_conn_id=metastore_conn_id)
+        self.hook = hooks.HiveMetastoreHook(
+            metastore_conn_id=metastore_conn_id)
         self.table = table
         self.partition = partition
         self.schema = schema
@@ -269,7 +269,7 @@ def __init__(
         self.bucket_name = bucket_name
         self.bucket_key = bucket_key
         self.s3_conn_id = s3_conn_id
-        self.hook = S3Hook(s3_conn_id=s3_conn_id)
+        self.hook = hooks.S3Hook(s3_conn_id=s3_conn_id)
         session.commit()
         session.close()
 
@@ -320,7 +320,7 @@ def __init__(
         self.delimiter = delimiter
         self.full_url = "s3://" + bucket_name + '/' + prefix
         self.s3_conn_id = s3_conn_id
-        self.hook = S3Hook(s3_conn_id=s3_conn_id)
+        self.hook = hooks.S3Hook(s3_conn_id=s3_conn_id)
         session.commit()
         session.close()
 

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Kept manually in sync with airflow.__version__
-version = '0.4.1'
+version = '0.4.2'
 
 
 doc = ['sphinx>=1.2.3',