Skip to content

Commit ab232e2

Browse files
mdickinsonmdickinson
committed
Merge remote-tracking branch 'origin/main' into release/7.0.4
2 parents dccab60 + 31d9d0d commit ab232e2

File tree

217 files changed

+219
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+219
-244
lines changed

‎.github/workflows/ets-from-source.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
path: ~/.cache
3434
key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
3535
- name: Set up EDM
36-
uses: enthought/setup-edm-action@v3
36+
uses: enthought/setup-edm-action@v4
3737
with:
3838
edm-version: ${{ env.INSTALL_EDM_VERSION }}
3939
- name: Set up bootstrap Python

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
path: ~/.cache
3333
key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
3434
- name: Set up EDM
35-
uses: enthought/setup-edm-action@v3
35+
uses: enthought/setup-edm-action@v4
3636
with:
3737
edm-version: ${{ env.INSTALL_EDM_VERSION }}
3838
- name: Set up bootstrap Python

‎docs/source/api/envisage.api.rst‎

Lines changed: 1 addition & 1 deletion

‎docs/source/api/templates/modules.rst_t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
..
2-
(C) Copyright 2007-2024 Enthought, Inc., Austin, TX
2+
(C) Copyright 2007-2025 Enthought, Inc., Austin, TX
33
All rights reserved.
44

55
This software is provided without warranty under the terms of the BSD

‎docs/source/api/templates/package.rst_t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
..
2-
(C) Copyright 2007-2024 Enthought, Inc., Austin, TX
2+
(C) Copyright 2007-2025 Enthought, Inc., Austin, TX
33
All rights reserved.
44

55
This software is provided without warranty under the terms of the BSD

‎docs/source/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2007-2025 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD
@@ -53,7 +53,7 @@
5353

5454
# General substitutions.
5555
project = "envisage"
56-
copyright = "2007-2024, Enthought"
56+
copyright = "2007-2025, Enthought"
5757

5858
# The default replacements for |version| and |release|, also used in various
5959
# other places throughout the built documents.

‎docs/update_gh_pages.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2007-2025 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

‎envisage/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2007-2025 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

‎envisage/api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2007-2025 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

‎envisage/application.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# (C) Copyright 2007-2024 Enthought, Inc., Austin, TX
1+
# (C) Copyright 2007-2025 Enthought, Inc., Austin, TX
22
# All rights reserved.
33
#
44
# This software is provided without warranty under the terms of the BSD

0 commit comments

Comments
 (0)