edge-containers-cli 4.1.1__tar.gz → 4.2.0__tar.gz

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/.copier-answers.yml

@@ -5,7 +5,7 @@ author_email: giles.knap@gmail.com
 author_name: Giles Knap
 description: CLI for deploying and managing epics containers IOCs and services
 distribution_name: edge-containers-cli
-docker: true
+docker: false
 docs_type: README
 git_platform: github.com
 github_org: epics-containers

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/.github/workflows/ci.yml

@@ -34,14 +34,6 @@ jobs:
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
-  container:
-    needs: check
-    if: needs.check.outputs.branch-pr == ''
-    uses: ./.github/workflows/_container.yml
-    permissions:
-      contents: read
-      packages: write
-
   dist:
     needs: check
     if: needs.check.outputs.branch-pr == ''

edge_containers_cli-4.2.0/Dockerfile

@@ -0,0 +1,13 @@
+# The devcontainer should use the developer target and run as root with podman
+# or docker with user namespaces.
+ARG PYTHON_VERSION=3.11
+FROM python:${PYTHON_VERSION} as developer
+
+# Add any system dependencies for the developer/build environment here
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    graphviz \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set up a virtual environment and put it in PATH
+RUN python -m venv /venv
+ENV PATH=/venv/bin:$PATH

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 4.1.1
+Version: 4.2.0
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License
@@ -250,7 +250,6 @@ https://epics-containers.github.io/
 Source          | <https://github.com/epics-containers/edge-containers-cli>
 :---:           | :---:
 PyPI            | `pip install edge-containers-cli`
-Docker          | `docker run ghcr.io/epics-containers/edge-containers-cli:latest`
 Releases        | <https://github.com/epics-containers/edge-containers-cli/releases>
 
 

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/README.md

@@ -15,7 +15,6 @@ https://epics-containers.github.io/
 Source          | <https://github.com/epics-containers/edge-containers-cli>
 :---:           | :---:
 PyPI            | `pip install edge-containers-cli`
-Docker          | `docker run ghcr.io/epics-containers/edge-containers-cli:latest`
 Releases        | <https://github.com/epics-containers/edge-containers-cli/releases>
 
 

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/src/edge_containers_cli/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.1.1'
-__version_tuple__ = version_tuple = (4, 1, 1)
+__version__ = version = '4.2.0'
+__version_tuple__ = version_tuple = (4, 2, 0)

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/src/edge_containers_cli/cli.py

@@ -234,13 +234,13 @@ def start(
     service_name: str = typer.Argument(
         ..., help="Name of the service container to start", autocompletion=all_svc
     ),
-    temp: bool = typer.Option(False, help="Directly overrides the controller values"),
+    commit: bool = typer.Option(False, help="Commits the values to the git repo"),
 ):
     """Start a service"""
     try:
-        backend.commands.start(service_name, temp)
+        backend.commands.start(service_name, commit)
     except GitError as e:
-        msg = f"{str(e)} - Try 'ec start <service> --temp' to bypass the git server"
+        msg = f"{str(e)} - Commit failed. Try 'ec start <service> --no-commit to set values without updating git"
         raise GitError(msg) from e
 
 
@@ -251,13 +251,13 @@ def stop(
         help="Name of the service container to stop",
         autocompletion=running_svc,
     ),
-    temp: bool = typer.Option(False, help="Directly overrides the controller values"),
+    commit: bool = typer.Option(False, help="Commits the values to the git repo"),
 ):
     """Stop a service"""
     try:
-        backend.commands.stop(service_name, temp)
+        backend.commands.stop(service_name, commit)
     except GitError as e:
-        msg = f"{str(e)} - Try ec stop <service> --temp to bypass the git server"
+        msg = f"{str(e)} - Commit failed. Try ec stop <service> --no-commit to set values without updating git"
         raise GitError(msg) from e
 
 

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/src/edge_containers_cli/cmds/argo_commands.py

@@ -84,19 +84,19 @@ class ArgoCommands(Commands):
         )
         shell.run_command(cmd, skip_on_dryrun=True)
 
-    def start(self, service_name, temp):
+    def start(self, service_name, commit):
         self._check_service(service_name)
-        if temp:
-            patch_value(self.target, f"ec_services.{service_name}.enabled", True)
-        else:
+        if commit:
             push_value(self.target, f"ec_services.{service_name}.enabled", True)
+        else:
+            patch_value(self.target, f"ec_services.{service_name}.enabled", True)
 
-    def stop(self, service_name, temp):
+    def stop(self, service_name, commit):
         self._check_service(service_name)
-        if temp:
-            patch_value(self.target, f"ec_services.{service_name}.enabled", False)
-        else:
+        if commit:
             push_value(self.target, f"ec_services.{service_name}.enabled", False)
