Skip to content

Commit

Permalink
Merge pull request #5 from spyder-ide/main-0.1.0
Browse files Browse the repository at this point in the history
PR: Fixes for 0.1.0
  • Loading branch information
hlouzada authored Aug 20, 2024
2 parents 489ebbd + 502635f commit 6d274e0
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 10 deletions.
6 changes: 2 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: spyder-remote
channels:
- conda-forge/label/spyder_kernels_rc
- conda-forge
# We want to have a reproducible setup, so we don't want default channels,
# which may be different for different users. All required channels should
Expand All @@ -9,6 +8,5 @@ channels:
dependencies:
- python=3.12.*
- pip
- jupyter_server
- jupyter_client
- spyder-kernels >=3.0.0b7,<3.0.0b8
- jupyter_server >=1.24.0,<2.0
- jupyter_client >=8.6.1,<9.0
12 changes: 12 additions & 0 deletions kernel_enviroment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: spyder-kernel
channels:
- conda-forge/label/spyder_kernels_rc
- conda-forge
# We want to have a reproducible setup, so we don't want default channels,
# which may be different for different users. All required channels should
# be listed explicitly here.
- nodefaults
dependencies:
- python=3.12.*
- pip
- spyder-kernels
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ readme = "README.md"
dynamic = ["version"]
requires-python = ">=3.10"
dependencies = [
"jupyter_server >= 1.24.0",
"jupyter_client >= 8.6.1",
"spyder-kernels >= 3.0.0b7,<3.0.0b8",
"jupyter_server >=1.24.0,<2.0",
"jupyter_client >=8.6.1,<9.0",
]

[tool.setuptools.dynamic]
version = {attr = "spyder_remote_services.__version__"}

[project.scripts]
spyder-remote-server = "spyder_remote_services.__main__:main"
spyder-server = "spyder_remote_services.__main__:main"

[project.optional-dependencies]
dev = [
Expand Down
2 changes: 1 addition & 1 deletion spyder_remote_services/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

__version__ = '0.0.1.dev1'
__version__ = '0.1.0'
4 changes: 3 additions & 1 deletion spyder_remote_services/jupyter_client/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
class SpyderAsyncIOLoopKernelManager(AsyncIOLoopKernelManager):
def format_kernel_cmd(self, extra_arguments=None):
"""Format the kernel command line to be run."""
# avoids sporadical warning on kernel restart
self.update_env({'PYDEVD_DISABLE_FILE_VALIDATION': '1'})

cmd = super().format_kernel_cmd(extra_arguments)
# Replace the `ipykernel_launcher` with `spyder_kernel.console`
cmd_indx = cmd.index('ipykernel_launcher')
if cmd_indx != -1:
cmd[cmd_indx] = 'spyder_kernels.console'
return cmd

0 comments on commit 6d274e0

Please sign in to comment.