Applied patch file and added version pins for qtawesome

appveyor.yml

@@ -21,13 +21,13 @@ install:
     - cmd: miniconda.exe /S /InstallationType=JustMe /D=%MINICONDA_DIRNAME%
     - cmd: set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%"
     - cmd: activate
-    - mamba info
-    - mamba env create --name cqgui -f cqgui_env.yml
+    - conda info
+    - conda env create -y --name cqgui -f cqgui_env.yml
     - sh: source activate cqgui
     - cmd: activate cqgui
-    - mamba list
-    - mamba install -y pytest pluggy pytest-qt
-    - mamba install -y pytest-mock pytest-cov pytest-repeat codecov pyvirtualdisplay
+    - conda list
+    - conda install -y pytest pluggy pytest-qt
+    - conda install -y pytest-mock pytest-cov pytest-repeat codecov pyvirtualdisplay
 
 build: false
 

cq_editor/icons.py

@@ -15,21 +15,21 @@
 import qtawesome as qta
 
 _icons_specs = {
-    "new": (("fa.file-o",), {}),
-    "open": (("fa.folder-open-o",), {}),
+    "new": (("fa5.file",), {}),
+    "open": (("fa5.folder-open",), {}),
     # borrowed from spider-ide
     "autoreload": [
-        ("fa.repeat", "fa.clock-o"),
+        ("fa5s.redo-alt", "fa5.clock"),
         {
             "options": [
                 {"scale_factor": 0.75, "offset": (-0.1, -0.1)},
                 {"scale_factor": 0.5, "offset": (0.25, 0.25)},
             ]
         },
     ],
-    "save": (("fa.save",), {}),
+    "save": (("fa5.save",), {}),
     "save_as": (
-        ("fa.save", "fa.pencil"),
+        ("fa5.save", "fa5s.pencil-alt"),
         {
             "options": [
                 {
@@ -39,12 +39,12 @@
             ]
         },
     ),
-    "run": (("fa.play",), {}),
-    "delete": (("fa.trash",), {}),
+    "run": (("fa5.play",), {}),
+    "delete": (("fa5s.trash",), {}),
     "delete-many": (
         (
-            "fa.trash",
-            "fa.trash",
+            "fa5s.trash",
+            "fa5s.trash",
         ),
         {
             "options": [
@@ -53,24 +53,24 @@
             ]
         },
     ),
-    "help": (("fa.life-ring",), {}),
-    "about": (("fa.info",), {}),
-    "preferences": (("fa.cogs",), {}),
+    "help": (("fa5s.life-ring",), {}),
+    "about": (("fa5s.info",), {}),
+    "preferences": (("fa5s.cogs",), {}),
     "inspect": (
-        ("fa.cubes", "fa.search"),
+        ("fa5s.cubes", "fa5s.search"),
         {"options": [{"scale_factor": 0.8, "offset": (0, 0), "color": "gray"}, {}]},
     ),
-    "screenshot": (("fa.camera",), {}),
+    "screenshot": (("fa5s.camera",), {}),
     "screenshot-save": (
-        ("fa.save", "fa.camera"),
+        ("fa5.save", "fa5s.camera"),
         {
             "options": [
                 {"scale_factor": 0.8},
                 {"scale_factor": 0.8, "offset": (0.2, 0.2)},
             ]
         },
     ),
-    "toggle-comment": (("fa.hashtag",), {}),
+    "toggle-comment": (("fa5s.hashtag",), {}),
 }
 
 

cq_editor/widgets/editor.py

@@ -124,11 +124,6 @@ def _fixContextMenu(self):
 
         menu = self.menu
 
-        menu.removeAction(self.run_cell_action)
-        menu.removeAction(self.run_cell_and_advance_action)
-        menu.removeAction(self.run_selection_action)
-        menu.removeAction(self.re_run_last_cell_action)
-
     def updatePreferences(self, *args):
 
         self.set_color_scheme(self.preferences["Color scheme"])

cq_editor/widgets/viewer.py

@@ -167,7 +167,7 @@ def create_actions(self, parent):
         self._actions = {
             "View": [
                 QAction(
-                    qta.icon("fa.arrows-alt"),
+                    qta.icon("fa6s.maximize"),
                     "Fit (Shift+F1)",
                     parent,
                     shortcut="shift+F1",
@@ -223,14 +223,14 @@ def create_actions(self, parent):
                     triggered=self.right_view,
                 ),
                 QAction(
-                    qta.icon("fa.square-o"),
+                    qta.icon("fa5.stop-circle"),
                     "Wireframe (Shift+F9)",
                     parent,
                     shortcut="shift+F9",
                     triggered=self.wireframe_view,
                 ),
                 QAction(
-                    qta.icon("fa.square"),
+                    qta.icon("fa5.square"),
                     "Shaded (Shift+F10)",
                     parent,
                     shortcut="shift+F10",

cqgui_env.yml

@@ -3,12 +3,12 @@ channels:
   - CadQuery
   - conda-forge
 dependencies:
-  - pyqt=5
   - pyqtgraph
-  - python=3.10
-  - spyder >=5.5.6,<6
+  - python=3.11
+  - spyder >=6,<7
   - path
   - logbook
   - requests
-  - cadquery
-  - qtconsole >=5.5.1,<5.6.0
+  - cadquery=master
+  - qtconsole >=5.6.1,<5.7.0
+  - qtawesome>=1.4.0

pyproject.toml

@@ -6,15 +6,16 @@ build-backend = "setuptools.build_meta"
 name = "CQ-editor"
 version = "0.6.dev0"
 dependencies = [
-  "cadquery",
+  "cadquery@git+https://github.com/CadQuery/cadquery.git",
   "pyqtgraph",
-  "spyder>=5.5.6,<6",
+  "spyder>=6,<7",
   "path",
   "logbook",
   "requests",
-  "qtconsole>=5.5.1,<5.6.0"
+  "qtconsole>=5.6.1,<5.7.0",
+  "qtawesome>=1.4.0"
 ]
-requires-python = ">=3.9,<3.13"
+requires-python = ">=3.9,<3.14"
 authors = [
   { name="CadQuery Developers" }
 ]

tests/test_app.py

@@ -595,7 +595,7 @@ def test_traceback(main):
     patch_debugger(debugger, ev)
 
     debugger.debug(True)
-
+    print(traceback_view.current_exception.text())
     assert "NameError" in traceback_view.current_exception.text()
     assert hasattr(sys, "last_traceback")
     assert traceback_view.tree.root.childCount() == 1