+        else:
+            patch_value(self.target, f"ec_services.{service_name}.enabled", False)
 
     def _get_logs(self, service_name, prev) -> str:
         namespace, app = extract_ns_app(self.target)

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/src/edge_containers_cli/cmds/commands.py

@@ -39,7 +39,7 @@ class Commands(ABC):
     Methods not exposed to the CLI should be private
     """
 
-    params_opt_out: dict[str, list[str]] = {}
+    params_opt_out: dict[str, list[str]] = {}  # Optionally drop parameters from the CLI
 
     def __init__(self, ctx: ECContext):
         self._target = ctx.target
@@ -103,11 +103,11 @@ class Commands(ABC):
         raise NotImplementedError
 
     @abstractmethod
-    def start(self, service_name: str, temp: bool) -> None:
+    def start(self, service_name: str, commit: bool) -> None:
         raise NotImplementedError
 
     @abstractmethod
-    def stop(self, service_name: str, temp: bool) -> None:
+    def stop(self, service_name: str, commit: bool) -> None:
         raise NotImplementedError
 
     def template(self, svc_instance: Path, args: str) -> None:

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/src/edge_containers_cli/cmds/demo_commands.py

@@ -87,7 +87,7 @@ class DemoCommands(Commands):
         self.start(service_name, False)
 
     @demo_message
-    def start(self, service_name, temp):
+    def start(self, service_name, commit):
         self._check_service(service_name)
         time.sleep(DELAY)
         self._stateDF = self._stateDF.with_columns(
@@ -98,7 +98,7 @@ class DemoCommands(Commands):
         )
 
     @demo_message
-    def stop(self, service_name, temp):
+    def stop(self, service_name, commit):
         self._check_service(service_name)
         time.sleep(DELAY)
         self._stateDF = self._stateDF.with_columns(

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/src/edge_containers_cli/cmds/k8s_commands.py

@@ -24,8 +24,8 @@ class K8sCommands(Commands):
     """
 
     params_opt_out = {
-        "stop": ["temp"],
-        "start": ["temp"],
+        "stop": ["commit"],
+        "start": ["commit"],
     }
 
     def __init__(
@@ -89,14 +89,14 @@ class K8sCommands(Commands):
             f"kubectl delete -n {self.target} {pod_name}", skip_on_dryrun=True
         )
 
-    def start(self, service_name, temp):
+    def start(self, service_name, commit):
         self._check_service(service_name)
         shell.run_command(
             f"kubectl scale -n {self.target} statefulset {service_name} --replicas=1",
             skip_on_dryrun=True,
         )
 
