feature: add PySide6 support (#25)

Changes:
* Added option to use PySide6 
* use PyQt5 or PySide6 based on the already imported modules

Author: danielhrisca

README.md

@@ -1,6 +1,6 @@
 # pyqtlet2
 
-pyqtlet is a wrapper for Leaflet maps in PyQt5. In construction and design, it mimics the [official leaflet api](http://leafletjs.com/reference-1.3.0.html) as much as possible.
+pyqtlet is a wrapper for Leaflet maps in PyQt5 or PySide6. In construction and design, it mimics the [official leaflet api](http://leafletjs.com/reference-1.3.0.html) as much as possible.
 
 ## About
 
@@ -9,7 +9,7 @@ This is a fork of the repository pyqtlet from @skylarkdrones. Since the original
 ## Installation
 
 ``` bash
-pip3 install PyQt5
+pip3 install PyQt5 # or pip3 install PySide6
 pip3 install PyQtWebEngine
 pip3 install pyqtlet2
 ```

docs/source/getting-started.rst

@@ -11,13 +11,13 @@ Google Earth and KML files for all our mapping needs.
 
 .. note::
     pyqtlet was designed for people familiar with both `PyQt5 <http://zetcode.com/gui/pyqt5/>`_ and `Leaflet <https://leafletjs.com/examples/quick-start/>`_.
-    It is suggested you go through the respective guides if not already familiar.
+    It is suggested you go through the respective guides if not already familiar. PySide6 is also supported.
 
 
 Installation
 ------------
 
-pyqtlet does not have any external dependencies apart from PyQt5. So if you already 
+pyqtlet does not have any external dependencies apart from PyQt5 or PySide6. So if you already 
 have pyqtlet installed, then you just need to copy the pyqtlet folder into your
 project folder. You may also install pyqtlet  from pip. This will install PyQt5 if
 it has not been installed already.

docs/source/index.rst

@@ -1,11 +1,11 @@
 Pyqtlet
 =======
 
-pyqtlet brings `Leaflet <https://leafletjs.com/>`_ maps to `PyQt5 <http://pyqt.sourceforge.net/Docs/PyQt5/introduction.html>`_.
+pyqtlet brings `Leaflet <https://leafletjs.com/>`_ maps to `PyQt5 <http://pyqt.sourceforge.net/Docs/PyQt5/introduction.html>`_ or PySide6.
 
 `Leaflet <https://leafletjs.com/>`_ is the most popular mapping library on the web. It has most mapping features that you might need, excellent documentation, and a host of plugins. In contstruction and design, pyqtlet attempts to mimic the `official Leaflet API <http://leafletjs.com/reference-1.3.0.html>`_ as much as possible.
 
-pyqtlet allows you to bring in these leaflet maps into PyQt5 in just a couple of lines. It provides a mapWidget (which is a QWidget) as well as a namespace (L) in order to mimic the Leaflet API.
+pyqtlet allows you to bring in these leaflet maps into PyQt5 or PySide6 in just a couple of lines. It provides a mapWidget (which is a QWidget) as well as a namespace (L) in order to mimic the Leaflet API.
 
 .. code-block:: python
 

pyqtlet2/__init__.py

@@ -3,7 +3,13 @@
 """
 
 __author__ = 'Leon Friedmann <leon.friedmann@tum.de>'
-__version__ = '0.5.0'
+__version__ = '0.7.0'
+import sys
+
+if 'PySide6' in sys.modules:
+    API = 'PySide6'
+else:
+    API = 'PyQt5'
 
 from .mapwidget import MapWidget
 from .leaflet import L

pyqtlet2/leaflet/control/control.py

@@ -3,7 +3,14 @@
 import os
 import time
 
-from PyQt5.QtCore import pyqtSlot, pyqtSignal
+from ... import API
+
+if API == 'PyQt5':
+    from PyQt5.QtCore import pyqtSlot, pyqtSignal
+else:
+    from PySide6.QtCore import Slot, Signal
+    pyqtSlot = Slot
+    pyqtSignal = Signal
 
 from ..core import Evented
 

pyqtlet2/leaflet/core/evented.py

@@ -1,9 +1,12 @@
 import logging
 import time
 
-from PyQt5.QtCore import QObject, QJsonValue
+from ... import API, mapwidget
 
-from ... import mapwidget
+if API == 'PyQt5':
+    from PyQt5.QtCore import QObject, QJsonValue
+else:
+    from PySide6.QtCore import QObject, QJsonValue
 
 
 class Evented(QObject):

pyqtlet2/leaflet/layer/marker/marker.py

@@ -1,7 +1,15 @@
 from ..layer import Layer
 from ..icon import Icon
 from ...core.Parser import Parser
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, QJsonValue
+
+from .... import API
+
+if API == 'PyQt5':
+    from PyQt5.QtCore import pyqtSlot, pyqtSignal, QJsonValue
+else:
+    from PySide6.QtCore import Slot, Signal, QJsonValue
+    pyqtSlot, pyqtSignal = Slot, Signal
+
 from typing import List
 
 

pyqtlet2/leaflet/map/map.py

@@ -3,7 +3,14 @@
 import os
 import time
 
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, QJsonValue
+from ... import API
+
+if API == 'PyQt5':
+    from PyQt5.QtCore import pyqtSlot, pyqtSignal, QJsonValue
+else:
+    from PySide6.QtCore import Slot, Signal, QJsonValue
+    pyqtSignal = Signal
+    pyqtSlot = Slot
 
 from ... import mapwidget
 from ..core import Evented

pyqtlet2/mapwidget.py

@@ -1,10 +1,19 @@
 import os
 import time
 
-from PyQt5.QtCore import QEventLoop, QObject, Qt, QUrl, pyqtSignal
-from PyQt5.QtWebChannel import QWebChannel
-from PyQt5.QtWebEngineWidgets import ( QWebEngineView, QWebEnginePage, QWebEngineSettings, 
+from . import API
+
+if API == 'PyQt5':
+    from PyQt5.QtCore import QEventLoop, QObject, Qt, QUrl, pyqtSignal
+    from PyQt5.QtWebChannel import QWebChannel
+    from PyQt5.QtWebEngineWidgets import ( QWebEngineView, QWebEnginePage, QWebEngineSettings, 
                                        QWebEngineScript )
+    Signal = pyqtSignal
+else:
+    from PySide6.QtCore import QEventLoop, QObject, QUrl, Signal, Qt
+    from PySide6.QtWebChannel import QWebChannel
+    from PySide6.QtWebEngineWidgets import QWebEngineView
+    from PySide6.QtWebEngineCore import QWebEnginePage, QWebEngineSettings, QWebEngineScript
 
 
 class MapWidget(QWebEngineView):

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='pyqtlet2',
-    version='0.6.1',
+    version='0.7.0',
     description='Bringing leaflet maps to PyQt',
     long_description=long_description,
     long_description_content_type="text/markdown",