Fix build issues for chaco

.github/actions/ets_toolkit/action.yml

@@ -0,0 +1,46 @@
+name: Set ETS_TOOLKIT
+description: 'Set the ETS_TOOLKIT environment variable'
+inputs:
+  toolkit:
+    required: true
+    description: 'The GUI toolkit to use (wx, null, pyqt5, pyqt6, pyside2, pyside6)'
+  kiva:
+    default: 'image'
+    description: 'The kiva toolkit to set'
+  shell:
+    default: 'bash'
+runs:
+  using: composite
+  steps:
+  - name: Null toolkit
+    if: inputs.toolkit == 'null'
+    run: echo "ETS_TOOLKIT=null.${{ inputs.kiva }}" >> $GITHUB_ENV
+    shell: ${{ inputs.shell }}
+  - name: WxPython toolkit
+    if: inputs.toolkit == 'wx'
+    run: echo "ETS_TOOLKIT=wx.${{ inputs.kiva }}" >> $GITHUB_ENV
+    shell: ${{ inputs.shell }}
+  - name: PyQT5 toolkit
+    if: inputs.toolkit == 'pyqt5'
+    run: |
+      echo "ETS_TOOLKIT=qt.${{ inputs.kiva }}" >> $GITHUB_ENV
+      echo "QT_API=pyqt5" >> $GITHUB_ENV
+    shell: ${{ inputs.shell }}
+  - name: PyQT6 toolkit
+    if: inputs.toolkit == 'pyqt6'
+    run: |
+      echo "ETS_TOOLKIT=qt.${{ inputs.kiva }}" >> $GITHUB_ENV
+      echo "QT_API=pyqt6" >> $GITHUB_ENV
+    shell: ${{ inputs.shell }}
+  - name: PySide2 toolkit
+    if: inputs.toolkit == 'pyside2'
+    run: |
+      echo "ETS_TOOLKIT=qt.${{ inputs.kiva }}" >> $GITHUB_ENV
+      echo "QT_API=pyside2" >> $GITHUB_ENV
+    shell: ${{ inputs.shell }}
+  - name: PySide6 toolkit
+    if: inputs.toolkit == 'pyside6'
+    run: |
+      echo "ETS_TOOLKIT=qt.${{ inputs.kiva }}" >> $GITHUB_ENV
+      echo "QT_API=pyside6" >> $GITHUB_ENV
+    shell: ${{ inputs.shell }}

.github/actions/install-qt-support/action.yml

@@ -7,10 +7,6 @@ runs:
     if: runner.os == 'Linux'
     run: |
       sudo apt-get update
-      sudo apt-get install qtbase5-dev
-      sudo apt-get install qtchooser
-      sudo apt-get install qt5-qmake
-      sudo apt-get install qtbase5-dev-tools
       sudo apt-get install libegl1
       sudo apt-get install libxkbcommon-x11-0
       sudo apt-get install libxcb-icccm4

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

@@ -2,66 +2,62 @@
 # Note that some packages may not actually be installed from EDM but from
 # PyPI, see ci/edmtool.py implementations.
 
-name: Test with EDM on Python 3.8
+name: Test with EDM
 
 on: pull_request
 
 env:
-  INSTALL_EDM_VERSION: 3.5.0
+  INSTALL_EDM_VERSION: 4.1.1
+  PYTHONUNBUFFERED: 1
+  EDM_CONFIG: '${{ github.workspace }}/ci/edm.yaml'
 
 jobs:
 
-  # Test against EDM packages on Linux
-  test-edm-linux-38:
+  test-edm:
     strategy:
       matrix:
-        toolkit: ['null', 'pyside6']
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install Qt dependencies
-        uses: ./.github/actions/install-qt-support
-        if: matrix.toolkit != 'null'
-      - name: Cache EDM packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache
-          key: ${{ runner.os }}-3.8-${{ matrix.toolkit }}-${{ hashFiles('ci/edmtool.py') }}
-      - name: Setup EDM
-        uses: enthought/setup-edm-action@v2
-        with:
-          edm-version: ${{ env.INSTALL_EDM_VERSION }}
-      - name: Install click to the default EDM environment
-        run: edm install -y wheel click coverage
-      - name: Install test environment
-        run: edm run -- python ci/edmtool.py install --runtime=3.8 --toolkit=${{ matrix.toolkit }}
-      - name: Flake8
-        run: edm run -- python ci/edmtool.py flake8 --runtime=3.8 --toolkit=${{ matrix.toolkit }}
-        if: matrix.toolkit == 'null'
-      - name: Run tests
-        run: xvfb-run -a --server-args="-screen 0 1024x768x24" edm run -- python ci/edmtool.py test --runtime=3.8 --toolkit=${{ matrix.toolkit }}
-
-  # Test against EDM packages on Windows and OSX
-  test-with-edm-38:
-    strategy:
-      matrix:
-        os: [windows-latest]
-        toolkit: ['null', 'pyside6']
+        toolkit: ['null', 'pyside6', 'wx']
+        runtime: ['3.11']
+        os: ['ubuntu-latest', 'windows-latest']
+        include:
+          - toolkit: 'null'
+            runtime: '3.11'
+            os: macos-latest
+          - toolkit: 'pyside6'
+            runtime: '3.11'
+            os: macos-latest
     runs-on: ${{ matrix.os }}
     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 }}-3.8-${{ matrix.toolkit }}-${{ hashFiles('ci/edmtool.py') }}
