Merge branch 'main' into main

johannesloibl · Jun 28, 2024 · e0c4460 · e0c4460
2 parents 0712077 + fc8e490
commit e0c4460
Show file tree

Hide file tree

Showing 161 changed files with 225 additions and 192 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/ets-from-source.yml b/.github/workflows/ets-from-source.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  INSTALL_EDM_VERSION: 3.5.0
+  INSTALL_EDM_VERSION: 3.7.0
 
 jobs:
 
@@ -21,22 +21,22 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout the target commit
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up bootstrap Python (3.10)
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
           cache: 'pip'
           cache-dependency-path: '.github/workflows/bootstrap-requirements.txt'
       - name: Install necessary packages to the bootstrap environment
         run: python -m pip install -r .github/workflows/bootstrap-requirements.txt
       - name: Cache EDM packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache
           key: ${{ runner.os }}-${{ matrix.runtime }}-${{ hashFiles('etstool.py') }}
       - name: Setup EDM
-        uses: enthought/setup-edm-action@v2
+        uses: enthought/setup-edm-action@v3
         with:
           edm-version: ${{ env.INSTALL_EDM_VERSION }}
       - name: Install test environment

diff --git a/.github/workflows/publish-on-pypi.yml b/.github/workflows/publish-on-pypi.yml
@@ -11,9 +11,9 @@ jobs:
 
     steps:
     - name: Check out the release commit
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.10'
     - name: Install Python packages needed for build and upload

diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml
@@ -7,7 +7,7 @@ name: Test with EDM
 on: [pull_request, workflow_dispatch]
 
 env:
-  INSTALL_EDM_VERSION: 3.5.0
+  INSTALL_EDM_VERSION: 3.7.0
 
 jobs:
 
@@ -16,33 +16,33 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'windows-latest']
-        runtime: ['3.6', '3.8']
+        runtime: ['3.8', '3.11']
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout the target commit
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up bootstrap Python (3.10)
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
           cache: 'pip'
           cache-dependency-path: '.github/workflows/bootstrap-requirements.txt'
       - name: Install necessary packages to the bootstrap environment
         run: python -m pip install -r .github/workflows/bootstrap-requirements.txt
       - name: Cache EDM packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache
           key: ${{ runner.os }}-${{ matrix.runtime }}-${{ hashFiles('etstool.py') }}
       - name: Setup EDM
-        uses: enthought/setup-edm-action@v2
+        uses: enthought/setup-edm-action@v3
         with:
           edm-version: ${{ env.INSTALL_EDM_VERSION }}
       - name: Install test environment
         run: python etstool.py install --runtime=${{ matrix.runtime }}
-      - name: Run style checks (only on Linux)
+      - name: Run style checks (only on Linux, 3.8)
         run: python etstool.py flake8 --runtime=${{ matrix.runtime }}
-        if: startsWith(matrix.os, 'ubuntu')
+        if: startsWith(matrix.os, 'ubuntu') && matrix.runtime == '3.8'
       - name: Run tests
         run: python etstool.py test --runtime=${{ matrix.runtime }}
diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml
@@ -9,20 +9,25 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
 
     runs-on: ${{ matrix.os }}
 
     steps:
     - name: Get apptools source
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies and local packages
-      run: |
-        python -m pip install .[h5,preferences]
+    - name: Install dependencies and local packages (not macOS)
+      run: python -m pip install .[h5,preferences]
+      if: matrix.os != 'macos-latest'
+    - name: Install dependencies and local packages (macOS)
+      run: python -m pip install .[preferences]
+      # PyTables currently won't build on Apple Silicon, so exclude the h5 deps
+      # xref: enthought/apptools/issues/344
+      if: matrix.os == 'macos-latest'
     - name: Run tests
       run: |
         mkdir testdir

diff --git a/apptools/__init__.py b/apptools/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/_testing/__init__.py b/apptools/_testing/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2006-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2006-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/_testing/optional_dependencies.py b/apptools/_testing/optional_dependencies.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2006-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2006-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/__init__.py b/apptools/io/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/api.py b/apptools/io/api.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/file.py b/apptools/io/file.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/__init__.py b/apptools/io/h5/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/dict_node.py b/apptools/io/h5/dict_node.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/file.py b/apptools/io/h5/file.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/table_node.py b/apptools/io/h5/table_node.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/tests/__init__.py b/apptools/io/h5/tests/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/tests/test_dict_node.py b/apptools/io/h5/tests/test_dict_node.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/tests/test_file.py b/apptools/io/h5/tests/test_file.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/tests/test_table_node.py b/apptools/io/h5/tests/test_table_node.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/tests/utils.py b/apptools/io/h5/tests/utils.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/h5/utils.py b/apptools/io/h5/utils.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/tests/__init__.py b/apptools/io/tests/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/tests/test_file.py b/apptools/io/tests/test_file.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/io/tests/test_folder.py b/apptools/io/tests/test_folder.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/__init__.py b/apptools/logger/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/agent/__init__.py b/apptools/logger/agent/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/agent/attachments.py b/apptools/logger/agent/attachments.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/agent/quality_agent_mailer.py b/apptools/logger/agent/quality_agent_mailer.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/agent/quality_agent_view.py b/apptools/logger/agent/quality_agent_view.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/agent/tests/__init__.py b/apptools/logger/agent/tests/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/agent/tests/test_attachments.py b/apptools/logger/agent/tests/test_attachments.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/api.py b/apptools/logger/api.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/custom_excepthook.py b/apptools/logger/custom_excepthook.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/log_point.py b/apptools/logger/log_point.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/log_queue_handler.py b/apptools/logger/log_queue_handler.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/logger.py b/apptools/logger/logger.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/plugin/__init__.py b/apptools/logger/plugin/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/plugin/logger_plugin.py b/apptools/logger/plugin/logger_plugin.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/plugin/logger_preferences.py b/apptools/logger/plugin/logger_preferences.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/plugin/logger_service.py b/apptools/logger/plugin/logger_service.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/plugin/tests/__init__.py b/apptools/logger/plugin/tests/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/plugin/tests/test_logger_service.py b/apptools/logger/plugin/tests/test_logger_service.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/plugin/view/__init__.py b/apptools/logger/plugin/view/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/plugin/view/logger_preferences_page.py b/apptools/logger/plugin/view/logger_preferences_page.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/plugin/view/logger_view.py b/apptools/logger/plugin/view/logger_view.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/logger/ring_buffer.py b/apptools/logger/ring_buffer.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/naming/__init__.py b/apptools/naming/__init__.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD

diff --git a/apptools/naming/address.py b/apptools/naming/address.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2005-2023 Enthought, Inc., Austin, TX
+# (C) Copyright 2005-2024 Enthought, Inc., Austin, TX
 # All rights reserved.
 #
 # This software is provided without warranty under the terms of the BSD