Remove mysqlclient from dependencies, fix shebang bug

Barski-lab · Sep 13, 2019 · 32d1c7f · 32d1c7f
1 parent dc2eec9
commit 32d1c7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cwl_airflow/app/launch.py b/cwl_airflow/app/launch.py
@@ -40,7 +40,8 @@ def __configure(self):
             self.__web_conf = self.__read_plist(os.path.join(default_conf_folder, os.path.basename(self.__AIRFLOW_WEB)))
             self.__api_conf = self.__read_plist(os.path.join(default_conf_folder, os.path.basename(self.__AIRFLOW_API)))
             self.__update_variables()
-            self.__update_shebang()
+            self.__update_shebang(os.path.join(self.__contents_dir, "Resources/app_packages/bin"))
+            self.__update_shebang(os.path.join(self.__contents_dir, "Resources/app/bin"))
             self.__init_airflow_db()
             self.__update_airflow_config()
             self.__copy_dags()
@@ -123,8 +124,7 @@ def __update_variables(self):
         self.__api_conf["StandardOutPath"] = log_api + ".stdout"
 
 
-    def __update_shebang(self):
-        lookup_dir = os.path.join(self.__contents_dir, "Resources/app_packages/bin")
+    def __update_shebang(self, lookup_dir):
         shebang = "#!{}".format(os.path.join(self.__contents_dir, "Resources/python/bin/python3"))
         for filename in os.listdir(lookup_dir):
             filename = os.path.join(lookup_dir, filename)

diff --git a/setup.py b/setup.py
@@ -83,7 +83,6 @@ def get_version():
         'jsonmerge',
         'ruamel.yaml == 0.15.97',
         'apache-airflow == 1.10.5',
-        'mysqlclient >= 1.3.6, < 1.4',
         'pyjwt',
         'urllib3',
         'connexion'