+          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 opengl for Linux
+        run: |
+          sudo apt-get update
+          sudo apt-get install libopengl0 libegl1
+        if: matrix.os == 'ubuntu-latest' && matrix.toolkit != 'null'
       - name: Install click to the default EDM environment
         run: edm install -y wheel click coverage
+      - name: Set ETS_TOOLKIT
+        uses: ./.github/actions/ets_toolkit
+        with:
+          toolkit: ${{ matrix.toolkit }}
       - name: Install test environment
-        run: edm run -- python ci/edmtool.py install --runtime=3.8 --toolkit=${{ matrix.toolkit }}
+        run: edm run -- python ci/edmtool.py install --toolkit=${{ matrix.toolkit }} --runtime=${{ matrix.runtime }}
+      - name: Run tests on Linux
+        if: matrix.os == 'ubuntu-latest'
+        env:
+          PYTHONFAULTHANDLER: 1
+        run: xvfb-run -a --server-args="-screen 0 1024x768x24" edm run -- python ci/edmtool.py test --toolkit=${{ matrix.toolkit }} --runtime=${{ matrix.runtime }}
       - name: Run tests
-        run: edm run -- python ci/edmtool.py test --runtime=3.8 --toolkit=${{ matrix.toolkit }}
+        if: matrix.os != 'ubuntu-latest'
+        env:
+          PYTHONFAULTHANDLER: 1
+        run: edm run -- python ci/edmtool.py test --toolkit=${{ matrix.toolkit }} --runtime=${{ matrix.runtime }}

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

@@ -1,4 +1,3 @@
-
 # This workflow installs dependencies from main branch
 
 name: Test with pip
@@ -14,153 +13,43 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        toolkit: ['pyside6']
+        toolkit: ['pyside2', 'pyside6', 'pyqt5', 'wx', 'null']
         kiva-backend: ['image']
-        python-version: ['3.8', '3.11']
-        include:
-          # Do more Python versions on linux
-          - os: 'ubuntu-latest'
-            toolkit: 'pyside6'
-            kiva-backend: 'image'
-            python-version: '3.9'
-          - os: 'ubuntu-latest'
-            toolkit: 'pyside6'
-            kiva-backend: 'image'
-            python-version: '3.10'
+        python-version: ['3.10', '3.11']
+        exclude:
+          # 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 PySide2 wheels for macos-latest
+          - os: 'macos-latest'
+            toolkit: 'pyside2'
     runs-on: ${{ matrix.os }}
-    env:
-      ETS_TOOLKIT: qt4.${{ matrix.kiva-backend }}
-      QT_API: ${{ matrix.toolkit }}
     steps:
       - name: Check out
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install Qt dependencies
-        uses: ./.github/actions/install-qt-support
-        if: matrix.toolkit == 'pyside6'
-      - name: Install dependencies for Linux
-        run: |
-          # needed for Celiagg
-          sudo apt-get install libfreetype-dev libharfbuzz-dev
-          # needed for Cairo
-          sudo apt-get install libcairo2-dev
-        if: matrix.os == 'ubuntu-latest'
-      - name: Install dependencies for Mac
-        run: |
-          brew install cairo
-        if: matrix.os == 'macos-latest'
-      - name: Install build dependencies
-        run: |
-          python -m pip install --upgrade pip wheel
-      - name: Install local enable main (temporary)
-        run: pip install --force "enable[celiagg,layout,svg] @ git+https://github.com/enthought/enable.git"
-      - name: Install local packages
-        run: pip install ".[tests,${{ matrix.toolkit }}]"
-      - name: Sanity check package version
-        run: pip list
-      - name: Run chaco test suite (Linux)
-        env:
-          PYTHONFAULTHANDLER: 1
-        # kiva agg requires at least 15-bit color depth.
-        run: xvfb-run -a --server-args="-screen 0 1024x768x24" python -m unittest discover -v chaco
-        if: matrix.os == 'ubuntu-latest'
-        working-directory: ${{ runner.temp }}
-      - name: Run enable test suite (not Linux)
-        env:
-          PYTHONFAULTHANDLER: 1
-        run: python -m unittest discover -v chaco
-        if: matrix.os != 'ubuntu-latest'
-        working-directory: ${{ runner.temp }}
-
-  test-wx:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ['windows-latest']
-        toolkit: ['wx']
-        kiva-backend: ['image']
-        python-version: ['3.8', '3.10']
-    runs-on: ${{ matrix.os }}
-    env:
-      ETS_TOOLKIT: ${{ matrix.toolkit }}.${{ matrix.kiva-backend }}
-    steps:
-      - name: Check out
-        uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
+          cache: 'pip'
+      - name: Set ETS_TOOLKIT
+        uses: ./.github/actions/ets_toolkit
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies for Linux
-        run: |
-          # needed for Celiagg
-          sudo apt-get install libfreetype-dev libharfbuzz-dev
-          # needed for Cairo
-          sudo apt-get install libcairo2-dev
-        if: matrix.os == 'ubuntu-latest'
-      - name: Install dependencies for Mac
-        run: |
-          brew install cairo
-        if: matrix.os == 'macos-latest'
+          toolkit: ${{ matrix.toolkit }}
       - name: Install build dependencies
         run: |
