From 62b4eadf580864254087fe7784eee03380f32edd Mon Sep 17 00:00:00 2001
From: Jitse Niesen <jitseniesen@yahoo.com>
Date: Tue, 3 Sep 2024 16:04:06 +0100
Subject: [PATCH 1/4] Use released version of Spyder 6 as requirement

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

diff --git a/requirements/conda.txt b/requirements/conda.txt
index a21d8a2..e5781c1 100644
--- a/requirements/conda.txt
+++ b/requirements/conda.txt
@@ -1,4 +1,4 @@
-spyder >=6.0.0.dev0,<7
+spyder >=6,<7
 jupyter_core
 jupyter_server
 nbformat
diff --git a/setup.py b/setup.py
index ac2a8fa..ae2e24d 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ def run(self):
 
 
 REQUIREMENTS = [
-    'spyder>=5.4.3,<6',
+    'spyder>=6,<7',
     'nbformat',
     'notebook>=7.2,<8',
     'qtpy',

From f0f1be2f01302c5c7f285783d9fff9cad0db4904 Mon Sep 17 00:00:00 2001
From: Jitse Niesen <jitseniesen@yahoo.com>
Date: Tue, 3 Sep 2024 16:04:42 +0100
Subject: [PATCH 2/4] Bump required Python version to 3.8

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ae2e24d..33a90de 100644
--- a/setup.py
+++ b/setup.py
@@ -91,7 +91,7 @@ def run(self):
     version=get_version(),
     cmdclass={'sdist': my_sdist},
     keywords='spyder jupyter notebook',
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     url='https://github.com/spyder-ide/spyder-notebook',
     license='MIT',
     author='Spyder Development Team',

From de4fee4cea17799cee40e3d38117c9ab548321cc Mon Sep 17 00:00:00 2001
From: Jitse Niesen <jitseniesen@yahoo.com>
Date: Tue, 3 Sep 2024 16:05:43 +0100
Subject: [PATCH 3/4] 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 7bbea2f..a53f15c 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:

From ca8a90337bc49c3cd5aee84b7e704cb66f28f747 Mon Sep 17 00:00:00 2001
From: Jitse Niesen <jitseniesen@yahoo.com>
Date: Tue, 3 Sep 2024 16:22:28 +0100
Subject: [PATCH 4/4] CI: Use miniforge

This ensures that we use the conda-forge channel instead of defaults.
---
 .github/workflows/run-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index a53f15c..bb76c7c 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -34,6 +34,7 @@ jobs:
       - name: Install Conda
         uses: conda-incubator/setup-miniconda@v3
         with:
+          miniforge-version: latest
           auto-update-conda: true
           python-version: ${{ matrix.PYTHON_VERSION }} 
       - name: Checkout Spyder from git