diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7bbea2f..bb76c7c 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: @@ -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 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..33a90de 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', @@ -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',