making-with-code-cli 4.1.2__tar.gz → 5.0.1__tar.gz

{making_with_code_cli-4.1.2 → making_with_code_cli-5.0.1}/PKG-INFO

@@ -1,25 +1,25 @@
 Metadata-Version: 2.3
 Name: making-with-code-cli
-Version: 4.1.2
+Version: 5.0.1
 Summary: Courseware for Making With Code
-License: MIT
 Author: Chris Proctor
-Author-email: chris@chrisproctor.net
-Requires-Python: >=3.11,<4.0
-Classifier: License :: OSI Approved :: MIT License
+Author-email: Chris Proctor <chris@chrisproctor.net>
+License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: click (>=8.1.8,<9.0.0)
-Requires-Dist: dateparser (>=1.2.0,<2.0.0)
-Requires-Dist: gitpython (>=3.1.44,<4.0.0)
-Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
-Requires-Dist: requests (>=2.32.3,<3.0.0)
-Requires-Dist: tabulate (>=0.9.0,<0.10.0)
-Requires-Dist: toml (>=0.10.2,<0.11.0)
-Requires-Dist: tqdm (>=4.67.1,<5.0.0)
-Project-URL: Documentation, https://docs.makingwithcode.org/making-with-code-cli
+Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: pyyaml>=6.0.2,<7.0.0
+Requires-Dist: click>=8.1.8,<9.0.0
+Requires-Dist: requests>=2.32.3,<3.0.0
+Requires-Dist: tabulate>=0.9.0,<0.10.0
+Requires-Dist: gitpython>=3.1.44,<4.0.0
+Requires-Dist: dateparser>=1.2.0,<2.0.0
+Requires-Dist: tqdm>=4.67.1,<5.0.0
+Requires-Dist: tomlkit>=0.14.0
+Requires-Python: >=3.11, <4.0
+Project-URL: documentation, https://docs.makingwithcode.org/making-with-code-cli
 Project-URL: issues, https://github.com/cproctor/making-with-code-courseware/issues
 Description-Content-Type: text/markdown
 
@@ -51,4 +51,3 @@ Once installed, you can set up your computer using the `mwc setup` command. Run
 
 If you're interested in computing education and want to learn more about Making With Code, 
 please contact [Dr. Chris Proctor](https://chrisproctor.net).
-

{making_with_code_cli-4.1.2 → making_with_code_cli-5.0.1}/pyproject.toml

@@ -1,24 +1,29 @@
 [project]
 name = "making-with-code-cli"
-version = "4.1.2"
+version = "5.0.1"
 description = "Courseware for Making With Code"
-authors = [
-    {name = "Chris Proctor",email = "chris@chrisproctor.net"}
-]
-license = {text = "MIT"}
-readme = "README.md"
-homepage = "https://github.com/cproctor/making-with-code-courseware"
+authors = [{ name = "Chris Proctor", email = "chris@chrisproctor.net" }]
 requires-python = ">=3.11,<4.0"
+readme = "README.md"
+license = { text = "MIT" }
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+]
 dependencies = [
     "pyyaml (>=6.0.2,<7.0.0)",
     "click (>=8.1.8,<9.0.0)",
     "requests (>=2.32.3,<3.0.0)",
-    "toml (>=0.10.2,<0.11.0)",
     "tabulate (>=0.9.0,<0.10.0)",
     "gitpython (>=3.1.44,<4.0.0)",
     "dateparser (>=1.2.0,<2.0.0)",
     "tqdm (>=4.67.1,<5.0.0)",
+    "tomlkit>=0.14.0",
 ]
+homepage = "https://github.com/cproctor/making-with-code-courseware"
 
 [project.urls]
 documentation = "https://docs.makingwithcode.org/making-with-code-cli"
@@ -28,12 +33,11 @@ issues = "https://github.com/cproctor/making-with-code-courseware/issues"
 mwc = "making_with_code_cli.cli:cli"
 
 [build-system]
