From 4bf21a71a23f93cbd4acbd041a06cb3b706a174b Mon Sep 17 00:00:00 2001 From: Hendrik Dumith Louzada Date: Tue, 20 Aug 2024 09:12:28 -0300 Subject: [PATCH 1/3] feat: seperate dependencies for kernel and server --- environment.yml | 6 ++---- kernel_enviroment.yml | 12 ++++++++++++ pyproject.toml | 7 +++---- 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 kernel_enviroment.yml diff --git a/environment.yml b/environment.yml index b300860..4770190 100644 --- a/environment.yml +++ b/environment.yml @@ -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 @@ -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 diff --git a/kernel_enviroment.yml b/kernel_enviroment.yml new file mode 100644 index 0000000..08e88b0 --- /dev/null +++ b/kernel_enviroment.yml @@ -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 diff --git a/pyproject.toml b/pyproject.toml index 03332e9..0a3eff3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 = [ From d54f8e06ecae5a63ca7b36dcfe4819729af54341 Mon Sep 17 00:00:00 2001 From: Hendrik Dumith Louzada Date: Tue, 20 Aug 2024 09:13:36 -0300 Subject: [PATCH 2/3] fix: set env to stop sporadic message on kernel restart, fixes #4 --- spyder_remote_services/jupyter_client/manager.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spyder_remote_services/jupyter_client/manager.py b/spyder_remote_services/jupyter_client/manager.py index 16da513..d0042d9 100644 --- a/spyder_remote_services/jupyter_client/manager.py +++ b/spyder_remote_services/jupyter_client/manager.py @@ -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 - From 502635fae3fc2375cfbf84cc61b5c89a5ad1d538 Mon Sep 17 00:00:00 2001 From: Hendrik Dumith Louzada Date: Tue, 20 Aug 2024 09:14:10 -0300 Subject: [PATCH 3/3] feat: set version 0.1.0 --- spyder_remote_services/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spyder_remote_services/__init__.py b/spyder_remote_services/__init__.py index 26e99ff..16e69f8 100644 --- a/spyder_remote_services/__init__.py +++ b/spyder_remote_services/__init__.py @@ -1,2 +1,2 @@ -__version__ = '0.0.1.dev1' +__version__ = '0.1.0'