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 Mar 14, 2024
2 parents e29e9fd + fc1b8b6 commit edac72a
Show file tree
Hide file tree
Showing 107 changed files with 131 additions and 125 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/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:

steps:
- name: Check out the main branch
uses: actions/checkout@v3
uses: actions/checkout@v4
# We need a full clone rather than a shallow clone so that setuptools-scm
# can compute the right version number for the docs.
# xref: https://github.com/pypa/setuptools_scm/issues/431
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install graphviz
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:

steps:
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Check out the target commit
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install necessary Python packages
run: |
python -m pip install -r style-requirements.txt
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
10 changes: 5 additions & 5 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
python-version: ['3.7', '3.8', '3.10']
python-version: ['3.8', '3.10']

env:
ETS_TOOLKIT: qt
Expand All @@ -19,7 +19,7 @@ jobs:

steps:
- name: Check out the target commit
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Linux packages for PySide6 support
run: |
sudo apt-get update
Expand All @@ -34,7 +34,7 @@ jobs:
sudo apt-get install libxcb-shape0
if: matrix.os == 'ubuntu-latest'
- 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
Expand Down Expand Up @@ -63,14 +63,14 @@ jobs:

steps:
- name: Check out the target commit
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Linux packages for wx support
run: |
sudo apt-get update
sudo apt-get install libsdl2-2.0-0
if: matrix.os == 'ubuntu-latest'
- 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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
sudo apt-get update
sudo apt-get install graphviz
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Check out the target commit
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install local package and documentation dependencies
run: |
python -m pip install -r docs/requirements.txt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-from-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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']

runs-on: ${{ matrix.os }}

Expand All @@ -30,7 +30,7 @@ jobs:
sudo apt-get install libxcb-shape0
if: matrix.os == 'ubuntu-latest'
- 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 package and test dependencies from PyPI sdist (with PySide6)
Expand All @@ -56,7 +56,7 @@ 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']

runs-on: ${{ matrix.os }}

Expand All @@ -75,7 +75,7 @@ jobs:
sudo apt-get install libxcb-shape0
if: matrix.os == 'ubuntu-latest'
- 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 package and test dependencies from PyPI wheel (with PySide6)
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/weekly-scheduled-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ 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']

runs-on: ${{ matrix.os }}

steps:
- name: Check out the target commit
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
Expand All @@ -38,13 +38,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.7', '3.8', '3.10']
python-version: ['3.8', '3.10']

runs-on: ${{ matrix.os }}

steps:
- name: Check out the main branch
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Linux packages for PySide6 support
run: |
sudo apt-get update
Expand All @@ -59,7 +59,7 @@ jobs:
sudo apt-get install libxcb-shape0
if: matrix.os == 'ubuntu-latest'
- 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
Expand Down
4 changes: 2 additions & 2 deletions DEVELOP.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-2024 Enthought, Inc., Austin, TX
All rights reserved.
This software is provided without warranty under the terms of the BSD
Expand All @@ -19,7 +19,7 @@ Getting started
---------------

You'll need a Python 3 environment for development. Any environment using
Python >= 3.7 will do. For example, you could create and activate a new venv
Python >= 3.8 will do. For example, you could create and activate a new venv
using something like::

python3.10 -m venv ../traits-futures && source ../traits-futures/bin/activate
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-2024 Enthought, Inc., Austin, TX
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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/module.rst_t
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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/traits_futures.api.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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/changes.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-2024 Enthought, Inc., Austin, TX
# All rights reserved.
#
# This software is provided without warranty under the terms of the BSD
Expand Down Expand Up @@ -61,7 +61,7 @@

# General information about the project.
project = "Traits Futures"
copyright = "2018-2023 Enthought, Inc., Austin, TX"
copyright = "2018-2024 Enthought, Inc., Austin, TX"
author = "Enthought"

# The version info for the project you're documenting, acts as replacement for
Expand Down
2 changes: 1 addition & 1 deletion docs/source/guide/advanced.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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/guide/cancel.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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/guide/contexts.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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/guide/examples.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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/guide/examples/background_processes.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/calculate_in_main_thread.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/calculate_in_worker_thread.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/fizz_buzz_task.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/fizz_buzz_ui.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/headless.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/interruptible_task.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/non_interruptible_task.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/pi_iterations.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/prime_counting.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/quick_start.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/simple_blocking_call.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/slow_squares.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/examples/test_future.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright 2018-2023 Enthought, Inc., Austin, TX
# (C) Copyright 2018-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/guide/intro.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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/guide/overview.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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/guide/testing.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
(C) Copyright 2018-2023 Enthought, Inc., Austin, TX
(C) Copyright 2018-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 edac72a

Please sign in to comment.