1.0.8

MacHu-GWU · Apr 13, 2022 · 1ba3a95 · 1ba3a95
1 parent 47c8c76
commit 1ba3a95
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 27 deletions.
diff --git a/aws_tools/_version.py b/aws_tools/_version.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "1.0.7"
+__version__ = "1.0.8"
 
 if __name__ == "__main__":
     print(__version__)
diff --git a/aws_tools/handlers/aws.py b/aws_tools/handlers/aws.py
@@ -144,7 +144,7 @@ def sh_top20_main_service(self, wf):
                 icon=HotIcons.info,
                 valid=True,
             )
-            cmd = "/usr/bin/python main.py '{} {}'".format("mh_rebuild_index", "do-build-index")
+            cmd = "~/.pyenv/shims/python2.7 main.py '{} {}'".format("mh_rebuild_index", "do-build-index")
             item_arg.run_script(cmd)
             item_arg.open_file(path=DIR_AWS_TOOL_USER_DATA.abspath)
             item_arg.notify(title="AWS Console url index is rebuilt!")

diff --git a/aws_tools/handlers/aws_tools.py b/aws_tools/handlers/aws_tools.py
@@ -31,7 +31,7 @@ def mh_clear_aws_tools_cache(self, wf, query_str):
         if query_str == magic_command:
             cache.clear()
             return wf
-        cmd = "/usr/bin/python main.py '{} {}'".format(self.mh_clear_aws_tools_cache.__name__, magic_command)
+        cmd = "~/.pyenv/shims/python2.7 main.py '{} {}'".format(self.mh_clear_aws_tools_cache.__name__, magic_command)
         item_arg = ItemArgs(
             title="Clear AWS tools workflow cache data",
             subtitle="hit 'Enter' to clear cache",
@@ -143,7 +143,7 @@ def handle_wrong_setting_key(wf, st_key):
                     icon=HotIcons.run,
                     valid=True,
                 )
