making-with-code-cli 2.2.2__tar.gz → 3.1.0__tar.gz

{making_with_code_cli-2.2.2 → making_with_code_cli-3.1.0}/PKG-INFO

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: making-with-code-cli
-Version: 2.2.2
+Version: 3.1.0
 Summary: Courseware for Making With Code
-Home-page: https://github.com/cproctor/making-with-code-courseware
 License: MIT
 Author: Chris Proctor
 Author-email: chris@chrisproctor.net
@@ -13,11 +12,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: PyYAML (>=6.0,<7.0)
-Requires-Dist: click (>=8.0.3,<9.0.0)
-Requires-Dist: dateparser (>=1.1.8,<2.0.0)
-Requires-Dist: gitpython (>=3.1.32,<4.0.0)
-Requires-Dist: requests (>=2.27.1,<3.0.0)
+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)

{making_with_code_cli-2.2.2 → making_with_code_cli-3.1.0}/making_with_code_cli/errors.py

@@ -21,5 +21,8 @@ class MissingSetting(MWCError):
         msg = f"Required setting {missing_setting} is missing. Please run mwc setup."
         super().__init__(msg)
 
+class SoftwareInstallationError(MWCError):
+    pass
+
 class NoCurriculaAvailable(MWCError):
     pass

{making_with_code_cli-2.2.2 → making_with_code_cli-3.1.0}/making_with_code_cli/mwc_accounts_api.py

@@ -43,7 +43,11 @@ class MWCAccountsAPI:
         elif response.status_code == 500:
             raise self.ServerError("Error 500")
         else:
-            raise self.RequestFailed(response.json())
+            try:
+                rj = response.json()
+                raise self.RequestFailed(rj)
+            except requests.exceptions.JSONDecodeError:
+                raise self.RequestFailed(response)
 
     class RequestFailed(Exception):
         pass

{making_with_code_cli-2.2.2 → making_with_code_cli-3.1.0}/making_with_code_cli/setup/tasks.py

@@ -3,6 +3,7 @@ from enum import Flag, auto
 from stat import *
 import sys
 import os
+import re
 import platform
 from importlib.util import find_spec
 from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
