skilleter-modules 0.0.1__tar.gz → 0.0.3__tar.gz

{skilleter_modules-0.0.1/src/skilleter_modules.egg-info → skilleter_modules-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_modules
-Version: 0.0.1
+Version: 0.0.3
 Summary: Modules used by my various Python projects (and hopefully useful to other people)
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_modules-0.0.1 → skilleter_modules-0.0.3}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_modules"
 
 # Version must be incremented to install updated skilleter-extras
 
-version = "0.0.1"
+version = "0.0.3"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_modules-0.0.1 → skilleter_modules-0.0.3}/src/skilleter_modules/dircolors.py

@@ -14,8 +14,8 @@ from io import StringIO, TextIOBase
 import os
 import stat
 
-import dc_defaults
-import dc_util
+from . import dc_defaults
+from . import dc_util
 
 __all__ = ['Dircolors']
 

skilleter_modules-0.0.3/src/skilleter_modules/docker.py

@@ -0,0 +1,105 @@
+#! /usr/bin/env python3
+
+################################################################################
+""" Docker interface for Thingy
+
+    Copyright (C) 2017 John Skilleter
+
+    Note that this:
+        * Only implements functions required by docker-purge
+        * Only has basic error checking, in that it raises DockerError
+          for any error returned by the external docker command.
+"""
+################################################################################
+
+import subprocess
+
+################################################################################
+
+class DockerError(Exception):
+    """ Exception for dockery things """
+
+    pass
+
+################################################################################
+
+def instances(all=False):
+    """ Return a list of all current Docker instances """
+
+    cmd = ['docker', 'ps', '-q']
+
+    if all:
+        cmd.append('-a')
+
+    instances_list = []
+    try:
+        process = subprocess.run(cmd, capture_output=True, check=True, text=True)
+
+        for result in process.stdout:
+            instances_list.append(result)
+
+    except subprocess.CalledProcessError as exc:
+        raise DockerError(exc)
+
+    return instances_list
+
+################################################################################
+
+def stop(instance, force=False):
+    """ Stop the specified Docker instance """
+
+    # TODO: force option not implemented
+
+    try:
+        subprocess.run(['docker', 'stop', instance], check=True, capture_output=False)
+
+    except suprocess.CalledProcessError as exc:
+        raise DockerError(exc)
+
+################################################################################
+
+def rm(instance, force=False):
+    """ Remove the specified instance """
+
+    cmd = ['docker', 'rm']
+
+    if force:
+        cmd.append('--force')
+
+    cmd.append(instance)
+
+    try:
+        subprocess.run(cmd, check=True, capture_output=False)
+
+    except subprocess.CalledProcessError as exc:
+        raise DockerError(exc)
+
+################################################################################
+
+def images():
+    """ Return a list of all current Docker images """
+
+    try:
+        process = subprocess.run(['docker', 'images', '-q'], capture_output=True, check=True)
+
+        for result in process:
+            yield result
+
+    except subprocess.CalledProcessError as exc:
+        raise DockerError(exc)
+
+################################################################################
+
+def rmi(image, force=False):
+    """ Remove the specified image """
+
+    cmd = ['docker', 'rmi']
+    if force:
+        cmd.append('--force')
+
+    cmd.append(image)
+
+    try:
+        subprocess.run(cmd, capture_output=False, check=True)
+    except subprocess.CalledProcessError as exc:
+        raise DockerError(exc)

{skilleter_modules-0.0.1 → skilleter_modules-0.0.3}/src/skilleter_modules/git.py

@@ -30,8 +30,8 @@ import subprocess
 
 import pygit2
 
-import run
-import gitlab
+from . import run
+from . import gitlab
 
 ################################################################################
 # Configuration files to access

{skilleter_modules-0.0.1 → skilleter_modules-0.0.3}/src/skilleter_modules/run.py

@@ -23,7 +23,7 @@ import subprocess
 import threading
 import shlex
 
-import tidy
+from . import tidy
 
 ################################################################################
 

{skilleter_modules-0.0.1 → skilleter_modules-0.0.3}/src/skilleter_modules/tfm_pane.py

@@ -16,9 +16,9 @@ from enum import IntEnum
 if sys.platform == 'linux':
     import inotify.adapters
 
-import dc_curses
-import path
-import popup
+from . import dc_curses
+from . import path
+from . import popup
 
 ################################################################################
 

{skilleter_modules-0.0.1 → skilleter_modules-0.0.3/src/skilleter_modules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_modules
-Version: 0.0.1
+Version: 0.0.3
 Summary: Modules used by my various Python projects (and hopefully useful to other people)
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_modules-0.0.1 → skilleter_modules-0.0.3}/src/skilleter_modules.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ src/skilleter_modules/dc_curses.py
 src/skilleter_modules/dc_defaults.py
 src/skilleter_modules/dc_util.py
 src/skilleter_modules/dircolors.py
+src/skilleter_modules/docker.py
 src/skilleter_modules/files.py
 src/skilleter_modules/git.py
 src/skilleter_modules/gitlab.py