remove checks once keen.master_key is added

buildtimetrend/keenio.py

@@ -51,12 +51,8 @@ def keen_has_project_id():
 
 def keen_has_master_key():
     """Check if Keen.io Master API key is set."""
-    # TODO remove try if master_key is part of the keen module
-    try:
-        if "KEEN_MASTER_KEY" in os.environ or keen.master_key is not None:
-            return True
-    except AttributeError:
-        get_logger().debug("keen.master_key is not set")
+    if "KEEN_MASTER_KEY" in os.environ or keen.master_key is not None:
+        return True
 
     get_logger().warning("Keen.io Master API Key is not set")
     return False
@@ -95,11 +91,7 @@ def keen_io_generate_read_key(repo):
                        " keen.master_key is not defined.")
         return None
 
-    # TODO remove try if master_key is part of the keen module
-    try:
-        master_key = keen.master_key
-    except AttributeError:
-        master_key = None
+    master_key = keen.master_key
 
     privileges = {
         "filters": [{

buildtimetrend/settings.py

@@ -239,10 +239,6 @@ def load_env_vars(self):
             self.env_var_to_settings("BUILD_TREND_CONFIGFILE",
                                      "dashboard_configfile")
 
-            # TODO remove if master_key is part of the keen module
-            if "KEEN_MASTER_KEY" in os.environ:
-                keen.master_key = os.environ["KEEN_MASTER_KEY"]
-
         def env_var_to_settings(self, env_var_name, settings_name):
             """
             Store environment variable value as a setting.

buildtimetrend/test/settings_test.py

@@ -146,8 +146,7 @@ def test_load_config_file(self):
         self.assertEquals(None, keen.project_id)
         self.assertEquals(None, keen.write_key)
         self.assertEquals(None, keen.read_key)
-        # TODO change test if master_key is part of the keen module
-        # self.assertEquals(None, keen.master_key)
+        self.assertEquals(None, keen.master_key)
 
         # load sample config file
         self.assertTrue(
@@ -178,8 +177,7 @@ def test_load_settings(self):
         self.assertEquals(None, keen.project_id)
         self.assertEquals(None, keen.write_key)
         self.assertEquals(None, keen.read_key)
-        # TODO change test if master_key is part of the keen module
-        # self.assertEquals(None, keen.master_key)
+        self.assertEquals(None, keen.master_key)
 
         scriptname = "script.py"
         expected_ci = "travis"
@@ -244,7 +242,6 @@ def test_load_env_vars(self):
         # set test environment variables
         exp_account_token = os.environ["TRAVIS_ACCOUNT_TOKEN"] = "1234abcde"
         exp_loglevel = os.environ["BTT_LOGLEVEL"] = "INFO"
-        exp_master_key = os.environ["KEEN_MASTER_KEY"] = "4567ghij"
         exp_config = os.environ["BUILD_TREND_CONFIGFILE"] = "test/config.js"
 
         self.settings.load_env_vars()
@@ -253,14 +250,12 @@ def test_load_env_vars(self):
         self.assertEquals(exp_loglevel, self.settings.get_setting("loglevel"))
         self.assertEquals(exp_account_token,
                           self.settings.get_setting("travis_account_token"))
-        self.assertEquals(exp_master_key, keen.master_key)
         self.assertEquals(exp_config,
                           self.settings.get_setting("dashboard_configfile"))
 
         # reset test environment variables
         del os.environ["BTT_LOGLEVEL"]
         del os.environ["TRAVIS_ACCOUNT_TOKEN"]
-        del os.environ["KEEN_MASTER_KEY"]
         del os.environ["BUILD_TREND_CONFIGFILE"]
 
     def test_process_argv(self):

setup.py

@@ -14,7 +14,7 @@
     name="buildtimetrend",
     version="0.2.dev27",
     packages=find_packages(),
-    install_requires=['keen', 'lxml', 'pyyaml', 'python-dateutil'],
+    install_requires=['keen>=0.3.8', 'lxml', 'pyyaml', 'python-dateutil'],
     tests_require=['nose', 'coveralls'],
     extras_require={
         'native': ['lxml', 'matplotlib>=1.2.0']