Merge pull request #495 from nucleic/qt-extras

Add easy ways to install extra dependencies required for some widgets

.github/workflows/ci.yml

@@ -61,23 +61,20 @@ jobs:
           pip install git+https://github.com/MatthieuDartiailh/bytecode@main
           pip install git+https://github.com/nucleic/atom@main
           pip install git+https://github.com/nucleic/kiwi@main
-      - name: Install project
+      - name: Install project (no-extras)
+        if: matrix.python-version != '3.9'
         env:
           CPPFLAGS: --coverage
         run: |
           pip install -e .[qt${{ matrix.qt-version }}-${{ matrix.qt-binding }}]
-      - name: Install extra dependencies
-        if: matrix.python-version == '3.9'
+      - name: Install project (with-extras pyqt)
+        if: matrix.python-version == '3.9' && matrix.qt-binding == 'pyqt'
         run: |
-          pip install matplotlib ipython qtconsole
-      - name: Install QScintilla (Qt5)
-        if: matrix.python-version == '3.9' && matrix.qt-binding == 'pyqt' && matrix.qt-version== 5
+          pip install -e .[qt${{ matrix.qt-version }}-${{ matrix.qt-binding }},ipython-qt,matplotlib-qt,scintilla-qt${{ matrix.qt-version }}-pyqt,webview-qt${{ matrix.qt-version }}-pyqt]
+      - name: Install project (with-extras pyside)
+        if: matrix.python-version == '3.9' && matrix.qt-binding != 'pyqt'
         run: |
-          pip install QScintilla
-      - name: Install QScintilla (Qt6)
-        if: matrix.python-version == '3.9' && matrix.qt-binding == 'pyqt' && matrix.qt-version== 6
-        run: |
-          pip install PyQt6-QScintilla
+          pip install -e .[qt${{ matrix.qt-version }}-${{ matrix.qt-binding }},ipython-qt,matplotlib-qt]
       - name: Install test requirements
         run: |
           pip install -r test_requirements.txt

enaml/core/declarative_meta.py

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2013, Nucleic Development Team.
+# Copyright (c) 2013-2022, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
@@ -86,7 +86,6 @@ def patch_d_member(member):
     """
     metadata = member.metadata
     if metadata['d_writable']:
-        mode, ctxt = member.default_value_mode
         handler = DeclarativeDefaultHandler()
         handler.delegate = member.clone()
         new_mode = DefaultValue.CallObject_ObjectName

pyproject.toml

@@ -36,10 +36,17 @@ dependencies = [
 dynamic=["version"]
 
 [project.optional-dependencies]
-qt5-pyqt = ["qtpy", "pyqt5"]
+qt5-pyqt = ["qtpy", "PyQt5"]
 qt5-pyside = ["qtpy", "pyside2"]
-qt6-pyqt = ["qtpy>=2.1.0", "pyqt6>=6.2"]
+qt6-pyqt = ["qtpy>=2.1.0", "PyQt6>=6.2"]
 qt6-pyside = ["qtpy>=2.1.0", "pyside6>=6.2.3"]
+scintilla-qt5-pyqt = ["QScintilla"]
+scintilla-qt6-pyqt = ["PyQt6-QScintilla"]
+matplotlib-qt = ["matplotlib"]
+ipython-qt = ["qtconsole"]
+webview-qt5-pyqt = ["PyQtWebEngine"]
+webview-qt6-pyqt = ["PyQt6-WebEngine"]
+vtk-qt = ["vtk"]
 
 [project.urls]
 homepage = "https://github.com/nucleic/enaml"