Skip to content

Commit

Permalink
Merge pull request #469 from jitseniesen/spyder6
Browse files Browse the repository at this point in the history
PR: Update to released version of Spyder 6
  • Loading branch information
jitseniesen authored Sep 3, 2024
2 parents 51e52b7 + ca8a903 commit 2b2ff9c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/conda.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
spyder >=6.0.0.dev0,<7
spyder >=6,<7
jupyter_core
jupyter_server
nbformat
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def run(self):


REQUIREMENTS = [
'spyder>=5.4.3,<6',
'spyder>=6,<7',
'nbformat',
'notebook>=7.2,<8',
'qtpy',
Expand All @@ -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',
Expand Down

0 comments on commit 2b2ff9c

Please sign in to comment.