Fix build issues with enable

.github/workflows/bleeding-edge.yml

@@ -14,16 +14,16 @@ jobs:
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
         toolkit: ['null', 'pyside6']
-        python-version: ['3.11']
+        python-version: ['3.13']
         include:
           # No Wx wheels available for Python 3.11, so test on 3.10
           - os: 'windows-latest'
             toolkit: 'wx'
-            python-version: '3.10'
+            python-version: '3.13'
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

.github/workflows/test-with-edm.yml

@@ -7,29 +7,30 @@ name: Test with EDM
 on: pull_request
 
 env:
-  INSTALL_EDM_VERSION: 3.5.0
+  INSTALL_EDM_VERSION: 4.1.1
 
 jobs:
 
   # Test against EDM packages on Linux
   test-edm-linux:
     strategy:
       matrix:
-        toolkit: ['null', 'pyside6']
-        runtime: ['3.8']
+        toolkit: ['null', 'pyside6', 'wx']
+        runtime: ['3.11']
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v3
-      - name: Install Qt dependencies
-        uses: ./.github/actions/install-qt-support
-        if: matrix.toolkit != 'wx'
+      - uses: actions/checkout@v4
+      - name: Install x11 headers
+        run: |
+          sudo apt-get install libx11-dev 
+          sudo apt-get install libopengl0
       - name: Cache EDM packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache
           key: ${{ runner.os }}-${{ matrix.toolkit }}-${{ matrix.runtime }}-${{ hashFiles('ci/edmtool.py') }}
       - name: Setup EDM
-        uses: enthought/setup-edm-action@v2
+        uses: enthought/setup-edm-action@v4.1
         with:
           edm-version: ${{ env.INSTALL_EDM_VERSION }}
       - name: Install click to the default EDM environment
@@ -46,7 +47,7 @@ jobs:
       matrix:
         os: ["windows-latest"]
         toolkit: ['null', 'pyside6', 'wx']
-        runtime: ['3.8']
+        runtime: ['3.11']
     runs-on: ${{ matrix.os }}
     env:
       # Set root directory, mainly for Windows, so that the EDM Python
@@ -55,14 +56,14 @@ jobs:
       # relative path between the site-packages and the source directory.
       EDM_ROOT_DIRECTORY: ${{ github.workspace }}/.edm
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Cache EDM packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache
           key: ${{ runner.os }}-${{ matrix.toolkit }}-${{ matrix.runtime }}-${{ hashFiles('ci/edmtool.py') }}
       - name: Setup EDM
-        uses: enthought/setup-edm-action@v1
+        uses: enthought/setup-edm-action@v4.1
         with:
           edm-version: ${{ env.INSTALL_EDM_VERSION }}
       - name: Install click to the default EDM environment

.github/workflows/test-with-pip.yml

@@ -11,32 +11,28 @@ on:
 jobs:
   test-ets:
     strategy:
+      fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
+        os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
         toolkit: ['null', 'pyside2', 'pyside6', 'pyqt5', 'wx']
         python-version: ['3.8', '3.10', '3.11']
         exclude:
-          # No Wx wheels available for Python 3.11
-          - toolkit: 'wx'
-            python-version: '3.11'
           # No PySide2 wheels available for Python 3.11
           - toolkit: 'pyside2'
             python-version: '3.11'
           # No PyQt5 wheels available for Python 3.11
           - toolkit: 'pyqt5'
             python-version: '3.11'
-          # No Wx wheels available for ubuntu or macos
-          - os: 'ubuntu-latest'
-            toolkit: 'wx'
+          # No PySide2 wheels for macos-latest
           - os: 'macos-latest'
-            toolkit: 'wx'
+            toolkit: 'pyside2'
           # Kiva tests hanging on windows, see #1038
           - os: 'windows-latest'
             toolkit: 'pyqt5'
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
@@ -59,7 +55,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip wheel
       - name: Install local packages
-        run: pip install ".[celiagg,cairo,layout,pdf,svg,test,${{ matrix.toolkit }}]"
+        run: pip install ".[cairo,layout,pdf,svg,test,${{ matrix.toolkit }}]"
       - name: Sanity check package version
         run: pip list
       - name: Run kiva test suite (Linux)

ci/edmtool.py

@@ -76,6 +76,7 @@
 
 import glob
 import os
+import platform
 import subprocess
 import sys
 from shutil import rmtree, copy as copyfile
@@ -85,12 +86,16 @@
 import click
 
 supported_combinations = {
-    '3.6': {'pyside2', 'pyqt5', 'wx', 'null'},
-    '3.8': {'pyside6', 'pyqt6', 'wx', 'null'},
+    '3.11': {'pyside6', 'pyqt6', 'wx', 'null'},
 }
 