-    def stop(self, service_name, temp):
+    def stop(self, service_name, commit):
         self._check_service(service_name)
         shell.run_command(
             f"kubectl scale -n {self.target} statefulset {service_name} --replicas=0 ",

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/src/edge_containers_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 4.1.1
+Version: 4.2.0
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License
@@ -250,7 +250,6 @@ https://epics-containers.github.io/
 Source          | <https://github.com/epics-containers/edge-containers-cli>
 :---:           | :---:
 PyPI            | `pip install edge-containers-cli`
-Docker          | `docker run ghcr.io/epics-containers/edge-containers-cli:latest`
 Releases        | <https://github.com/epics-containers/edge-containers-cli/releases>
 
 

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/src/edge_containers_cli.egg-info/SOURCES.txt

@@ -15,7 +15,6 @@ pyproject.toml
 .github/pages/index.html
 .github/pages/make_switcher.py
 .github/workflows/_check.yml
-.github/workflows/_container.yml
 .github/workflows/_dist.yml
 .github/workflows/_pypi.yml
 .github/workflows/_release.yml

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/tests/data/argocd.yaml

@@ -36,7 +36,7 @@ restart:
   - cmd: argocd app delete-resource namespace/bl01t-ea-test-01 --kind StatefulSet
     rsp: ""
 
-start:
+start_commit:
   - cmd: argocd app get namespace/bl01t -o yaml
     rsp: |
       spec:
@@ -56,13 +56,13 @@ start:
   - cmd: argocd app unset namespace/bl01t -p ec_services.bl01t-ea-test-01.enabled
     rsp: ""
 
-start_temp:
+start:
   - cmd: argocd app set namespace/bl01t -p ec_services.bl01t-ea-test-01.enabled=True
     rsp: ""
   - cmd: argocd app sync namespace/bl01t --apply-out-of-sync-only
     rsp: ""
 
-stop:
+stop_commit:
   - cmd: argocd app get namespace/bl01t -o yaml
     rsp: |
       spec:
@@ -76,7 +76,7 @@ stop:
   - cmd: argocd app unset namespace/bl01t -p ec_services.bl01t-ea-test-01.enabled
     rsp: ""
 
-stop_temp:
+stop:
   - cmd: argocd app set namespace/bl01t -p ec_services.bl01t-ea-test-01.enabled=False
     rsp: ""
   - cmd: argocd app sync namespace/bl01t --apply-out-of-sync-only

{edge_containers_cli-4.1.1 → edge_containers_cli-4.2.0}/tests/test_argocd.py

@@ -19,28 +19,28 @@ def test_restart(mock_run, ARGOCD):
     mock_run.run_cli("restart bl01t-ea-test-01")
 
 
-def test_start(mock_run, ARGOCD, data: Path):
-    mock_run.set_seq(ARGOCD.checks + ARGOCD.start)
+def test_start_commit(mock_run, ARGOCD, data: Path):
+    mock_run.set_seq(ARGOCD.checks + ARGOCD.start_commit)
     TMPDIR.mkdir()
     shutil.copytree(data / "bl01t-deployment/apps", TMPDIR / "apps")
-    mock_run.run_cli("start bl01t-ea-test-01")
+    mock_run.run_cli("start bl01t-ea-test-01 --commit")
 
 
-def test_start_temp(mock_run, ARGOCD):
-    mock_run.set_seq(ARGOCD.checks + ARGOCD.start_temp)
-    mock_run.run_cli("start bl01t-ea-test-01 --temp")
+def test_start(mock_run, ARGOCD):
+    mock_run.set_seq(ARGOCD.checks + ARGOCD.start)
+    mock_run.run_cli("start bl01t-ea-test-01")
 
 
-def test_stop(mock_run, ARGOCD, data: Path):
-    mock_run.set_seq(ARGOCD.checks + ARGOCD.stop)
+def test_stop_commit(mock_run, ARGOCD, data: Path):
+    mock_run.set_seq(ARGOCD.checks + ARGOCD.stop_commit)
     TMPDIR.mkdir()
     shutil.copytree(data / "bl01t-deployment/apps", TMPDIR / "apps")
-    mock_run.run_cli("stop bl01t-ea-test-01")
+    mock_run.run_cli("stop bl01t-ea-test-01 --commit")
 
 
-def test_stop_temp(mock_run, ARGOCD):
-    mock_run.set_seq(ARGOCD.checks + ARGOCD.stop_temp)
-    mock_run.run_cli("stop bl01t-ea-test-01 --temp")
+def test_stop(mock_run, ARGOCD):
+    mock_run.set_seq(ARGOCD.checks + ARGOCD.stop)
+    mock_run.run_cli("stop bl01t-ea-test-01")
 
 
 def test_ps(mock_run, ARGOCD):

edge_containers_cli-4.1.1/.github/workflows/_container.yml

@@ -1,60 +0,0 @@
-on:
-  workflow_call:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          # Need this to get version number from last tag
-          fetch-depth: 0
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Docker Registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and export to Docker local cache
-        uses: docker/build-push-action@v6
-        env:
-          DOCKER_BUILD_RECORD_UPLOAD: false
-        with:
-          context: .
-          # Need load and tags so we can test it below
-          load: true
-          tags: tag_for_testing
-
-      - name: Test cli works in cached runtime image
-        run: docker run --rm tag_for_testing --help
-
-      - name: Create tags for publishing image
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/${{ github.repository }}
-          tags: |
-            type=ref,event=tag
-            type=raw,value=latest
-
-      - name: Push cached image to container registry
-        if: github.ref_type == 'tag'
-        uses: docker/build-push-action@v6
-        env:
-          DOCKER_BUILD_RECORD_UPLOAD: false
-        # This does not build the image again, it will find the image in the
-        # Docker cache and publish it
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

edge_containers_cli-4.1.1/Dockerfile

@@ -1,31 +0,0 @@
-# The devcontainer should use the developer target and run as root with podman
-# or docker with user namespaces.
-ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION} as developer
-
-# Add any system dependencies for the developer/build environment here
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    graphviz \
-    && rm -rf /var/lib/apt/lists/*
-
-# Set up a virtual environment and put it in PATH
-RUN python -m venv /venv
-ENV PATH=/venv/bin:$PATH
-
-# The build stage installs the context into the venv
-FROM developer as build
-COPY . /context
-WORKDIR /context
-RUN touch dev-requirements.txt && pip install -c dev-requirements.txt .
-
-# The runtime stage copies the built venv into a slim runtime container
-FROM python:${PYTHON_VERSION}-slim as runtime
-# Add apt-get system dependecies for runtime here if needed
-COPY --from=build /venv/ /venv/
-ENV PATH=/venv/bin:$PATH
-RUN pip install textual-dev
-
-# change this entrypoint if it is not the same as the repo
-# Usage: serve "ec -b DEMO monitor" -p 8081
-ENTRYPOINT ["textual", "serve"]
-CMD ["--version"]