From 9c520cc4e422a41a808fdc0ba0d78882a80a2983 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Wed, 17 Jul 2024 09:29:15 +0100
Subject: [PATCH] Require apptools 5.3 or later, Python 3.8 or later (#584)

This PR updates the apptools dependency to apptools >= 5.3, and deals
with various pieces of fallout from that change:

Detailed changes:

- require `apptools >= 5.3`, which contains some fixes that we need for
some upcoming bugfixes on this repository (see #583)
- require `apptools[preferences]` rather than just plain `apptools`,
since version 5.3.0 of `apptools` no longer declares `configobj` as an
explicit dependency, and Envisage preferences depend on `configobj`
- similarly, require `configobj` explicitly in `etstool.py`, since EDS
doesn't support optional requirements
- require Python >= 3.8, since `apptools` now also requires Python >=
3.8, and `apptools >= 5.3.0` is not available for Python 3.7
---
 .github/workflows/test-with-pypi.yml | 2 +-
 README.rst                           | 2 +-
 etstool.py                           | 1 +
 pyproject.toml                       | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-with-pypi.yml b/.github/workflows/test-with-pypi.yml
index 601d2aa52..eecece2b1 100644
--- a/.github/workflows/test-with-pypi.yml
+++ b/.github/workflows/test-with-pypi.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        python-version: ['3.7', '3.8', '3.10', '3.11']
+        python-version: ['3.8', '3.10', '3.11']
 
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/README.rst b/README.rst
index 4abafe60c..e5a8d97d2 100644
--- a/README.rst
+++ b/README.rst
@@ -33,7 +33,7 @@ framework. You are free to use:
 Prerequisites
 -------------
 
-The supported versions of Python are Python >= 3.7.  Envisage requires:
+The supported versions of Python are Python >= 3.8.  Envisage requires:
 
 * `apptools <https://pypi.org/project/apptools/>`_
 * `traits <https://pypi.org/project/traits/>`_
diff --git a/etstool.py b/etstool.py
index 244a31905..b4bd76a94 100644
--- a/etstool.py
+++ b/etstool.py
@@ -104,6 +104,7 @@
 
 dependencies = {
     "apptools",
+    "configobj",
     "coverage",
     "enthought_sphinx_theme",
     "pyface",
diff --git a/pyproject.toml b/pyproject.toml
index 516e941e2..eafcd3bd5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ name = 'envisage'
 version = '7.0.3'
 description = 'Extensible application framework'
 readme = 'README.rst'
-requires-python = '>= 3.7'
+requires-python = '>= 3.8'
 license = {file = 'LICENSE.txt'}
 authors = [{name = 'Enthought', email = 'info@enthought.com'}]
 keywords = ['extensible', 'plugin', 'application', 'framework']
@@ -28,7 +28,7 @@ classifiers = [
     'Topic :: Software Development :: User Interfaces',
 ]
 dependencies = [
-    'apptools',
+    'apptools[preferences]>=5.3',
     'pyface',
     'setuptools',
     'traits>=6.2',