gitlabform 3.9.2__tar.gz → 3.9.4__tar.gz

{gitlabform-3.9.2 → gitlabform-3.9.4}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2023 Greg Dubicki and Contributors
+Copyright (c) 2016-2024 Greg Dubicki and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{gitlabform-3.9.2 → gitlabform-3.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlabform
-Version: 3.9.2
+Version: 3.9.4
 Summary: 🏗 Specialized configuration as a code tool for GitLab projects, groups and more using hierarchical configuration written in YAML
 Home-page: https://gitlabform.github.io/gitlabform
 Author: Greg Dubicki and Contributors
@@ -25,31 +25,31 @@ Requires-Dist: certifi
 Requires-Dist: cli-ui==0.17.2
 Requires-Dist: ez-yaml==1.2.0
 Requires-Dist: Jinja2==3.1.3
-Requires-Dist: luddite==1.0.2
+Requires-Dist: luddite==1.0.4
 Requires-Dist: MarkupSafe==2.1.5
 Requires-Dist: mergedeep==1.3.4
 Requires-Dist: packaging==24.0
 Requires-Dist: python-gitlab==4.4.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: ruamel.yaml==0.17.21
-Requires-Dist: types-requests==2.31.0.20240311
+Requires-Dist: types-requests==2.31.0.20240406
 Requires-Dist: yamlpath==3.8.2
 Provides-Extra: test
 Requires-Dist: coverage==7.4.4; extra == "test"
 Requires-Dist: cryptography==42.0.5; extra == "test"
-Requires-Dist: deepdiff==6.7.1; extra == "test"
+Requires-Dist: deepdiff==7.0.1; extra == "test"
 Requires-Dist: mypy==1.9.0; extra == "test"
 Requires-Dist: mypy-extensions==1.0.0; extra == "test"
 Requires-Dist: pre-commit==2.21.0; extra == "test"
 Requires-Dist: pytest==8.1.1; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
 Requires-Dist: pytest-rerunfailures==14.0; extra == "test"
-Requires-Dist: xkcdpass==1.19.8; extra == "test"
+Requires-Dist: xkcdpass==1.19.9; extra == "test"
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
 Requires-Dist: mkdocs-material; extra == "docs"
 
-[![version](https://badge.fury.io/py/gitlabform.svg)](https://badge.fury.io/py/gitlabform)
+[![version](https://badge.fury.io/gh/gitlabform%2Fgitlabform.svg)](https://badge.fury.io/gh/gitlabform%2Fgitlabform)
 ![release date](https://img.shields.io/github/release-date/gitlabform/gitlabform)
 [![Downloads](https://static.pepy.tech/badge/gitlabform/month)](https://pepy.tech/project/gitlabform)
 [![code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

{gitlabform-3.9.2 → gitlabform-3.9.4}/README.md

@@ -1,4 +1,4 @@
-[![version](https://badge.fury.io/py/gitlabform.svg)](https://badge.fury.io/py/gitlabform)
+[![version](https://badge.fury.io/gh/gitlabform%2Fgitlabform.svg)](https://badge.fury.io/gh/gitlabform%2Fgitlabform)
 ![release date](https://img.shields.io/github/release-date/gitlabform/gitlabform)
 [![Downloads](https://static.pepy.tech/badge/gitlabform/month)](https://pepy.tech/project/gitlabform)
 [![code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

{gitlabform-3.9.2 → gitlabform-3.9.4}/gitlabform/__init__.py

@@ -5,7 +5,7 @@ import argparse
 import cli_ui
 import logging
 import luddite
-import pkg_resources
+from importlib.metadata import version as package_version
 import textwrap
 import traceback
 from cli_ui import (
@@ -25,7 +25,7 @@ from cli_ui import (
     purple,
     warning,
 )
-from packaging import version as packaging_version
+from packaging import version
 from typing import Any, Tuple
 
 from gitlabform.configuration import Configuration
@@ -47,7 +47,13 @@ from gitlabform.processors.project import ProjectProcessors
 
 
 class GitLabForm:
-    def __init__(self, include_archived_projects=True, target=None, config_string=None):
+    def __init__(
+        self,
+        include_archived_projects=True,
+        target=None,
+        config_string=None,
+        noop=False,
+    ):
         if target and config_string:
             # this mode is basically only for testing
 
@@ -58,7 +64,7 @@ class GitLabForm:
             self.strict = True
             self.start_from = 1
             self.start_from_group = 1
-            self.noop = False
+            self.noop = noop
             self.output_file = None
             self.skip_version_check = True
             self.include_archived_projects = include_archived_projects
@@ -508,7 +514,7 @@ class GitLabForm:
         :param skip_version_check: if True then the comparison to the latest versions is skipped
         """
 
-        local_version = pkg_resources.get_distribution("gitlabform").version
+        local_version = package_version("gitlabform")
 
         # fmt: off
         tower_crane = Symbol("🏗", "")
@@ -533,9 +539,7 @@ class GitLabForm:
                 happy = Symbol("😊", ":)")
                 to_show = ["= the latest stable ", happy]
                 # fmt: on
-            elif packaging_version.parse(local_version) < packaging_version.parse(
-                latest_version
-            ):
+            elif version.parse(local_version) < version.parse(latest_version):
                 # fmt: off
                 sad = Symbol("😔", ":(")
                 to_show = ["= outdated ", sad, " , please update! (the latest stable is ", latest_version, ")"]

{gitlabform-3.9.2 → gitlabform-3.9.4}/gitlabform/gitlab/core.py

@@ -3,7 +3,7 @@ import os
 from logging import debug
 from urllib import parse
 
-import pkg_resources
+from importlib.metadata import version as package_version
 import requests
 
 # noinspection PyPackageRequirements
@@ -42,8 +42,8 @@ class GitLabCore:
         if not self.ssl_verify:
             urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-        self.gitlabform_version = pkg_resources.get_distribution("gitlabform").version
-        self.requests_version = pkg_resources.get_distribution("requests").version
+        self.gitlabform_version = package_version("gitlabform")
+        self.requests_version = package_version("requests")
         self.session.headers.update(
             {
                 "private-token": self.token,

{gitlabform-3.9.2 → gitlabform-3.9.4}/gitlabform/processors/abstract_processor.py

@@ -51,6 +51,16 @@ class AbstractProcessor(ABC):
                 verbose(
                     f"Processing section '{self.configuration_name}' in dry-run mode."
                 )
+                try:
+                    project_transfer_source = configuration["project"]["transfer_from"]
+                    verbose(
+                        f"""Project {project_or_project_and_group} is configured to be transferred, 
+                        diffing config from transfer source project {project_transfer_source}."""
+                    )
+                    project_or_project_and_group = project_transfer_source
+                except KeyError:
+                    pass
+
                 self._print_diff(
                     project_or_project_and_group,
                     configuration.get(self.configuration_name),

{gitlabform-3.9.2 → gitlabform-3.9.4}/gitlabform.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlabform
-Version: 3.9.2
+Version: 3.9.4
 Summary: 🏗 Specialized configuration as a code tool for GitLab projects, groups and more using hierarchical configuration written in YAML
 Home-page: https://gitlabform.github.io/gitlabform
 Author: Greg Dubicki and Contributors
@@ -25,31 +25,31 @@ Requires-Dist: certifi
 Requires-Dist: cli-ui==0.17.2
 Requires-Dist: ez-yaml==1.2.0
 Requires-Dist: Jinja2==3.1.3
-Requires-Dist: luddite==1.0.2
+Requires-Dist: luddite==1.0.4
 Requires-Dist: MarkupSafe==2.1.5
 Requires-Dist: mergedeep==1.3.4
 Requires-Dist: packaging==24.0
 Requires-Dist: python-gitlab==4.4.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: ruamel.yaml==0.17.21
-Requires-Dist: types-requests==2.31.0.20240311
+Requires-Dist: types-requests==2.31.0.20240406
 Requires-Dist: yamlpath==3.8.2
 Provides-Extra: test
 Requires-Dist: coverage==7.4.4; extra == "test"
 Requires-Dist: cryptography==42.0.5; extra == "test"
-Requires-Dist: deepdiff==6.7.1; extra == "test"
+Requires-Dist: deepdiff==7.0.1; extra == "test"
 Requires-Dist: mypy==1.9.0; extra == "test"
 Requires-Dist: mypy-extensions==1.0.0; extra == "test"
 Requires-Dist: pre-commit==2.21.0; extra == "test"
 Requires-Dist: pytest==8.1.1; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
 Requires-Dist: pytest-rerunfailures==14.0; extra == "test"
-Requires-Dist: xkcdpass==1.19.8; extra == "test"
+Requires-Dist: xkcdpass==1.19.9; extra == "test"
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
 Requires-Dist: mkdocs-material; extra == "docs"
 
-[![version](https://badge.fury.io/py/gitlabform.svg)](https://badge.fury.io/py/gitlabform)
+[![version](https://badge.fury.io/gh/gitlabform%2Fgitlabform.svg)](https://badge.fury.io/gh/gitlabform%2Fgitlabform)
 ![release date](https://img.shields.io/github/release-date/gitlabform/gitlabform)
 [![Downloads](https://static.pepy.tech/badge/gitlabform/month)](https://pepy.tech/project/gitlabform)
 [![code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

{gitlabform-3.9.2 → gitlabform-3.9.4}/gitlabform.egg-info/requires.txt

@@ -2,14 +2,14 @@ certifi
 cli-ui==0.17.2
 ez-yaml==1.2.0
 Jinja2==3.1.3
-luddite==1.0.2
+luddite==1.0.4
 MarkupSafe==2.1.5
 mergedeep==1.3.4
 packaging==24.0
 python-gitlab==4.4.0
 requests==2.31.0
 ruamel.yaml==0.17.21
-types-requests==2.31.0.20240311
+types-requests==2.31.0.20240406
 yamlpath==3.8.2
 
 [docs]
@@ -19,11 +19,11 @@ mkdocs-material
 [test]
 coverage==7.4.4
 cryptography==42.0.5
-deepdiff==6.7.1
+deepdiff==7.0.1
 mypy==1.9.0
 mypy-extensions==1.0.0
 pre-commit==2.21.0
 pytest==8.1.1
 pytest-cov==5.0.0
 pytest-rerunfailures==14.0
-xkcdpass==1.19.8
+xkcdpass==1.19.9

{gitlabform-3.9.2 → gitlabform-3.9.4}/setup.py

@@ -48,28 +48,28 @@ setup(
         "cli-ui==0.17.2",
         "ez-yaml==1.2.0",
         "Jinja2==3.1.3",
-        "luddite==1.0.2",
+        "luddite==1.0.4",
         "MarkupSafe==2.1.5",
         "mergedeep==1.3.4",
         "packaging==24.0",
         "python-gitlab==4.4.0",
         "requests==2.31.0",
         "ruamel.yaml==0.17.21",
-        "types-requests==2.31.0.20240311",
+        "types-requests==2.31.0.20240406",
         "yamlpath==3.8.2",
     ],
     extras_require={
         "test": [
             "coverage==7.4.4",
             "cryptography==42.0.5",
-            "deepdiff==6.7.1",
+            "deepdiff==7.0.1",
             "mypy==1.9.0",
             "mypy-extensions==1.0.0",
             "pre-commit==2.21.0",  # not really for tests, but for development
             "pytest==8.1.1",
             "pytest-cov==5.0.0",
             "pytest-rerunfailures==14.0",
-            "xkcdpass==1.19.8",
+            "xkcdpass==1.19.9",
         ],
         "docs": [
             "mkdocs",

{gitlabform-3.9.2 → gitlabform-3.9.4}/tests/acceptance/__init__.py

@@ -247,7 +247,7 @@ def randomize_case(input: str) -> str:
     return "".join(random.choice((str.upper, str.lower))(char) for char in input)
 
 
-def run_gitlabform(config, target, include_archived_projects=True):
+def run_gitlabform(config, target, include_archived_projects=True, noop=False):
     # f-strings with """ used as configs have the disadvantage of having indentation in them - let's remove it here
     config = textwrap.dedent(config)
 
@@ -264,5 +264,6 @@ def run_gitlabform(config, target, include_archived_projects=True):
         include_archived_projects=include_archived_projects,
         config_string=config,
         target=target,
+        noop=noop,
     )
     gf.run()

{gitlabform-3.9.2 → gitlabform-3.9.4}/tests/acceptance/standard/test_running.py

@@ -22,6 +22,23 @@ class TestRunning:
         other_project = gl.projects.get(other_project.id)
         assert other_project.request_access_enabled is True
 
+    # noinspection PyPep8Naming
+    def test__ALL_dry_run(self, gl, project, other_project):
+        config = f"""
+        projects_and_groups:
+          '*':
+            project_settings:
+              request_access_enabled: false
+        """
+
+        run_gitlabform(config, "ALL", noop=True)
+
+        project = gl.projects.get(project.id)
+        assert project.request_access_enabled is True
+
+        other_project = gl.projects.get(other_project.id)
+        assert other_project.request_access_enabled is True
+
     # noinspection PyPep8Naming
     def test__ALL_DEFINED(self, gl, project, other_project):
         config = f"""

{gitlabform-3.9.2 → gitlabform-3.9.4}/tests/acceptance/standard/test_transfer_project.py

@@ -9,6 +9,30 @@ import pytest
 
 
 class TestTransferProject:
+    def test__transfer_between_two_root_groups_dry_run(
+        self, project_for_function, group, other_group
+    ):
+        project_new_path_with_namespace = (
+            f"{other_group.path}/{project_for_function.name}"
+        )
+        projects_in_destination_before_transfer = other_group.projects.list()
+
+        config = f"""
+        projects_and_groups:
+          {project_new_path_with_namespace}:
+            project:
+              transfer_from: {project_for_function.path_with_namespace}
+            project_settings:
+              description: test
+        """
+
+        run_gitlabform(config, project_new_path_with_namespace, noop=True)
+        projects_in_destination_after_transfer = other_group.projects.list()
+
+        assert len(projects_in_destination_after_transfer) == len(
+            projects_in_destination_before_transfer
+        )
+
     def test__transfer_between_two_root_groups(
         self, project_for_function, group, other_group
     ):