Merge branch 'master' into dependabot/github_actions/dependencies-1aa…

…36b2c20

ChangeLog

@@ -4,6 +4,15 @@ sage-flatsurf Change Log
 
 .. current developments
 
+v0.6.1
+====================
+
+**Fixed:**
+
+* Fixed startup of SageMath on first invocation on Windows.
+
+
+
 v0.6.0
 ====================
 

README.md

@@ -33,9 +33,9 @@ Extract it anywhere (make sure there are no spaces in the directory name) and
 run `./sage` or `./jupyterlab`.
 
 ```sh
-tar zxf sage-flatsurf-0.6.0.unix.tar.gz
-./sage-flatsurf-0.6.0/jupyterlab  # or
-./sage-flatsurf-0.6.0/sage
+tar zxf sage-flatsurf-0.6.1.unix.tar.gz
+./sage-flatsurf-0.6.1/jupyterlab  # or
+./sage-flatsurf-0.6.1/sage
 ```
 
 If you are on **Windows**, download the latest `.exe` installer from our [Releases

doc/install.rst

@@ -21,7 +21,7 @@ Install with the pixi tarball
 
 Open a terminal and run the following command::
 
-  curl -fsSL https://github.com/flatsurf/sage-flatsurf/releases/download/0.6.0/sage-flatsurf-0.6.0.unix.tar.gz | tar zxf -
+  curl -fsSL https://github.com/flatsurf/sage-flatsurf/releases/download/0.6.1/sage-flatsurf-0.6.1.unix.tar.gz | tar zxf -
 
 This will download the latest pixi tarball from our `Releases Page
 <https://github.com/flatsurf/sage-flatsurf/releases/>`_ and extract it into a
@@ -39,11 +39,11 @@ rename it.
 You can now use sage-flatsurf in a terminal or through Jupyter notebooks. To
 launch sage-flatsurf in the terminal, run::
 
-  ./sage-flatsurf-0.6.0/sage
+  ./sage-flatsurf-0.6.1/sage
 
 To launch a browser with Jupyter Lab instead, run::
 
-  ./sage-flatsurf-0.6.0/jupyterlab
+  ./sage-flatsurf-0.6.1/jupyterlab
 
 The first time you run either of these commands, the installer downloads a copy
 of SageMath and some other dependencies (in total this is going to use about

flatsurf/version.py

@@ -1 +1 @@
-version = "0.6.0"
+version = "0.6.1"

installer/win/launch.ps1

@@ -1,4 +1,4 @@
-# Launch or Reinstall SageMath
+# Launch, Reinstall, or Uninstall SageMath
 $ErrorActionPreference = "Stop"
 
 $appDataDir = [System.Environment]::GetFolderPath("LocalApplicationData")
@@ -14,22 +14,19 @@ function Usage {
 }
 
 function EnsureInstalled {
-  $consoleHandle = (Get-Process -Id $PID).MainWindowHandle
-
-  if ($consoleHandle -ne 0) {
-    if (Test-Path $wsldlExe) {
-      Write-Output "Not installing, wsldl executable already exists"
-      return
-    }
-
-    Install
-  } else {
-    # Restart script in a visible terminal
-    Start-Process powershell.exe -ArgumentList @("-File", "`"$PSCommandPath`"", $commandArgs[0]) -Wait
-    exit
+  if (Test-Path $wsldlExe) {
+    Write-Output "Not installing, wsldl executable already exists"
+    return
   }
+
+  # Run installer in a visible terminal.
+  Start-Process powershell.exe -ArgumentList @("-File", "`"$PSCommandPath`"", "--install") -Wait
 }
 
+# Creates a VM and installs sage-flatsurf.
+# Strangely, this breaks the surrounding PowerShell process.
+# It's unclear what's the problem but once this finishes, the actual
+# sage-flatsurf won't be able to launch anymore.
 function Install {
   New-Item -ItemType Directory -Path $localDir -Force > $null
   foreach ($fileName in @("sage-flatsurf-VERSION.exe", "preset.json")) {
@@ -68,6 +65,8 @@ function Install {
 
   & "$wsldlExe" "run" "sh" "-c" "cd ~ && tar zxf sage-flatsurf-VERSION.unix.tar.gz"
   Pop-Location
+
+  sleep 2
 }
 
 function JupyterLab {
@@ -105,8 +104,6 @@ if ($args.Count -ne 1) {
   exit 1
 }
 
-$commandArgs = $args
-
 switch ($args[0]) {
   '--jupyterlab' {
     Write-Output "Launching JupyterLab..."

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sage-flatsurf"
-version = "0.6.0"
+version = "0.6.1"
 authors = [
   {name = "Vincent Delecroix"},
   {name = "W. Patrick Hooper"},