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

{making_with_code_cli-5.1.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.1.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.1.0 → making_with_code_cli-5.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "making-with-code-cli"
-version = "5.1.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.1.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/curriculum.py

@@ -12,10 +12,16 @@ def get_curriculum(mwc_site_url, course_name=None):
     Returns the curriculum metadata for course_name.
     """
     url = mwc_site_url + "/manifest"
-    response = requests.get(url)
+    try:
+        response = requests.get(url, timeout=15)
+    except requests.exceptions.RequestException as e:
+        raise CurriculumSiteNotAvailable(mwc_site_url) from e
     if response.ok:
-        text = response.text.strip(LIVE_RELOAD)
-        metadata = json.loads(text)
+        try:
+            text = response.text.strip(LIVE_RELOAD)
+            metadata = json.loads(text)
+        except (json.JSONDecodeError, ValueError) as e:
+            raise CurriculumSiteNotAvailable(mwc_site_url) from e
         if course_name:
             for course in metadata["courses"]:
                 if course["name"] == course_name:

{making_with_code_cli-5.1.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/git_backend/mwc_backend.py

@@ -20,10 +20,17 @@ from making_with_code_cli.errors import (
     GitServerNotAvailable,
 )
 
+EDITOR_COMMANDS = {
+    "atom": "atom --wait",
+    "code": "code --wait",
+    "subl": "subl -n -w",
+    "mate": "mate -w",
+    "vim": "vim",
+    "emacs": "emacs",
+}
+
 class MWCBackend(GitBackend):
     """A Github backend. Students own their own repos and grant teachers access via token.
-    Note that this gives the teacher account access to the student's entire github account, 
-    within scope.
     """
 
     MWC_GIT_PROTOCOL = "https"
@@ -31,7 +38,7 @@ class MWCBackend(GitBackend):
     COMMIT_TEMPLATE = ".commit_template"
 
     def init_module(self, module, modpath):
-        """Creates the named repo from a template. 
+        """Creates the named repo from a template.
         """
         self.check_settings()
         server, repo_owner, repo_name = self.parse_repo_url(module["repo_url"])
@@ -42,19 +49,36 @@ class MWCBackend(GitBackend):
             self.create_from_template(repo_owner, repo_name)
         with cd(modpath.parent):
             self.clone_repo(repo_name)
+        self.configure_git(modpath)
         if (modpath / self.COMMIT_TEMPLATE).exists():
-            run(f"git config commit.template {self.COMMIT_TEMPLATE}", shell=True, 
+            run(["git", "config", "--local", "commit.template", self.COMMIT_TEMPLATE],
                     check=True, cwd=modpath)
         run("uv venv", shell=True, check=True, cwd=modpath, capture_output=True)
         self.init_direnv(modpath)
 
+    def configure_git(self, modpath):
+        """Configures git user settings locally for the repo."""
+        name = self.settings['mwc_username']
+        run(["git", "config", "--local", "user.name", name], check=True, cwd=modpath)
+        run(["git", "config", "--local", "user.email", "nobody@makingwithcode.org"],
+            check=True, cwd=modpath)
+        editor = self.settings.get('editor')
+        if editor in EDITOR_COMMANDS:
+            run(["git", "config", "--local", "core.editor", EDITOR_COMMANDS[editor]],
+                check=True, cwd=modpath)
+
     def update(self, module, modpath, install=True):
         if (modpath / ".git").is_dir():
             with cd(modpath):
                 relpath = self.relative_path(modpath)
                 click.echo(address(f"Checking {relpath} for updates.", preformatted=True))
-                gitresult = run("git pull", shell=True, check=True, capture_output=True,
-                        text=True)
+                gitresult = run("git pull", shell=True, capture_output=True, text=True)
+                if gitresult.returncode != 0:
+                    click.echo(error(
+                        f"Could not update {relpath}: {gitresult.stderr.strip()}\n"
+                        "You may have local changes that conflict. Ask a teacher for help."
+                    ))
+                    return
                 click.echo(info(gitresult.stdout))
                 if install and Path("pyproject.toml").exists():
                     result = run("uv sync", shell=True, capture_output=True, text=True, cwd=modpath)
@@ -92,7 +116,7 @@ class MWCBackend(GitBackend):
         user = self.settings['mwc_username']
         auth = user + ':' + self.settings['mwc_git_token']
         url = f"{self.MWC_GIT_PROTOCOL}://{auth}@{self.MWC_GIT_SERVER}/{user}/{repo_name}.git"
-        run(f"git clone {url}", shell=True, check=True, capture_output=True)
+        run(["git", "clone", url], check=True, capture_output=True)
 
     def check_settings(self):
         if "mwc_username" not in self.settings:

making_with_code_cli-5.2.1/src/making_with_code_cli/helpers.py

@@ -0,0 +1,38 @@
+from pathlib import Path
+from contextlib import contextmanager
+import dateparser
+import os
+import csv
+from making_with_code_cli.errors import MWCError
+
+@contextmanager
+def cd(path):
+    """Sets the cwd within the context
+    """
+    origin = Path().resolve()
+    try:
+        os.chdir(path)
+        yield
+    finally:
+        os.chdir(origin)
+
+def in_bounds(value, minimum=None, maximum=None):
+    return (not minimum or value >= minimum) and (not maximum or value <= maximum)
+
+def date_string(arg):
+    return dateparser.parse(arg, settings={'RETURN_AS_TIMEZONE_AWARE': True})
+
+def read_roster_file(filepath):
+    try:
+        with open(filepath) as fh:
+            records = [record for record in csv.DictReader(fh)]
+    except Exception as err:
+        raise MWCError(f"Error reading roster file {filepath} as csv")
+    for i, record in enumerate(records):
+        if "username" not in record.keys():
+            raise MWCError(f"Error reading roster data from {filepath}: 'username' key missing in row {i}")
+        if "username" not in record.keys():
+            raise MWCError(f"Error reading roster data from {filepath}: 'password' key missing in row {i}")
+
+
+

{making_with_code_cli-5.1.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/mwc_accounts_api.py

@@ -1,3 +1,4 @@
+import click
 import requests
 import json
 import os
@@ -5,12 +6,14 @@ from pathlib import Path
 from urllib.parse import urljoin
 from getpass import getpass
 from making_with_code_cli.errors import MWCError
+from making_with_code_cli.styles import debug as debug_fmt
 
 MWC_ACCOUNTS_SERVER = "https://accounts.makingwithcode.org"
 
 class MWCAccountsAPI:
-    def __init__(self, mwc_accounts_server=None):
+    def __init__(self, mwc_accounts_server=None, debug=False):
         self.mwc_accounts_server = mwc_accounts_server or MWC_ACCOUNTS_SERVER
+        self.debug = debug
 
     def login(self, username, password):
         "Authenticates with a username and password, returning an auth token"
@@ -34,6 +37,10 @@ class MWCAccountsAPI:
         response = self.post("/students", data=params, token=token)
         return self.handle_response(response)
 
+    def remove_student_from_section(self, token, params):
+        response = self.delete("/students", data=params, token=token)
+        return self.handle_response(response)
+
     def update_student(self, token, params):
         response = self.put("/students", data=params, token=token)
         return self.handle_response(response)
@@ -65,6 +72,10 @@ class MWCAccountsAPI:
     def http_request(self, method, url, data=None, token=None):
         fn = getattr(requests, method)
         headers = {"Authorization": f"Token {token}"} if token else None
+        if self.debug:
+            click.echo(debug_fmt(
+                f"{method} {self.mwc_accounts_server + url}, data={data}"
+            ))
         try:
             return fn(self.mwc_accounts_server + url, data=data, headers=headers)
         except requests.exceptions.ConnectionError:

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

@@ -35,7 +35,7 @@ def iter_settings(settings, prefix=None):
     for key, value in settings.items():
         keypath = (prefix or []) + [key]
         if isinstance(value, dict):
-            for k, v in _iter_settings(value, prefix=keypath):
+            for k, v in iter_settings(value, prefix=keypath):
                 yield '.'.join(keypath), v
         else:
             yield '.'.join(keypath), value

{making_with_code_cli-5.1.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/setup/__init__.py

@@ -40,18 +40,18 @@ from making_with_code_cli.setup.tasks import (
     InstallImageMagick,
     InstallHttpie,
     InstallScipy,
-    GitConfiguration,
+    InstallOllama,
+    InstallPandoc,
+    InstallPoppler,
 )
 
 @click.command()
 @click.option("--config", help="Path to config file (default: ~/.mwc)")
 @click.option("--debug", is_flag=True, help="Show debug-level output")
-@click.option("--git-name", help="Set git name")
-@click.option("--git-email", help="Set git email address")
 @click.option("--mwc-accounts-url", help="Set URL for MWC accounts server")
 @click.pass_context
 @handle_mwc_errors
-def setup(ctx, config, debug, git_name, git_email, mwc_accounts_url):
+def setup(ctx, config, debug, mwc_accounts_url):
     """Set up the MWC command line interface"""
     settings = read_settings(config)
     sp = get_settings_path(config)
@@ -68,10 +68,6 @@ def setup(ctx, config, debug, git_name, git_email, mwc_accounts_url):
     for note in INTRO_NOTES:
         click.echo(address(note, list_format=True))
     click.echo()
-    if git_name:
-        settings['git_name'] = git_name
-    if git_email:
-        settings['git_email'] = git_email
     if mwc_accounts_url:
         settings['mwc_accounts_url'] = mwc_accounts_url
     settings['mwc_username'] = choose_mwc_username(settings.get("mwc_username"))
@@ -112,7 +108,9 @@ def setup(ctx, config, debug, git_name, git_email, mwc_accounts_url):
         InstallVSCode,
         InstallImageMagick,
         InstallHttpie,
-        GitConfiguration,
+        InstallOllama,
+        InstallPandoc,
+        InstallPoppler,
     ]
     errors = []
     for task_class in task_classes:

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

@@ -28,6 +28,7 @@ from making_with_code_cli.errors import (
 )
 import click
 import requests
+import shutil
 from subprocess import run
 import yaml
 
@@ -54,7 +55,8 @@ class PlatformNotSupported(Exception):
 class Platform(Flag):
     MAC = auto()
     UBUNTU = auto()
-    SUPPORTED = MAC | UBUNTU 
+    WSL = auto()
+    SUPPORTED = MAC | UBUNTU | WSL
     UNSUPPORTED = 0
 
     @classmethod
@@ -63,6 +65,11 @@ class Platform(Flag):
         if system_name == "Darwin":
             return cls.MAC
         if system_name == "Linux":
+            try:
+                if "microsoft" in Path("/proc/version").read_text().lower():
+                    return cls.WSL
+            except OSError:
+                pass
             return cls.UBUNTU
         return cls.UNSUPPORTED
 
@@ -70,16 +77,16 @@ class Platform(Flag):
     def package_manager(cls, brew_cask=False):
         """Returns the command for the platform's package manager.
         """
-        platform = cls.detect()
-        if platform == cls.MAC:
-            if brew_cask: 
+        p = cls.detect()
+        if p == cls.MAC:
+            if brew_cask:
                 return "brew install --cask "
             else:
                 return "brew install "
-        elif platform == cls.UBUNTU:
+        elif p in (cls.UBUNTU, cls.WSL):
             return "sudo apt install "
         else:
-            raise cls.NotSupported()
+            raise PlatformNotSupported()
 
 def default_work_dir(teacher=False):
     dirname = "making_with_code_teacher" if teacher else "making_with_code"
@@ -120,7 +127,7 @@ def choose_work_dir(default=None, teacher=False):
             default=default or default_work_dir(teacher=teacher),
             type=click.Path(path_type=Path),
         )
-        work_dir = work_dir.expanduser()
+        work_dir = work_dir.expanduser().resolve()
         if work_dir.is_file():
             click.echo(error("There's already a file at that location."))
         elif work_dir.exists():
@@ -168,15 +175,15 @@ def choose_editor(default=None):
         click.echo(error(f"Couldn't find {ed}. Double-check that it's installed."))
 
 def editor_installed(ed):
-    return bool(run(f"which {ed}", shell=True, capture_output=True).stdout)
+    return shutil.which(ed) is not None
 
 def get_shell_name():
     shellpath = run("echo $SHELL", shell=True, capture_output=True, text=True)
     return shellpath.stdout.split('/')[-1].strip()
 
 def get_mwc_rc_path():
-    xdg_config_home = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config"))
-    return xdg_config_home / "mwc" / "shell_config.sh"
+    xdg_config_home = os.environ.get("XDG_CONFIG_HOME", str(Path.home() / ".config"))
+    return Path(xdg_config_home) / "mwc" / "shell_config.sh"
 
 def platform_rc_file(debug=False):
     shell = get_shell_name()
@@ -234,7 +241,7 @@ class SetupTask:
             click.echo(debug_fmt(message))
 
     def executable_on_path(self, name):
-        return bool(run(f"which {name}", shell=True, capture_output=True).stdout)
+        return shutil.which(name) is not None
 
 class WriteMWCShellConfig(SetupTask):
     description = "Write the MWC shell config file to ~/.config/mwc/shell_config.sh or XDG_CONFIG_HOME"
@@ -319,7 +326,7 @@ class SuppressDirenvDiffs(SetupTask):
             tomlkit.dump(direnv_conf, fh)
 
     def get_direnv_config_file(self):
-        config_home = os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config")
+        config_home = os.environ.get("XDG_CONFIG_HOME", str(Path.home() / ".config"))
         return Path(config_home) / "direnv" / "direnv.toml"
 
 
@@ -328,12 +335,13 @@ class InstallXCode(SetupTask):
     platform = Platform.MAC
 
     def is_complete(self):
-        return bool(run("xcode-select -p", shell=True, capture_output=True, check=True).stdout)
+        result = run("xcode-select -p", shell=True, capture_output=True)
+        return result.returncode == 0 and bool(result.stdout)
 
     def run_task(self):
         msg = (
-            "Installing Xcode... (this may take a while)"
-            "Please click \"Install\" and accept the license agreement. "
+            "Installing Xcode... (this may take a while)\n"
+            "Please click \"Install\" and accept the license agreement."
         )
         click.echo(address(msg))
         run("xcode-select --install", shell=True, check=True)
@@ -358,7 +366,7 @@ class InstallPackage(SetupTask):
         system_platform = Platform.detect()
         if system_platform == Platform.MAC:
             return self.brew_name
-        elif system_platform == Platform.UBUNTU:
+        elif system_platform in (Platform.UBUNTU, Platform.WSL):
             return self.apt_name
         else:
             raise PlatformNotSupported()
@@ -390,17 +398,34 @@ class InstallTree(InstallPackage):
     executable_name = brew_name = apt_name = nix_name = "tree"
 
 class InstallVSCode(InstallPackage):
-    platform = Platform.MAC
+    platform = Platform.MAC | Platform.UBUNTU | Platform.WSL
     executable_name = "code"
     brew_name = "visual-studio-code"
-    cask = True
+    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):
-        platform = Platform.detect()
-        if platform & Platform.UBUNTU:
+        if Platform.detect() in (Platform.UBUNTU, Platform.WSL):
             run("sudo snap install --classic code", shell=True, check=True)
         else:
-            return super().run_task()
+            # 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):
     executable_name = "magick"
@@ -419,50 +444,24 @@ class InstallScipy(InstallPackage):
     def is_complete(self):
         return find_spec("scipy") is not None
 
-class GitConfiguration(SetupTask):
-    """Configure global git settings.
-    Can be skipped by setting `skip_git_config: true` in settings.
-    """
-    description = "Configure git"
-
-    editorcmds = {
-        "atom": '"atom --wait"',
-        "code": '"code --wait"',
-        "subl": '"subl -n -w"',
-        "mate": '"mate -w"',
-        "vim": "vim",
-        "emacs": "emacs",
-    }
-
-    def is_complete(self):
-        if self.settings.get("skip_git_config"):
-            confirm("Skipping git configuration because 'skip_git_config' is set in MWC settings")
-            return True
-        for key, value in self.get_expected_git_config().items():
-            expected = value.strip().strip('"')
-            observed = self.read_git_config(key).strip().strip('"')
-            if expected != observed:
-                return False
-        return True
+class InstallOllama(InstallPackage):
+    executable_name = "ollama"
+    brew_name = "ollama"
 
     def run_task(self):
-        (Path.home() / ".gitconfig").touch()
-        for key, val in self.get_expected_git_config().items():
-            run(f'git config --global --replace-all {key} {val}', shell=True, check=True)
+        if Platform.detect() in (Platform.UBUNTU, Platform.WSL):
+            click.echo(address("Installing ollama..."))
+            run("curl -fsSL https://ollama.com/install.sh | sh", shell=True, check=True)
+        else:
+            super().run_task()
 
-    def read_git_config(self, setting):
-        "Reads current git config setting"
-        result = run(f"git config --get {setting}", shell=True, capture_output=True, text=True)
-        return result.stdout.strip()
+class InstallPandoc(InstallPackage):
+    executable_name = brew_name = apt_name = "pandoc"
+
+class InstallPoppler(InstallPackage):
+    executable_name = "pdftotext"
+    brew_name = "poppler"
+    apt_name = "poppler-utils"
 
-    def get_expected_git_config(self):
-        """Returns a dict containing expected git configuration settings.
-        """
-        git_config = {"init.defaultBranch": "main"}
-        if self.settings.get('editor') in self.editorcmds:
-            git_config["core.editor"] = self.editorcmds[self.settings.get('editor')]
-        git_config["user.name"] = self.settings.get('git_name', self.settings['mwc_username'])
-        git_config["user.email"] = self.settings.get('git_email', 'nobody@makingwithcode.org')
-        return git_config
 
 

{making_with_code_cli-5.1.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/teach/section/__init__.py

@@ -1,25 +1,32 @@
 import click
 from csv import DictWriter
 from tabulate import tabulate
-from making_with_code_cli.settings import read_settings
+from making_with_code_cli.settings import read_settings, get_settings_path
 from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
 from making_with_code_cli.styles import (
     info,
+    debug as debug_fmt,
 )
 from making_with_code_cli.teach.setup import check_required_teacher_settings
 from making_with_code_cli.teach.section.create import create_section
 from making_with_code_cli.teach.section.show import show_section
 from making_with_code_cli.teach.section.edit import edit_section
 from making_with_code_cli.teach.section.delete import delete_section
+from making_with_code_cli.decorators import handle_mwc_errors
 
 @click.group(invoke_without_command=True)
 @click.pass_context
 @click.option("--config", help="Path to config file (default: ~/.mwc)")
 @click.option("-o", "--outfile", help="Save results as csv")
-def section(ctx, config, outfile):
+@click.option("--debug", is_flag=True, help="Show debug-level output")
+@handle_mwc_errors
+def section(ctx, config, outfile, debug):
     "Manage sections of students"
     if ctx.invoked_subcommand is None:
         settings = read_settings(config)
+        if debug:
+            sp = get_settings_path(config)
+            click.echo(debug_fmt(f"Reading settings from {sp}"))
         if not check_required_teacher_settings(settings):
             return
         api = MWCAccountsAPI(settings.get('mwc_accounts_url'))

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

@@ -4,6 +4,7 @@ from making_with_code_cli.settings import read_settings
 from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
 from making_with_code_cli.curriculum import get_curriculum
 from making_with_code_cli.errors import CurriculumSiteNotAvailable, MWCError
+from making_with_code_cli.decorators import handle_mwc_errors
 from making_with_code_cli.styles import (
     address, 
     error,
@@ -18,10 +19,15 @@ 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", help="csv file containing student information")
-def edit_section(slug, config, name, curriculum_site_url, course_name, code, roster):
+@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
+def edit_section(slug, config, name, curriculum_site_url, course_name, code, roster, remove, force):
     "Edit an existing section"
     settings = read_settings(config)
+    if roster:
+        roster_data = read_roster_file(roster)
     api = MWCAccountsAPI(settings.get('mwc_accounts_url'))
     params = {"slug": slug}
     if name: 

{making_with_code_cli-5.1.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/teach/section/show.py

@@ -1,9 +1,10 @@
 import click
 from csv import DictWriter
-from making_with_code_cli.settings import read_settings
+from making_with_code_cli.settings import read_settings, get_settings_path
 from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
 from making_with_code_cli.styles import (
     address, 
+    debug as debug_fmt,
     error,
     info,
     question,
@@ -13,9 +14,13 @@ from making_with_code_cli.styles import (
 @click.argument("slug")
 @click.option("--config", help="Path to config file (default: ~/.mwc)")
 @click.option("-o", "--outfile", help="Save results as csv")
-def show_section(config, slug, outfile):
+@click.option("--debug", is_flag=True, help="Show debug-level output")
+def show_section(config, slug, outfile, debug):
     "Show section details"
     settings = read_settings(config)
+    if debug:
+        sp = get_settings_path(config)
+        click.echo(debug_fmt(f"Reading settings from {sp}"))
     api = MWCAccountsAPI(settings.get('mwc_accounts_url'))
     params = {"slug": slug}
     response = api.get_roster(settings.get('mwc_accounts_token'))

{making_with_code_cli-5.1.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/teach/setup.py

@@ -46,10 +46,8 @@ def check_required_teacher_settings(settings):
 @click.command
 @click.option("--config", help="Path to config file (default: ~/.mwc)")
 @click.option("--debug", is_flag=True, help="Show debug-level output")
-@click.option("--git-name", help="Set git name")
-@click.option("--git-email", help="Set git email address")
 @click.option("--mwc-accounts-url", help="Set URL for MWC accounts server")
-def setup(config, debug, git_name, git_email, mwc_accounts_url):
+def setup(config, debug, mwc_accounts_url):
     """Configure teacher settings"""
     settings = read_settings(config)
     if debug:
@@ -57,10 +55,6 @@ def setup(config, debug, git_name, git_email, mwc_accounts_url):
         click.echo(debug_fmt(f"Reading settings from {sp}"))
     click.echo(address(INTRO_MESSAGE))
     click.echo()
-    if git_name:
-        settings['git_name'] = git_name
-    if git_email:
-        settings['git_email'] = git_email
     if mwc_accounts_url:
         settings['mwc_accounts_url'] = mwc_accounts_url
     settings['mwc_username'] = choose_mwc_username(settings.get("mwc_username"))
@@ -78,7 +72,7 @@ def setup(config, debug, git_name, git_email, mwc_accounts_url):
             token = prompt_mwc_password(settings['mwc_username'], api)
             settings['mwc_accounts_token'] = token
     settings['mwc_git_token'] = status['git_token']
-    settings['work_dir'] = str(choose_work_dir(settings.get("work_dir")).resolve())
+    settings['work_dir'] = str(choose_work_dir(settings.get("work_dir")))
     settings['editor'] = choose_editor(settings.get('editor', 'code'))
     settings['teacher_work_dir'] = str(choose_work_dir(
         settings.get("teacher_work_dir"), 

making_with_code_cli-5.2.1/src/making_with_code_cli/teach/student/__init__.py

@@ -0,0 +1,12 @@
+import click
+from making_with_code_cli.teach.student.create import create_student
+from making_with_code_cli.teach.student.edit import edit_student
+from making_with_code_cli.teach.student.remove import remove_student_from_section
+
+@click.group()
+def student():
+    "Manage students"
+
+student.add_command(create_student)
+student.add_command(edit_student)
+student.add_command(remove_student_from_section)

making_with_code_cli-5.1.0/src/making_with_code_cli/teach/student/update.py → making_with_code_cli-5.2.1/src/making_with_code_cli/teach/student/edit.py

@@ -1,19 +1,24 @@
 import click
 from tabulate import tabulate
-from making_with_code_cli.settings import read_settings
+from making_with_code_cli.settings import read_settings, get_settings_path
 from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
 from making_with_code_cli.styles import (
     info,
+    debug as debug_fmt,
     error,
 )
 
-@click.command("update")
+@click.command("edit")
 @click.argument("username")
 @click.argument("password")
 @click.option("--config", help="Path to config file (default: ~/.mwc)")
-def update_student(username, password, config):
-    "Update a student's password"
+@click.option("--debug", is_flag=True, help="Show debug-level output")
+def edit_student(username, password, config, debug):
+    "Edit a student's password"
     settings = read_settings(config)
+    if debug:
+        sp = get_settings_path(config)
+        click.echo(debug_fmt(f"Reading settings from {sp}"))
     api = MWCAccountsAPI(settings.get('mwc_accounts_url'))
     params = {
         "username": username, 

making_with_code_cli-5.2.1/src/making_with_code_cli/teach/student/remove.py

@@ -0,0 +1,34 @@
+import click
+from making_with_code_cli.settings import read_settings, get_settings_path
+from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
+from making_with_code_cli.styles import (
+    info,
+    debug as debug_fmt,
+    error,
+)
+
+@click.command("remove")
+@click.argument("username")
+@click.argument("section")
+@click.option("--config", help="Path to config file (default: ~/.mwc)")
+@click.option("--debug", is_flag=True, help="Show debug-level output")
+def remove_student_from_section(username, section, config, debug):
+    "Remove a student from a section"
+    settings = read_settings(config)
+    if debug:
+        sp = get_settings_path(config)
+        click.echo(debug_fmt(f"Reading settings from {sp}"))
+    api = MWCAccountsAPI(settings.get('mwc_accounts_url'), debug=debug)
+    params = {
+        "username": username, 
+        "section": section,
+    }
+    try:
+        response = api.remove_student_from_section(settings.get('mwc_accounts_token'), params)
+        click.echo(info(f"Removed student {username} from {section}."))
+    except api.RequestFailed as err:
+        click.echo(error(f"Could not remove {params['username']} from {params['section']}:"))
+        for field, problems in err.data.items():
+            click.echo(error(f" - {field}: {'; '.join(problems)}"))
+
+

{making_with_code_cli-5.1.0 → making_with_code_cli-5.2.1}/src/making_with_code_cli/update/__init__.py

@@ -22,8 +22,8 @@ from making_with_code_cli.styles import (
 def update(config, debug):
     """Update the MWC work directory"""
     settings = read_settings(config)
-    sp = get_settings_path(config)
     if debug:
+        sp = get_settings_path(config)
         click.echo(debug_fmt(f"Reading settings from {sp}"))
     if not settings:
         click.echo(error(f"Please run mwc setup first."))

making_with_code_cli-5.1.0/src/making_with_code_cli/helpers.py

@@ -1,22 +0,0 @@
-from pathlib import Path
-from contextlib import contextmanager
-import dateparser
-import os
-
-@contextmanager
-def cd(path):
-    """Sets the cwd within the context
-    """
-    origin = Path().resolve()
-    try:
-        os.chdir(path)
-        yield
-    finally:
-        os.chdir(origin)
-
-def in_bounds(value, minimum=None, maximum=None):
-    return (not minimum or value >= minimum) and (not maximum or value <= maximum)
-
-def date_string(arg):
-    return dateparser.parse(arg, settings={'RETURN_AS_TIMEZONE_AWARE': True})
-

making_with_code_cli-5.1.0/src/making_with_code_cli/teach/student/__init__.py

@@ -1,10 +0,0 @@
-import click
-from making_with_code_cli.teach.student.create import create_student
-from making_with_code_cli.teach.student.update import update_student
-
-@click.group()
-def student():
-    "Manage students"
-
-student.add_command(create_student)
-student.add_command(update_student)