cmem-cmemc 26.1.0rc1__tar.gz → 26.1.0rc2__tar.gz

{cmem_cmemc-26.1.0rc1 → cmem_cmemc-26.1.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmem-cmemc
-Version: 26.1.0rc1
+Version: 26.1.0rc2
 Summary: Command line client for eccenca Corporate Memory
 License: Apache-2.0
 License-File: LICENSE
@@ -32,7 +32,7 @@ Requires-Dist: certifi (>=2024.2.2)
 Requires-Dist: click (>=8.3.0,<9.0.0)
 Requires-Dist: click-didyoumean (>=0.3.1,<0.4.0)
 Requires-Dist: click-help-colors (>=0.9.4,<0.10.0)
-Requires-Dist: cmem-client (>=0.5.0,<0.6.0)
+Requires-Dist: cmem-client (==0.6.0)
 Requires-Dist: cmem-cmempy (==25.4.0)
 Requires-Dist: configparser (>=7.2.0,<8.0.0)
 Requires-Dist: humanize (>=4.14.0,<5.0.0)

{cmem_cmemc-26.1.0rc1 → cmem_cmemc-26.1.0rc2}/cmem_cmemc/commands/package.py

@@ -13,7 +13,6 @@ from cmem_client.repositories.marketplace_packages import (
     MarketplacePackagesImportConfig,
     MarketplacePackagesRepository,
 )
-from eccenca_marketplace_client.manifests import AbstractPackageManifest, ManifestMetadata
 from eccenca_marketplace_client.package_version import PackageVersion
 from pydantic_extra_types.semantic_version import SemanticVersion
 
@@ -93,55 +92,6 @@ def _complete_installed_package_ids(
     return completion.finalize_completion(candidates=candidates, incomplete=incomplete)
 
 
-@click.command(cls=CmemcCommand, name="create")
-@click.argument("package_id", required=True)
-@click.option(
-    "--name",
-    type=click.STRING,
-    help=ManifestMetadata.model_fields.get("name").description + " Defaults to package ID.",
-)
-@click.option(
-    "--version",
-    type=click.STRING,
-    default="0.0.1",
-    show_default=True,
-    help=AbstractPackageManifest.model_fields.get("package_version").description,
-)
-@click.option(
-    "--description",
-    type=click.STRING,
-    help=ManifestMetadata.model_fields.get("description").description,
-    default="This is the first version of a wonderful eccenca Corporate Memory package 🤓",
-    show_default=True,
-)
-@click.pass_obj
-def create_command(
-    app: ApplicationContext, package_id: str, version: str, name: str | None, description: str
-) -> None:
-    """Initialize an empty package directory with a minimal manifest."""
-    if Path(package_id).exists():
-        raise click.UsageError(f"Package directory '{package_id}' already exists.")
-    if name is None:
-        name = package_id
-    manifest_src = {
-        "package_id": package_id,
-        "package_type": "project",
-        "package_version": version,
-        "metadata": {
-            "name": name,
-            "description": description,
-        },
-        "files": [],
-    }
-    package_version = PackageVersion.from_json(json.dumps(manifest_src))
-    directory = Path(package_id)
-    app.echo_info(f"Initialize package directory '{directory}' ... ", nl=False)
-    directory.mkdir(parents=True, exist_ok=True)
-    manifest = directory / "manifest.json"
-    manifest.write_text(package_version.manifest.model_dump_json(indent=2))
-    app.echo_success("done")
-
-
 @click.command(cls=CmemcCommand, name="inspect")
 @click.argument(
     "PACKAGE_PATH",
@@ -165,7 +115,9 @@ def inspect_command(app: ApplicationContext, package_path: Path, key: str, raw:
     """Inspect the manifest of a package."""
     path = Path(package_path)
     package_version = (
-        PackageVersion.from_directory(path) if path.is_dir() else PackageVersion.from_archive(path)
+        PackageVersion.from_directory(path, validate_files=False)
+        if path.is_dir()
+        else PackageVersion.from_archive(path)
     )
     manifest = package_version.manifest
     manifest_data = json.loads(manifest.model_dump_json(indent=2))
@@ -281,7 +233,7 @@ def install_command(
     if input_path:
         package_path = Path(input_path)
         package_version = (
-            PackageVersion.from_directory(package_path)
+            PackageVersion.from_directory(package_path, validate_files=False)
             if package_path.is_dir()
             else PackageVersion.from_archive(package_path)
         )
@@ -447,7 +399,7 @@ def build_command(
     Package archives can be published to the marketplace using the `package publish` command.
     """
     package_path = Path(package_directory)
-    package_version = PackageVersion.from_directory(package_path)
+    package_version = PackageVersion.from_directory(package_path, validate_files=False)
     if version:
         if version.startswith("v"):
             version = version[1:]
@@ -466,25 +418,32 @@ def build_command(
 
     if version_str.endswith("dirty"):
         app.echo_warning(
-            "Dirty Repository: Your version strings ends with 'dirty'."
+            "Dirty Repository: Your version string ends with 'dirty'."
             "This indicates an unclean repository."
         )
+    if version_str == "0.0.0":
+        raise CmemcError(
+            "Invalid Version 0.0.0: "
+            "Use the --version option to override this, or change the manifest."
+        )
     if cpa_file.exists() and not replace:
         raise CmemcError(
             f"Package archive `{cpa_file}` already exists. Use `--replace` to overwrite."
         )
     app.echo_info(f"Building package archive `{cpa_file.name}` ... ", nl=False)
+    package_version.validate_text_files(package_version.manifest, package_path)
+    package_version.validate_image_files(package_version.manifest, package_path)
     package_version.build_archive(archive=cpa_file)
     app.echo_success("done")
 
 
 @click.command(cls=CmemcCommand, name="publish")
 @click.argument(
-    "PACKAGE",
+    "PACKAGE_ARCHIVE",
     required=True,
     type=ClickSmartPath(
         allow_dash=False,
-        dir_okay=True,
+        dir_okay=False,
         readable=True,
         exists=True,
         remote_okay=True,
@@ -497,25 +456,16 @@ def build_command(
     default="https://marketplace.eccenca.dev/",
 )
 @click.pass_obj
-def publish_command(app: ApplicationContext, package: str, marketplace_url: str) -> None:
+def publish_command(app: ApplicationContext, package_archive: str, marketplace_url: str) -> None:
     """Publish a package archive to the marketplace server."""
-    package_path = Path(package)
+    package_path = Path(package_archive)
 
-    package_version = (
-        PackageVersion.from_directory(package_path)
-        if package_path.is_dir()
-        else PackageVersion.from_archive(package_path)
-    )
+    package_version = PackageVersion.from_archive(package_path)
     package_id = package_version.manifest.package_id
 
     app.echo_info(f"Publishing package `{package_id}` ... ", nl=False)
-
-    if package_path.is_dir():
-        package_data = b"".join(PackageVersion.create_archive(package_path))
-        filename = f"{package_id}.cpa"
-    else:
-        package_data = package_path.read_bytes()
-        filename = package_path.name
+    package_data = package_path.read_bytes()
+    filename = package_path.name
 
     if marketplace_url.endswith("/"):
         marketplace_url = marketplace_url[:-1]
@@ -538,7 +488,6 @@ def package_group() -> CmemcGroup:  # type: ignore[empty-body]
     """List, (un)install, export, create, or inspect packages."""
 
 
-package_group.add_command(create_command)
 package_group.add_command(inspect_command)
 package_group.add_command(list_command)
 package_group.add_command(install_command)

{cmem_cmemc-26.1.0rc1 → cmem_cmemc-26.1.0rc2}/cmem_cmemc/manual_helper/multi_page.py

@@ -26,6 +26,7 @@ def get_icon_for_command_group(full_name: str) -> str:
         "admin workspace python": "material/language-python",
         "config": "material/cog-outline",
         "dataset": "eccenca/artefact-dataset",
+        "package": "material/shopping",
         "project": "eccenca/artefact-project",
         "project file": "eccenca/artefact-file",
         "project variable": "material/variable-box",
@@ -54,6 +55,7 @@ def get_tags_for_command_group(full_name: str) -> str:
         "admin workspace python": ["Python", "cmemc"],
         "config": ["Configuration", "cmemc"],
         "dataset": ["cmemc"],
+        "package": ["cmemc", "Package"],
         "project": ["Project", "cmemc"],
         "project file": ["Files", "cmemc"],
         "project variable": ["Variables", "cmemc"],

{cmem_cmemc-26.1.0rc1 → cmem_cmemc-26.1.0rc2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cmem-cmemc"
-version = "26.1.0rc1"
+version = "26.1.0rc2"
 description = "Command line client for eccenca Corporate Memory"
 license = "Apache-2.0"
 classifiers = [
@@ -36,7 +36,7 @@ click-didyoumean = "^0.3.1"
 click-help-colors = "^0.9.4"
 cmem-cmempy = "==25.4.0"
 # cmem-cmempy = { path = "cmempy", develop = true }
-cmem-client = "^0.5.0"
+cmem-client = "=0.6.0"
 # cmem-client = { path = "cmem-client", develop = true }
 configparser = "^7.2.0"
 jinja2 = "^3.1.6"
@@ -71,7 +71,7 @@ pytest-mock = "^3.14.1"
 requests-mock = "^1.12.1"
 ruff = "^0.7.4"
 semver = "^3.0.4"
-trivy-py-ecc = "^0.67.2"
+trivy-py-ecc = "^0.68"
 types-python-dateutil = "^2.9.0.20240316"
 types-requests = "^2.32.0.20241016"
 types-six = "^1.16.21.20240425"