[#16] Re-enabled building wxPython for tests.

eoyilmaz · Oct 22, 2024 · fbb0f34 · fbb0f34
1 parent a36be9b
commit fbb0f34
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -86,10 +86,9 @@ jobs:
         python3 -m pip install --upgrade pip
         pip install wheel
 
-    # Disabling temporarily
-    # - name: Install wxPython ${{ matrix.wx-version }}
-    #   run: |
-    #     pip install wxPython==${{ matrix.wx-version }}
+    - name: Install wxPython ${{ matrix.wx-version }}
+      run: |
+        pip install wxPython==${{ matrix.wx-version }}
 
     - name: Install Python dependencies
       run: |

diff --git a/DisplayCAL/setup.py b/DisplayCAL/setup.py
@@ -936,10 +936,9 @@ def findall(
     if not setuptools or sys.platform != "win32":
         # wxPython windows installer doesn't add egg-info entry, so
         # a dependency check from pkg_resources would always fail
-        # requires.append(
-        #     "wxPython (>= {})".format(".".join(str(n) for n in wx_minversion))
-        # )
-        pass
+        requires.append(
+            "wxPython (>= {})".format(".".join(str(n) for n in wx_minversion))
+        )
     if sys.platform == "win32":
         requires.append("pywin32 (>= 213.0)")
 

diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -6,6 +6,6 @@ numpy
 Pillow
 PyChromecast
 Send2Trash
-# wxPython>=4.2.2;python_version>="3.12"
-# wxPython>=4.1.1;python_version<"3.12"
+wxPython>=4.2.2;python_version>="3.12"
+wxPython>=4.1.1;python_version<"3.12"
 zeroconf
diff --git a/requirements.txt b/requirements.txt
@@ -8,5 +8,5 @@ Pillow
 PyChromecast
 pywin32; sys_platform=='win32'
 Send2Trash
-# wxPython>=4.2.2
+wxPython>=4.2.2
 zeroconf
diff --git a/setup.cfg b/setup.cfg
@@ -16,7 +16,7 @@ install_requires =
     PyChromecast
     pywin32; sys_platform=='win32'
     Send2Trash
-    # wxPython
+    wxPython
     zeroconf
 
 [bdist_wheel]

diff --git a/tests/test_real_display_size_mm.py b/tests/test_real_display_size_mm.py
@@ -243,7 +243,7 @@ def patched_get_argyll_util(*args):
     monkeypatch.setattr(
         "DisplayCAL.RealDisplaySizeMM.argyll.get_argyll_util", patched_get_argyll_util
     )
-    assert RealDisplaySizeMM.get_dispwin_output() is b""
+    assert RealDisplaySizeMM.get_dispwin_output() == b""
 
 
 def test_get_dispwin_output_returns_dispwin_output_as_bytes(