-          python -m pip install --upgrade pip wheel
-      - name: Install local enable main (temporary)
-        run: pip install --force "enable[celiagg,layout,svg] @ git+https://github.com/enthought/enable.git"
-      - name: Install local packages
-        run: pip install ".[tests,${{ matrix.toolkit }}]"
-      - name: Sanity check package version
-        run: pip list
-      - name: Run chaco test suite (Linux)
-        env:
-          PYTHONFAULTHANDLER: 1
-        # kiva agg requires at least 15-bit color depth.
-        run: xvfb-run -a --server-args="-screen 0 1024x768x24" python -m unittest discover -v chaco
-        if: matrix.os == 'ubuntu-latest'
-        working-directory: ${{ runner.temp }}
-      - name: Run enable test suite (not Linux)
-        env:
-          PYTHONFAULTHANDLER: 1
-        run: python -m unittest discover -v chaco
-        if: matrix.os != 'ubuntu-latest'
-        working-directory: ${{ runner.temp }}
-
-  test-null:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        toolkit: ['null']
-        kiva-backend: ['image', 'celiagg']
-        python-version: ['3.8', '3.11']
-    runs-on: ${{ matrix.os }}
-    env:
-      ETS_TOOLKIT: ${{ matrix.toolkit }}.${{ matrix.kiva-backend }}
-    steps:
-      - name: Check out
-        uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies for Linux
-        run: |
-          # needed for Celiagg
-          sudo apt-get install libfreetype-dev libharfbuzz-dev
-          # needed for Cairo
-          sudo apt-get install libcairo2-dev
-        if: matrix.os == 'ubuntu-latest'
-      - name: Install dependencies for Mac
-        run: |
-          brew install cairo
-        if: matrix.os == 'macos-latest'
-      - name: Install build dependencies
+          python -m pip install --upgrade pip wheel Cython
+      - name: Install wxdependencies for Linux
         run: |
-          python -m pip install --upgrade pip wheel
-      - name: Install local enable main (temporary)
-        run: pip install --force "enable[celiagg,cairo,layout,svg] @ git+https://github.com/enthought/enable.git"
+          sudo apt-get update
+          sudo apt-get install libgtk-3-dev
+        if: matrix.os == 'ubuntu-latest' && matrix.toolkit == 'wx'
+      - name: Install Qt dependencies on Linux
+        uses: ./.github/actions/install-qt-support
+        if: matrix.os == 'ubuntu-latest' && startsWith(matrix.toolkit, 'py')
       - name: Install local packages
         run: pip install ".[tests,${{ matrix.toolkit }}]"
       - name: Sanity check package version

chaco/base_contour_plot.py

@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 
-from numpy import array, isscalar, issubsctype, linspace, number
+from numpy import array, isscalar, issubdtype, linspace, number
 
 # Enthought library imports
 from enable.api import ColorTrait
@@ -135,7 +135,7 @@ def _update_colors(self, numcolors=None):
         # be converted via self._color_map_trait.
         else:
             if len(colors) in (3, 4) and (
-                isscalar(colors[0]) and issubsctype(type(colors[0]), number)
+                isscalar(colors[0]) and issubdtype(type(colors[0]), number)
             ):
                 self._color_map_trait = colors
                 self._colors = [self._color_map_trait_] * numcolors

chaco/color_mapper.py

@@ -12,6 +12,7 @@
 """
 
 # Major library imports
+import numpy as np
 from numpy import (
     arange,
     array,
@@ -24,7 +25,6 @@
     isnan,
     ones,
     searchsorted,
-    sometrue,
     sort,
     take,
     uint8,
@@ -413,7 +413,7 @@ def _make_mapping_array(self, n, data):
             raise ValueError(
                 "data mapping points must start with x=0. and end with x=1"
             )
-        if sometrue(sort(x) - x):
+        if np.any(sort(x) - x):
             raise ValueError(
                 "data mapping points must have x in increasing order"
             )

chaco/downsample/lttb.py

@@ -7,8 +7,8 @@
 # is also available online at http://www.enthought.com/licenses/BSD.txt
 #
 # Thanks for using Enthought open source!
-
 import logging
+import platform
 
 logger = logging.getLogger(__name__)