skilleter-thingy 0.2.0__py3-none-any.whl → 0.2.3__py3-none-any.whl

skilleter_thingy/git_retag.sync-conflict-20250928-192600-TVSLRWK.py

@@ -0,0 +1,54 @@
+#! /usr/bin/env python3
+
+################################################################################
+""" Apply or update a tag, optionally updating it on the remote as well.
+
+    Copyright (C) 2025 John Skilleter
+
+    Licence: GPL v3 or later
+"""
+################################################################################
+
+import sys
+import argparse
+
+import thingy.git2 as git
+
+################################################################################
+
+def main():
+    """ Main function """
+
+    # Command line parameters
+
+    parser = argparse.ArgumentParser(description='Apply or update a tag, optionally updating it on the remote as well.')
+    parser.add_argument('--push', '-p', action='store_true', help='Push the tag to the remote')
+    parser.add_argument('tag', nargs=1, help='The tag')
+
+    args = parser.parse_args()
+
+    # Delete the tag if it currently exists, optionally pushing the deletion
+
+    if args.tag in git.tags():
+        git.tag_delete(args.tag, push=args.push)
+
+    # Apply the tag
+
+    git.tag_apply(args.tag, push=args.push)
+
+################################################################################
+
+def git_retag():
+    """Entry point"""
+
+    try:
+        main()
+    except KeyboardInterrupt:
+        sys.exit(1)
+    except BrokenPipeError:
+        sys.exit(2)
+
+################################################################################
+
+if __name__ == '__main__':
+    git_retag()

