Change package name to prevent conflicts

homebysix · homebysix · commit ede768380218 · 2025-09-20T16:00:20.000-07:00
Resolves #78
diff --git a/pre_commit_macadmin_hooks/__init__.py b/pre_commit_macadmin_hooks/__init__.py
diff --git a/pre_commit_macadmin_hooks/check_autopkg_recipe_list.py b/pre_commit_macadmin_hooks/check_autopkg_recipe_list.py
diff --git a/pre_commit_macadmin_hooks/check_autopkg_recipes.py b/pre_commit_macadmin_hooks/check_autopkg_recipes.py
@@ -10,7 +10,7 @@
 
 from packaging.version import Version
 
-from pre_commit_hooks.util import (
+from pre_commit_macadmin_hooks.util import (
     detect_deprecated_keys,
     detect_typoed_keys,
     load_autopkg_recipe,
diff --git a/pre_commit_macadmin_hooks/check_git_config_email.py b/pre_commit_macadmin_hooks/check_git_config_email.py
diff --git a/pre_commit_macadmin_hooks/check_jamf_extension_attributes.py b/pre_commit_macadmin_hooks/check_jamf_extension_attributes.py
@@ -5,7 +5,7 @@
 import re
 from typing import List, Optional
 
-from pre_commit_hooks.util import validate_shebangs
+from pre_commit_macadmin_hooks.util import validate_shebangs
 
 
 def build_argument_parser() -> argparse.ArgumentParser:
diff --git a/pre_commit_macadmin_hooks/check_jamf_json_manifests.py b/pre_commit_macadmin_hooks/check_jamf_json_manifests.py
@@ -10,7 +10,7 @@
 from datetime import datetime
 from typing import Any, Dict, List, Optional, Tuple
 
-from pre_commit_hooks.util import validate_required_keys
+from pre_commit_macadmin_hooks.util import validate_required_keys
 
 # Types found in the Jamf JSON manifests
 MANIFEST_TYPES = {
diff --git a/pre_commit_macadmin_hooks/check_jamf_profiles.py b/pre_commit_macadmin_hooks/check_jamf_profiles.py
diff --git a/pre_commit_macadmin_hooks/check_jamf_scripts.py b/pre_commit_macadmin_hooks/check_jamf_scripts.py
@@ -4,7 +4,7 @@
 import argparse
 from typing import List, Optional
 
-from pre_commit_hooks.util import validate_shebangs
+from pre_commit_macadmin_hooks.util import validate_shebangs
 
 
 def build_argument_parser() -> argparse.ArgumentParser:
diff --git a/pre_commit_macadmin_hooks/check_munki_pkgsinfo.py b/pre_commit_macadmin_hooks/check_munki_pkgsinfo.py
@@ -8,7 +8,7 @@
 from typing import List, Optional
 from xml.parsers.expat import ExpatError
 
-from pre_commit_hooks.util import (
+from pre_commit_macadmin_hooks.util import (
     detect_deprecated_keys,
     detect_typoed_keys,
     validate_pkginfo_key_types,
diff --git a/pre_commit_macadmin_hooks/check_munkiadmin_scripts.py b/pre_commit_macadmin_hooks/check_munkiadmin_scripts.py
@@ -5,7 +5,7 @@
 import os
 from typing import List, Optional
 
-from pre_commit_hooks.util import validate_shebangs
+from pre_commit_macadmin_hooks.util import validate_shebangs
 
 
 def build_argument_parser() -> argparse.ArgumentParser:
diff --git a/pre_commit_macadmin_hooks/check_munkipkg_buildinfo.py b/pre_commit_macadmin_hooks/check_munkipkg_buildinfo.py
@@ -9,7 +9,7 @@
 
 import ruamel.yaml
 
-from pre_commit_hooks.util import validate_required_keys
+from pre_commit_macadmin_hooks.util import validate_required_keys
 
 yaml = ruamel.yaml.YAML(typ="safe")
 
diff --git a/pre_commit_macadmin_hooks/check_outset_scripts.py b/pre_commit_macadmin_hooks/check_outset_scripts.py
@@ -5,7 +5,7 @@
 import os
 from typing import List, Optional
 
-from pre_commit_hooks.util import validate_shebangs
+from pre_commit_macadmin_hooks.util import validate_shebangs
 
 
 def build_argument_parser() -> argparse.ArgumentParser:
diff --git a/pre_commit_macadmin_hooks/check_plists.py b/pre_commit_macadmin_hooks/check_plists.py
diff --git a/pre_commit_macadmin_hooks/check_preference_manifests.py b/pre_commit_macadmin_hooks/check_preference_manifests.py
@@ -12,7 +12,7 @@
 from typing import Any, Dict, List, Optional, Tuple
 from xml.parsers.expat import ExpatError
 
-from pre_commit_hooks.util import PLIST_TYPES
+from pre_commit_macadmin_hooks.util import PLIST_TYPES
 
 # List keys and their expected item types
 PFM_LIST_TYPES = {
diff --git a/pre_commit_macadmin_hooks/forbid_autopkg_overrides.py b/pre_commit_macadmin_hooks/forbid_autopkg_overrides.py
@@ -4,7 +4,7 @@
 import argparse
 from typing import List, Optional
 
-from pre_commit_hooks.util import load_autopkg_recipe
+from pre_commit_macadmin_hooks.util import load_autopkg_recipe
 
 
 def build_argument_parser() -> argparse.ArgumentParser:
diff --git a/pre_commit_macadmin_hooks/forbid_autopkg_trust_info.py b/pre_commit_macadmin_hooks/forbid_autopkg_trust_info.py
@@ -5,7 +5,7 @@
 import argparse
 from typing import List, Optional
 
-from pre_commit_hooks.util import load_autopkg_recipe
+from pre_commit_macadmin_hooks.util import load_autopkg_recipe
 
 
 def build_argument_parser() -> argparse.ArgumentParser:
diff --git a/pre_commit_macadmin_hooks/munki_makecatalogs.py b/pre_commit_macadmin_hooks/munki_makecatalogs.py
diff --git a/pre_commit_macadmin_hooks/util.py b/pre_commit_macadmin_hooks/util.py
diff --git a/setup.py b/setup.py
@@ -9,26 +9,26 @@
     version="1.20.0",
     author="Elliot Jordan",
     author_email="elliot@elliotjordan.com",
-    packages=["pre_commit_hooks"],
+    packages=["pre_commit_macadmin_hooks"],
     install_requires=["ruamel.yaml>=0.15", "packaging>=23.2"],
     entry_points={
         "console_scripts": [
-            "check-autopkg-recipe-list = pre_commit_hooks.check_autopkg_recipe_list:main",
-            "check-autopkg-recipes = pre_commit_hooks.check_autopkg_recipes:main",
-            "check-git-config-email = pre_commit_hooks.check_git_config_email:main",
-            "check-jamf-extension-attributes = pre_commit_hooks.check_jamf_extension_attributes:main",
-            # "check-jamf-json-manifests = pre_commit_hooks.check_jamf_json_manifests:main",
-            "check-jamf-profiles = pre_commit_hooks.check_jamf_profiles:main",
-            "check-jamf-scripts = pre_commit_hooks.check_jamf_scripts:main",
-            "check-munki-pkgsinfo = pre_commit_hooks.check_munki_pkgsinfo:main",
-            "check-munkiadmin-scripts = pre_commit_hooks.check_munkiadmin_scripts:main",
-            "check-munkipkg-buildinfo = pre_commit_hooks.check_munkipkg_buildinfo:main",
-            "check-outset-scripts = pre_commit_hooks.check_outset_scripts:main",
-            "check-plists = pre_commit_hooks.check_plists:main",
-            "check-preference-manifests = pre_commit_hooks.check_preference_manifests:main",
-            "forbid-autopkg-overrides = pre_commit_hooks.forbid_autopkg_overrides:main",
-            "forbid-autopkg-trust-info = pre_commit_hooks.forbid_autopkg_trust_info:main",
-            "munki-makecatalogs = pre_commit_hooks.munki_makecatalogs:main",
+            "check-autopkg-recipe-list = pre_commit_macadmin_hooks.check_autopkg_recipe_list:main",
+            "check-autopkg-recipes = pre_commit_macadmin_hooks.check_autopkg_recipes:main",
+            "check-git-config-email = pre_commit_macadmin_hooks.check_git_config_email:main",
+            "check-jamf-extension-attributes = pre_commit_macadmin_hooks.check_jamf_extension_attributes:main",
+            # "check-jamf-json-manifests = pre_commit_macadmin_hooks.check_jamf_json_manifests:main",
+            "check-jamf-profiles = pre_commit_macadmin_hooks.check_jamf_profiles:main",
+            "check-jamf-scripts = pre_commit_macadmin_hooks.check_jamf_scripts:main",
+            "check-munki-pkgsinfo = pre_commit_macadmin_hooks.check_munki_pkgsinfo:main",
+            "check-munkiadmin-scripts = pre_commit_macadmin_hooks.check_munkiadmin_scripts:main",
+            "check-munkipkg-buildinfo = pre_commit_macadmin_hooks.check_munkipkg_buildinfo:main",
+            "check-outset-scripts = pre_commit_macadmin_hooks.check_outset_scripts:main",
+            "check-plists = pre_commit_macadmin_hooks.check_plists:main",
+            "check-preference-manifests = pre_commit_macadmin_hooks.check_preference_manifests:main",
+            "forbid-autopkg-overrides = pre_commit_macadmin_hooks.forbid_autopkg_overrides:main",
+            "forbid-autopkg-trust-info = pre_commit_macadmin_hooks.forbid_autopkg_trust_info:main",
+            "munki-makecatalogs = pre_commit_macadmin_hooks.munki_makecatalogs:main",
         ]
     },
 )
diff --git a/tests/test_check_autopkg_recipe_list.py b/tests/test_check_autopkg_recipe_list.py
@@ -9,7 +9,7 @@
 import tempfile
 import unittest
 
-import pre_commit_hooks.check_autopkg_recipe_list as target
+import pre_commit_macadmin_hooks.check_autopkg_recipe_list as target
 
 
 class TestCheckAutopkgRecipeList(unittest.TestCase):
diff --git a/tests/test_check_autopkg_recipes.py b/tests/test_check_autopkg_recipes.py
@@ -3,7 +3,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_autopkg_recipes as target
+import pre_commit_macadmin_hooks.check_autopkg_recipes as target
 
 
 class TestCheckAutopkgRecipes(unittest.TestCase):
diff --git a/tests/test_check_git_config_email.py b/tests/test_check_git_config_email.py
@@ -1,7 +1,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_git_config_email as target
+import pre_commit_macadmin_hooks.check_git_config_email as target
 
 
 class TestCheckGitConfigEmail(unittest.TestCase):
diff --git a/tests/test_check_jamf_extension_attributes.py b/tests/test_check_jamf_extension_attributes.py
@@ -3,7 +3,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_jamf_extension_attributes as target
+import pre_commit_macadmin_hooks.check_jamf_extension_attributes as target
 
 
 class TestCheckJamfExtensionAttributes(unittest.TestCase):
diff --git a/tests/test_check_jamf_json_manifests.py b/tests/test_check_jamf_json_manifests.py
@@ -1,6 +1,6 @@
 import unittest
 
-# import pre_commit_hooks.check_jamf_json_manifests as target
+# import pre_commit_macadmin_hooks.check_jamf_json_manifests as target
 
 
 class TestCheckJamfJsonManifests(unittest.TestCase):
diff --git a/tests/test_check_jamf_profiles.py b/tests/test_check_jamf_profiles.py
@@ -3,7 +3,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_jamf_profiles as target
+import pre_commit_macadmin_hooks.check_jamf_profiles as target
 
 
 class TestCheckJamfProfiles(unittest.TestCase):
diff --git a/tests/test_check_jamf_scripts.py b/tests/test_check_jamf_scripts.py
@@ -3,7 +3,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_jamf_scripts as target
+import pre_commit_macadmin_hooks.check_jamf_scripts as target
 
 
 class TestCheckJamfScripts(unittest.TestCase):
diff --git a/tests/test_check_munki_pkgsinfo.py b/tests/test_check_munki_pkgsinfo.py
@@ -4,7 +4,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_munki_pkgsinfo as target
+import pre_commit_macadmin_hooks.check_munki_pkgsinfo as target
 
 
 class TestCheckMunkiPkgsinfo(unittest.TestCase):
diff --git a/tests/test_check_munkiadmin_scripts.py b/tests/test_check_munkiadmin_scripts.py
@@ -3,7 +3,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_munkiadmin_scripts as target
+import pre_commit_macadmin_hooks.check_munkiadmin_scripts as target
 
 
 class TestCheckMunkiadminScripts(unittest.TestCase):
diff --git a/tests/test_check_munkipkg_buildinfo.py b/tests/test_check_munkipkg_buildinfo.py
@@ -7,7 +7,7 @@
 
 import ruamel.yaml
 
-import pre_commit_hooks.check_munkipkg_buildinfo as target
+import pre_commit_macadmin_hooks.check_munkipkg_buildinfo as target
 
 
 class TestCheckMunkiPkgBuildinfo(unittest.TestCase):
diff --git a/tests/test_check_outset_scripts.py b/tests/test_check_outset_scripts.py
@@ -4,7 +4,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_outset_scripts as target
+import pre_commit_macadmin_hooks.check_outset_scripts as target
 
 
 class TestCheckOutsetScripts(unittest.TestCase):
diff --git a/tests/test_check_plists.py b/tests/test_check_plists.py
@@ -4,7 +4,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_plists as target
+import pre_commit_macadmin_hooks.check_plists as target
 
 
 class TestCheckPlists(unittest.TestCase):
diff --git a/tests/test_check_preference_manifests.py b/tests/test_check_preference_manifests.py
@@ -5,7 +5,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.check_preference_manifests as target
+import pre_commit_macadmin_hooks.check_preference_manifests as target
 
 
 class TestCheckPreferenceManifests(unittest.TestCase):
diff --git a/tests/test_forbid_autopkg_overrides.py b/tests/test_forbid_autopkg_overrides.py
@@ -4,7 +4,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.forbid_autopkg_overrides as target
+import pre_commit_macadmin_hooks.forbid_autopkg_overrides as target
 
 
 class TestForbidAutoPkgOverrides(unittest.TestCase):
diff --git a/tests/test_forbid_autopkg_trust_info.py b/tests/test_forbid_autopkg_trust_info.py
@@ -1,7 +1,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.forbid_autopkg_trust_info as target
+import pre_commit_macadmin_hooks.forbid_autopkg_trust_info as target
 
 
 class TestForbidAutoPkgTrustInfo(unittest.TestCase):
diff --git a/tests/test_munki_makecatalogs.py b/tests/test_munki_makecatalogs.py
@@ -2,7 +2,7 @@
 import unittest
 from unittest import mock
 
-import pre_commit_hooks.munki_makecatalogs as target
+import pre_commit_macadmin_hooks.munki_makecatalogs as target
 
 
 class TestMunkiMakecatalogs(unittest.TestCase):
diff --git a/tests/test_util.py b/tests/test_util.py
@@ -9,7 +9,7 @@
 import tempfile
 import unittest
 
-from pre_commit_hooks.util import (
+from pre_commit_macadmin_hooks.util import (
     detect_deprecated_keys,
     detect_typoed_keys,
     load_autopkg_recipe,