@@ -22,6 +23,7 @@ from making_with_code_cli.curriculum import (
 from making_with_code_cli.errors import (
     CurriculumSiteNotAvailable,
     NoCurriculaAvailable,
+    SoftwareInstallationError,
 )
 import click
 import requests
@@ -59,10 +61,8 @@ class Platform(Flag):
         system_name = platform.system()
         if system_name == "Darwin":
             return cls.MAC
-        if system_name == "Linux" and platform.freedesktop_os_release().get('NAME'):
-            release_name = (platform.freedesktop_os_release() or {}).get('NAME')
-            if release_name == "Ubuntu":
-                return cls.UBUNTU
+        if system_name == "Linux":
+            return cls.UBUNTU
         return cls.UNSUPPORTED
 
     @classmethod
@@ -283,11 +283,15 @@ class InstallPoetry(SetupTask):
     description = "Install poetry"
 
     def is_complete(self):
-        return self.executable_on_path("poetry")
+        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:
@@ -300,6 +304,22 @@ class InstallPoetry(SetupTask):
         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"
 

{making_with_code_cli-2.2.2 → making_with_code_cli-3.1.0}/making_with_code_cli/teach/check/__init__.py

@@ -35,6 +35,8 @@ def check(url, repo_dir, course, module, use_json):
         errors = test.run()
         if errors:
             results.append((slug, errors))
+    if len(test_cases) == 0:
+        print(warn("No matching modules."))
     if use_json:
         print([{'module': slug, 'errors': errors} for slug, errors in results])
     else:

{making_with_code_cli-2.2.2 → making_with_code_cli-3.1.0}/making_with_code_cli/teach/check/check_module.py

@@ -1,6 +1,8 @@
 # test_module.py
 # --------------
 # Defines a test case for a MWC module.
+# TODO:
+# - check minimum version 1.0
 
 from pathlib import Path
 from subprocess import run
@@ -26,8 +28,9 @@ class TestMWCModule:
             self.fetch_repo()
             self.test_curriculum_page_exists()
             self.test_has_commit_template()
-            self.test_poetry()
-            self.test_module_metadata()
+            poetry_ok = self.test_poetry()
+            if poetry_ok:
+                self.test_module_metadata()
         except TestCouldNotContinue as err:
             self.errors.append(str(err))
         return self.errors
@@ -45,7 +48,7 @@ class TestMWCModule:
             try:
                 repo = Repo.clone_from(self.module_metadata['repo_url'], self.repo_path)
             except GitCommandError:
-                raise TestCouldNotContinue("Could not clone repo")
+                raise TestCouldNotContinue(f"Could not clone repo ({self.module_metadata['repo_url']})")
         if not repo.active_branch.name == DEFAULT_BRANCH_NAME:
             self.errors.append(f"Default branch is not '{DEFAULT_BRANCH_NAME}'")
 
@@ -72,6 +75,7 @@ class TestMWCModule:
             for err in result.stderr.split('\n'):
                 if err.strip():
                     self.errors.append(err.strip())
+        return result.returncode == 0
 
     def test_module_metadata(self):
         md_file = self.repo_path/"pyproject.toml"
@@ -79,14 +83,11 @@ class TestMWCModule:
             self.errors.append(f"pyproject.toml missing")
             return 
         md = toml.load(md_file)
-        if not "project" in md:
-            self.errors.append("'project' section missing from pyproject.toml")
-            return
-        if "tool" in md:
-            self.errors.append("Deprecated 'tool' section found in pyproject.toml")
         pyversion = md['project'].get('requires-python')
         if not pyversion == PYTHON_VERSION:
             self.errors.append(f"python version is {pyversion}, expected {PYTHON_VERSION}")
+        if not md.get('tool', {}).get('poetry', {}).get('package-mode') == False:
+            self.errors.append("tool.poetry.package-mode must be false")
 
 
 

making_with_code_cli-3.1.0/pyproject.toml

@@ -0,0 +1,38 @@
+[project]
+name = "making-with-code-cli"
+version = "3.1.0"
+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"
+requires-python = ">=3.10,<4.0"
+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)"
+]
+
+[project.urls]
+issues = "https://github.com/cproctor/making-with-code-courseware/issues"
+
+[project.scripts]
+mwc = "making_with_code_cli.cli:cli"
+
+[build-system]
+requires = ["poetry-core>=2.0.0,<3.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry.group.docs]
+optional = true
+
+[tool.poetry.group.docs.dependencies]
+sphinx = "^7.3.7"
+sphinx-rtd-theme = "^2.0.0"

making_with_code_cli-2.2.2/pyproject.toml

@@ -1,42 +0,0 @@
-[tool.poetry]
-name = "making-with-code-cli"
-version = "2.2.2"
-description = "Courseware for Making With Code"
-authors = ["Chris Proctor <chris@chrisproctor.net>"]
-license = "MIT"
-readme = "README.md"
-homepage = "https://github.com/cproctor/making-with-code-courseware"
-
-[tool.poetry.dependencies]
-python = "^3.10"
-PyYAML = "^6.0"
-click = "^8.0.3"
-requests = "^2.27.1"
-toml = "^0.10.2"
-tabulate = "^0.9.0"
-gitpython = "^3.1.32"
-dateparser = "^1.1.8"
-tqdm = "^4.67.1"
-
-[tool.poetry.group.docs]
-optional = true
-
-[tool.poetry.group.docs.dependencies]
-sphinx = "^7.3.7"
-sphinx-rtd-theme = "^2.0.0"
-
-[tool.poetry.group.teacher]
-optional = true
-
-[tool.poetry.group.teacher.dependencies]
-gitpython = "^3.1.44"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry.urls]
-issues = "https://github.com/cproctor/making-with-code-courseware/issues"
-
-[tool.poetry.scripts]
-mwc = "making_with_code_cli.cli:cli"