Skip to content

Commit

Permalink
Merge branch 'main' into dev/remove-slack-notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
mdickinson authored Jul 15, 2024
2 parents de4836c + 4ec68a4 commit b10287f
Show file tree
Hide file tree
Showing 223 changed files with 246 additions and 236 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
4 changes: 2 additions & 2 deletions .github/workflows/check-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: 'ubuntu-latest'

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ets-from-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Clone the Envisage source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install packages for Qt support
uses: ./.github/actions/install-qt-support
- name: Cache EDM packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache
key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
- name: Set up EDM
uses: enthought/setup-edm-action@v2
uses: enthought/setup-edm-action@v3
with:
edm-version: ${{ env.INSTALL_EDM_VERSION }}
- name: Set up bootstrap Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-on-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip'
Expand All @@ -18,7 +18,7 @@ jobs:
python -m pip install .
- run: |
python -m sphinx -b html -d docs/build/doctrees docs/source docs/build/html
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: documentation
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-with-edm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Clone the Envisage source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install packages for Qt support
uses: ./.github/actions/install-qt-support
- name: Cache EDM packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache
key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
- name: Set up EDM
uses: enthought/setup-edm-action@v2
uses: enthought/setup-edm-action@v3
with:
edm-version: ${{ env.INSTALL_EDM_VERSION }}
- name: Set up bootstrap Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-with-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Clone the Envisage source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install packages for Qt support
uses: ./.github/actions/install-qt-support
- 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 packages needed for testing
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-gh-pages-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip'
Expand Down
2 changes: 1 addition & 1 deletion docs/source/api/envisage.api.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2007-2023 Enthought, Inc., Austin, TX
(C) Copyright 2007-2024 Enthought, Inc., Austin, TX
All rights reserved.
This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion docs/source/api/templates/modules.rst_t
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2007-2023 Enthought, Inc., Austin, TX
(C) Copyright 2007-2024 Enthought, Inc., Austin, TX
All rights reserved.

This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion docs/source/api/templates/package.rst_t
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2007-2023 Enthought, Inc., Austin, TX
(C) Copyright 2007-2024 Enthought, Inc., Austin, TX
All rights reserved.

This software is provided without warranty under the terms of the BSD
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down Expand Up @@ -53,7 +53,7 @@

# General substitutions.
project = "envisage"
copyright = "2007-2023, Enthought"
copyright = "2007-2024, Enthought"

# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
Expand Down
2 changes: 1 addition & 1 deletion docs/update_gh_pages.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/api.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/application.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/application_event.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/composite_plugin_manager.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/core_plugin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/egg_basket_plugin_manager.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/egg_plugin_manager.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/egg_utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/_demo.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/_etsdemo_info.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/GUI_Application/traitsui_gui_app.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/Hello_World/hello_world.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/MOTD/acme/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/MOTD/acme/motd/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/MOTD/acme/motd/api.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/MOTD/acme/motd/i_message.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/MOTD/acme/motd/i_motd.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/MOTD/acme/motd/message.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/MOTD/acme/motd/motd.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/MOTD/acme/motd/motd_plugin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
2 changes: 1 addition & 1 deletion envisage/examples/demo/MOTD/run.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2007-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down
Loading

0 comments on commit b10287f

Please sign in to comment.