gitlabform 5.5.6__tar.gz → 6.0.0__tar.gz

{gitlabform-5.5.6 → gitlabform-6.0.0}/.github/workflows/_releases.yml

@@ -165,12 +165,12 @@ jobs:
         uses: actions/checkout@v6
         with:
           ref: ${{ needs.prep-release.outputs.semver_tag }}
-      - name: Get the version from the tag
-        run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
       - name: Docker metadata
         id: metadata
         uses: docker/metadata-action@v6
         with:
+          # Get the ref and the sha from the checked out context - e.g. semver tag rather than triggering branch
+          context: git
           images: |
             ghcr.io/gitlabform/gitlabform
           flavor: |

{gitlabform-5.5.6 → gitlabform-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitlabform
-Version: 5.5.6
+Version: 6.0.0
 Summary: 🏗 Specialized configuration as a code tool for GitLab projects, groups and more using hierarchical configuration written in YAML
 Project-URL: Homepage, https://gitlabform.github.io/gitlabform/
 Project-URL: Repository, https://github.com/gitlabform/gitlabform.git
@@ -21,7 +21,6 @@ Classifier: Topic :: Software Development :: Version Control :: Git
 Requires-Python: >=3.12.0
 Requires-Dist: certifi==2026.5.20
 Requires-Dist: cli-ui==0.19.0
-Requires-Dist: ez-yaml==1.2.0
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: luddite==1.0.4
 Requires-Dist: markupsafe==3.0.3
@@ -30,8 +29,8 @@ Requires-Dist: packaging==26.2
 Requires-Dist: python-gitlab[graphql]==8.4.0
 Requires-Dist: requests==2.34.2
 Requires-Dist: rich==15.0.0
-Requires-Dist: ruamel-yaml==0.17.21
-Requires-Dist: yamlpath==3.8.2
+Requires-Dist: ruamel-yaml==0.19.1
+Requires-Dist: yamlpath==3.9.1
 Description-Content-Type: text/markdown
 
 [![version](https://badge.fury.io/gh/gitlabform%2Fgitlabform.svg)](https://badge.fury.io/gh/gitlabform%2Fgitlabform)

{gitlabform-5.5.6 → gitlabform-6.0.0}/docs/changelog.md

@@ -6,6 +6,22 @@ For details on how to migrate between major versions, please refer to the [upgra
 
 ---
 
+## 6.0.0
+
+### Breaking Changes
+
+**Drops default support for YAML 1.1 by upgrading dependency major versions:** [#1309](https://github.com/gitlabform/gitlabform/pull/1309). ([timknight01](https://github.com/TimKnight01))
+* Drops DeepDiff and ez_yaml dependencies
+* Upgrades ruamel.yaml and yamlpath to their latest versions
+
+See [upgrade guide](upgrade.md) for important upgrade instructions and migration details.
+
+## 5.5.7
+
+### Build
+
+* Fix an issue where the incorrect `ref` was used in docker/metadata-action preventing publishing to GHCR on a Tag. ([timknight01](https://github.com/TimKnight01))
+
 ## 5.5.6
 
 ### Documentation

{gitlabform-5.5.6 → gitlabform-6.0.0}/docs/upgrade.md

@@ -2,6 +2,25 @@
 
 Some of these changes between major application versions may affect the effective configuration that would be applied if you run the application. Therefore to do the upgrade safely please follow this procedure.
 
+## From 5.\* to 6.\*
+
+We have upgraded to new major versions of underlying YAML libraries `ezyaml`, `yamlpath` and `ruamel.yaml`.
+
+This results in GitLabForm no longer defaulting to `yaml 1.1` support when parsing YAML configuration files.
+
+In order to retain `yaml 1.1` configuration you **must** add the `%YAML` directive to the top of your configuration file, for example:
+
+```yaml
+%YAML 1.1
+---
+ projects_and_groups:
+   some_group/*:
+     project_settings:
+       foo: yes
+```
+
+Alternatively update your YAML to be compatible with `yaml 1.2` specification, for example by replacing `yes` with `true` in the above example, and any instances of `no` with `false`.
+
 ## From 4.\* to 5.\*
 
 ### Update `config_version`

{gitlabform-5.5.6 → gitlabform-6.0.0}/gitlabform/__init__.py

@@ -68,8 +68,9 @@ class GitLabForm:
             self.only_sections = "all"
             self.exclude_sections = []
             self.recurse_subgroups = recurse_subgroups
+            self.log_level = logging.DEBUG
 
-            self._configure_output(tests=True)
+            self._configure_logging()
         else:
             # normal mode
 
@@ -94,7 +95,16 @@ class GitLabForm:
                 self.recurse_subgroups,
             ) = self._parse_args()
 
-            self._configure_output()
+            if self.debug:
+                level = logging.DEBUG
+            elif self.verbose:
+                level = logging.INFO
+            else:
+                level = logging.WARNING
+
+            self.log_level = level
+
+            self._configure_logging()
 
             self._show_version(self.skip_version_check)
             if self.just_show_version:
@@ -108,7 +118,7 @@ class GitLabForm:
 
         self.application_processors = ApplicationProcessors(self.gitlab, self.configuration, self.strict)
         self.group_processors = GroupProcessors(self.gitlab, self.configuration, self.strict)
-        self.project_processors = ProjectProcessors(self.gitlab, self.configuration, self.strict)
+        self.project_processors = ProjectProcessors(self.gitlab, self.configuration, self.strict, self.log_level)
         self.groups_provider = GroupsProvider(
             self.gitlab,
             self.configuration,
@@ -323,27 +333,24 @@ class GitLabForm:
             args.recurse_subsgroups,
         )
 
-    def _configure_output(self, tests=False) -> None:
+    def _configure_logging(self) -> None:
         """
         Configures the application output using logging, based on debug and verbose flags:
 
         * normal mode - logging only WARNING logs
         * verbose mode - logging INFO level and above
         * debug / tests mode - logging DEBUG level and above, along with rich exception tracebacks (may expose secrets)
-
-        :param tests: True if we are running in tests mode
         """
         rich_tracebacks = False
-        if tests or self.debug:
-            level = logging.DEBUG
+
+        if self.log_level == logging.DEBUG:
             rich_tracebacks = True
-        elif self.verbose:
-            level = logging.INFO
-        else:
-            level = logging.WARNING
 
         logging.basicConfig(
-            level=level, format="%(message)s", datefmt="[%X]", handlers=[RichHandler(rich_tracebacks=rich_tracebacks)]
+            level=self.log_level,
+            format="%(message)s",
+            datefmt="[%X]",
+            handlers=[RichHandler(rich_tracebacks=rich_tracebacks)],
         )
 
     def _initialize_configuration_and_gitlab(self) -> Tuple[GitLab, Configuration]:
@@ -362,7 +369,7 @@ class GitLabForm:
                 gitlab = GitLab(config_path=self.config)
             configuration = gitlab.get_configuration()
 
-            configuration_transformers = ConfigurationTransformers(gitlab)
+            configuration_transformers = ConfigurationTransformers(gitlab, self.log_level)
             configuration_transformers.transform(configuration)
 
         except ConfigFileNotFoundException as e:

{gitlabform-5.5.6 → gitlabform-6.0.0}/gitlabform/configuration/core.py

@@ -93,10 +93,6 @@ class ConfigurationCore(ABC):
 
         yaml = Parsers.get_yaml_editor()
 
-        # for better backward compatibility with PyYAML (that supports only YAML 1.1) used in the previous
-        # GitLabForm versions, let's force ruamel.yaml to use YAML version 1.1 by default too
-        yaml.version = (1, 1)
-
         if config_string:
             config = textwrap.dedent(source)
             info("Reading config from the provided string.")

{gitlabform-5.5.6 → gitlabform-6.0.0}/gitlabform/configuration/transform.py

@@ -1,15 +1,13 @@
 import sys
-from logging import debug, info, critical
+from logging import debug, info, critical, DEBUG
 from abc import ABC, abstractmethod
-from ez_yaml import ez_yaml
-from ruamel.yaml import YAML
 from types import SimpleNamespace
-
 from ruamel.yaml.comments import CommentedMap
 from yamlpath import Processor
 from yamlpath.exceptions import YAMLPathException
 from yamlpath.wrappers import ConsolePrinter
 
+from gitlabform import util
 from gitlabform.constants import EXIT_INVALID_INPUT, APPROVAL_RULE_NAME
 from gitlabform.configuration import Configuration
 from gitlabform.gitlab import AccessLevel
@@ -24,23 +22,26 @@ from gitlabform.gitlab import GitLab
 
 
 class ConfigurationTransformers:
-    def __init__(self, gitlab: GitLab):
+    def __init__(self, gitlab: GitLab, log_level: int):
         self.user_transformer = UserTransformer(gitlab)
         self.group_transformer = GroupTransformer(gitlab)
         self.implicit_name_transformer = ImplicitNameTransformer(gitlab)
         self.access_level_transformer = AccessLevelsTransformer(gitlab)
+        self.log_level = log_level
 
     def transform(self, configuration: Configuration) -> None:
-        config_before = ez_yaml.to_string(obj=configuration.config, options={})
-        debug(f"Config BEFORE transformations:\n{config_before}")
+        if self.log_level == DEBUG:
+            config_before = util.yaml_config_to_string(configuration.config)
+            debug(f"Config BEFORE transformations:\n{config_before}")
 
         self.user_transformer.transform(configuration)
         self.group_transformer.transform(configuration)
         self.implicit_name_transformer.transform(configuration)
         self.access_level_transformer.transform(configuration, last=True)
 
-        config_after = ez_yaml.to_string(obj=configuration.config, options={})
-        debug(f"Config AFTER transformations:\n{config_after}")
+        if self.log_level == DEBUG:
+            config_after = util.yaml_config_to_string(configuration.config)
+            debug(f"Config AFTER transformations:\n{config_after}")
 
 
 class ConfigurationTransformer(ABC):
@@ -58,9 +59,9 @@ class ConfigurationTransformer(ABC):
         # we needed complex ruamel.yaml's types like ordereddict and CommentedSeq
         # for transformations, but at the end convert them to simple dict and lists
         # for easier to understand debug output and tests
+        config_yaml_string = util.yaml_config_to_string(configuration.config)
 
-        config_yaml_string = ez_yaml.to_string(obj=configuration.config, options={})
-        simple_yaml_loader = YAML(typ="safe", pure=True)
+        simple_yaml_loader = util.configure_ruamel_yaml_loader(typ="safe", pure=True)
         configuration.config = simple_yaml_loader.load(config_yaml_string)
 
 

{gitlabform-5.5.6 → gitlabform-6.0.0}/gitlabform/output.py

@@ -1,8 +1,7 @@
 import sys
 from logging import debug, critical, info
 
-import ez_yaml
-
+from gitlabform import util
 from gitlabform.constants import EXIT_INVALID_INPUT, EXIT_PROCESSING_ERROR
 
 
@@ -38,7 +37,7 @@ class EffectiveConfigurationFile:
     def write_to_file(self):
         if self.output_file:
             try:
-                yaml_configuration = ez_yaml.to_string(self.config)
+                yaml_configuration = util.yaml_config_to_string(self.config)
                 self.output_file.write(yaml_configuration)
                 self.output_file.close()
             except Exception as e:

{gitlabform-5.5.6 → gitlabform-6.0.0}/gitlabform/processors/project/__init__.py

@@ -47,7 +47,7 @@ from gitlabform.processors.project.remote_mirrors_processor import RemoteMirrors
 
 
 class ProjectProcessors(AbstractProcessors):
-    def __init__(self, gitlab: GitLab, config: Configuration, strict: bool):
+    def __init__(self, gitlab: GitLab, config: Configuration, strict: bool, log_level: int):
         super().__init__(gitlab, config, strict)
         self.processors: List[AbstractProcessor] = [
             # Order of processors matter. GitLabForm will process config sections
@@ -64,7 +64,7 @@ class ProjectProcessors(AbstractProcessors):
             ProjectLabelsProcessor(gitlab),
             JobTokenScopeProcessor(gitlab),
             DeployKeysProcessor(gitlab),
-            ProjectVariablesProcessor(gitlab),
+            ProjectVariablesProcessor(gitlab, log_level),
             BranchesProcessor(gitlab, strict),
             TagsProcessor(gitlab, strict),
             IntegrationsProcessor(gitlab),

{gitlabform-5.5.6 → gitlabform-6.0.0}/gitlabform/processors/project/project_variables_processor.py

@@ -1,12 +1,13 @@
 from typing import Dict, Any, List, cast
-from logging import warning, info
+from logging import warning, info, INFO
 
 import copy
 import textwrap
-import ez_yaml
 
 from gitlab.exceptions import GitlabGetError
 from gitlab.v4.objects import Project, ProjectVariable
+
+from gitlabform import util
 from gitlabform.gitlab import GitLab
 from gitlabform.processors.util.difference_logger import hide
 from gitlabform.processors.abstract_processor import AbstractProcessor
@@ -14,8 +15,9 @@ from gitlabform.processors.util.variables_processor import VariablesProcessor
 
 
 class ProjectVariablesProcessor(AbstractProcessor):
-    def __init__(self, gitlab: GitLab):
+    def __init__(self, gitlab: GitLab, log_level: int):
         super().__init__("variables", gitlab)
+        self.log_level = log_level
         self._variables_processor = VariablesProcessor(self._needs_update)
 
     def _process_configuration(self, project_and_group: str, configuration: Dict[str, Any]) -> None:
@@ -65,12 +67,14 @@ class ProjectVariablesProcessor(AbstractProcessor):
                 variables_list.append(var_dict)
 
             info(f"Variables for {project_and_group} in GitLab:")
-            info(
-                textwrap.indent(
-                    ez_yaml.to_string(variables_list),
-                    "  ",
+            if self.log_level == INFO:
+                yaml = util.yaml_config_to_string(variables_list)
+                info(
+                    textwrap.indent(
+                        yaml,
+                        "  ",
+                    )
                 )
-            )
         except GitlabGetError:
             info(f"Variables for {project_and_group} in GitLab cannot be checked.")
 
@@ -86,9 +90,11 @@ class ProjectVariablesProcessor(AbstractProcessor):
         for key in configured_variables.keys():
             configured_variables[key]["value"] = hide(configured_variables[key]["value"])
 
-        info(
-            textwrap.indent(
-                ez_yaml.to_string(configured_variables),
-                "  ",
+        if self.log_level == INFO:
+            yaml = util.yaml_config_to_string(configured_variables)
+            info(
+                textwrap.indent(
+                    "",
+                    "  ",
+                )
             )
-        )

gitlabform-6.0.0/gitlabform/util.py

@@ -0,0 +1,47 @@
+import json
+from io import StringIO
+
+from ruamel.yaml import YAML
+
+
+def to_str(a_dict: dict) -> str:
+    # arguably the most readable form of a dict in a single line
+    # is JSON with sorted keys
+    return json.dumps(a_dict, sort_keys=True, default=str)
+
+
+def yaml_config_to_string(yaml) -> str:
+    """
+    Provides a convenience wrapper around ruamel.yaml to output to a string
+    ez_yaml used to perform this task but in v2.2 they seem to have over complicated the implementation and it is
+    breaking in ruamel.yaml when parsing the yaml, with no way for us to configure it.
+    We can provide a simple native implementation around ruamel.yaml to configure it consistently.
+    :param yaml:
+    :return:
+    """
+    yaml_loader = configure_ruamel_yaml_loader()
+
+    # dump to StringIO
+    string_stream = StringIO()
+    yaml_loader.dump(yaml, string_stream)
+    config_yaml_string = string_stream.getvalue()
+    string_stream.close()
+
+    return config_yaml_string
+
+
+def configure_ruamel_yaml_loader(typ=None, pure=False, output=None, plug_ins=None) -> YAML:
+    """
+    Takes inputs matching ruamel.yaml __init__ and configures with indentation, duplicate key allowance and null representor
+    :return: instance of ruamel.yaml
+    """
+    yaml_loader = YAML(typ=typ, pure=pure, output=output, plug_ins=plug_ins)
+    yaml_loader.indent(mapping=3, sequence=2, offset=0)
+    yaml_loader.allow_duplicate_keys = True
+    yaml_loader.explicit_start = False
+    # show null
+    yaml_loader.representer.add_representer(
+        type(None),
+        lambda self, data: self.represent_scalar("tag:yaml.org,2002:null", "null"),
+    )
+    return yaml_loader

{gitlabform-5.5.6 → gitlabform-6.0.0}/pyproject.toml

@@ -10,7 +10,7 @@ packages = ["gitlabform"]
 
 [project]
 name = "gitlabform"
-version = "5.5.6"
+version = "6.0.0"
 requires-python = ">=3.12.0"
 authors = [{ name = "Greg Dubicki and Contributors" }]
 description = "🏗 Specialized configuration as a code tool for GitLab projects, groups and more using hierarchical configuration written in YAML"
@@ -33,8 +33,6 @@ classifiers = [
 dependencies = [
     "certifi==2026.5.20",
     "cli-ui==0.19.0",
-    # ez_yaml >1.2.0 changes imports and also uses ruamel.yaml tied to 1.2 so wouldn't support "yes" as True
-    "ez-yaml==1.2.0",
     "jinja2==3.1.6",
     "luddite==1.0.4",
     "markupsafe==3.0.3",
@@ -43,11 +41,8 @@ dependencies = [
     "python-gitlab[graphql]==8.4.0",
     "requests==2.34.2",
     "rich==15.0.0",
-    # yamlpath and ruamel and tightly coupled, currently 0.19.1 of ruamel and 3.9.0 of yamlpath break support for
-    # yaml 1.1 "yes" -> True conversion. If we want to upgrade we'd need to make a breaking-change and drop support for
-    # unannotated yaml 1.1
-    "ruamel.yaml==0.17.21",
-    "yamlpath==3.8.2",
+    "ruamel.yaml==0.19.1",
+    "yamlpath==3.9.1",
 ]
 
 # PEP 735 Dependency Groups.
@@ -65,7 +60,6 @@ dev = [
 test = [
     "coverage==7.14.1",
     "cryptography==49.0.0",
-    "deepdiff==9.1.0",
     "pytest==9.1.0",
     "pytest-cov==7.1.0",
     "pytest-rerunfailures==16.3",

{gitlabform-5.5.6 → gitlabform-6.0.0}/tbump.toml

@@ -2,7 +2,7 @@
 github_url = "https://github.com/gitlabform/gitlabform/"
 
 [version]
-current = "5.5.6"
+current = "6.0.0"
 
 # Example of a semver regexp.
 # Make sure this matches current_version before

{gitlabform-5.5.6 → gitlabform-6.0.0}/tests/acceptance/standard/test_files_templates.py

@@ -81,7 +81,7 @@ class TestFilesTemplates:
               "README.md":
                 overwrite: true
                 branches: all
-                template: no
+                template: false
                 content: |
                   This is a text containing literals: {{{{ group }}}}/{{{{ project }}}}
         """

gitlabform-6.0.0/tests/unit/configuration/test_yaml_version.py

@@ -0,0 +1,63 @@
+import pytest
+
+from gitlabform.configuration import Configuration
+
+
+@pytest.fixture
+def yaml11_configuration_with_yes():
+    config_yaml = """
+    ---
+    projects_and_groups:
+      some_group/*:
+        project_settings:
+          foo: yes          # in YAML 1.1 this should be interpreted as boolean true
+    """
+    return Configuration(config_string=config_yaml)
+
+
+@pytest.fixture
+def yaml12_configuration():
+    config_yaml = """
+    %YAML 1.2
+    ---
+    projects_and_groups:
+      some_group/*:
+        project_settings:
+          foo: true
+    """
+    return Configuration(config_string=config_yaml)
+
+
+@pytest.fixture
+def yaml11_annotated_configuration_with_yes():
+    config_yaml = """
+    %YAML 1.1
+    ---
+    projects_and_groups:
+      some_group/*:
+        project_settings:
+          foo: yes          # in YAML 1.1 this should be interpreted as boolean true
+    """
+    return Configuration(config_string=config_yaml)
+
+
+def test__unannotated_yaml_11(yaml11_configuration_with_yes):
+    """
+    By default, in v6.+ we use YAML 1.2, so the "yes" value is not interpreted as a boolean.
+    This test validates that without annotation, the YAML file is treated as v1.2, and "yes" is just a string, not a boolean.
+    """
+    assert yaml11_configuration_with_yes.get("projects_and_groups|some_group/*|project_settings") == {"foo": "yes"}
+
+
+def test__annotated_yaml_11(yaml11_annotated_configuration_with_yes):
+    """
+    By default, in v6.+ we use YAML 1.2, so the "yes" value is not interpreted as a boolean, unless annotated as such.
+    This test validates the annotation can correctly set a YAML file to v1.1
+    """
+    assert yaml11_annotated_configuration_with_yes.get("projects_and_groups|some_group/*|project_settings") == {
+        "foo": True
+    }
+
+
+def test__yaml_12(yaml12_configuration):
+    assert yaml12_configuration.get("projects_and_groups|some_group/*|project_settings") == {"foo": True}

{gitlabform-5.5.6 → gitlabform-6.0.0}/tests/unit/configuration/transform/test_access_level_transformer.py

@@ -1,11 +1,6 @@
-from unittest import TestCase
-
-import ez_yaml
 import pytest
-from deepdiff import DeepDiff
 from unittest.mock import MagicMock
 
-from gitlabform.constants import APPROVAL_RULE_NAME
 from gitlabform import EXIT_INVALID_INPUT
 from gitlabform.configuration import Configuration
 from gitlabform.configuration.transform import (
@@ -86,8 +81,7 @@ def test__config__with_access_level_names__branches():
     """
     configuration_with_numbers = Configuration(config_string=config_with_numbers)
 
-    ddiff = DeepDiff(configuration.config, configuration_with_numbers.config)
-    assert not ddiff
+    assert configuration.config == configuration_with_numbers.config
 
 
 def test__config__with_access_level_names__group_ldap_links():
@@ -128,8 +122,7 @@ def test__config__with_access_level_names__group_ldap_links():
     """
     configuration_with_numbers = Configuration(config_string=config_with_numbers)
 
-    ddiff = DeepDiff(configuration.config, configuration_with_numbers.config)
-    assert not ddiff
+    assert configuration_with_numbers.config == configuration_with_numbers.config
 
 
 def test__config__with_access_level_names__branches_premium_syntax():
@@ -174,8 +167,7 @@ def test__config__with_access_level_names__branches_premium_syntax():
     """
     configuration_with_numbers = Configuration(config_string=config_with_numbers)
 
-    ddiff = DeepDiff(configuration.config, configuration_with_numbers.config)
-    assert not ddiff
+    assert configuration.config == configuration_with_numbers.config
 
 
 def test__config__with_access_level_names__invalid_name():

{gitlabform-5.5.6 → gitlabform-6.0.0}/tests/unit/configuration/transform/test_group_transformer.py

@@ -1,4 +1,3 @@
-from deepdiff import DeepDiff
 from unittest.mock import MagicMock
 
 from gitlabform.configuration import Configuration
@@ -29,10 +28,6 @@ def test__transform_for_merge_request_approvals() -> None:
 
     assert gitlab_mock._get_group_id.call_count == 1
 
-    # effective_config_yaml_str = ez_yaml.to_string(obj=configuration.config, options={})
-    # print("!!!")
-    # print(effective_config_yaml_str)
-
     expected_transformed_config_yaml = f"""
     projects_and_groups:
       "foo/bar":
@@ -45,6 +40,5 @@ def test__transform_for_merge_request_approvals() -> None:
     """
 
     expected_transformed_config = Configuration(config_string=expected_transformed_config_yaml)
-    transformer.convert_to_simple_types(expected_transformed_config)
 
-    assert not DeepDiff(configuration.config, expected_transformed_config.config)
+    assert configuration.config == expected_transformed_config.config

{gitlabform-5.5.6 → gitlabform-6.0.0}/tests/unit/configuration/transform/test_implicit_name_transformer.py

@@ -1,4 +1,3 @@
-from deepdiff import DeepDiff
 from unittest.mock import MagicMock
 
 from gitlabform.configuration import Configuration
@@ -31,7 +30,7 @@ def test__transform_for_protected_environments():
 
     expected_transformed_config = Configuration(config_string=expected_transformed_config_yaml)
 
-    assert not DeepDiff(configuration.config, expected_transformed_config.config)
+    assert configuration.config == expected_transformed_config.config
 
 
 def test__transform_for_protected_environments_sanity_check():
@@ -47,4 +46,4 @@ def test__transform_for_protected_environments_sanity_check():
 
     expected_transformed_config = Configuration(config_string=expected_transformed_config_yaml)
 
-    assert DeepDiff(configuration.config, expected_transformed_config.config)
+    assert configuration.config != expected_transformed_config.config

{gitlabform-5.5.6 → gitlabform-6.0.0}/tests/unit/configuration/transform/test_user_and_group_transformers.py

@@ -1,6 +1,3 @@
-import ez_yaml
-from deepdiff import DeepDiff
-from pprint import pprint
 from unittest.mock import MagicMock
 
 from gitlabform.configuration import Configuration
@@ -35,7 +32,6 @@ def test__transform_for_merge_request_approvals() -> None:
     gitlab_mock = MagicMock(GitLab)
     gitlab_mock._get_group_id = MagicMock(side_effect=[1])
     gitlab_mock._get_user_id = MagicMock(side_effect=[2])
-    # gitlab_mock._get_branch_id = MagicMock(side_effect=[3])
 
     ut = UserTransformer(gitlab_mock)
     ut.transform(configuration)
@@ -43,13 +39,6 @@ def test__transform_for_merge_request_approvals() -> None:
     gt = GroupTransformer(gitlab_mock)
     gt.transform(configuration, last=True)
 
-    # ut = UserTransformer(gitlab_mock)
-    # ut.transform(configuration)
-
-    effective_config_yaml_str = ez_yaml.to_string(obj=configuration.config, options={})
-    print("!!!BEFORE:")
-    print(effective_config_yaml_str)
-
     expected_transformed_config_yaml = f"""
     projects_and_groups:
 
@@ -70,11 +59,4 @@ def test__transform_for_merge_request_approvals() -> None:
 
     expected_transformed_config = Configuration(config_string=expected_transformed_config_yaml)
 
-    ut.convert_to_simple_types(expected_transformed_config)
-
-    effective_config_yaml_str = ez_yaml.to_string(obj=expected_transformed_config.config, options={})
-    print("!!!After:")
-    print(effective_config_yaml_str)
-
-    difference = DeepDiff(configuration.config, expected_transformed_config.config)
-    assert not difference
+    assert configuration.config == expected_transformed_config.config