Merge pull request #1 from r0x0r/master

Pull forked origin

MANIFEST.in

@@ -2,3 +2,12 @@ include webview/lib/WebBrowserInterop.x64.dll
 include webview/lib/WebBrowserInterop.x86.dll
 include webview/lib/Microsoft.Toolkit.Forms.UI.Controls.WebView.dll
 include webview/lib/Microsoft.Toolkit.Forms.UI.Controls.WebView.LICENSE.md
+include webview/lib/WebBrowserInterop.x64.dll
+include webview/lib/WebBrowserInterop.x86.dll
+include webview/lib/Microsoft.Toolkit.Forms.UI.Controls.WebView.dll
+include webview/lib/Microsoft.Toolkit.Forms.UI.Controls.WebView.LICENSE.md
+include webview/lib/x64/WebView2Loader.dll
+include webview/lib/x86/WebView2Loader.dll
+include webview/lib/Microsoft.Web.WebView2.Core.dll
+include webview/lib/Microsoft.Web.WebView2.LICENSE.md
+include webview/lib/Microsoft.Web.WebView2.WinForms.dll

appveyor.yml

@@ -51,7 +51,7 @@ install:
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
-  - "%CMD_IN_ENV% pip install \"pytest>=4.3.0\" .[cef]"
+  - "%CMD_IN_ENV% pip install \"pytest>=4.3.0\" six .[cef]"
 
 
 test_script:

docs/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 3.4: Second wave
+
+_Released 04/12/2020_
+
+- `New` [Windows] WebView2 Chromium support. Thanks [sbbosco](https://github.com/sbbosco). [#521](https://github.com/r0x0r/pywebview/issues/521).
+- `Fix` [All] Exception with HTML checkboxes and `get_elements`. [#622](https://github.com/r0x0r/pywebview/issues/622).
+- `Fix` [All] pystray compatibility. Thanks [AlexCovizzi](https://github.com/AlexCovizzi). [#486](https://github.com/r0x0r/pywebview/issues/486).
+- `Fix` [All] expose methods instead of all callables for JS API objects. Thanks [jgentil](https://github.com/jgentil). [#629](https://github.com/r0x0r/pywebview/issues/629).
+- `Fix` [EdgeHTML] Make returning results of `evaluate_js` more robust. Thanks [sbbosco](https://github.com/sbbosco).
+- `Fix` [QT] KDE_FULL_SESSION not being used. Thanks [Maltzur](https://github.com/Maltzur).
+- `Fix` [Cocoa] Unicode filenames for input files.
+- `Improvement` [Cocoa] Only install the specific `pyobjc` packages required. Thanks [Fizzadar](https://github.com/fizzadar).
+- `Improvement` [Cocoa] Add support for default document navigation and window handling shortcut keys . Thanks [ikhmyz](https://github.com/ikhmyz) and [Fizzadar](https://github.com/fizzadar)
+
 ## 3.3.5
 
 _Released 26/09/2020_

docs/README.md

@@ -7,7 +7,7 @@ actionLink: /guide/
 footer: BSD Licensed | Copyright © 2014-present Roman Sirokov
 ---
 <div class='center version'>
-Current version: <strong>3.3.5</strong><br/>
+Current version: <strong>3.4</strong><br/>
 <a href='/changelog'>What's new</a>
 </div>
 

docs/guide/README.md

@@ -21,4 +21,4 @@ _pywebview_ is a BSD licensed open source project. It is an independent project
 
 
 
-_pywebview_ is created by [Roman Sirokov](https://github.com/r0x0r/). Maintained by Roman and [Shiva Prasad](https://github.com/shivaprsdv).
+_pywebview_ is created by [Roman Sirokov](https://github.com/r0x0r/).

setup.py

@@ -29,22 +29,27 @@
     long_description=long_description,
     long_description_content_type='text/markdown',
     url='https://github.com/r0x0r/pywebview',
-    download_url='https://github.com/r0x0r/pywebview/archive/3.3.5.tar.gz',
+    download_url='https://github.com/r0x0r/pywebview/archive/3.4.tar.gz',
     keywords=['gui', 'webkit', 'html', 'web'],
     install_requires=install_requires,
     extras_require=extras_require,
-    version='3.3.5',
+    version='3.4',
     include_package_data=True,
     packages=['webview', 'webview.js', 'webview.platforms'],
     package_dir={'webview': 'webview'},
     package_data={
         'webview': [
             'webview/lib/WebBrowserInterop.x64.dll',
             'webview/lib/WebBrowserInterop.x86.dll',
-            'webview/lib/Microsoft.Toolkit.Forms.UI.Controls.WebView.dll'
-            'webview/lib/Microsoft.Toolkit.Forms.UI.Controls.WebView.LICENSE.md'
-            ]
-        },
+            'webview/lib/Microsoft.Toolkit.Forms.UI.Controls.WebView.dll',
+            'webview/lib/Microsoft.Toolkit.Forms.UI.Controls.WebView.LICENSE.md',
+            'webview/lib/x64/WebView2Loader.dll',
+            'webview/lib/x86/WebView2Loader.dll',
+            'webview/lib/Microsoft.Web.WebView2.Core.dll',
+            'webview/lib/Microsoft.Web.WebView2.LICENSE.md',
+            'webview/lib/Microsoft.Web.WebView2.WinForms.dll',
+        ]
+    },
     license='New BSD license',
     classifiers=[
         'Intended Audience :: Developers',
@@ -60,6 +65,8 @@
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Software Development :: User Interfaces'

webview/guilib.py

@@ -70,7 +70,7 @@ def try_import(guis):
         forced_gui = 'qt' if 'KDE_FULL_SESSION' in os.environ else None
         forced_gui = os.environ['PYWEBVIEW_GUI'].lower() \
             if 'PYWEBVIEW_GUI' in os.environ and os.environ['PYWEBVIEW_GUI'].lower() in ['qt', 'gtk', 'cef', 'mshtml', 'edgechromium', 'edgehtml'] \
-            else None
+            else forced_gui
 
     forced_gui_ = forced_gui