skilleter-thingy 0.2.15__py3-none-any.whl → 0.3.1__py3-none-any.whl

skilleter_thingy/gitcmp_helper.py

@@ -298,8 +298,10 @@ def main():
             if not deleted_file or not skip_deleted:
                 try:
                     subprocess.run([difftool, args.old_file, args.new_file], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+
                 except subprocess.CalledProcessError as exc:
                     print(f'WARNING: Diff failed - status = {exc.returncode}')
+
                 except FileNotFoundError:
                     print(f'ERROR: Unable to locate diff tool {difftool}')
                     sys.exit(1)

skilleter_thingy/multigit.py

@@ -646,16 +646,18 @@ def mg_run(args, config, console):
         repo_path = absolute_repo_path(args, repo.name)
 
         try:
-            status = subprocess.run(args.parameters, cwd=repo_path, check=False)
+            status = subprocess.run(args.parameters, cwd=repo_path, check=True)
+
         except FileNotFoundError:
             err_msg = f'"[BLUE:{args.parameters[0]}]" - Command not found'
             if args.error_continue:
                 colour.write(f'[RED:WARNING]: {err_msg}')
             else:
                 colour.error(f'[RED:ERROR]: {err_msg}')
-        else:
-            if status.returncode and not args.error_continue:
-                sys.exit(status)
+
+        except subprocess.CalledProcessError as exc:                
+            if not args.error_continue:
+                sys.exit(exc.returncode)
 
 ################################################################################
 

skilleter_thingy/py_audit.py

@@ -100,11 +100,12 @@ def main():
                          f' && python3 -m pip {PIP_OPTIONS} list | tail -n+3 | tee {package_list.name}' \
                           ' && deactivate'
 
-                result = subprocess.run(script, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
+                try:
+                    subprocess.run(script, check=True, shell=True)
 
-                if result.returncode:
-                    print(f'ERROR #{result.returncode}: {result.stdout}')
-                    sys.exit(result.returncode)
+                except subprocess.CalledProcessError as exc:
+                    print(f'ERROR #{exc.returncode}: {exc.stdout}')
+                    sys.exit(exc.returncode)
 
                 with open(package_list.name) as infile:
                     for package in infile.readlines():

skilleter_thingy/thingy/git.py

@@ -85,7 +85,7 @@ def git(cmd, stdout=None, stderr=None, path=None):
 ################################################################################
 
 def git_run_status(cmd, stdout=None, stderr=None, path=None, redirect=True):
-    """ Wrapper for run.run that returns the output and status, and
+    """ Wrapper for subprocess.run that returns the output and status, and
         does not raise an exception on error.
         Optionally redirect stdout and stderr as specified. """
 

{skilleter_thingy-0.2.15.dist-info → skilleter_thingy-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.15
+Version: 0.3.1
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk
@@ -52,7 +52,7 @@ For ease of use it is recommended that you create an alias for multigit called `
 
     alias mg="multigit $@"
 
-## Initialisation
+### Initialisation
 
 To use multigit, start by creating working trees for the repositories that you want to use in a directory tree - the working trees can be at different levels or even nested, for example:
 
@@ -70,7 +70,7 @@ To use multigit, start by creating working trees for the repositories that you w
 
 Start by running ensuring that the default branch (e.g. `main`) is checked out in each of the working trees and, in the top-level directory, run `multigit init` to create the configuration file which, by default is called `multigit.toml` - this is just a text file that sets the configuration for each working tree in terms of name, origin, default branch, tags and location.
 
-## Multigit Command Line
+### Multigit Command Line
 
 The multigit command line format is:
 
@@ -100,7 +100,7 @@ These options are AND-ed together, so specifying `--modified --branched --tag WO
 
 Multigit tags are stored in the configuration file, not within the working tree and each working tree can have multiple tags.
 
-## Multigit Commands
+### Multigit Commands
 
 Multigit supports a small list of subcommands, each of which are prefixed with a `+` to distinguish them from Git commands:
 
@@ -184,6 +184,21 @@ This is most useful where branches contain ticket numbers so, for instance given
 
 Note that the concept of the default branch `DEFAULT` mentioned above *only* applies when using the `multigit` command, although some of the commands will treat branches called `master` or `main` as special cases (see the individual command documentation).
 
+## git br
+
+List or delete branches that have been merged
+
+        usage: git-br [-h] [--all] [--delete] [--path PATH] [branches ...]
+
+        positional arguments:
+          branches              Filter the list of branches according to one or more patterns
+
+        options:
+          -h, --help            show this help message and exit
+          --all, -a             List all branches, including remotes
+          --delete, -d          Delete the specified branch(es), even if it is the current one (list of branches to delete must be supplied as parameters)
+          --path PATH, -C PATH  Run the command in the specified directory
+
 ## git ca
 
 Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
@@ -242,6 +257,37 @@ Equivalent to `git checkout` but with enhanced branch matching as described abov
         --exact, -e   Do not use branch name matching - check out the branch as specified (if it exists)
         --debug       Enable debug output
 
+## git common
+
+Find the most recent common ancestor for two commits
+
+        usage: git-common [-h] [--short] [--long] [--path PATH] [commit1] [commit2]
+
+        positional arguments:
+          commit1               First commit (default=HEAD)
+          commit2               Second commit (default=master)
+
+        options:
+          -h, --help            show this help message and exit
+          --short, -s           Just output the ancestor commit ID
+          --long, -l            Output the log entry for the commit
+          --path PATH, -C PATH  Run the command in the specified directory
+
+## git hold
+
+Archive, list or recover one or more Git branches
+
+        usage: git-hold [-h] [--list] [--restore] [--path PATH] [branches ...]
+
+        positional arguments:
+          branches              Branches
+
+        options:
+          -h, --help            show this help message and exit
+          --list, -l            List archived branches
+          --restore, -r         Restore archived branches
+          --path PATH, -C PATH  Run the command in the specified directory
+
 ## git parent
 
 Attempt to determine the parent branch for the specified branch (defaulting to the current one).
@@ -258,6 +304,21 @@ Attempt to determine the parent branch for the specified branch (defaulting to t
           --all, -a      Include feature branches as possible parents
           --verbose, -v  Report verbose results (includes number of commits between branch and parent)
 
+## git retag
+
+Apply or update a tag, optionally updating it on the remote as well. If the specified tag exists, it is deleted
+and re-applied, otherwise it is recreated.
+
+        usage: git-retag [-h] [--push] [--path PATH] tag
+
+        positional arguments:
+          tag                   The tag
+
+        options:
+          -h, --help            show this help message and exit
+          --push, -p            Push the tag to the remote
+          --path PATH, -C PATH  Run the command in the specified directory
+
 ## git update
 
 Update the rworking tree from the remote, rebase local branch(es) against their parents and optionally run git cleanup.
@@ -313,6 +374,14 @@ Menu-driven Git code review tool
       --dir DIR             Work in the specified directory
       --difftool DIFFTOOL   Override the default git diff tool
 
+## ggit
+
+Run a git command in all working trees under the current directory (somewhat superceded by multigit).
+
+## ggrep
+
+Run 'git grep' in all repos under the current directory (somewhat superceded by multigit).
+
 # General Commands
 
 ## addpath
@@ -334,23 +403,9 @@ Add or remove entries from a path list (e.g. as used by the PATH environment var
       --separator SEPARATOR
                             Override the default path separator
 
-## docker-purge
-
-Stop or kill docker instances and/or remove docker images.
-
-    docker-purge [-h] [--stop] [--kill] [--remove] [--list] [--force] [--debug] [images ...]
-
-    positional arguments:
-      images        List of Docker containers (regular expression)
+## consolecolours
 
-    options:
-      -h, --help    show this help message and exit
-      --stop, -s    Stop Docker instances
-      --kill, -k    Kill Docker instances
-      --remove, -r  Remove Docker images
-      --list, -l    List what would be done without doing it
-      --force, -f   Forcibly kill/remove instances
-      --debug       Enable debug output
+Display all available colours in the console.
 
 ## ffind
 
@@ -470,24 +525,6 @@ Recursively delete empty directories
                             Files to ignore when considering whether a directory is empty
       --keep KEEP, -K KEEP  Directories that should be kept even if they are empty
 
-## rmdupe
-
-Search for duplicate files.
-
-    rmdupe [-h] [--debug] [--save SAVE] [--load LOAD] [--script SCRIPT] [--exclude EXCLUDE] [--ignore IGNORE] [path]
-
-    positional arguments:
-      path               Path(s) to search for duplicates
-
-    options:
-      -h, --help         show this help message and exit
-      --debug            Debug output
-      --save SAVE        Save duplicate file list
-      --load LOAD        Load duplicate file list
-      --script SCRIPT    Generate a shell script to delete the duplicates
-      --exclude EXCLUDE  Directories to skip when looking for duplicates
-      --ignore IGNORE    Wildcards to ignore when looking for duplicates
-
 ## rpylint
 
 Run pylint on all the Python source files in a directory tree
@@ -500,10 +537,6 @@ Run pylint on all the Python source files in a directory tree
     options:
       -h, --help  show this help message and exit
 
-## s3-sync
-
-Synchronise files from S3 to local storage.
-
 ## strreplace
 
 Simple search and replace utility for those times when trying to escape characters in a regexp to use sed is more hassle than it is worth.
@@ -592,33 +625,3 @@ YAML validator - checks that a file is valid YAML (use yamllint to verify that i
       --block     Force block style when dumping the YAML data
       --flow      Force flow style when dumping the YAML data
       --hiera     Process the file as Puppet Hiera data
-
-# Obsolescent Utilities
-
-These will be moved to the skilleter-extras package in due course.
-
-## consolecolours
-
-Display all available colours in the console.
-
-# Obsolescent Commands
-
-These commands will probably be retired in future versions of Thingy
-
-## ggit
-
-Run a git command in all working trees under the current directory (superceded by multigit).
-
-## ggrep
-
-Run 'git grep' in all repos under the current directory (superceded by multigit).
-
-## GitLab Commands
-
-### git mr
-
-Push a feature branch to GitLab and create a merge request
-
-### gl
-
-Command line for GitLab

{skilleter_thingy-0.2.15.dist-info → skilleter_thingy-0.3.1.dist-info}/RECORD

@@ -1,7 +1,6 @@
 skilleter_thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
 skilleter_thingy/addpath.py,sha256=4Yhhgjjz1XDI98j0dAiQpNA2ejLefeWUTeSg3nIXQq0,3842
 skilleter_thingy/console_colours.py,sha256=BOS9mo3jChx_FE8L1j488MDoVNgib11KjTRhrz_YRYE,1781
-skilleter_thingy/docker_purge.py,sha256=PRQ7EBXymjYIHuJL4pk4r6KNn09IF28OGZ0ln57xtNg,3314
 skilleter_thingy/ffind.py,sha256=kIMx3VDvNpvTbp0gDzsiOiSlV_R8xZowHxADjts9qI0,19571
 skilleter_thingy/ggit.py,sha256=BL-DhNcz4Nd3sA-3Kl6gZ-zFtbNqOpyufvas-0aD8nk,2465
 skilleter_thingy/ggrep.py,sha256=fnTzOI1Qbf7IY_TnStdx5uqeUhqSDkapxmhYgrONJHw,5887
@@ -11,28 +10,24 @@ skilleter_thingy/git_cleanup.py,sha256=3T8vkDJHsEVMTMkC2ARo8KHJ4zgPo6mmABVeuHcXh
 skilleter_thingy/git_co.py,sha256=Mc-6jEUpVWAJJ-2PTpQ4tjDw03_zJMJDX9SGIxCqzJQ,8404
 skilleter_thingy/git_common.py,sha256=FKXB6aT-y_a3N6wFnnwM6qJi4ClLFvDAivkSQ4iEYP4,2111
 skilleter_thingy/git_hold.py,sha256=coyHdl1bWivrWdmgs7smVPvHRNoXgsgmUjR6n-08lV4,4920
-skilleter_thingy/git_mr.py,sha256=MsrAkIKW27fVTljV__zAjMveIpufvDQ_j0jeKJu2rZM,3426
 skilleter_thingy/git_parent.py,sha256=VqP4v3zsWp6utJvxFxSB_GwCv82xNIiiBlAlkinO1Wk,2938
 skilleter_thingy/git_retag.py,sha256=JT-yD-uU4dL0mxDq9IRynugUKqIxjMCdU1dYDjiBSTU,1828
 skilleter_thingy/git_review.py,sha256=AsCVq2viAsNE527uHvbPOYASI3iVx0JgCfuA0J0Ocmg,52557
 skilleter_thingy/git_update.py,sha256=Ic5X_GZO2yez_nwrCqSTq3p07k3TyRAMSvQYpjP-yvE,14571
 skilleter_thingy/git_wt.py,sha256=tkGN_Bfz80icHNDVG8xuXVeUUR-xyZ3u8jopLRt1Ff4,2355
-skilleter_thingy/gitcmp_helper.py,sha256=SwYYHXYJQnPizCrLpHwOt-h0_O61zRwV1Ckr2XehyKc,11576
+skilleter_thingy/gitcmp_helper.py,sha256=VqmKXQ44qn4gdRUdDPvcDqnySlBmaV4TsSqc8z-0SbQ,11578
 skilleter_thingy/gitprompt.py,sha256=19vBe2JSs6H_7us5MYmdmGnwEIKiP9K2JlUBWPxXuCg,8939
-skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/linecount.py,sha256=ehTN6VD76i4U5k6dXuYoiqSRHI67_BP-bziklNAJSKY,4309
-skilleter_thingy/multigit.py,sha256=kTxEYinHCH1CQE7hzJF58XH1m-n0NZz5IGOtIJ3nL4Q,33979
-skilleter_thingy/py_audit.py,sha256=4CAdqBAIIVcpTCn_7dGm56bdfGpUtUJofqTGZomClkY,4417
+skilleter_thingy/multigit.py,sha256=3pH5Lqvms6cTMKdGOU0mO63zGNoDsC_CYk9QWVDsm9I,34021
+skilleter_thingy/py_audit.py,sha256=W21pnrCI-Cz3qUgfJ8HODtTjmZTtGlTOKoTTpz-Mo2o,4384
 skilleter_thingy/readable.py,sha256=LcMMOiuzf9j5TsxcMbO0sbj6m1QCuABl91Hrv-YyIww,15422
 skilleter_thingy/remdir.py,sha256=Ueg3a6_m7y50zWykhKk6pcuz4FKPjoLJVPo9gh_dsic,4653
-skilleter_thingy/rmdupe.py,sha256=RWtOHq__zY4yOf6_Y-H-8RRJy31Sr3c8DEyTd6Y4oV4,17213
 skilleter_thingy/rpylint.py,sha256=spdVVpNyElkV1fQknv-RESmqe7U0QZYneX96vSAEMSo,2875
 skilleter_thingy/strreplace.py,sha256=zMhqC38KF0BddTsRM5Pa99HU3KXvxXg942qxRK-LALA,2539
 skilleter_thingy/tfm.py,sha256=bw_S4bCAisZAEkzrbqnXqJsjC62oA08FM_xrbkuDQuQ,33787
 skilleter_thingy/tfparse.py,sha256=rRoinnbq6sLfkT38yzzXi2jQuJgBIJoC--G05TVTDIc,2991
 skilleter_thingy/trimpath.py,sha256=ijLowl-rxV53m0G75tGNuHWobObz5NreBy8yXP9l4eY,2373
 skilleter_thingy/venv_create.py,sha256=EV_oZh3JlDc5hX5h9T1hnt65AEABw6PufaKvPYabR00,1159
-skilleter_thingy/x.py,sha256=hFiinFX2p0x0OkPf7QnBdW6vAhSIfocwq4siZl2_MvQ,49
 skilleter_thingy/xchmod.py,sha256=T89xiH_po0nvH5T1AGgQOD5yhjKd9-LcHcmez3IORww,4604
 skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
 skilleter_thingy/thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
@@ -41,9 +36,8 @@ skilleter_thingy/thingy/dc_curses.py,sha256=fuuQPR11zV_akAhygL_cAhVLC5YAgKgowzlI
 skilleter_thingy/thingy/dc_defaults.py,sha256=ahcteQvoWZrO5iTU68zkIY1Zex6iX5uR5ubwI4CCYBk,6170
 skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUsMhOFs,1783
 skilleter_thingy/thingy/dircolors.py,sha256=aBcq9ci855GSOIjrZWm8kG0ksCodvUmc4FlIOEOyBcA,12292
-skilleter_thingy/thingy/docker.py,sha256=iT8PqX2hJfcR1e4hotQfSBBYNe0Qdcmeo-XJ6y7lw7Y,2477
 skilleter_thingy/thingy/files.py,sha256=nFIOEi2rl2SuYa6Zd7Nf1BWCKyKlF8D6hsbPlfnVefQ,4791
-skilleter_thingy/thingy/git.py,sha256=aa4vFwXiZ9JkH-zJuKZWACw4Ympcomi6EsPdlLIJiSs,43227
+skilleter_thingy/thingy/git.py,sha256=AIPPhEg1KU98milewP_vazxDUVat3QFQUsK9cqmdsEw,43234
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
 skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
 skilleter_thingy/thingy/popup.py,sha256=TY9rpj4q8uZxerSt641LGUTy0TZgUjgfEX-CkRMuyek,2540
@@ -51,9 +45,9 @@ skilleter_thingy/thingy/run.py,sha256=Q6uug_LucKbn36RB-r08QYaCzmeoU452ipzQ2YiVUP
 skilleter_thingy/thingy/tfm_pane.py,sha256=XTTpSm71CyQyGmlVLuCthioOwech0jhUiFUXb-chS_Q,19792
 skilleter_thingy/thingy/tidy.py,sha256=AQ2RawsZJg6WHrgayi_ZptFL9occ7suSdCHbU3P-cys,5971
 skilleter_thingy/thingy/venv_template.py,sha256=ZfUvi8qFNGrk7J030Zy57xjwMtfIArJyqa-MqafyjVk,1016
-skilleter_thingy-0.2.15.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.2.15.dist-info/METADATA,sha256=NV9puo96TLDp25-yZ2LNqq95Q3eAAIcNX0rhciQJh58,28914
-skilleter_thingy-0.2.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skilleter_thingy-0.2.15.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
-skilleter_thingy-0.2.15.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.2.15.dist-info/RECORD,,
+skilleter_thingy-0.3.1.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.3.1.dist-info/METADATA,sha256=J9OlzotB7aCdrmYT7Kl0dP-9Oj7BzzBpQVS7kmoweJ0,29526
+skilleter_thingy-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.3.1.dist-info/entry_points.txt,sha256=GVZW2krSQlttxWWkym-ZCc4W0nV97gaqtFi-emcvQMk,1449
+skilleter_thingy-0.3.1.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.3.1.dist-info/RECORD,,

{skilleter_thingy-0.2.15.dist-info → skilleter_thingy-0.3.1.dist-info}/entry_points.txt

@@ -1,7 +1,6 @@
 [console_scripts]
 addpath = skilleter_thingy:addpath.addpath
 consolecolours = skilleter_thingy:console_colours.console_colours
-docker-purge = skilleter_thingy:docker_purge.docker_purge
 ffind = skilleter_thingy:ffind.ffind
 ggit = skilleter_thingy:ggit.ggit
 ggrep = skilleter_thingy:ggrep.ggrep
@@ -11,7 +10,6 @@ git-cleanup = skilleter_thingy:git_cleanup.git_cleanup
 git-co = skilleter_thingy:git_co.git_co
 git-common = skilleter_thingy:git_common.git_common
 git-hold = skilleter_thingy:git_hold.git_hold
-git-mr = skilleter_thingy:git_mr.git_mr
 git-parent = skilleter_thingy:git_parent.git_parent
 git-retag = skilleter_thingy:git_retag.git_retag
 git-review = skilleter_thingy:git_review.git_review
@@ -19,22 +17,16 @@ git-update = skilleter_thingy:git_update.git_update
 git-wt = skilleter_thingy:git_wt.git_wt
 gitcmp-helper = skilleter_thingy:gitcmp_helper.gitcmp_helper
 gitprompt = skilleter_thingy:gitprompt.gitprompt
-gl = skilleter_thingy:gl.gl
-gphotosync = skilleter_thingy:gphotosync.gphotosync
 linecount = skilleter_thingy:linecount.linecount
-mg = skilleter_thingy:mg.mg
 multigit = skilleter_thingy:multigit.multigit
 py-audit = skilleter_thingy:py_audit.py_audit
 readable = skilleter_thingy:readable.readable
 remdir = skilleter_thingy:remdir.remdir
-rmdupe = skilleter_thingy:rmdupe.rmdupe
 rpylint = skilleter_thingy:rpylint.rpylint
-s3-sync = skilleter_thingy:s3_sync.s3_sync
 strreplace = skilleter_thingy:strreplace.strreplace
 tfm = skilleter_thingy:tfm.tfm
 tfparse = skilleter_thingy:tfparse.tfparse
 trimpath = skilleter_thingy:trimpath.trimpath
 venv-create = skilleter_thingy:venv_create.venv_create
-webwatch = skilleter_thingy:webwatch.webwatch
 xchmod = skilleter_thingy:xchmod.xchmod
 yamlcheck = skilleter_thingy:yamlcheck.yamlcheck

skilleter_thingy/docker_purge.py

@@ -1,111 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Thingy docker-purge command
-
-    Copyright (C) 2017 John Skilleter
-
-    Initial version - contains only basic error checking and limited debug output.
-"""
-################################################################################
-
-import sys
-import re
-import argparse
-import logging
-
-from thingy import docker
-
-################################################################################
-
-def initialise():
-    """ Parse the command line """
-
-    parser = argparse.ArgumentParser(description='Purge docker instances and images')
-
-    parser.add_argument('--stop', '-s', action='store_true', help='Stop Docker instances')
-    parser.add_argument('--kill', '-k', action='store_true', help='Kill Docker instances')
-    parser.add_argument('--remove', '-r', action='store_true', help='Remove Docker images')
-    parser.add_argument('--list', '-l', action='store_true', help='List what would be done without doing it')
-    parser.add_argument('--force', '-f', action='store_true', help='Forcibly kill/remove instances')
-    parser.add_argument('--debug', action='store_true', help='Enable debug output')
-    parser.add_argument('images', nargs='*', help='List of Docker containers (regular expression)')
-
-    args = parser.parse_args()
-
-    # Configure logging
-
-    if args.debug:
-        logging.basicConfig(level=logging.DEBUG)
-        logging.info('Debug logging enabled')
-
-    # Default is to stop matching images
-
-    if not args.stop and not args.kill and not args.remove:
-        args.stop = True
-
-    # Default is to match all containers
-
-    if not args.images:
-        args.images = '.*'
-    else:
-        args.images = '|'.join(args.images)
-
-    logging.info('Arguments: %s', args)
-    return args
-
-################################################################################
-
-def main(args):
-    """ Main code """
-
-    try:
-        if args.stop or args.kill:
-            for instance in docker.instances():
-                if re.match(args.images, instance):
-
-                    print(f'Stopping instance: {instance}')
-
-                    if not args.list:
-                        docker.stop(instance, force=args.force)
-
-        if args.kill:
-            for instance in docker.instances(all=True):
-                if re.match(args.images, instance):
-
-                    print(f'Removing instance: {instance}')
-
-                    if not args.list:
-                        docker.rm(instance)
-
-        if args.remove:
-            for image in docker.images():
-                if re.match(args.images, image):
-
-                    print(f'Removing image: {image}')
-
-                    if not args.list:
-                        docker.rmi(image, force=args.force)
-
-    except docker.DockerError as exc:
-        sys.stderr.write(f'{str(exc)}\n')
-        sys.exit(1)
-
-################################################################################
-
-def docker_purge():
-    """Entry point"""
-
-    try:
-        config = initialise()
-        main(config)
-
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    docker_purge()

skilleter_thingy/git_mr.py

@@ -1,103 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Push to Gitlab and create a merge request at the same time """
-################################################################################
-
-import os
-import logging
-import sys
-import argparse
-
-import thingy.git as git
-import thingy.colour as colour
-
-################################################################################
-
-DESCRIPTION = 'Push a feature branch to GitLab and create a merge request'
-
-################################################################################
-
-def parse_arguments():
-    """ Parse and return command line arguments """
-
-    parser = argparse.ArgumentParser(description=DESCRIPTION, formatter_class=argparse.RawTextHelpFormatter)
-
-    parser.add_argument('--debug', action='store_true', help='Enable debug output')
-    parser.add_argument('--force', '-f', action='store_true', help='Force-push the branch')
-    parser.add_argument('--parent', '-p', action='store', help='Override the default parent and specify the branch to merge onto')
-    parser.add_argument('--reviewer', '-r', action='store', help='Specify the name of the reviewer for the merge request')
-    parser.add_argument('--keep', '-k', action='store_true', help='Keep the source branch after the merge (default is to delete it).')
-    parser.add_argument('--path', '-C', nargs=1, type=str, default=None,
-                        help='Run the command in the specified directory')
-
-    args = parser.parse_args()
-
-    # Enable logging if requested
-
-    if args.debug:
-        logging.basicConfig(level=logging.INFO)
-
-    # Change directory, if specified
-
-    if args.path:
-        os.chdir(args.path[0])
-
-    return args
-
-################################################################################
-
-def main():
-    """ Main function - parse the command line and perform the pushing """
-
-    args = parse_arguments()
-
-    if args.parent:
-        parents = [args.parent]
-    else:
-        parents, _ = git.parents()
-
-        if not parents:
-            colour.error('Unable to determine parent branch. Use the [BLUE]--parent[NORMAL] option to specify the appropriate one.')
-
-        if len(parents) > 1:
-            parent_list = ', '.join(parents)
-            colour.error(
-                f'Branch has multiple potential parents: [BLUE]{parent_list}[NORMAL]. Use the [BLUE]--parent[NORMAL] option to specify the appropriate one.')
-
-    options = ['merge_request.create', f'merge_request.target={parents[0]}']
-
-    if args.reviewer:
-        options.append(f'merge_request.assign={args.reviewer}')
-
-    if not args.keep:
-        options.append('merge_request.remove_source_branch')
-
-    logging.debug('Running git push with:')
-    logging.debug('  force: %s', args.force)
-    logging.debug('  push options: %s', options)
-
-    result = git.push(force_with_lease=args.force, push_options=options)
-
-    for text in result:
-        print(text)
-
-################################################################################
-
-def git_mr():
-    """Entry point"""
-
-    try:
-        main()
-
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-    except git.GitError as exc:
-        colour.error(exc.msg, status=exc.status, prefix=True)
-
-################################################################################
-
-if __name__ == '__main__':
-    git_mr()