skilleter-modules 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

skilleter_modules/git.py

@@ -27,11 +27,11 @@ import re
 import logging
 import fnmatch
 import subprocess
+from functools import cache
 
 import pygit2
 
 from . import run
-from . import gitlab
 
 ################################################################################
 # Configuration files to access
@@ -873,6 +873,7 @@ def reset(sha1, path=None):
 
 ################################################################################
 
+@cache
 def config_get(section, key, source=None, defaultvalue=None, path=None):
     """ Return the specified configuration entry
         Returns a default value if no matching configuration entry exists """
@@ -900,6 +901,8 @@ def config_get(section, key, source=None, defaultvalue=None, path=None):
 def config_set(section, key, value, source=None, path=None):
     """ Set a configuration entry """
 
+    config_get.cache_clear()
+
     cmd = ['config']
 
     if source == GLOBAL:
@@ -1212,37 +1215,38 @@ def isbranch(branchname, path=None):
 
 ################################################################################
 
-def default_branch(path=None):
-    """ Return the name of the default branch, attempting to interrogate GitLab
-        if the repo appears to have been cloned from there and falling back to
-        returning whichever one of 'develop', 'main' or 'master' exists. """
+def is_default_branch(path, branchname=None):
+    """ Return True if the specified branch is a default branch """
+
+    # Use the current branch if not specified
 
-    remote_list = remotes(path=path)
-    if remote_list:
-        for name in remote_list:
-            if 'gitlab' in remote_list[name]:
-                url = remote_list[name].split('@')[1].split(':')[0]
-                repo = remote_list[name].split(':')[1]
+    if not branchname:
+        branchname = branch(path=path)
 
-                if not url.startswith('http://') and not url.startswith('https://'):
-                    url = f'https://{url}'
+    # Get the list of default branch wildcards
 
-                if repo.endswith('.git'):
-                    repo = repo[:-4]
+    default_branches = config_get('skilleter-thingy', 'defaultBranches', defaultvalue=DEFAULT_DEFAULT_BRANCHES, path=path).split(',')
+
+    # If the branch matches any of the wildcards, return True
 
-                try:
-                    gl = gitlab.GitLab(url)
-                    return gl.default_branch(repo)
+    for defbranch in default_branches:
+        if fnmatch.fnmatch(branchname, defbranch):
+            return True
+
+    # No match, so not a default branch
+
+    return False
+
+################################################################################
 
-                except gitlab.GitLabError:
-                    return None
+def default_branch(path=None):
+    """ Return the name of the default branch """
 
     git_branches = branches(path=path)
-    default_branches = config_get('skilleter-thingy', 'defaultBranches', defaultvalue=DEFAULT_DEFAULT_BRANCHES, path=path).split(',')
 
-    for branch in default_branches:
-        if branch in git_branches:
-            return branch
+    for branchname in git_branches:
+        if is_default_branch(path, branchname):
+            return branchname
 
     raise GitError('Unable to determine default branch in the repo')
 
