robotframework
diff --git a/‎CHANGELOG.adoc‎
Lines changed: 12 additions & 6 deletions b/‎CHANGELOG.adoc‎
Lines changed: 12 additions & 6 deletions
diff --git a/‎setup.py‎
Lines changed: 29 additions & 29 deletions b/‎setup.py‎
Lines changed: 29 additions & 29 deletions
diff --git a/‎src/robotide/context/__init__.py‎
Lines changed: 1 addition & 0 deletions b/‎src/robotide/context/__init__.py‎
Lines changed: 1 addition & 0 deletions
@@ -10,19 +10,25 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
 
 === Changed
 
--- Made ``\n`` visible when editing cells in Grid Editor (problematic in Windows)
+- Keywords auto-suggestion in grid editor does not need shortcut anymore, if you want to disable this feature you can config in `Preferences -> Grid Editor -> Only trigger auto suggestions from shortcuts`
+
+- Made ``\n`` visible when editing cells in Grid Editor (problematic in Windows)
 
 == Fixed
 
--- Fixed missing color definition for keyword call in Text Editor
+- Fixed missing auto-enclosing when in Cell Editor in Linux
+
+- Fixed RIDE will crash when using third party input method in Mac OS
+
+- Fixed missing color definition for keyword call in Text Editor
 
--- Fixed clearing or emptying fixtures (Setups, Teardowns), now removes headers and synchronizes Text Editor
+- Fixed clearing or emptying fixtures (Setups, Teardowns), now removes headers and synchronizes Text Editor
 
--- Fixed selection and persistance of colors in File Explorer and Project Tree panels
+- Fixed selection and persistance of colors in File Explorer and Project Tree panels
 
--- Fixed not using defined color for help and HTML content
+- Fixed not using defined color for help and HTML content
 
--- Fixed missing newlines in sections separation
+- Fixed missing newlines in sections separation
 
 
 == https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.0.rst[2.0] - 2023-03-01
 
@@ -14,24 +14,21 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+import os
 import sys
 from os.path import abspath, join, dirname
-
-sys.path.append(join(dirname(__file__), 'src'))
 from setuptools import setup, find_packages
+from setuptools.command.install import install
 
 ROOT_DIR = dirname(abspath(__file__))
 SOURCE_DIR = 'src'
-REQUIREMENTS = ['wxPython', 'PyPubSub', 'Pygments', 'psutil']
-
-#Windows specific requirements
-if sys.platform == 'win32':
-    REQUIREMENTS.append('Pywin32')
+REQUIREMENTS = ['PyPubSub',
+                'Pygments',
+                'psutil',
+                'Pywin32; sys_platform=="win32"',
+                'wxPython']
 
-version_file = join(ROOT_DIR, 'src', 'robotide', 'version.py')
-exec(compile(open(version_file).read(), version_file, 'exec'))
-
-package_data = {
+PACKAGE_DATA = {
     'robotide.preferences': ['settings.cfg'],
     'robotide.widgets': ['*.png', '*.gif', '*.ico'],
     'robotide.messages': ['*.html'],
@@ -41,57 +38,60 @@
                              'RIDE.app/Contents/MacOS/RIDE', 'RIDE.app/Contents/Resources/*.icns']
 }
 
-long_description = """
+LONG_DESCRIPTION = """
 Robot Framework is a generic test automation framework for acceptance
 level testing. RIDE is a lightweight and intuitive editor for Robot
 Framework test data.
 """.strip()
 
-classifiers = """
+CLASSIFIERS = """
 Development Status :: 5 - Production/Stable
 License :: OSI Approved :: Apache Software License
 Operating System :: OS Independent
-Programming Language :: Python
+Programming Language :: Python :: 3.6
+Programming Language :: Python :: 3.7
+Programming Language :: Python :: 3.8
 Topic :: Software Development :: Testing
 """.strip().splitlines()
 
-# This solution is found at http://stackoverflow.com/a/26490820/5889853
-from setuptools.command.install import install
-import os
-import sys
-
 
+# This solution is found at http://stackoverflow.com/a/26490820/5889853
 class CustomInstallCommand(install):
-    """Customized setuptools install command - prints a friendly greeting."""
+    """Customized setuptools install command - install RIDE desktop shortcut."""
     def run(self):
         install.run(self)
-        _ = sys.stderr.write("Creating Desktop Shortcut to RIDE...\n")
-        postinstaller_file = join(ROOT_DIR, 'src', 'robotide', 'postinstall', '__main__.py')
-        command = sys.executable + " " +postinstaller_file + " -install"
+        sys.stdout.write("Creating Desktop Shortcut to RIDE...\n")
+        post_installer_file = join(ROOT_DIR, SOURCE_DIR, 'robotide', 'postinstall', '__main__.py')
+        command = sys.executable + " " + post_installer_file + " -install"
         os.system(command)
 
+
+main_ns = dict()
+version_file = join(ROOT_DIR, SOURCE_DIR, 'robotide', 'version.py')
+with open(version_file) as _:
+    exec(_.read(), main_ns)
+
 setup(
     name='robotframework-ride',
-    version=VERSION,
+    version=main_ns['VERSION'],
     description='RIDE :: Robot Framework Test Data Editor',
-    long_description=long_description,
+    long_description=LONG_DESCRIPTION,
     license='Apache License 2.0',
     keywords='robotframework testing testautomation',
     platforms='any',
-    classifiers=classifiers,
+    classifiers=CLASSIFIERS,
     author='Robot Framework Developers',
     author_email='[email protected]',
     url='https://github.com/robotframework/RIDE/',
     download_url='https://pypi.python.org/pypi/robotframework-ride',
-    install_requires = REQUIREMENTS,
+    install_requires=REQUIREMENTS,
     package_dir={'': SOURCE_DIR},
     packages=find_packages(SOURCE_DIR),
-    package_data=package_data,
+    package_data=PACKAGE_DATA,
     python_requires='>=3.6',
     # Robot Framework package data is not included, but RIDE does not need it.
     # Always install everything, since we may be switching between versions
     options={'install': {'force': True}},
     scripts=['src/bin/ride.py', 'src/bin/ride_postinstall.py'],
     cmdclass={'install': CustomInstallCommand},
-    requires=['Pygments', 'wxPython', 'PyPubSub']
 )
@@ -31,6 +31,7 @@
 IS_MAC = sys.platform == 'darwin'
 IS_LINUX = sys.platform == 'linux'
 WX_VERSION = wx.VERSION_STRING
+IS_WX_410_OR_HIGHER = WX_VERSION >= '4.1.0'
 
 if IS_WINDOWS:
     SETTINGS_DIRECTORY = os.path.join(