+platforms = {
+    ('3.11', 'Linux') : 'rh8_x86_64',
+    ('3.11', 'Windows') : 'win_x86_64',
+    ('3.11', 'Darwin') : 'osx_x86_64'}
+
 dependencies = {
-    '3.6': {
+    '3.11': {
         "apptools",
         "celiagg",
         "coverage",
@@ -102,27 +107,11 @@
         "pyface",
         "pygments",
         "pyparsing",
-        "pypdf2",
-        "reportlab",
-        "traits",
-        "traitsui",
-        "wheel",
-    },
-    '3.8': {
-        "apptools",
-        "celiagg",
-        "coverage",
-        "Cython",
-        "fonttools",
-        "kiwisolver",
-        "numpy",
-        "pillow_simd",
-        "pyface",
-        "pygments",
-        "pyparsing",
         "traits",
         "traitsui",
         "wheel",
+        "build",
+        "reportlab",
     }
 }
 
@@ -137,19 +126,14 @@
 ]
 
 extra_dependencies = {
-    'pyqt5': {'pyqt5'},
     'pyqt6': {'pyqt6'},
-    'pyside2': {'pyside2'},
     'pyside6': {'pyside6'},
-    # XXX once wxPython 4 is available in EDM, we will want it here
-    "wx": set(),
+    "wx": {'wxPython'},
     'null': set()
 }
 
 environment_vars = {
-    'pyside2': {'ETS_TOOLKIT': 'qt', 'QT_API': 'pyside2'},
     'pyside6': {'ETS_TOOLKIT': 'qt', 'QT_API': 'pyside6'},
-    'pyqt5': {'ETS_TOOLKIT': 'qt', 'QT_API': 'pyqt5'},
     'pyqt6': {'ETS_TOOLKIT': 'qt', 'QT_API': 'pyqt6'},
     'wx': {'ETS_TOOLKIT': 'wx'},
     'null': {'ETS_TOOLKIT': 'null.image'},
@@ -177,7 +161,7 @@ def cli():
 
 
 @cli.command()
-@click.option('--runtime', default='3.6')
+@click.option('--runtime', default='3.11')
 @click.option('--toolkit', default='null')
 @click.option('--environment', default=None)
 @click.option(
@@ -195,28 +179,13 @@ def install(runtime, toolkit, environment, source):
     # edm commands to setup the development environment
     commands = [
         ("edm --config {edm_config} environments create {environment} "
-         "--force --version={runtime}"),
+         "--force --version={runtime} --platform={platform}"),
         ("edm --config {edm_config} install -y -e {environment} {packages} "
          "--add-repository enthought/lgpl"),
         ("edm run -e {environment} -- pip install -r ci/requirements_{runtime}.txt"
          " --no-dependencies"),
     ]
 
-    if toolkit == "wx":
-        if sys.platform == "darwin":
-            commands.append(
-                "edm run -e {environment} -- python -m pip install wxPython<4.1"  # noqa: E501
-            )
-        elif sys.platform == "linux":
-            # XXX this is mainly for TravisCI workers; need a generic solution
-            commands.append(
-                "edm run -e {environment} -- pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/ wxPython"  # noqa: E501
-            )
-        else:
-            commands.append(
-                "edm run -e {environment} -- python -m pip install wxPython"
-            )
-
     click.echo("Creating environment '{environment}'".format(**parameters))
     execute(commands, parameters)
 
@@ -244,11 +213,15 @@ def install(runtime, toolkit, environment, source):
 
     # No matter what happens before, always install local source again with no
     # dependencies or we risk testing against an released enable.
-    install_local = (
-        "edm run -e {environment} -- "
-        "pip install --force-reinstall --no-dependencies " + ROOT
-    )
-    execute([install_local], parameters)
+    install_local = [
+        (
+            "edm run -e {environment} -- "
+            "python -m build -x -n -w " + ROOT),
+        (
+            "edm run -e {environment} -- "
+            "python -m pip install --no-deps dist/*.whl")
+    ]
+    execute(install_local, parameters)
 
     click.echo('Done install')
 
@@ -477,7 +450,8 @@ def get_parameters(runtime, toolkit, environment):
         tmpl = 'enable-test-{runtime}-{toolkit}'
         environment = tmpl.format(**parameters)
         parameters['environment'] = environment
-
+    os = platform.system()
+    parameters['platform'] = platforms[(runtime, os)]
     parameters["edm_config"] = EDM_CONFIG
     return parameters
 

ci/requirements_3.8.txt → ci/requirements_3.11.txt

@@ -1,2 +1 @@
 pypdf2<3.0
-reportlab

kiva/_cython_speedups.pyx

@@ -8,9 +8,12 @@
 #
 # Thanks for using Enthought open source!
 import numpy as np
-from numpy cimport uint8_t
-cimport _hit_test
 
+from numpy cimport uint8_t, import_array
+cimport cython
+from . cimport _hit_test
+
+import_array()
 
 def points_in_polygon(pts, poly_pts, use_winding=False):
     """Test whether point pairs in pts are within the polygon, poly_pts.

kiva/_marker_renderer.pyx

@@ -7,11 +7,13 @@
 # is also available online at http://www.enthought.com/licenses/BSD.txt
 #
 # Thanks for using Enthought open source!
-import cython
 import numpy as np
-from numpy cimport uint8_t
 
-cimport _marker_renderer
+from numpy cimport uint8_t, import_array
+cimport cython
+from . cimport _marker_renderer
+
+import_array()
 
 ctypedef _marker_renderer.marker_renderer_base renderer_base_t