skilleter-modules 0.0.8__tar.gz → 0.0.9__tar.gz

{skilleter_modules-0.0.8/src/skilleter_modules.egg-info → skilleter_modules-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_modules
-Version: 0.0.8
+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.8 → skilleter_modules-0.0.9}/README.md

@@ -20,10 +20,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.8 → skilleter_modules-0.0.9}/pyproject.toml

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

{skilleter_modules-0.0.8 → skilleter_modules-0.0.9}/src/skilleter_modules/git.py

@@ -32,7 +32,6 @@ from functools import cache
 import pygit2
 
 from . import run
-from . import gitlab
 
 ################################################################################
 # Configuration files to access
@@ -1216,47 +1215,37 @@ def isbranch(branchname, path=None):
 
 ################################################################################
 
-def is_default_branch(branchname=None):
+def is_default_branch(path, branchname=None):
     """ Return True if the specified branch is a default branch """
 
-    if not branchname:
-        branchname = branch()
+    # Use the current branch if not specified
 
-    default_branches = config_get('skilleter-thingy', 'defaultBranches', defaultvalue=DEFAULT_DEFAULT_BRANCHES, path=path).split(',')
+    if not branchname:
+        branchname = branch(path=path)
 
-    return branchname in default_branches
+    # Get the list of default branch wildcards
 
-################################################################################
+    default_branches = config_get('skilleter-thingy', 'defaultBranches', defaultvalue=DEFAULT_DEFAULT_BRANCHES, path=path).split(',')
 
-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. """
+    # If the branch matches any of the wildcards, return True
 
-    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]
+    for defbranch in default_branches:
+        if fnmatch.fnmatch(branchname, defbranch):
+            return True
 
-                if not url.startswith('http://') and not url.startswith('https://'):
-                    url = f'https://{url}'
+    # No match, so not a default branch
 
-                if repo.endswith('.git'):
-                    repo = repo[:-4]
+    return False
 
-                try:
-                    gl = gitlab.GitLab(url)
-                    return gl.default_branch(repo)
+################################################################################
 
-                except gitlab.GitLabError:
-                    return None
+def default_branch(path=None):
+    """ Return the name of the default branch """
 
     git_branches = branches(path=path)
 
     for branchname in git_branches:
-        if is_default_branch(branchname):
+        if is_default_branch(path, branchname):
             return branchname
 
     raise GitError('Unable to determine default branch in the repo')

{skilleter_modules-0.0.8 → skilleter_modules-0.0.9/src/skilleter_modules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_modules
-Version: 0.0.8
+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.8 → skilleter_modules-0.0.9}/src/skilleter_modules.egg-info/SOURCES.txt

@@ -10,7 +10,6 @@ src/skilleter_modules/dircolors.py
 src/skilleter_modules/docker.py
 src/skilleter_modules/files.py
 src/skilleter_modules/git.py
-src/skilleter_modules/gitlab.py
 src/skilleter_modules/path.py
 src/skilleter_modules/popup.py
 src/skilleter_modules/run.py
@@ -26,7 +25,6 @@ tests/test_dircolors.py
 tests/test_docker.py
 tests/test_files.py
 tests/test_git.py
-tests/test_gitlab.py
 tests/test_path.py
 tests/test_popup.py
 tests/test_run.py

skilleter_modules-0.0.8/src/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

skilleter_modules-0.0.8/tests/test_gitlab.py

@@ -1,4 +0,0 @@
-import skilleter_modules.gitlab as gitlab
-
-def test_gitlab():
-    pass