-requires = ["poetry-core>=2.0.0,<3.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["uv_build>=0.9.0,<0.10.0"]
+build-backend = "uv_build"
 
-[tool.poetry.group.docs]
-optional = true
-
-[tool.poetry.group.docs.dependencies]
-sphinx = "^8.2.3"
-sphinx-rtd-theme = "^3.0.2"
+[dependency-groups]
+docs = [
+    "sphinx>=8.2.3,<9",
+    "sphinx-rtd-theme>=3.0.2,<4",
+]

making_with_code_cli-5.0.1/src/making_with_code_cli/git_backend/base_backend.py

@@ -0,0 +1,33 @@
+from pathlib import Path
+from subprocess import run, CalledProcessError
+import click
+from making_with_code_cli.helpers import cd
+from making_with_code_cli.setup.tasks import WORK_DIR_PERMISSIONS
+from making_with_code_cli.styles import (
+    address,
+    info,
+    confirm,
+    error,
+)
+
+class GitBackend:
+    """Base class interface to backend git server.
+    All Making With Code deployments are backed by a git server, but the nature of the
+    server and the strategies for completing tasks vary by backend. 
+    """
+
+    def __init__(self, settings):
+        self.settings = settings
+
+    def init_module(self, module, modpath):
+        raise NotImplemented()
+
+    def update(self, module, modpath, install=True):
+        raise NotImplemented()
+
+    def work_dir(self):
+        return Path(self.settings['work_dir'])
+
+    def relative_path(self, path):
+        return path.relative_to(self.work_dir())
+

{making_with_code_cli-4.1.2 → making_with_code_cli-5.0.1/src}/making_with_code_cli/git_backend/mwc_backend.py

@@ -38,8 +38,33 @@ class MWCBackend(GitBackend):
         with cd(modpath.parent):
             self.clone_repo(repo_name)
         if (modpath / self.COMMIT_TEMPLATE).exists():
+            run(f"git config commit.template {self.COMMIT_TEMPLATE}", shell=True, 
+                    check=True, cwd=modpath)
+        run("uv venv", shell=True, check=True, cwd=modpath)
+        self.init_direnv(modpath)
+
+    def update(self, module, modpath, install=True):
+        if (modpath / ".git").is_dir():
             with cd(modpath):
-                run(f"git config commit.template {self.COMMIT_TEMPLATE}", shell=True, check=True)
+                relpath = self.relative_path(modpath)
+                try:
+                    click.echo(address(f"Checking {relpath} for updates.", preformatted=True))
+                    gitresult = run("git pull", shell=True, check=True, capture_output=True,
+                            text=True)
+                    click.echo(info(gitresult.stdout))
+                    if install and Path("pyproject.toml").exists():
+                        result = run("uv sync", shell=True, check=True, 
+                                capture_output=True, text=True)
+                        self.init_direnv(modpath)
+                        click.echo(info(result.stdout, preformatted=True))
+                except CalledProcessError as e:
+                    click.echo(error(f"There was a problem updating {relpath}. Ask a teacher."))
+                    raise e
+
+    def init_direnv(self, modpath):
+        if not (modpath / ".envrc").exists():
+            (modpath / ".envrc").write_text("source .venv/bin/activate")
+        run("direnv allow", shell=True, check=True, cwd=modpath)
 
     def user_has_repo(self, repo_name, username=None):
         """Checks to see whether a user already has the named repo.

{making_with_code_cli-4.1.2 → making_with_code_cli-5.0.1/src}/making_with_code_cli/settings.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-import yaml
+import tomlkit
 import os
 
 
@@ -14,7 +14,8 @@ def get_settings_path(settings_path=None):
     elif "MWC_CONFIG" in os.environ:
         return Path(os.environ["MWC_CONFIG"])
     else:
-        return Path.home() / ".mwc"
+        xdg_config_home = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config"))
+        return xdg_config_home / "settings.toml"
 
 def read_settings(settings_path=None):
     """Reads the settings file and returns a dict. 
@@ -22,7 +23,8 @@ def read_settings(settings_path=None):
     """
     sp = get_settings_path(settings_path)
     if sp.exists():
-        return yaml.safe_load(sp.read_text())
+        with open(sp, "rb") as f:
+            return tomlkit.load(f)
     else:
         return {}
 
@@ -38,6 +40,7 @@ def iter_settings(settings, prefix=None):
         else:
             yield '.'.join(keypath), value
 
+# TODO
 def check_settings(settings):
     """Checks that all settings match SETTINGS_FORMAT"""
     errors = []
@@ -45,5 +48,5 @@ def check_settings(settings):
 def write_settings(settings, settings_path=None):
     """Writes the settings to the settings file."""
     sp = get_settings_path(settings_path)
-    sp.write_text(yaml.dump(settings))
-    
+    with open(sp, "w") as f:
+        tomlkit.dump(settings, f)

{making_with_code_cli-4.1.2 → making_with_code_cli-5.0.1/src}/making_with_code_cli/setup/__init__.py

@@ -1,7 +1,7 @@
 import click
 from subprocess import run
+from pprint import pformat
 import traceback
-import yaml
 from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
 from making_with_code_cli.git_backend import get_backend
 from making_with_code_cli.update import update
@@ -29,8 +29,10 @@ from making_with_code_cli.setup.tasks import (
     choose_work_dir,
     choose_course,
     choose_editor,
+    WriteMWCShellConfig,
+    SourceMWCShellConfig,
     InstallXCode,
-    InstallPoetry,
+    InstallDirenv,
     InstallGit,
     InstallTree,
     InstallVSCode,
@@ -95,18 +97,19 @@ def setup(ctx, config, debug, git_name, git_email, mwc_accounts_url):
         click.echo(debug_fmt("MWC Accounts Server status:"))
         click.echo(debug_fmt(str(status)))
         click.echo(info("MWC settings:"))
-        click.echo(info(yaml.dump(settings), preformatted=True))
+        click.echo(info(settings, preformatted=True))
     write_settings(settings, config)
 
     task_classes = [
+        WriteMWCShellConfig,
+        SourceMWCShellConfig,
         InstallXCode,
-        InstallPoetry,
+        InstallDirenv,
         InstallGit,
         InstallTree,
         InstallVSCode,
         InstallImageMagick,
         InstallHttpie,
-        #InstallScipy,
         GitConfiguration,
     ]
     errors = []

{making_with_code_cli-4.1.2 → making_with_code_cli-5.0.1/src}/making_with_code_cli/setup/tasks.py

@@ -129,24 +129,6 @@ def choose_work_dir(default=None, teacher=False):
             work_dir.mkdir(mode=WORK_DIR_PERMISSIONS, parents=True)
             return work_dir
 
-def choose_mwc_site_url(default=None):
-    """Asks the user for the Making With Code site URL
-    """
-    while True:
-        url = click.prompt(
-            question("What's the URL of your Making With Code website?"),
-            default=default,
-        )
-        if url.endswith('/'):
-            url = url[:-1]
-        try:
-            curriculum = get_curriculum({'mwc_site_url': url})
-            return url
-        except CurriculumSiteNotAvailable as err:
-            click.echo(error(str(err)))
-        except requests.exceptions.MissingSchema as e:
-            click.echo(error(str(e)))
-
 def choose_course(options, default=None):
     """Asks the user which course they are part of"""
     if len(options) == 0:
@@ -192,19 +174,28 @@ def get_shell_name():
     return shellpath.stdout.split('/')[-1].strip()
 
 def get_mwc_rc_path():
-    return (Path.home() / ".mwc_rc").resolve()
+    xdg_config_home = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config"))
+    return xdg_config_home / "mwc" / "shell_config.sh"
 
 def platform_rc_file():
     shell = get_shell_name()
+    if shell == "zsh":
+        dothome = Path(os.environ.get("ZDOTDIR", Path.home()))
+    else:
+        dothome = Path.home()
     candidates = [
-        ("bash", Path.home() / ".bash_profile"),
-        ("bash", Path.home() / ".bash_rc"),
-        ("bash", Path.home() / ".bashrc"),
-        ("zsh", Path.home() / ".zprofile"),
-        ("zsh", Path.home() / ".zshrc"),
+        ("bash", dothome / ".bashrc"),
+        ("bash", dothome / ".bash_profile"),
+        ("bash", dothome / ".bash_login"),
+        ("bash", dothome / ".profile"),
+        ("zsh", dothome / ".zshenv"),
+        ("zsh", dothome / ".zshrc"),
+        ("zsh", dothome / ".zprofile"),
+        ("zsh", dothome / ".zlogin"),
     ]
     for sh, rc in candidates:
         if shell == sh and rc.exists():
+            click.echo(debug(f"Shell identified as {sh}. Using {rc} as rc file."))
             return rc
     raise IOError("Can't find an rc file.")
 
@@ -232,10 +223,10 @@ class SetupTask:
         pass
 
     def report_not_needed(self):
-        click.echo(info(f"{self.description} is already complete."))
+        click.echo(info(f"{self.description} is already complete.", preformatted=True))
         
     def report_complete(self):
-        click.echo(success(f"{self.description} is complete!"))
+        click.echo(success(f"{self.description} is complete.", preformatted=True))
 
     def debug_log(self, message):
         if self.debug:
@@ -244,11 +235,44 @@ class SetupTask:
     def executable_on_path(self, name):
         return bool(run(f"which {name}", shell=True, capture_output=True).stdout)
 
-# DEPRECATED
-class MWCShellConfig(SetupTask):
-    """Writes a line in the rc shell config file sourcing ~/.mwc_rc.
+class WriteMWCShellConfig(SetupTask):
+    description = "Write the MWC shell config file to ~/.config/mwc/shell_config.sh or XDG_CONFIG_HOME"
+
+    def is_complete(self):
+        p = get_mwc_rc_path()
+        return p.exists() and p.read_text() == self.generate_shell_config()
+
+    def run_task(self):
+        mwc_rc_path = get_mwc_rc_path()
+        config_text = self.generate_shell_config()
+        self.debug_log(f"Writing to {mwc_rc_path}:\n\n{config_text}\n\n")
+        mwc_rc_path.parent.mkdir(parents=True, exist_ok=True)
+        mwc_rc_path.write_text(config_text)
+
+    def generate_shell_config(self):
+        "Generates the shell configuration file contents"
+        f = ""
+        shell = get_shell_name()
+        f += "# Making With Code RC File\n\n" 
+        f += "## Hook direnv into shell\n"
+        f += f'eval "$(direnv hook {shell})"\n\n'
+
+        if Platform.detect() == Platform.MAC:
+            if self.settings['editor'] == "subl":
+                f += "## Add subl to $PATH\n"
+                subldir = "/Applications/Sublime Text.app/Contents/SharedSupport/bin"
+                f += f'export PATH="{subldir}:$PATH"\n\n'
+        shell = get_shell_name()
+        if shell == "zsh": 
+            f += "## Initialize zsh autocomplete\n"
+            f += "fpath+=~/.zfunc\n"
+            f += "autoload -Uz compinit && compinit\n\n"
+        return f
+
+class SourceMWCShellConfig(SetupTask):
+    """Writes a line in the shell rc config file sourcing ~/.config/mwc/shell_config.sh.
     """
-    description = "Link main shell config file to ~/.mwc_rc"
+    description = "Source MWC config file in the main shell config file"
 
     def is_complete(self):
         return f"source {get_mwc_rc_path()}" in platform_rc_file().read_text()
@@ -262,6 +286,7 @@ class MWCShellConfig(SetupTask):
             fh.write(f"\n# MAKING WITH CODE\n")
             fh.write(f'export PATH="$PATH:{mwcpath}"\n')
             fh.write(f"source {get_mwc_rc_path()}\n")
+        click.echo(info(f"Updated your shell login file ({rc_file}). You may need to close and reopen Terminal."))
 
 class InstallXCode(SetupTask):
     description = "Install XCode"
@@ -278,78 +303,6 @@ class InstallXCode(SetupTask):
         click.echo(address(msg))
         run("xcode-select --install", shell=True, check=True)
 
-class InstallPoetry(SetupTask):
-    description = "Install poetry"
-
-    def is_complete(self):
-        if self.executable_on_path("poetry"):
-            self.check_for_poetry2()
-            return True
-
-    def run_task(self):
-        click.echo(address("Installing poetry..."))
-        run("pipx install poetry", shell=True, check=True)
-        run("poetry self add poetry-plugin-shell", shell=True, check=True)
-        self.check_for_poetry2()
-        click.echo(address("Installing poetry tab completions..."))
-        shell = get_shell_name()
-        try:
-            if shell == "bash":
-                run("poetry completions bash > ~/.bash_completion", shell=True, check=True)
-            if shell == "zsh":
-                tab_completion_dir = Path("~/.zfunc")
-                tab_completion_dir.mkdir(exist_ok=True)
-                run("poetry completions zsh > ~/.zfunc/_poetry", shell=True, check=True)
-        except PermissionError:
-            click.echo(warn(f"Couldn't install tab completions for poetry. This is not a big deal."))
-
-    def check_for_poetry2(self, upgrade=True):
-        result = run("poetry --version", shell=True, check=True, capture_output=True, text=True)
-        match = re.search(r"(\d+)\.\d+\.\d+", result.stdout)
-        if match:
-            poetry_major_version = int(match.group(1))
-            if not poetry_major_version == 2:
-                if upgrade:
-                    click.echo(info("Upgrading Poetry"))
-                    run("pipx upgrade poetry", shell=True, check=True)
-                    run("poetry self add poetry-plugin-shell", shell=True, check=True)
-                    self.check_for_poetry2(upgrade=False)
-                else:
-                    raise MWCInstallationError("Poetry 2 is required. Please upgrade.")
-        else:
-            raise MWCInstallationError("Could not determine Poetry version; Poetry 2 is required.")
-
-class WriteShellConfig(SetupTask):
-    description = "Write the MWC shell configuration file ~/.mwc_rc"
-
-    def is_complete(self):
-        p = get_mwc_rc_path()
-        return p.exists() and p.read_text() == self.generate_shell_config()
-
-    def run_task(self):
-        click.echo(address("Writing the MWC shell configuration file..."))
-        mwc_rc_path = get_mwc_rc_path()
-        config_text = self.generate_shell_config()
-        self.debug_log(f"Writing to {mwc_rc_path}:\n\n{config_text}\n\n")
-        mwc_rc_path.write_text(config_text)
-        run(f"source {get_mwc_rc_path()}", shell=True, check=True)
-
-    def generate_shell_config(self):
-        "Generates the shell configuration file contents"
-        f = ""
-        shell = get_shell_name()
-        f += "# Making With Code RC File\n\n" 
-        if Platform.detect() == Platform.MAC:
-            if self.settings['editor'] == "subl":
-                f += "## Add subl to $PATH\n"
-                subldir = "/Applications/Sublime Text.app/Contents/SharedSupport/bin"
-                f += f'export PATH="{subldir}:$PATH"\n\n'
-        shell = get_shell_name()
-        if shell == "zsh": 
-            f += "fpath+=~/.zfunc\n"
-            f += "autoload -Uz compinit && compinit\n"
-        return f
-
 class InstallPackage(SetupTask):
     """A subclass of SetupTask for packages to be installed by the Platform package manager.
     """
@@ -382,6 +335,18 @@ class InstallPackage(SetupTask):
         self.debug_log(f"Running: {package_manager}{package_name}")
         run(f"{package_manager}{package_name}", shell=True, check=True)
 
+class InstallPackageFromInstaller(InstallPackage):
+    """Install from a remotely-fetched installer specified as install_command.
+    """
+    def run_task(self):
+        click.echo(address(f"Installing {self.executable_name}..."))
+        self.debug_log(f"Running: {self.install_command}")
+        run(self.install_command, shell=True, check=True)
+
+class InstallDirenv(InstallPackageFromInstaller):
+    executable_name = "direnv"
+    install_command = "curl -sfL https://direnv.net/install.sh | bash"
+
 class InstallGit(InstallPackage):
     platform = Platform.MAC | Platform.UBUNTU
     executable_name = brew_name = apt_name = "git"

{making_with_code_cli-4.1.2 → making_with_code_cli-5.0.1/src}/making_with_code_cli/teach/check/check_module.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from subprocess import run
 import requests
-import toml
+import tomllib
 from git import Repo, InvalidGitRepositoryError, GitCommandError
 
 DEFAULT_BRANCH_NAME = "main"
@@ -82,7 +82,7 @@ class TestMWCModule:
         if not md_file.exists():
             self.errors.append(f"pyproject.toml missing")
             return 
-        md = toml.load(md_file)
+        md = tomllib.load(md_file)
         pyversion = md['project'].get('requires-python')
         if not pyversion == PYTHON_VERSION:
             self.errors.append(f"python version is {pyversion}, expected {PYTHON_VERSION}")

{making_with_code_cli-4.1.2 → making_with_code_cli-5.0.1/src}/making_with_code_cli/update/__init__.py

@@ -1,6 +1,7 @@
 import click
 import traceback
 from pathlib import Path
+from subprocess import run
 from making_with_code_cli.settings import read_settings
 from making_with_code_cli.curriculum import get_curriculum
 from making_with_code_cli.git_backend import get_backend

making_with_code_cli-4.1.2/making_with_code_cli/git_backend/base_backend.py

@@ -1,47 +0,0 @@
-from pathlib import Path
-from subprocess import run, CalledProcessError
-import click
-from making_with_code_cli.helpers import cd
-from making_with_code_cli.setup.tasks import WORK_DIR_PERMISSIONS
-from making_with_code_cli.styles import (
-    address,
-    info,
-    confirm,
-    error,
-)
-
-class GitBackend:
-    """Base class interface to backend git server.
-    All Making With Code deployments are backed by a git server, but the nature of the
-    server and the strategies for completing tasks vary by backend. 
-    """
-
-    def __init__(self, settings):
-        self.settings = settings
-
-    def init_module(self, module, modpath):
-        raise NotImplemented()
-
-    def update(self, module, modpath, install=True):
-        if (modpath / ".git").is_dir():
-            with cd(modpath):
-                relpath = self.relative_path(modpath)
-                try:
-                    click.echo(address(f"Checking {relpath} for updates.", preformatted=True))
-                    gitresult = run("git pull", shell=True, check=True, capture_output=True,
-                            text=True)
-                    click.echo(info(gitresult.stdout))
-                    if install and Path("pyproject.toml").exists():
-                        result = run("poetry install", shell=True, check=True, 
-                                capture_output=True, text=True)
-                        click.echo(info(result.stdout, preformatted=True))
-                except CalledProcessError as e:
-                    click.echo(error(f"There was a problem updating {relpath}. Ask a teacher."))
-                    raise e
-
-    def work_dir(self):
-        return Path(self.settings['work_dir'])
-
-    def relative_path(self, path):
-        return path.relative_to(self.work_dir())
-