{skilleter_thingy-0.2.0.dist-info → skilleter_thingy-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.0
+Version: 0.2.3
 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

skilleter_thingy-0.2.3.dist-info/PKG-INFO 2

@@ -0,0 +1,193 @@
+Metadata-Version: 2.1
+Name: skilleter_thingy
+Version: 0.0.49
+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
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: imagehash
+Requires-Dist: inotify
+Requires-Dist: pillow
+Requires-Dist: psutil
+Requires-Dist: pyaml
+Requires-Dist: pygit2
+Requires-Dist: python-dateutil
+Requires-Dist: requests
+
+# Thingy
+
+Licence: GPL v3
+
+Author: John Skilleter v0.99
+
+Collection of shell utilities and configuration stuff for Linux and MacOS. Untested on other operating systems.
+
+Permanently (for the forseeable future!) in a beta stage - usable, with a few rough edges, and probably with bugs when used in way I'm not expecting!
+
+The following commands are documented in detail in the help output that can be displayed by running the command with the '--help' option.
+
+This README just contains a summary of the functionality of each command.
+
+# General Commands
+
+## addpath
+
+Update a $PATH-type variable by adding or removing entries.
+
+## borger
+
+Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
+
+## console-colours
+
+Display all available colours in the console.
+
+## diskspacecheck
+
+Check how much free space is available on all filesystems, ignoring read-only filesystems, /dev and tmpfs.
+
+Issue a warning if any are above 90% used.
+
+## docker-purge
+
+Stop or kill docker instances and/or remove docker images.
+
+## ffind
+
+Simple file find utility
+
+Implements the functionality of the find command that is regularly used in a simpler fashion and ignores all the options that nobody ever uses.
+
+## gl
+
+### gphotosync
+
+Utility for syncing photos from Google Photos to local storage
+
+## linecount
+
+Count lines of code in a directory tree organised by file type.
+
+## moviemover
+
+Search for files matching a wildcard in a directory tree and move them to an equivalent location in a different tree
+
+## phototidier
+
+Perform various tidying operations on a directory full of photos:
+
+* Remove leading '$' and '_' from filenames
+* Move files in hidden directories up 1 level
+* If the EXIF data in a photo indicates that it was taken on date that doesn't match the name of the directory it is stored in (in YYYY-MM-DD format) then it is moved to the correct directory, creating it if necessary.
+
+All move/rename operations are carried out safely with the file being moved having
+a numeric suffix added to the name if it conflicts with an existing file.
+
+## photodupe
+
+## py-audit
+
+Query api.osv.dev to determine whether a specified version of a particular Python package is subject to known security vulnerabilities
+
+## readable
+
+Pipe for converting colour combinations to make them readable on a light background
+
+## remdir
+
+Recursively delete empty directories
+
+## rmdupe
+
+Search for duplicate files
+
+## rpylint
+
+Run pylint on all the Python source files in the current tree
+
+## s3-sync
+
+Synchronise files from S3 to local storage.
+
+## splitpics
+
+Copy a directory full of pictures to a destination, creating subdiretories with a fixed number of pictures in each in the destination directory for use with FAT filesystems and digital photo frames.
+
+## 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.
+
+## sysmon
+
+## tfm
+
+Console-based file-manager, similar to Midnight Commander but better.
+
+## tfparse
+
+Read JSON Terraform output and convert back to human-readable text
+This allows multiple errors and warnings to be reported as there's
+no way of doing this directly from Terraform
+
+## trimpath
+
+Intelligently trim a path to fit a given width (used by gitprompt)
+
+## window-rename
+
+## xchmod
+
+WIP: Command to run chmod only on files that need it (only modifies files that don't have the required permissions already).
+
+Currently implements a *very* restricted set of functionality.
+
+## yamlcheck
+
+YAML validator - checks that a file is valid YAML (use yamllint to verify that it is nicely-formatted YAML).
+
+# Git Utilities
+
+## ggit
+
+Run a git command in all repos under the current directory
+
+## ggrep
+
+Run 'git grep' in all repos under the current directory
+
+## gitprompt
+
+Output a string containing colour-coded shell nesting level, current directory and git working tree status (used in the shell prompt).
+
+## git ca
+
+Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
+
+## git cleanup
+
+List or delete branches that have already been merged and delete tracking branches that are no longer on ther remote.
+
+## git co
+
+## git mr
+
+## git parent
+
+## git update
+
+Update the repo from the remote, rebase branches against their parents, optionally run git cleanup
+
+## git wt
+
+Output the top level directory of the git working tree or return an error if we are not in a git working tree.
+
+## git review
+
+## venv-create
+
+Create a script to create/update a virtual environment and run a python script in it.

{skilleter_thingy-0.2.0.dist-info → skilleter_thingy-0.2.3.dist-info}/RECORD

@@ -14,6 +14,7 @@ skilleter_thingy/git_hold.py,sha256=EkIHzubG7BsR-Vv-UCj8rl-9Hx7ft31t7IEf1nGW6WE,
 skilleter_thingy/git_mr.py,sha256=g33FaRtJTbIQI0tfXv_a042YpGwtbg5fKw072aqjAdw,3086
 skilleter_thingy/git_parent.py,sha256=s0HYTuVlEHLQCI9ZQ6EcR_9rSU9Ps3U2oSUABLX-YQI,2800
 skilleter_thingy/git_retag.py,sha256=_e-oODX4mMV5o3OXSBlSYeqCCx-S4EWHEmu6Az8ABgY,1450
+skilleter_thingy/git_retag.sync-conflict-20250928-192600-TVSLRWK.py,sha256=70rbybb1M2sCUblmD2-iLVG0xdFq-Bl5HG0U1LRnAvs,1442
 skilleter_thingy/git_review.py,sha256=Z_e0wyQJ2AzOSy5cPI3jmAWystpJbHH4ygENjFagepo,52576
 skilleter_thingy/git_update.py,sha256=Z3p3E33ZJ2DVa107UzaFR9V8LXADRuHjJL8TX3IhEa4,14348
 skilleter_thingy/git_wt.py,sha256=93mbh8AKej8_y3aL6mVxKjKLEqMczaDtHoYcWf70eU0,2231
@@ -52,9 +53,10 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 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=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.2.0.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.2.0.dist-info/METADATA,sha256=lfOs1rUsUbK947Haf9nIzzFzvB3SR41pYf6LGpcGGEY,28913
-skilleter_thingy-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skilleter_thingy-0.2.0.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
-skilleter_thingy-0.2.0.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.2.0.dist-info/RECORD,,
+skilleter_thingy-0.2.3.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.2.3.dist-info/METADATA,sha256=nHx-ihEZhMQJLSWOSoWPzebuTnNWMe-euOyqJ3R5x6g,28913
+skilleter_thingy-0.2.3.dist-info/PKG-INFO 2,sha256=BryF-1KGwXobPiiN60EmDKuqAtIBSPadlgmJ72xZhMk,5313
+skilleter_thingy-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.2.3.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
+skilleter_thingy-0.2.3.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.2.3.dist-info/RECORD,,