Revert ansible-compat vendoring (#3478)

ansible · May 22, 2023 · 8edd021 · 8edd021
1 parent 2fa3858
commit 8edd021
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 67 deletions.
diff --git a/.config/requirements-lock.txt b/.config/requirements-lock.txt
@@ -4,6 +4,7 @@
 #
 #    pip-compile --no-annotate --output-file=.config/requirements-lock.txt --resolver=backtracking --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml
 #
+ansible-compat==4.0.5
 ansible-core==2.15.0
 attrs==23.1.0
 black==23.3.0

diff --git a/.config/requirements.in b/.config/requirements.in
@@ -1,6 +1,7 @@
 # Special order section for helping pip:
 will-not-work-on-windows-try-from-wsl-instead; platform_system=='Windows'
 ansible-core>=2.12.0 # GPLv3
+ansible-compat>=4.0.5 # GPLv3
 # alphabetically sorted:
 black>=22.8.0 # MIT
 filelock>=3.3.0 # The Unlicense

diff --git a/.config/requirements.txt b/.config/requirements.txt
@@ -4,6 +4,7 @@
 #
 #    pip-compile --extra=docs --extra=test --no-annotate --output-file=.config/requirements.txt --resolver=backtracking --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml
 #
+ansible-compat==4.0.5
 ansible-core==2.15.0
 astroid==2.15.5
 attrs==23.1.0

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule ".projects/ansible-compat"]
-	path = .projects/ansible-compat
-	url = https://github.com/ansible/ansible-compat

diff --git a/.projects/ansible-compat b/.projects/ansible-compat
diff --git a/pyproject.toml b/pyproject.toml
@@ -71,7 +71,7 @@ source = ["src", ".tox/*/site-packages"]
 
 [tool.coverage.report]
 exclude_lines = ["pragma: no cover", "if TYPE_CHECKING:"]
-omit = ["*/src/*/_vendor/*", "test/*"]
+omit = ["test/*"]
 # Increase it just so it would pass on any single-python run
 fail_under = 93
 skip_covered = true
@@ -137,7 +137,7 @@ bad-names = [
 # pylint defaults + f,fh,v,id
 good-names = ["i", "j", "k", "Run", "_", "f", "fh", "v", "id", "T"]
 # Ignore as being generated:
-ignore-paths = "^src/ansiblelint/(_version|_vendor).*$"
+ignore-paths = "^src/ansiblelint/_version.*$"
 
 [tool.pylint."MESSAGES CONTROL"]
 # increase from default is 50 which is too aggressive
@@ -199,7 +199,6 @@ norecursedirs = [
   "collections",
   "dist",
   "docs",
-  "src/ansiblelint/_vendor",
   "src/ansible_lint.egg-info",
   ".cache",
   ".eggs",

diff --git a/src/ansiblelint/__init__.py b/src/ansiblelint/__init__.py
@@ -20,10 +20,6 @@
 """Main ansible-lint package."""
 from __future__ import annotations
 
-import ansiblelint._vendor  # noqa: F401
 from ansiblelint.version import __version__
 
-# make vendored top-level modules accessible EARLY
-
-
 __all__ = ("__version__",)
diff --git a/src/ansiblelint/_vendor/__init__.py b/src/ansiblelint/_vendor/__init__.py
diff --git a/src/ansiblelint/_vendor/ansible_compat b/src/ansiblelint/_vendor/ansible_compat
diff --git a/test/schemas/package-lock.json b/test/schemas/package-lock.json
diff --git a/test/schemas/package.json b/test/schemas/package.json
@@ -16,7 +16,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/minimatch": "^5.1.2",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.2.1",
+    "@types/node": "^20.2.3",
     "chai": "^4.3.7",
     "minimatch": "^9.0.1",
     "mocha": "^10.2.0",

diff --git a/tox.ini b/tox.ini
@@ -19,6 +19,7 @@ description =
   devel: ansible devel branch
 deps =
   devel: ansible-core @ git+https://github.com/ansible/ansible.git  # GPLv3+
+  devel: ansible-compat @ git+https://github.com/ansible/ansible-compat.git  # GPLv3+
 extras =
   test
 commands_pre =