skilleter-thingy 0.2.14__py3-none-any.whl → 0.3.0__py3-none-any.whl

skilleter_thingy/docker_purge.py

@@ -21,6 +21,7 @@ from thingy import docker
 def initialise():
     """ Parse the command line """
 
+    breakpoint()
     parser = argparse.ArgumentParser(description='Purge docker instances and images')
 
     parser.add_argument('--stop', '-s', action='store_true', help='Stop Docker instances')

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/docker.py

@@ -12,7 +12,7 @@
 """
 ################################################################################
 
-import thingy.run as run
+import subprocess
 
 ################################################################################
 
@@ -33,9 +33,12 @@ def instances(all=False):
 
     instances_list = []
     try:
-        for result in run.run(cmd):
+        process = subprocess.run(cmd, capture_output=True, check=True, text=True)
+
+        for result in process.stdout:
             instances_list.append(result)
-    except run.RunError as exc:
+
+    except subprocess.CalledProcessError as exc:
         raise DockerError(exc)
 
     return instances_list
@@ -48,8 +51,9 @@ def stop(instance, force=False):
     # TODO: force option not implemented
 
     try:
-        run.run(['docker', 'stop', instance], output=True)
-    except run.RunError as exc:
+        subprocess.run(['docker', 'stop', instance], check=True, capture_output=False)
+
+    except suprocess.CalledProcessError as exc:
         raise DockerError(exc)
 
 ################################################################################
@@ -65,8 +69,9 @@ def rm(instance, force=False):
     cmd.append(instance)
 
     try:
-        run.run(cmd, output=True)
-    except run.RunError as exc:
+        subprocess.run(cmd, check=True, capture_output=False)
+
+    except subprocess.CalledProcessError as exc:
         raise DockerError(exc)
 
 ################################################################################
@@ -75,9 +80,12 @@ def images():
     """ Return a list of all current Docker images """
 
     try:
-        for result in run.run(['docker', 'images', '-q']):
+        process = subprocess.run(['docker', 'images', '-q'], capture_output=True, check=True)
+
+        for result in process:
             yield result
-    except run.RunError as exc:
+
+    except subprocess.CalledProcessError as exc:
         raise DockerError(exc)
 
 ################################################################################
@@ -92,6 +100,6 @@ def rmi(image, force=False):
     cmd.append(image)
 
     try:
-        run.run(cmd, foreground=True)
-    except run.RunError as exc:
+        subprocess.run(cmd, capture_output=False, check=True)
+    except subprocess.CalledProcessError as exc:
         raise DockerError(exc)

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. """
 
@@ -948,7 +948,7 @@ def ref(fields=('objectname'), sort=None, remotes=False, path=None):
 
 ################################################################################
 
-def branches(all=False, path=None):
+def branches(all=False, path=None, remote=False):
     """ Return a list of all the branches in the current repo """
 
     cmd = ['branch', '--format=%(refname:short)','--list']
@@ -956,6 +956,9 @@ def branches(all=False, path=None):
     if all:
         cmd.append('--all')
 
+    if remote:
+        cmd.append('--remote')
+
     results = []
     for output in git(cmd, path=path):
         if ' -> ' not in output and '(HEAD detached at ' not in output:
