[FR] Bundle KQL & Kibana libs into base dependencies

.github/workflows/backport.yml

@@ -99,7 +99,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install .[dev]
-          pip install lib/kql lib/kibana
 
       - name: Prune non-${{matrix.target_branch}} rules
         env:

.github/workflows/get-target-branches.yml

@@ -26,7 +26,6 @@ jobs:
           python -m pip install --upgrade pip
           pip cache purge
           pip install .[dev]
-          pip install lib/kql lib/kibana
 
       - id: get-branch-list
         run: |

.github/workflows/lock-versions.yml

@@ -36,7 +36,6 @@ jobs:
           python -m pip install --upgrade pip
           pip cache purge
           pip install .[dev]
-          pip install lib/kql lib/kibana
 
       - name: Build release package
         run: |

.github/workflows/manual-backport.yml

@@ -55,7 +55,6 @@ jobs:
           python -m pip install --upgrade pip
           pip cache purge
           pip install .[dev]
-          pip install lib/kql lib/kibana
 
       - name: Prune non-"${{github.event.inputs.target_branch}}" rules
         env:

.github/workflows/pythonpackage.yml

@@ -24,7 +24,6 @@ jobs:
         python -m pip install --upgrade pip
         pip cache purge
         pip install .[dev]
-        pip install lib/kql lib/kibana
 
     - name: Python Lint
       run: |

.github/workflows/release-docs.yml

@@ -48,7 +48,6 @@ jobs:
           python -m pip install --upgrade pip
           pip cache purge
           pip install .[dev]
-          pip install lib/kql lib/kibana
 
       - name: Build Integration Docs
         env:

.github/workflows/release-fleet.yml

@@ -84,7 +84,6 @@ jobs:
             python -m pip install --upgrade pip
             pip cache purge
             pip install .[dev]
-            pip install lib/kql lib/kibana
 
         - name: Bump prebuilt rules package version
           env:

Makefile

@@ -20,15 +20,10 @@ clean:
 	rm -rf $(VENV) *.egg-info .eggs .egg htmlcov build dist packages .build .tmp .tox __pycache__  lib/kql/build lib/kibana/build lib/kql/*.egg-info lib/kibana/*.egg-info
 
 .PHONY: deps
-deps: $(VENV) install-packages
+deps: $(VENV)
 	@echo "Installing all dependencies..."
 	$(PIP) install .[dev]
 
-.PHONY: install-packages
-install-packages:
-	@echo "Installing kql and kibana packages..."
-	$(PIP) install lib/kql lib/kibana
-
 .PHONY: pytest
 pytest: $(VENV) deps
 	$(PYTHON) -m detection_rules test

README.md

@@ -76,16 +76,17 @@ Collecting Click==7.0
   Downloading Click-7.0-py2.py3-none-any.whl (81 kB)
      |████████████████████████████████| 81 kB 2.6 MB/s
 ...
-pip3 install packages/kibana packages/kql
 ```
 
-Note: The `kibana` and `kql` packages are not available on PyPI and must be installed from the `packages` directory or `git`.
+Note: The `kibana` and `kql` packages are not available on PyPI and must be installed from the `lib` directory.
 
 ```console
+
+# Install from the repository
 pip3 install git+https://github.com/elastic/detection-rules.git#subdirectory=kibana
 pip3 install git+https://github.com/elastic/detection-rules.git#subdirectory=kql
 
-# or locally
+# Or locally for development
 pip3 install lib/kibana lib/kql
 ```
 

pyproject.toml

@@ -37,7 +37,9 @@ dependencies = [
 	"typing-inspect==0.9.0",
 	"typing-extensions==4.10.0",
 	"XlsxWriter~=3.2.0",
-	"semver==3.0.2"
+	"semver==3.0.2",
+	"detection-rules-kql @ git+https://github.com/elastic/detection-rules.git#subdirectory=lib/kql",
+	"detection-rules-kibana @ git+https://github.com/elastic/detection-rules.git#subdirectory=lib/kibana"
 ]
 [project.optional-dependencies]
 dev = ["pep8-naming==0.13.0", "PyGithub==2.2.0", "flake8==7.0.0", "pyflakes==3.2.0", "pytest>=8.1.1", "pre-commit==3.6.2"]