-
Notifications
You must be signed in to change notification settings - Fork 667
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
23 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| # Apache License 2.0, Copyright 2019 Tebel.Automation Private Limited | ||
| # https://github.com/tebelorg/RPA-Python/blob/master/LICENSE.txt | ||
| __author__ = 'Ken Soh <[email protected]>' | ||
| __version__ = '1.49.0' | ||
| __version__ = '1.50.0' | ||
|
|
||
| # for backward compatibility, invoke tagui.py functions to use in rpa.py | ||
| from tagui import * | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,8 @@ | |
|
|
||
| setup( | ||
| name='rpa', | ||
| version='1.49.0', | ||
| py_modules=['rpa'], install_requires=['tagui>=1.49.0'], | ||
| version='1.50.0', | ||
| py_modules=['rpa'], install_requires=['tagui>=1.50.0'], | ||
| author='Ken Soh', | ||
| author_email='[email protected]', | ||
| license='Apache License 2.0', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| setup( | ||
| name='tagui', | ||
| version='1.49.0', | ||
| version='1.50.0', | ||
| py_modules=['tagui'], | ||
| author='Ken Soh', | ||
| author_email='[email protected]', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| # Apache License 2.0, Copyright 2019 Tebel.Automation Private Limited | ||
| # https://github.com/tebelorg/RPA-Python/blob/master/LICENSE.txt | ||
| __author__ = 'Ken Soh <[email protected]>' | ||
| __version__ = '1.49.0' | ||
| __version__ = '1.50.0' | ||
|
|
||
| import subprocess | ||
| import os | ||
|
|
@@ -245,6 +245,19 @@ def _patch_macos_pjs(): | |
| else: | ||
| return True | ||
|
|
||
| def _patch_macos_py3(): | ||
| """because newer macOS does not have python command only python3 command""" | ||
| if platform.system() == 'Darwin' and not os.path.isfile(tagui_location() + '/.tagui/src/py3_patched'): | ||
| if not os.system('python --version > /dev/null 2>&1') == 0: | ||
| if os.system('python3 --version > /dev/null 2>&1') == 0: | ||
| list_of_patch_files = [tagui_location() + '/.tagui/src/casperjs/bin/casperjs', | ||
| tagui_location() + '/.tagui/src/casperjs/tests/clitests/runtests.py', | ||
| tagui_location() + '/.tagui/src/slimerjs/slimerjs.py'] | ||
| for patch_file in list_of_patch_files: | ||
| dump(load(patch_file).replace('#!/usr/bin/env python', '#!/usr/bin/env python3'), patch_file) | ||
| dump('python updated to python 3', tagui_location() + '/.tagui/src/py3_patched') | ||
| return True | ||
|
|
||
| def coord(x_coordinate = 0, y_coordinate = 0): | ||
| """function to form a coordinate string from x and y integers""" | ||
| return '(' + str(x_coordinate) + ',' + str(y_coordinate) + ')' | ||
|
|
@@ -420,6 +433,8 @@ def setup(): | |
|
|
||
| # patch PhantomJS to solve OpenSSL issue | ||
| if not _patch_macos_pjs(): return False | ||
| # patch files to solve no python issue | ||
| if not _patch_macos_py3(): return False | ||
| print('[RPA][INFO] - TagUI now ready for use in your Python environment') | ||
|
|
||
| # perform Windows specific setup actions | ||
|
|
@@ -488,6 +503,8 @@ def init(visual_automation = False, chrome_browser = True, headless_mode = False | |
|
|
||
| # on macOS, patch PhantomJS to latest v2.1.1 to solve OpenSSL issue | ||
| if platform.system() == 'Darwin' and not _patch_macos_pjs(): return False | ||
| # newer macOS has no python command, patch some files header to python3 | ||
| if platform.system() == 'Darwin' and not _patch_macos_py3(): return False | ||
|
|
||
| # create entry flow to launch SikuliX accordingly | ||
| if visual_automation: | ||
|
|
||