Update to Airflow==1.10.6

Don't overwrite shebang from app. Use /usr/bin/env python3 when creating the app
Barski-lab · Nov 12, 2019 · 5994527 · 5994527
1 parent f6e8f6f
commit 5994527
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/cwl_airflow/app/launch.py b/cwl_airflow/app/launch.py
@@ -48,8 +48,8 @@ def configure_macos_app(self):
 
 
     def init(self):
-        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.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()

diff --git a/dev/pack_macos.sh b/dev/pack_macos.sh
@@ -10,6 +10,10 @@ python setup.py macos
 deactivate
 cd macOS
 cp ../dev/macos/*  ./cwl-airflow.app/Contents/MacOS/
+
+find ./cwl-airflow.app/Contents/Resources/app/bin -type f -maxdepth 1 -exec sed -i '' -e '1s/.*/#!\/usr\/bin\/env python3/' {}  \;
+find ./cwl-airflow.app/Contents/Resources/app_packages/bin -type f -maxdepth 1 -exec sed -i '' -e '1s/.*/#!\/usr\/bin\/env python3/' {}  \;
+
 chmod -R u+w ./cwl-airflow.app
 tar -zcvf cwl-airflow.macos.tar.gz cwl-airflow.app
 rm -rf cwl-airflow.app

diff --git a/setup.py b/setup.py
@@ -86,7 +86,7 @@ def get_version():
         'schema-salad==4.5.20190815125611',
         'jsonmerge',
         'ruamel.yaml == 0.15.97',
-        'apache-airflow == 1.10.5',
+        'apache-airflow == 1.10.6',
         'pyjwt',
         'connexion==2.3.0'
     ],