From 430753d2577381de76e2ff215c7e53942fdf4f49 Mon Sep 17 00:00:00 2001 From: Mehmet Bektas <mbektasgh@outlook.com> Date: Wed, 31 Jan 2024 21:00:15 -0800 Subject: [PATCH 1/4] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7f0d5a3e..4cf36e89 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,3 @@ __pycache__ env_installer/jlab_server/ env_installer/jlab_server.tar.gz - From 18e2c30f0920649ce6f4142c1d5a6cf159402312 Mon Sep 17 00:00:00 2001 From: Mehmet Bektas <mbektasgh@outlook.com> Date: Thu, 1 Feb 2024 21:10:28 -0800 Subject: [PATCH 2/4] fix venv create script --- src/main/cli.ts | 2 +- src/main/pythonenvdialog/pythonenvdialog.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/cli.ts b/src/main/cli.ts index 2ffbc3a3..e5445f72 100644 --- a/src/main/cli.ts +++ b/src/main/cli.ts @@ -537,7 +537,7 @@ export async function createPythonEnvironment( } else { const systemPythonPath = getSystemPythonPath(); if (condaBaseEnvExists) { - const createCommand = `python -m venv create ${envPath}`; + const createCommand = `python -m venv ${envPath}`; await runCommandInEnvironment(baseCondaEnvPath, createCommand, callbacks); } else if (fs.existsSync(systemPythonPath)) { execFileSync(systemPythonPath, ['-m', 'venv', 'create', envPath]); diff --git a/src/main/pythonenvdialog/pythonenvdialog.ts b/src/main/pythonenvdialog/pythonenvdialog.ts index fc58a921..2bc91de4 100644 --- a/src/main/pythonenvdialog/pythonenvdialog.ts +++ b/src/main/pythonenvdialog/pythonenvdialog.ts @@ -962,7 +962,7 @@ export class ManagePythonEnvironmentDialog { createCommandPreview.value = \`conda create -p \$\{getEnvInstallPath()\} \$\{getCondaChannels()\}\ \$\{getPackageList()\}\`; } else { const envPath = getEnvInstallPath(); - createCommandPreview.value = \`python -m venv create \$\{envPath\}\n\$\{envPath\}\$\{pathSeparator\}${activateRelPath.replace( + createCommandPreview.value = \`python -m venv \$\{envPath\}\n\$\{envPath\}\$\{pathSeparator\}${activateRelPath.replace( '\\', '\\\\' )}\npython -m pip install \$\{getPackageList()\}\`; From 200954ad8f77af2af08cf042ab2c840d343cddf1 Mon Sep 17 00:00:00 2001 From: Mehmet Bektas <mbektasgh@outlook.com> Date: Thu, 1 Feb 2024 21:13:45 -0800 Subject: [PATCH 3/4] fix venv create --- src/main/cli.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/cli.ts b/src/main/cli.ts index e5445f72..9e676f3c 100644 --- a/src/main/cli.ts +++ b/src/main/cli.ts @@ -540,7 +540,7 @@ export async function createPythonEnvironment( const createCommand = `python -m venv ${envPath}`; await runCommandInEnvironment(baseCondaEnvPath, createCommand, callbacks); } else if (fs.existsSync(systemPythonPath)) { - execFileSync(systemPythonPath, ['-m', 'venv', 'create', envPath]); + execFileSync(systemPythonPath, ['-m', 'venv', envPath]); } else { throw new Error( 'Failed to create Python environment. Python executable not found.' From 5aa4e6163c1baf970fb016b71296c75c1aa1d51e Mon Sep 17 00:00:00 2001 From: Mehmet Bektas <mbektasgh@outlook.com> Date: Fri, 2 Feb 2024 08:58:20 -0800 Subject: [PATCH 4/4] update download links --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6f8e0a80..0ec32f36 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ JupyterLab Desktop is the cross-platform desktop application for [JupyterLab](ht If you have an existing JupyterLab Desktop installation, please uninstall it first by following the [uninstall instructions](user-guide.md#uninstalling-jupyterlab-desktop). -- [Debian, Ubuntu Linux Installer](https://github.com/jupyterlab/jupyterlab-desktop/releases/latest/download/JupyterLab-Setup-Debian.deb) -- [Red Hat, Fedora, SUSE Linux Installer](https://github.com/jupyterlab/jupyterlab-desktop/releases/latest/download/JupyterLab-Setup-Fedora.rpm) +- [Debian, Ubuntu Linux Installer](https://github.com/jupyterlab/jupyterlab-desktop/releases/latest/download/JupyterLab-Setup-Debian-x64.deb) +- [Red Hat, Fedora, SUSE Linux Installer](https://github.com/jupyterlab/jupyterlab-desktop/releases/latest/download/JupyterLab-Setup-Fedora-x64.rpm) - [macOS Intel Installer](https://github.com/jupyterlab/jupyterlab-desktop/releases/latest/download/JupyterLab-Setup-macOS-x64.dmg), [macOS Apple silicon Installer](https://github.com/jupyterlab/jupyterlab-desktop/releases/latest/download/JupyterLab-Setup-macOS-arm64.dmg) -- [Windows Installer](https://github.com/jupyterlab/jupyterlab-desktop/releases/latest/download/JupyterLab-Setup-Windows.exe) +- [Windows Installer](https://github.com/jupyterlab/jupyterlab-desktop/releases/latest/download/JupyterLab-Setup-Windows-x64.exe) Additionally, JupyterLab Desktop can be installed on Windows via winget: `winget install jupyterlab`.