From 7ae312d59a51f9cda77542db7c9160c28315d745 Mon Sep 17 00:00:00 2001
From: Jitse Niesen <jitseniesen@yahoo.com>
Date: Tue, 3 Sep 2024 10:01:19 +0100
Subject: [PATCH 1/3] Use released version of Spyder 6 as requirement

---
 requirements/conda.txt | 2 +-
 setup.py               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements/conda.txt b/requirements/conda.txt
index 9cd6ae5..6cf2cc6 100644
--- a/requirements/conda.txt
+++ b/requirements/conda.txt
@@ -1,2 +1,2 @@
 line_profiler
-spyder>=6.0.0.dev0,<7
+spyder>=6,<7
diff --git a/setup.py b/setup.py
index 9d90c3e..ea98661 100644
--- a/setup.py
+++ b/setup.py
@@ -41,13 +41,13 @@ def get_package_data(name, extlist):
 
 
 # Requirements
-REQUIREMENTS = ['line_profiler', 'qtawesome', 'spyder>=6.0.0.dev0,<7']
+REQUIREMENTS = ['line_profiler', 'qtawesome', 'spyder>=6,<7']
 EXTLIST = ['.jpg', '.png', '.json', '.mo', '.ini']
 LIBNAME = 'spyder_line_profiler'
 
 
 LONG_DESCRIPTION = """
-This is a plugin for the Spyder 5 IDE that integrates the Python line profiler.
+This is a plugin for the Spyder IDE that integrates the Python line profiler.
 It allows you to see the time spent in every line.
 
 Usage
@@ -79,7 +79,7 @@ def get_package_data(name, extlist):
         ],
     },
     author="Spyder Project Contributors",
-    description='Plugin for the Spyder 5 IDE that integrates the Python line profiler.',
+    description='Plugin for the Spyder IDE that integrates the Python line profiler.',
     long_description=LONG_DESCRIPTION,
     classifiers=[
         'Development Status :: 4 - Beta',

From e59a87b4256613ffd81b6283d11614194184666a Mon Sep 17 00:00:00 2001
From: Jitse Niesen <jitseniesen@yahoo.com>
Date: Tue, 3 Sep 2024 10:12:46 +0100
Subject: [PATCH 2/3] Bump required Python version to 3.8

---
 setup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index ea98661..826261d 100644
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ def get_package_data(name, extlist):
     install_requires=REQUIREMENTS,
     url='https://github.com/spyder-ide/spyder-line-profiler',
     license='MIT',
-    python_requires='>= 3.7',
+    python_requires='>= 3.8',
     entry_points={
         "spyder.plugins": [
             "spyder_line_profiler = spyder_line_profiler.spyder.plugin:SpyderLineProfiler"
@@ -89,9 +89,10 @@ def get_package_data(name, extlist):
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Software Development',
         'Topic :: Text Editors :: Integrated Development Environments (IDE)'])

From 7af837b5e6fce6c88ac4979a3c7eafcbfc14f4d1 Mon Sep 17 00:00:00 2001
From: Jitse Niesen <jitseniesen@yahoo.com>
Date: Tue, 3 Sep 2024 10:14:57 +0100
Subject: [PATCH 3/3] CI: Test against both Spyder from conda and Spyder from
 git

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 9248522..705ca51 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         OS: ['ubuntu', 'macos', 'windows']
         PYTHON_VERSION: ['3.9', '3.10', '3.11']
-        SPYDER_SOURCE: ['git']
+        SPYDER_SOURCE: ['conda', 'git']
     name: ${{ matrix.OS }} py${{ matrix.PYTHON_VERSION }} spyder-from-${{ matrix.SPYDER_SOURCE }}
     runs-on: ${{ matrix.OS }}-latest
     env: