Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ci in 8.16 #2944

Merged
merged 1 commit into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/actions/hermit/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ runs:
name: Install poetry
shell: bash
run: pip3 install poetry
- if: ${{ inputs.init-tools == 'true' }}
name: Install poetry-plugin-export
shell: bash
run: pip3 install poetry-plugin-export
- if: ${{ inputs.init-tools == 'true' }}
name: Install tests poetry dependencies
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ repos:
args: ["--profile", "black"]

- repo: https://github.com/psf/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black

Expand Down Expand Up @@ -155,7 +155,7 @@ repos:
name: Update rule status
description: Update rule status in rules_table.md
require_serial: true
entry: poetry run -C security-policies python security-policies/dev/update_rule_status.py
entry: poetry run -C security-policies python dev/update_rule_status.py
pass_filenames: false
language: system
files: (.*\.rego|tests\/product\/.*\.py)$
Expand All @@ -164,7 +164,7 @@ repos:
name: Update rule metadata
description: Update rule status in rules_table.md
require_serial: true
entry: poetry run -C security-policies python security-policies/dev/generate_rule_metadata.py
entry: poetry run -C security-policies python dev/generate_rule_metadata.py
pass_filenames: false
language: system
files: (\.rego)$
Expand Down
2 changes: 1 addition & 1 deletion scripts/sync_rule_templates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fi

# generate the rule templates
cd ../cloudbeat
poetry run -C security-policies python security-policies/dev/generate_rule_templates.py
poetry run -C security-policies python dev/generate_rule_templates.py

# commit and push the changes
cd ../integrations
Expand Down
38 changes: 34 additions & 4 deletions security-policies/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 22 additions & 20 deletions security-policies/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
[tool.poetry]
[project]
name = "security-policies"
version = "0.1.0"
description = ""
authors = ["oren zohar <[email protected]>"]

[tool.poetry.dependencies]
python = "^3.11"
pandas = "^1.5.2"
GitPython = "^3.1.41"
openpyxl = "^3.0.10"
tabulate = "^0.9.0"
numpy = "^1.23.5"
Jinja2 = "^3.1.4"
regex = "^2022.10.31"
"ruamel.yaml" = "^0.17.21"
PyYAML = "^6.0"
pytest = "^7.4.4"
allure-python-commons = "^2.13.2"
munch = "^4.0.0"
loguru = "^0.7.2"

[tool.poetry.dev-dependencies]
authors = [
{name ="oren zohar", email = "[email protected]"}
]
requires-python = ">=3.11"
dependencies = [
"pandas >= 1.5.2",
"GitPython >= 3.1.41",
"openpyxl >= 3.0.10",
"tabulate >= 0.9.0",
"numpy >= 1.23.5",
"Jinja2 >= 3.1.4",
"regex >= 2022.10.31",
"ruamel.yaml >= 0.17.21",
"PyYAML >= 6.0",
"pytest >= 7.4.4",
"allure-python-commons >= 2.13.2",
"munch >= 4.0.0",
"loguru >= 0.7.2",
]

[tool.poetry]
package-mode = false

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
2 changes: 2 additions & 0 deletions tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ WORKDIR /usr/src/app

RUN pip install poetry

RUN pip install poetry-plugin-export

COPY pyproject.toml poetry.lock ./

RUN poetry export --without-hashes -f requirements.txt --output requirements.txt
Expand Down
Loading
Loading