-                cmd = "/usr/bin/python main.py '{} {} {}'".format(
+                cmd = "~/.pyenv/shims/python2.7 main.py '{} {} {}'".format(
                     self.mh_set_value.__name__,
                     st_key,
                     st_value,
@@ -165,7 +165,7 @@ def mh_rebuild_index(self, wf, query_str):
             main_service_searcher.build_index(force_rebuild=True)
             sub_service_searcher.build_index(force_rebuild=True)
             return wf
-        cmd = "/usr/bin/python main.py '{} {}'".format(self.mh_rebuild_index.__name__, magic_command)
+        cmd = "~/.pyenv/shims/python2.7 main.py '{} {}'".format(self.mh_rebuild_index.__name__, magic_command)
         item_arg = ItemArgs(
             title="Rebuild AWS console url index",
             subtitle="hit 'Enter' to rebuild the index",
@@ -183,7 +183,7 @@ def mh_clear_log(self, wf, query_str):
         if query_str == magic_command:
             clear_log()
             return wf
-        cmd = "/usr/bin/python main.py '{} {}'".format(self.mh_clear_log.__name__, magic_command)
+        cmd = "~/.pyenv/shims/python2.7 main.py '{} {}'".format(self.mh_clear_log.__name__, magic_command)
         item_arg = ItemArgs(
             title="Clear all log files",
             subtitle="hit 'Enter' to clear the log",

diff --git a/aws_tools/handlers/item_builder/__init__.py b/aws_tools/handlers/item_builder/__init__.py
@@ -27,7 +27,7 @@ def select_aws_profile_as_default(
         :rtype: Workflow3
         """
         for aws_profile in aws_profile_list:
-            cmd = "/usr/bin/python main.py '{} {}'".format(
+            cmd = "~/.pyenv/shims/python2.7 main.py '{} {}'".format(
                 set_default_aws_profile_handler_id,
                 aws_profile,
             )
@@ -56,7 +56,7 @@ def select_aws_profile_for_mfa(
         :rtype: Workflow3
         """
         for aws_profile in aws_profile_list:
-            cmd = "/usr/bin/python main.py '{} {}'".format(
+            cmd = "~/.pyenv/shims/python2.7 main.py '{} {}'".format(
                 execute_mfa_auth_handler_id,
                 aws_profile,
             )
@@ -85,7 +85,7 @@ def set_aws_profile_as_aws_tools_default(
         :rtype: Workflow3
         """
         for aws_profile in aws_profile_list:
-            cmd = "/usr/bin/python main.py '{} {}'".format(
+            cmd = "~/.pyenv/shims/python2.7 main.py '{} {}'".format(
                 set_aws_profile_as_aws_tools_default_handler_id,
                 aws_profile,
             )
@@ -114,7 +114,7 @@ def set_aws_region_as_aws_tools_default(
         :rtype: Workflow3
         """
         for long_name, short_name in all_regions:
-            cmd = "/usr/bin/python main.py '{} {}'".format(
+            cmd = "~/.pyenv/shims/python2.7 main.py '{} {}'".format(
                 set_aws_region_as_aws_tools_default_handler_id,
                 short_name,
             )
@@ -143,12 +143,12 @@ def set_aws_profile_as_default_for_everything(
         :rtype: Workflow3
         """
         for aws_profile, region in aws_profile_and_region_list:
-            cmd = "/usr/bin/python main.py '{} {}'".format(
+            cmd = "~/.pyenv/shims/python2.7 main.py '{} {}'".format(
                 set_aws_profile_as_default_for_everything_handler_id,
                 "{}____{}".format(aws_profile, region),
             )
             item_arg = ItemArgs(
-                title="{} {}".format(aws_profile, region),
+                title="{} | {}".format(aws_profile, region),
                 subtitle="set default profile as [{}] for everything".format(aws_profile),
                 autocomplete=aws_profile,
                 icon=HotIcons.iam,

diff --git a/info.plist b/info.plist
@@ -592,7 +592,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_select_aws_profile_to_set_as_default {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_select_aws_profile_to_set_as_default {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -656,7 +656,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_info {query}'</string>
+				<string> ~/.pyenv/shims/python2.7 main.py 'mh_info {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -743,7 +743,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_select_aws_profile_for_mfa_auth {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_select_aws_profile_for_mfa_auth {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -811,7 +811,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_clear_aws_tools_cache {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_clear_aws_tools_cache {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -902,7 +902,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_select_aws_profile_to_set_as_aws_tools_default {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_select_aws_profile_to_set_as_aws_tools_default {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -1010,7 +1010,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_select_aws_region_to_set_as_aws_tools_default {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_select_aws_region_to_set_as_aws_tools_default {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -1097,7 +1097,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_set {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_set {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -1146,7 +1146,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_rebuild_index {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_rebuild_index {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -1214,7 +1214,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_clear_log {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_clear_log {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -1263,7 +1263,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_select_aws_profile_to_set_as_default_for_everything {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_select_aws_profile_to_set_as_default_for_everything {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -1312,7 +1312,7 @@
 				<key>runningsubtext</key>
 				<string>please wait ...</string>
 				<key>script</key>
-				<string>/usr/bin/python main.py 'mh_aws {query}'</string>
+				<string>~/.pyenv/shims/python2.7 main.py 'mh_aws {query}'</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -1503,7 +1503,7 @@
 	<key>variablesdontexport</key>
 	<array/>
 	<key>version</key>
-	<string>1.0.6</string>
+	<string>1.0.8</string>
 	<key>webaddress</key>
 	<string>https://github.com/MacHu-GWU/afwf_aws_tools-project</string>
 </dict>

diff --git a/release-history.rst b/release-history.rst
@@ -4,7 +4,7 @@ Release and Version History
 ==============================================================================
 
 
-1.0.8 (TODO)
+1.0.9 (TODO)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 **Features and Improvements**
 
@@ -15,7 +15,14 @@ Release and Version History
 **Miscellaneous**
 
 
-1.0.7 (TODO)
+1.0.8 (2022-04-13)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Features and Improvements**
+
+- MacOS may not support system Python2 anymore after 12.3. Now user has to install their own Python2 using `pyenv <https://github.com/pyenv/pyenv>`_. Please follow the installation guide and use this command ``pyenv install 2.7.18`` to install the python2 and make sure ``~/.pyenv/shims/python2.7``
+
+
+1.0.7 (2022-03-06)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 **Features and Improvements**
 

diff --git a/version b/version
@@ -1 +1 @@
-1.0.7
+1.0.8