Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/ets-from-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
runtime: ['3.8', '3.11']
runtime: ['3.11']
toolkit: ['null', 'pyside6']
exclude:
# EDM does not provide a Python 3.8 runtime for ARM (osx_arm64).
- os: macos-latest
runtime: '3.8'

runs-on: ${{ matrix.os }}
steps:
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test-with-edm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
runtime: ['3.8', '3.11']
runtime: ['3.11']
toolkit: ['null', 'pyside6']
exclude:
# EDM does not provide a Python 3.8 runtime for ARM (osx_arm64).
- os: macos-latest
runtime: '3.8'

runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-with-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest']
python-version: ['3.8', '3.10', '3.11', '3.12', '3.13', '3.14']
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']

runs-on: ${{ matrix.os }}
steps:
Expand Down
7 changes: 5 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ Changes

Removals
--------
* Drop support for Python 3.8 and 3.9. Envisage now requires Python 3.10
or later. (#616)
* Remove the deprecated ``EggPluginManager``, ``EggBasketPluginManager``
and ``PackagePluginManager`` classes, along with the supporting
``egg_utils`` module and associated tests. (#548)
Expand All @@ -45,8 +47,9 @@ Build
-----
* Remove all uses of ``pkg_resources`` and drop ``setuptools`` as a
runtime dependency. ``setuptools`` is retained as a build dependency.
``importlib.resources`` (with ``importlib-resources`` as a backport
for Python 3.8) is used instead.
``importlib.resources`` is used instead.
* Drop the ``importlib-resources`` dependency, which was only needed for
Python versions earlier than 3.9. (#616)

Tests
-----
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ framework. You are free to use:
Prerequisites
-------------

The supported versions of Python are Python >= 3.8. Envisage requires:
The supported versions of Python are Python >= 3.10. Envisage requires:

* `apptools <https://pypi.org/project/apptools/>`_
* `traits <https://pypi.org/project/traits/>`_
Expand Down
5 changes: 1 addition & 4 deletions envisage/examples/_etsdemo_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
entry points.
"""

try:
from importlib.resources import files
except ImportError:
from importlib_resources import files
from importlib.resources import files


def info(request):
Expand Down
4 changes: 1 addition & 3 deletions envisage/resource/http_resource_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ def file(self, address):
f = urlopen("http://" + address)

except HTTPError as exc:
# On Python 3.8 and 3.9, close() fails if the HTTPError has no fp.
if exc.fp is not None:
exc.close()
exc.close()
raise NoSuchResourceError("http://" + address)

return f
5 changes: 1 addition & 4 deletions envisage/resource/package_resource_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@


# Standard library imports.
try:
from importlib.resources import files
except ImportError:
from importlib_resources import files
from importlib.resources import files

# Enthought library imports.
from traits.api import HasTraits, provides
Expand Down
7 changes: 1 addition & 6 deletions envisage/resource/tests/test_resource_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,10 @@
# Standard library imports.
import unittest
import urllib.request
from importlib.resources import as_file, files
from io import StringIO
from urllib.error import HTTPError

try:
from importlib.resources import as_file, files
except ImportError:
from importlib_resources import as_file, files


# Enthought library imports.
from envisage.resource.api import NoSuchResourceError, ResourceManager

Expand Down
6 changes: 1 addition & 5 deletions envisage/tests/test_core_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@

# Standard library imports.
import unittest

try:
from importlib.resources import as_file, files
except ImportError:
from importlib_resources import as_file, files
from importlib.resources import as_file, files

# Enthought library imports.
from traits.api import HasTraits, Interface, List, on_trait_change, Str
Expand Down
6 changes: 1 addition & 5 deletions envisage/ui/tasks/tests/test_tasks_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
import shutil
import tempfile
import unittest

try:
from importlib.resources import files
except ImportError:
from importlib_resources import files
from importlib.resources import files

# Enthought library imports.
from pyface.gui import GUI
Expand Down
23 changes: 3 additions & 20 deletions etstool.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,31 +85,21 @@
import click

# Python runtime versions supported by this tool.
available_runtimes = ["3.8", "3.11"]
available_runtimes = ["3.11"]

# Python runtime used by default.
default_runtime = "3.8"
default_runtime = "3.11"

# Toolkits supported by this tool.
# PySide2 and PyQt5 are not (currently) available for EDM + Python 3.8, so we
# don't support them here.
available_toolkits = ["null", "pyqt6", "pyside6"]

# Toolkit used by default.
default_toolkit = "null"

supported_combinations = {
"3.8": {"null", "pyqt6", "pyside6"},
"3.11": {"null", "pyqt6", "pyside6"},
}

# On Linux, EDM requires an explicit platform string that depends on the
# runtime: Python 3.8 uses rh7_x86_64 and Python 3.11 uses rh8_x86_64.
linux_runtime_platform = {
"3.8": "rh7_x86_64",
"3.11": "rh8_x86_64",
}

dependencies = {
"apptools",
"configobj",
Expand Down Expand Up @@ -227,16 +217,9 @@ def install(edm, runtime, toolkit, environment, editable, source):
| toolkit_dependencies.get(toolkit, set())
| runtime_dependencies.get(runtime, set())
)
# On Linux, the EDM platform must be specified explicitly since the
# default (rh8_x86_64) only supports newer runtimes.
if sys.platform.startswith("linux") and runtime in linux_runtime_platform:
platform_flag = " --platform=" + linux_runtime_platform[runtime]
else:
platform_flag = ""
# edm commands to setup the development environment
commands = [
"{edm} environments create {environment} --force --version={runtime}"
+ platform_flag,
"{edm} environments create {environment} --force --version={runtime}",
"{edm} --config edm.yaml install -y -e {environment} " + packages,
]
commands.extend(
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = 'envisage'
version = '7.0.4'
description = 'Extensible application framework'
readme = 'README.rst'
requires-python = '>= 3.8'
requires-python = '>= 3.10'
license = {file = 'LICENSE.txt'}
authors = [{name = 'Enthought', email = 'info@enthought.com'}]
keywords = ['extensible', 'plugin', 'application', 'framework']
Expand All @@ -32,7 +32,6 @@ dependencies = [
'pyface',
'traits>=6.2',
'traitsui',
'importlib-resources>=1.1.0; python_version<"3.9"',
]

[project.entry-points.'envisage.plugins']
Expand Down