making-with-code-cli 5.2.0__tar.gz → 5.2.1__tar.gz

{making_with_code_cli-5.2.0 → making_with_code_cli-5.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: making-with-code-cli
-Version: 5.2.0
+Version: 5.2.1
 Summary: Courseware for Making With Code
 Author: Chris Proctor
 Author-email: Chris Proctor <chris@chrisproctor.net>

{making_with_code_cli-5.2.0 → making_with_code_cli-5.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "making-with-code-cli"
-version = "5.2.0"
+version = "5.2.1"
 description = "Courseware for Making With Code"
 authors = [{ name = "Chris Proctor", email = "chris@chrisproctor.net" }]
 requires-python = ">=3.11,<4.0"
@@ -41,3 +41,5 @@ docs = [
     "sphinx>=8.2.3,<9",
     "sphinx-rtd-theme>=3.0.2,<4",
 ]
+[tool.uv]
+check-url = "https://pypi.org/simple/"

{making_with_code_cli-5.2.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/settings.py

@@ -14,7 +14,7 @@ def get_settings_path(settings_path=None):
     elif "MWC_CONFIG" in os.environ:
         return Path(os.environ["MWC_CONFIG"])
     else:
-        xdg_config_home = os.environ.get("XDG_CONFIG_HOME", str(Path.home() / ".config"))
+        xdg_config_home = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config"))
         return xdg_config_home / "mwc" / "settings.toml"
 
 def read_settings(settings_path=None):

{making_with_code_cli-5.2.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/setup/tasks.py

@@ -403,10 +403,28 @@ class InstallVSCode(InstallPackage):
     brew_name = "visual-studio-code"
     brew_cask = True
 
+    def is_complete(self):
+        if Platform.detect() == Platform.MAC:
+            app_locations = [
+                Path("/Applications/Visual Studio Code.app"),
+                Path.home() / "Applications/Visual Studio Code.app",
+            ]
+            return self.executable_on_path("code") or any(p.exists() for p in app_locations)
+        return self.executable_on_path("code")
+
     def run_task(self):
         if Platform.detect() in (Platform.UBUNTU, Platform.WSL):
             run("sudo snap install --classic code", shell=True, check=True)
         else:
+            # If brew has a stale record of VS Code but the app is missing,
+            # the upgrade will fail. Zap the cask first to clear brew's state.
+            stale = run(
+                "brew list --cask visual-studio-code",
+                shell=True, capture_output=True
+            ).returncode == 0
+            if stale:
+                run("brew uninstall --cask --zap --force visual-studio-code",
+                    shell=True, check=True)
             super().run_task()
 
 class InstallImageMagick(InstallPackage):

{making_with_code_cli-5.2.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/teach/section/edit.py

@@ -19,7 +19,7 @@ from making_with_code_cli.styles import (
 @click.option("--curriculum-site-url", help="URL for curriculum website. e.g. https://makingwithcode.org")
 @click.option("--course-name", help="MWC course name")
 @click.option("--code", help="Code students can use to join the section")
-@click.option("--roster", click.Path(exists=True), help="csv file containing student information")
+@click.option("--roster", type=click.Path(exists=True), help="csv file containing student information")
 @click.option('-r', "--remove", is_flag=True, help="When using a roster, remove existing students not on roster")
 @click.option('-f', "--force", is_flag=True, help="When using a roster, update existing student passwords")
 @handle_mwc_errors