@@ -1250,7 +1253,10 @@ def matching_branch(branchname, case=False, path=None):
         otherwise, it just checks for a branches containing the branchname
         as a substring. """
 
-    all_branches = branches(all=True, path=path)
+    local_branches = branches(path=path)
+    remote_branches = branches(path=path, remote=True)
+
+    all_branches = local_branches + remote_branches
 
     # Always return exact matches
 
@@ -1284,8 +1290,8 @@ def matching_branch(branchname, case=False, path=None):
                 # If the match is a remote branch, ignore it if we already have the equivalent
                 # local branch, otherwise add the name of the local branch that would be created.
 
-                if branch.startswith('remotes/'):
-                    localbranch = '/'.join(branch.split('/')[2:])
+                if branch in remote_branches:
+                    localbranch = '/'.join(branch.split('/')[1:])
                     if localbranch not in matching:
                         matching_remote.append(localbranch)
                 else:

{skilleter_thingy-0.2.14.dist-info → skilleter_thingy-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.14
+Version: 0.3.0
 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,6 +403,10 @@ Add or remove entries from a path list (e.g. as used by the PATH environment var
       --separator SEPARATOR
                             Override the default path separator
 
+## consolecolours
+
+Display all available colours in the console.
+
 ## docker-purge
 
 Stop or kill docker instances and/or remove docker images.
@@ -470,24 +543,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 +555,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 +643,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.14.dist-info → skilleter_thingy-0.3.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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/docker_purge.py,sha256=6vIZmSHd8ik1mvLICekjvrTz4A7h2S74QeafZ--GvUU,3331
 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 +11,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 +37,9 @@ 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/docker.py,sha256=6F6SewGMNk6FV_UICJuEGeyU5bqF-NRN9FHCefKNDNA,2790
 skilleter_thingy/thingy/files.py,sha256=nFIOEi2rl2SuYa6Zd7Nf1BWCKyKlF8D6hsbPlfnVefQ,4791
-skilleter_thingy/thingy/git.py,sha256=xUIjRH3BLXssUbGdnxr7-UfGuiSai17jruNe7h9gBJw,43070
+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 +47,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.14.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.2.14.dist-info/METADATA,sha256=bA0ajwEyvjYdGEvO7KlRLoeZAfdRhudqkepZiTMHASk,28914
-skilleter_thingy-0.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skilleter_thingy-0.2.14.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
-skilleter_thingy-0.2.14.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.2.14.dist-info/RECORD,,
+skilleter_thingy-0.3.0.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.3.0.dist-info/METADATA,sha256=pSxW_v8FMf_sluaynVivXZ59memjX-fGYptHD9hg77c,30134
+skilleter_thingy-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.3.0.dist-info/entry_points.txt,sha256=nqNYc__bq5Dl9SgXktajdqxpFkEAUVDkxh8dNFjDP9A,1507
+skilleter_thingy-0.3.0.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.3.0.dist-info/RECORD,,

{skilleter_thingy-0.2.14.dist-info → skilleter_thingy-0.3.0.dist-info}/entry_points.txt

@@ -11,7 +11,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 +18,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/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()

skilleter_thingy/gl.py

@@ -1,174 +0,0 @@
-#! /usr/bin/env python3
-
-""" Nearly MVP of a command to do things to GitLab
-    Currently just implements the 'mr-list' command which outputs a list
-    of merge requests from all projects in CSV format.
-
-    TODO: Lots and lots of things! """
-
-################################################################################
-
-import argparse
-import os
-import sys
-from collections import defaultdict
-
-import thingy.colour as colour
-import thingy.gitlab as gitlab
-
-################################################################################
-
-def mr_list(args):
-    """ List merge requests """
-
-    gl = gitlab.GitLab(args.server)
-
-    # TODO: Could incorporate some/all filtering in the request rather than getting all MRs and filtering them
-
-    mrs = gl.merge_requests(scope='all')
-
-    # TODO: Output format other than CSV
-    # TODO: More filtering
-
-    if args.summary:
-        authors = defaultdict(int)
-        reviewers = defaultdict(int)
-        combos = defaultdict(int)
-
-        count = 0
-        for mr in mrs:
-            author = mr['author']['username']
-            authors[author] += 1
-
-            if mr['state'] == 'merged':
-                try:
-                    reviewer = mr['merged_by']['username']
-                except TypeError:
-                    reviewer = 'UNKNOWN'
-
-                reviewers[reviewer] += 1
-                combos[f"{author}|{reviewer}"] += 1
-
-            count += 1
-            if args.limit and count > args.limit:
-                break
-
-        print('Number of merge requests by author')
-
-        for value in sorted(set(authors.values()), reverse=True):
-            for person in authors:
-                if authors[person] == value:
-                    print(f'    {person:32}: {authors[person]}')
-
-        print()
-        print('Number of merge requests by reviewer')
-
-        for value in sorted(set(reviewers.values()), reverse=True):
-            for person in reviewers:
-                if reviewers[person] == value:
-                    print(f'    {person:32}: {reviewers[person]}')
-
-        print()
-        print('Author/Reviewer combinations for merged changes')
-
-        for value in sorted(set(combos.values()), reverse=True):
-            for combo in combos:
-                if combos[combo] == value:
-                    author, reviewer = combo.split('|')
-
-                    print(f'    Written by {author}, reviewed by {reviewer}: {combos[combo]}')
-
-    else:
-        print('state,merge id,project id,author,approver,title,merge date')
-
-        for mr in mrs:
-            if args.author and mr['author']['username'] != args.author:
-                continue
-
-            if mr['state'] == 'merged':
-                try:
-                    merged_by = mr['merged_by']['username']
-                except TypeError:
-                    merged_by = 'NONE'
-
-                if args.approver and merged_by != args.approver:
-                    continue
-
-                if not args.summary:
-                    print('%s,%s,%s,%s,%s,%s,"%s"' % (mr['state'], mr['id'], mr['project_id'],
-                          mr['author']['username'], merged_by, mr['title'], mr['merged_at']))
-            elif args.all and not args.summary:
-                print('%s,%s,%s,%s,,"%s",' % (mr['state'], mr['id'], mr['project_id'], mr['author']['username'], mr['title']))
-
-            count += 1
-            if args.limit and count > args.limit:
-                break
-
-################################################################################
-
-def main():
-    """ Entry point """
-
-    parser = argparse.ArgumentParser(description='Gitlab commands')
-
-    parser.add_argument('--dryrun', '--dry-run', '-D', action='store_true', help='Dry-run comands')
-    parser.add_argument('--debug', '-d', action='store_true', help='Debug')
-    parser.add_argument('--verbose', '-v', action='store_true', help='Verbosity to the maximum')
-    parser.add_argument('--server', '-s', default=None, help='The GitLab server')
-    parser.add_argument('--token', '-t', default=None, help='The GitLab access token')
-
-    subparsers = parser.add_subparsers(dest='command')
-
-    parser_mr_list = subparsers.add_parser('mr-list', help='List merge requests')
-    parser_mr_list.add_argument('--all', action='store_true', help='List un-merged merge requests')
-    parser_mr_list.add_argument('--author', action='store', help='List merge requests created by a specific user')
-    parser_mr_list.add_argument('--approver', action='store', help='List merge requests approved by a specific user')
-    parser_mr_list.add_argument('--summary', action='store_true', help='Produce a summary report')
-    parser_mr_list.add_argument('--limit', action='store', type=int, help='Output the first N merge requests')
-
-    # TODO: Other subcommands
-
-    # Parse the command line
-
-    args = parser.parse_args()
-
-    # Check the server/token configuration
-
-    if not args.server:
-        args.server = os.environ.get('GITLAB_SERVER', None)
-
-        if not args.server:
-            colour.error('The GitLab server must be specified on the command line or via the [BLUE:GITLAB_SERVER] environment variable')
-
-    if not args.token:
-        args.token = os.environ.get('GITLAB_TOKEN', None)
-
-        if not args.token:
-            colour.error('GitLab access token must be specified on the command line or via the [BLUE:GITLAB_TOKEN] environment variable')
-
-    # Invoke the subcommand
-
-    if args.command == 'mr-list':
-        mr_list(args)
-
-    elif not args.command:
-        colour.error('No command specified')
-    else:
-        colour.error(f'Invalid command: "{args.command}"')
-
-################################################################################
-
-def gl():
-    """Entry point"""
-
-    try:
-        main()
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    gl()

skilleter_thingy/rmdupe.py

@@ -1,553 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Find duplicate files and do things with them.
-
-    Uses the 'jdupes' utility
-
-    TODO: Option to ignore by filetype
-    TODO: Ignore folder.jpg files
-
-    NOTE: The option to ignore directories in jdupes doesn't work (at least in the version in Ubuntu 18.04) so we do this after searching for duplicates
-"""
-################################################################################
-
-import os
-import argparse
-import logging
-import subprocess
-import sys
-import re
-import pickle
-import copy
-import fnmatch
-
-################################################################################
-
-ALWAYS_IGNORE_DIRS = ['.git']
-
-################################################################################
-
-def error(msg):
-    """ Report an error and exit """
-
-    sys.stderr.write('%s\n' % msg)
-    sys.exit(1)
-
-################################################################################
-
-def parse_command_line():
-    """ Parse the command line """
-
-    parser = argparse.ArgumentParser(description='Find duplicate files created by SyncThing or in temporary directories in a given path')
-    parser.add_argument('--debug', action='store_true', help='Debug output')
-    parser.add_argument('--save', action='store', help='Save duplicate file list')
-    parser.add_argument('--load', action='store', help='Load duplicate file list')
-    parser.add_argument('--script', action='store', help='Generate a shell script to delete the duplicates')
-    parser.add_argument('--exclude', action='append', help='Directories to skip when looking for duplicates')
-    parser.add_argument('--ignore', action='append', help='Wildcards to ignore when looking for duplicates')
-    parser.add_argument('path', nargs='?', default='.', help='Path(s) to search for duplicates')
-
-    args = parser.parse_args()
-
-    logging.basicConfig(level=logging.DEBUG if args.debug else logging.ERROR)
-
-    if args.save and args.load:
-        error('The save and load options are mutually exclusive')
-
-    return args
-
-################################################################################
-
-def jdupes(path,
-           one_file_system=False,
-           no_hidden=False,
-           check_permissions=False,
-           quick=False,
-           recurse=True,
-           follow_symlinks=False,
-           exclude=None,
-           zero_match=False):
-    """ Run jdupes with the specified options """
-
-    cmd = ['jdupes', '--quiet']
-
-    if one_file_system:
-        cmd.append('--one-file-system')
-
-    if no_hidden:
-        cmd.append('--nohidden')
-
-    if check_permissions:
-        cmd.append('--permissions')
-
-    if quick:
-        cmd.append('--quick')
-
-    if recurse:
-        cmd += ['--recurse', path]
-    else:
-        cmd.append(path)
-
-    if follow_symlinks:
-        cmd.append('--symlinks')
-
-    if exclude:
-        cmd += ['--exclude', exclude]
-
-    if zero_match:
-        cmd.append('--zeromatch')
-
-    logging.debug('Running %s', ' '.join(cmd))
-
-    try:
-        result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
-    except FileNotFoundError:
-        error('The jdupes utility is not installed')
-
-    results = [[]]
-    for output in result.stdout.split('\n'):
-        output = output.strip()
-
-        logging.debug(output)
-
-        if output:
-            results[-1].append(output)
-        else:
-            results.append([])
-
-    while results and results[-1] == []:
-        results = results[:-1]
-
-    logging.debug('Found %d duplicated files', len(results))
-    for entry in results:
-        logging.debug('    %s', ', '.join(entry))
-
-    return results
-
-################################################################################
-
-def remove_excluded_entries(args, duplicates):
-    """ Now filter out enties in the duplicates lists that are in the
-        directories that we are supposed to be ignoring """
-
-    # Build the list of directories to ignore - add the default list
-
-    ignore_dirs = ALWAYS_IGNORE_DIRS
-    if args.exclude:
-        ignore_dirs += args.exclude
-
-    # Build the list of absolute and relative paths to ignore
-    # both are in the form '/path/'
-
-    ignore_prefixes = []
-    ignore_subdirs = []
-
-    for ignore in ignore_dirs:
-        if ignore[-1] != '/':
-            ignore = '%s/' % ignore
-
-        if ignore[0] == '/':
-            ignore_prefixes.append(ignore)
-        else:
-            ignore_subdirs.append('/%s' % ignore)
-
-    # Now remove entries from the duplicate list that are within the ignored
-    # directories. If the resultant duplicate record is empty or only contains
-    # one entry, then remove it.
-
-    filtered_duplicates = []
-
-    for duplicate in duplicates:
-        # Set of entries in the record to remove
-
-        remove_entries = set()
-
-        for entry in duplicate:
-            # If the entry is in an excluded directory tree, remove it
-
-            for ignore in ignore_prefixes:
-                if entry.startswith(ignore):
-                    remove_entries.add(entry)
-
-            # If the entry is in an excluded subdirectory tree, remove it
-
-            for ignore in ignore_subdirs:
-                if ignore in entry:
-                    remove_entries.add(entry)
-
-            # If we have a list of files to ignore then check each entry against the list
-            # and remove any matches.
-
-            for ignore in args.ignore or []:
-                if fnmatch.fnmatch(os.path.basename(entry), ignore):
-                    remove_entries.add(entry)
-
-            # If we loaded a saved list and the entry doesn't exist, remove it
-
-            if args.load and entry not in remove_entries and not os.path.isfile(entry):
-                remove_entries.add(entry)
-
-        # If we have entries to remove from the record, then remove them
-
-        if remove_entries:
-            for entry in remove_entries:
-                duplicate.remove(entry)
-
-        # Only add to the filtered duplicate list if we have more than one duplicate in the entry
-
-        if len(duplicate) >= 2:
-            filtered_duplicates.append(duplicate)
-
-    return filtered_duplicates
-
-################################################################################
-
-def find_duplicates(args):
-    """ Find duplicates, or load them from a saved status file """
-
-    if args.load:
-        logging.debug('Loading duplicate file data from %s', args.load)
-
-        with open(args.load, 'rb') as infile:
-            duplicates = pickle.load(infile)
-
-        logging.debug('Data loaded, %d duplicates', len(duplicates))
-    else:
-        duplicates = jdupes(args.path)
-
-    if args.save:
-        logging.debug('Saving duplicate file data to %s', args.save)
-
-        with open(args.save, 'wb') as outfile:
-            pickle.dump(duplicates, outfile)
-
-        print('Duplicate file data saved')
-        sys.exit(0)
-
-    return remove_excluded_entries(args, duplicates)
-
-################################################################################
-
-def check_duplicates(duplicate):
-    """ Given a list of duplicate files work out what to do with them.
-        Returns:
-            List of files (if any) to keep
-            List of files (if any) to be deleted
-            Name of a file that is similar to the duplicates (both in name and content)
-            True if the files being removed are .ini files with mangled names
-            Any error/warning message associated with processing the duplicates
-    """
-
-    keep = set()
-    remove = set()
-    similar = None
-    error_msg = None
-
-    # We can just delete entries that are conflicting picasa.ini files
-
-    for entry in duplicate:
-        if re.fullmatch(r'.*/\.?[pP]icasa.sync-conflict-.*\.ini', entry):
-            logging.debug('Remove picasa.ini sync conflict: %s', entry)
-
-            remove.add(entry)
-
-    if remove:
-        for item in remove:
-            duplicate.remove(item)
-
-    ini_file_purge = (len(remove) > 0)
-
-    # If all of the files are called 'picasa.ini' then we skip them as it is valid to have multiple picasa.ini files
-
-    if duplicate:
-        for entry in duplicate:
-            if os.path.basename(entry).lower() not in ('picasa.ini', '.picasa.ini'):
-                break
-        else:
-            print('Keeping picasa.ini files: %s' % (', '.join(duplicate)))
-            duplicate = []
-
-    # Skip other checks if we don't have any files that aren't conflicting picasa.ini files
-
-    if duplicate:
-        # Look for entries that are in known temporary directories
-
-        for entry in duplicate:
-            if re.match(r'.*/(\$RECYCLE\.BIN|.Picasa3Temp|.Picasa3Temp_[0-9]+|.picasaoriginals)/.*', entry):
-                logging.debug('Removing temporary directory item: %s', entry)
-                remove.add(entry)
-            else:
-                keep.add(entry)
-
-        # Look for lists of copies where some are marked as copies with _X appended to the file name
-
-        if len(keep) > 1:
-            copies = set()
-            originals = set()
-
-            for entry in keep:
-                if re.fullmatch(r'.*_[1-9][0-9]{0,2}\.[^/]+', entry):
-                    copies.add(entry)
-                else:
-                    originals.add(entry)
-
-            # If we have at least one original, then we can remove the copies
-
-            if originals:
-                if copies:
-                    logging.debug('Removing copies: %s', list(copies))
-                    logging.debug('Keeping originals: %s', originals)
-
-                    remove |= copies
-                    keep = originals
-            else:
-                error_msg = 'No originals found in %s' % (', '.join(keep))
-
-            # Looks for lists of copies where some are marked as copies with (N) appended to the file name
-
-            copies = set()
-            originals = set()
-
-            for entry in keep:
-                if re.fullmatch(r'.*\([0-9]+\)\.[^/]+', entry):
-                    copies.add(entry)
-                else:
-                    originals.add(entry)
-
-            # If we have at least one original, then we can remove the copies
-
-            if originals:
-                if copies:
-                    logging.debug('Removing copies: %s', list(copies))
-                    logging.debug('Keeping originals: %s', originals)
-
-                    remove |= copies
-                    keep = originals
-            else:
-                error_msg = 'No originals found in %s' % (', '.join(keep))
-
-        # Now look for sync conflicts
-
-        if len(keep) > 1:
-            conflicts = set()
-
-            for entry in keep:
-                if re.fullmatch(r'.*(\.sync-conflict-|/.stversions/).*', entry):
-                    conflicts.add(entry)
-
-            if conflicts:
-                keep = keep.difference(conflicts)
-
-                if keep:
-                    logging.debug('Removing sync conflicts: %s', conflicts)
-                    logging.debug('Keeping: %s', keep)
-
-                    remove |= conflicts
-                else:
-                    logging.debug('No non-conflicting files found in %s', (', '.join(conflicts)))
-
-                    originals = set()
-
-                    for entry in conflicts:
-                        originals.add(re.sub(r'(\.sync-conflict-[0-9]{8}-[0-9]{6}-[A-Z]{7}|/.stversions/)', '', entry))
-
-                    if len(originals) == 1:
-                        original = originals.pop()
-                        if os.path.isfile(original):
-
-                            similar = original
-                            remove = conflicts
-
-        # Now look for files that differ only by case
-
-        if len(keep) > 1:
-            # Take a copy of the set, then compare the lower case versions of the entries
-            # and remove any that match
-            # TODO: We only check for a match against a lower case version of the first entry
-
-            keep_c = copy.copy(keep)
-            name_lc = keep_c.pop().lower()
-
-            for entry in keep_c:
-                if entry.lower() == name_lc:
-                    logging.debug('Removing duplicate mixed-case entry: %s', entry)
-
-                    remove.add(entry)
-
-            keep = keep.difference(remove)
-
-        # Now look for files with '~' in the name
-
-        if len(keep) > 1:
-            tilde = set()
-
-            for k in keep:
-                if '~' in k:
-                    tilde.add(k)
-
-            if tilde != keep:
-                remove |= tilde
-                keep = keep.difference(tilde)
-
-        # Now remove entries with the shorter subdirectory names
-
-        if len(keep) > 1:
-            longest = ""
-            longest_name = None
-
-            for k in sorted(list(keep)):
-                subdir = os.path.split(os.path.dirname(k))[1]
-
-                if len(subdir) > len(longest):
-                    longest = subdir
-                    longest_name = k
-
-            if longest_name:
-                for k in keep:
-                    if k != longest_name:
-                        remove.add(k)
-
-            keep = keep.difference(remove)
-
-        # Now remove entries with the shorter file names
-
-        if len(keep) > 1:
-            longest = ""
-            longest_name = None
-
-            for k in sorted(list(keep)):
-                filename = os.path.basename(k)
-
-                if len(filename) > len(longest):
-                    longest = filename
-                    longest_name = k
-
-            if longest_name:
-                for k in keep:
-                    if k != filename:
-                        remove.add(k)
-
-            keep = keep.difference(remove)
-
-        # Don't allow files called 'folder.jpg' to be removed - multiple directories can
-        # have the same cover art.
-
-        if remove:
-            for r in remove:
-                if os.path.basename(r) in ('folder.jpg', 'Folder.jpg', 'cover.jpg', 'Cover.jpg'):
-                    keep.add(r)
-
-            remove = remove.difference(keep)
-
-    return sorted(list(keep)), sorted(list(remove)), similar, ini_file_purge, error_msg
-
-################################################################################
-
-def process_duplicates(args, duplicates):
-    """ Process the duplicate file records """
-
-    # Optionally generate the shell script
-
-    if args.script:
-        script = open(args.script, 'wt')
-
-        script.write('#! /usr/bin/env bash\n\n'
-                     '# Auto-generated shell script to delete duplicate files\n\n'
-                     'set -o pipefail\n'
-                     'set -o errexit\n'
-                     'set -o nounset\n\n')
-
-    # List of errors - we report everything that doesn't work at the end
-
-    errors = []
-
-    # Decide what to do with each duplication record
-
-    for duplicate in duplicates:
-        keep, remove, similar, ini_file_purge, error_msg = check_duplicates(duplicate)
-
-        if error_msg:
-            errors.append(error_msg)
-
-        # Report what we'd do
-
-        if args.script and (remove or keep):
-            script.write('\n')
-
-            for k in keep:
-                script.write('# Keep %s\n' % k)
-
-            if ini_file_purge:
-                script.write('# Remove conflicting, renamed picasa.ini files\n')
-
-            if similar:
-                script.write('# Similar file: %s\n' % similar)
-
-            for r in remove:
-                r = r.replace('$', '\\$')
-                script.write('rm -- "%s"\n' % r)
-
-        if remove:
-            print('Duplicates found:')
-
-            if keep:
-                print('    Keep:    %s' % (', '.join(keep)))
-
-            if similar:
-                print('    Similar: %s' % similar)
-
-            print('    Delete:  %s' % (', '.join(remove)))
-
-        elif keep and not remove:
-            errors.append('Keeping all copies of %s' % (', '.join(keep)))
-
-        elif len(keep) > 1:
-            print('Keeping %d copies of %s' % (len(keep), ', '.join(keep)))
-            print('    Whilst removing %s' % (', '.join(remove)))
-
-        elif duplicate and remove and not keep:
-            errors.append('All entries classified for removal: %s' % (', '.join(remove)))
-
-    if errors:
-        errors.sort()
-
-        print('-' * 80)
-        print('Problems:')
-
-        for error in errors:
-            print(error)
-
-        if args.script:
-            script.write('\n'
-                         '# %s\n'
-                         '# There are a number of duplicates where it is not clear which one should be kept,\n'
-                         '# or whether all copies should be kept. These are listed below.\n'
-                         '# %s\n\n' % ('-' * 80, '-' * 80))
-
-            for error in errors:
-                script.write('# %s\n' % error)
-
-################################################################################
-
-def rmdupe():
-    """ Main function """
-
-    try:
-        args = parse_command_line()
-
-        duplicates = find_duplicates(args)
-
-        process_duplicates(args, duplicates)
-
-    except KeyboardInterrupt:
-        sys.exit(1)
-
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-# Entry point
-
-if __name__ == '__main__':
-    rmdupe()

skilleter_thingy/x.py

@@ -1,3 +0,0 @@
-import subprocess
-
-subprocess.check_call(['ls'])