@@ -1423,80 +1427,3 @@ def clean(recurse=False, force=False, dry_run=False, quiet=False,
         cmd.append('-X')
 
     return git(cmd, path=path)
-
-################################################################################
-
-def run_tests():
-    """Test suite for the module"""
-
-    print('Creating local git repo')
-
-    init('test-repo')
-    os.chdir('test-repo')
-
-    try:
-        print('Initial status:')
-        print('  User name:            %s' % config_get('user', 'name'))
-        print('  Project:              %s' % project())
-        print('  Remotes:              %s' % remotes())
-        print('  Current branch:       %s' % branch())
-        print('  Current working tree: %s' % working_tree())
-        print('  Rebasing?             %s' % rebasing())
-        print('  Status:               %s' % status())
-        print()
-
-        print('Adding a removing a configuration value')
-
-        config_set('user', 'size', 'medium')
-
-        print('  User size config:     %s' % config_get('user', 'size'))
-
-        config_rm('user', 'size')
-
-        value = config_get('user', 'size')
-        if value is None:
-            print('  Successfully failed to read the newly-deleted config data')
-        else:
-            raise GitError('Unexpected lack of error reading configuration data', 1)
-
-        config_set('user', 'email', 'user@localhost')
-        config_set('user', 'name', 'User Name')
-
-        print('')
-
-        with open('newfile.txt', 'w', encoding='utf8') as newfile:
-            newfile.write('THIS IS A TEST')
-
-        print('Adding and committing "newfile.txt"')
-
-        add(['newfile.txt'])
-
-        commit(['newfile.txt'], 'Test the add and commit functionality')
-
-        print('Removing and committing "newfile.txt"')
-
-        rm(['newfile.txt'])
-
-        commit(None, 'Removed "newfile.txt"')
-
-        print('Removing the last commit')
-
-        reset('HEAD~1')
-
-        print('Commit info for HEAD  %s' % commit_info('HEAD'))
-
-    except GitError as exc:
-        sys.stderr.write(f'ERROR: {exc.msg}')
-        sys.exit(1)
-
-    finally:
-        # If anything fails, then clean up afterwards
-
-        os.chdir('..')
-        shutil.rmtree('test-repo')
-
-################################################################################
-# Entry point
-
-if __name__ == '__main__':
-    run_tests()

skilleter_modules/popup.py

@@ -30,7 +30,7 @@ class PopUp():
         self.centre = centre
         self.colour = curses.color_pair(colour)
         self.refresh = refresh
-        self.sleep = 0 if waitkey else sleep 
+        self.sleep = 0 if waitkey else sleep
         self.waitkey = waitkey
         self.start_time = 0
 

{skilleter_modules-0.0.7.dist-info → skilleter_modules-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_modules
-Version: 0.0.7
+Version: 0.0.9
 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
@@ -38,10 +38,6 @@ Miscellaneous file-related functions - backup creation, file-type detection, etc
 
 A git library
 
-## gitlab.py
-
-GitLab access module - due to be deprecated as I no longer support GitLab
-
 ## path.py
 
 Filesystem path-related functions

{skilleter_modules-0.0.7.dist-info → skilleter_modules-0.0.9.dist-info}/RECORD

@@ -6,15 +6,14 @@ skilleter_modules/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUsMhOFs,
 skilleter_modules/dircolors.py,sha256=p_rCka-Fnjyu38H8qB3RSZogOkmkbHWYrLbtSWIHcfs,12449
 skilleter_modules/docker.py,sha256=VKcV1aR7X7Yq4ml7zIamwAD05w73Z_2D8yW9MxcNXaE,2923
 skilleter_modules/files.py,sha256=HLrNcUdnpWO-1GEZiDochpVdDKto4G1ukmk4Mszdy7o,4752
-skilleter_modules/git.py,sha256=1rXwhvxHQuIMFqBTRxc1OYOgfcpcIGiWRl1HWRU6x4k,43300
-skilleter_modules/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
+skilleter_modules/git.py,sha256=SmK9vVu6ahxQ0mst0fx3S8FPQGOdlUI4QPSLa47nXfs,40929
 skilleter_modules/path.py,sha256=sk_v9wlRTqZybyl6muAM5yL93ni2LTM0pPj1tyqcaHs,4886
-skilleter_modules/popup.py,sha256=FPp4O759UiogTAYefmrfV6vW0LcG6XEbGqePtKpZNMo,2579
+skilleter_modules/popup.py,sha256=xq3C64ju_1aDr4koyhC-Y9SJv57kUawrh8L486Jo564,2578
 skilleter_modules/run.py,sha256=mXzf1kJxNIKSYVT6khJ8s5RiA2cVqkoOFk0P6QPIBY0,10631
 skilleter_modules/tidy.py,sha256=AN_3CRHd8HyWeXlNtd0gZyaA0UJfO4k3IvC5fszeUtk,5972
 skilleter_modules/venv_template.py,sha256=ZfUvi8qFNGrk7J030Zy57xjwMtfIArJyqa-MqafyjVk,1016
-skilleter_modules-0.0.7.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_modules-0.0.7.dist-info/METADATA,sha256=czar0fCT9eGUAJXF_NTxuSHgynvNGO2BlYFrvwKCKPM,1824
-skilleter_modules-0.0.7.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-skilleter_modules-0.0.7.dist-info/top_level.txt,sha256=DMa0AkGOjoDHiHDG6Nw1jtdUylaMm5WkF6uODT9yxJc,18
-skilleter_modules-0.0.7.dist-info/RECORD,,
+skilleter_modules-0.0.9.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_modules-0.0.9.dist-info/METADATA,sha256=IWwWK22sKoREQWxXMdjEh2wPf0nq3lwgwUltkGTBCnA,1735
+skilleter_modules-0.0.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+skilleter_modules-0.0.9.dist-info/top_level.txt,sha256=DMa0AkGOjoDHiHDG6Nw1jtdUylaMm5WkF6uODT9yxJc,18
+skilleter_modules-0.0.9.dist-info/RECORD,,

{skilleter_modules-0.0.7.dist-info → skilleter_modules-0.0.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

skilleter_modules/gitlab.py

@@ -1,193 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" GitLab module - implemented using the REST API as some features are not
-    available (or don't work) in the official Python module
-
-    Copyright (C) 2017-20 John Skilleter
-
-    Licence: GPL v3 or later
-
-    Note: There are two types of function for returning data from GitLab;
-    the paged functions and the non-paged ones - the paged ones return a page
-    (normally 20 items) of data and need to be called repeated until no data is
-    left whereas the non-paged ones query all the data and concatenate it
-    together.
-
-    The paged functions expect a full request string with the URL, as returned
-    by the request_string() member. The non-paged ones call request_string()
-    to add the URL & API prefix.
-"""
-################################################################################
-
-import sys
-import os
-
-try:
-    import requests
-except ModuleNotFoundError:
-    sys.stderr.write('This code requires the Python "requests" module which should be installed via your package manager\n')
-    sys.exit(1)
-
-################################################################################
-
-class GitLabError(Exception):
-    """ Gitlab exceptions """
-
-    def __init__(self, response):
-        """ Save the error code and text """
-
-        self.status = response.status_code
-        self.message = response.reason
-
-    def __str__(self):
-        """ Return a string version of the exception """
-
-        return '%s: %s' % (self.status, self.message)
-
-################################################################################
-
-class GitLab:
-    """ Class for GitLab access """
-
-    def __init__(self, gitlab, token=None):
-        """ Initialisation """
-
-        # Save the GitLab URL
-
-        self.gitlab = gitlab
-
-        # If we have a private token use it, otherwise try and get it from
-        # the environmnet
-
-        self.token = token if token else os.getenv('GITLAB_TOKEN', None)
-
-        # Create the default header for requests
-
-        self.header = {'Private-Token': self.token}
-
-    ################################################################################
-
-    @staticmethod
-    def encode_project(name):
-        """ Encode a project name in the form request by GitLab requests """
-
-        return name.replace('/', '%2F')
-
-    ################################################################################
-
-    def request_string(self, request):
-        """ Add the URL/API header onto a request string """
-
-        return '%s/api/v4/%s' % (self.gitlab, request)
-
-    ################################################################################
-
-    def request(self, request, parameters=None):
-        """ Send a request to GitLab - handles pagination and returns all the
-            results concatenated together """
-
-        if parameters:
-            request = '%s?%s' % (request, '&'.join(parameters))
-
-        gl_request = self.request_string(request)
-
-        # Keep requesting data until there's no 'next' link in the response
-
-        while True:
-            response = requests.get(gl_request, headers=self.header)
-
-            if not response:
-                raise GitLabError(response)
-
-            yield response.json()
-
-            if 'next' not in response.links:
-                break
-
-            gl_request = response.links['next']['url']
-
-    ################################################################################
-
-    def paged_request(self, request):
-        """ Send a request to GitLab - returns all the results concatenated together
-            and returns a page of results along with the request for the next page of
-            results (if any).
-
-            Note that the request parameter is the full request string as returned by
-            request_string(). """
-
-        response = requests.get(request, headers=self.header)
-
-        result = response.json()
-
-        if not response:
-            raise GitLabError(response)
-
-        request = response.links['next']['url'] if 'next' in response.links else None
-
-        return result, request
-
-    ################################################################################
-
-    def projects(self):
-        """ Return a list of projects """
-
-        return self.request('projects')
-
-    ################################################################################
-
-    def branches(self, repo):
-        """ Return the list of branches in a repo """
-
-        for batch in self.request('projects/%s/repository/branches' % self.encode_project(repo)):
-            for branch in batch:
-                yield branch
-
-    ################################################################################
-
-    def merge_requests(self, **kwargs):
-        """ Return a list of merge requests filtered according to the parameters """
-
-        request = 'merge_requests'
-
-        parameters = []
-
-        for data in kwargs:
-            parameters.append('%s=%s' % (data, kwargs[data]))
-
-        for result in self.request(request, parameters):
-            for r in result:
-                yield r
-
-    ################################################################################
-
-    def default_branch(self, repo):
-        """ Query gitlab to retreive the default branch for the repo """
-
-        # Look for the default branch
-
-        for branch in self.branches(repo):
-            if branch['default']:
-                return branch['name']
-
-        return None
-
-    ################################################################################
-
-    def isbranch(self, repo, branchname):
-        """ Return True if the branch exists in the repo """
-
-        request = self.request_string('projects/%s/repository/branches' % self.encode_project(repo))
-
-        while True:
-            branches, request = self.paged_request(request)
-
-            for branch in branches:
-                if branch['name'] == branchname:
-                    return True
-
-            if not request:
-                break
-
-        return False