Skip to content

Commit

Permalink
chore(poetry): Upgrade to v2
Browse files Browse the repository at this point in the history
  • Loading branch information
jfagoagas committed Mar 4, 2025
1 parent f7a9187 commit 044afc2
Show file tree
Hide file tree
Showing 7 changed files with 387 additions and 156 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
if: steps.are-non-ignored-files-changed.outputs.any_changed == 'true'
run: |
python -m pip install --upgrade pip
pipx install poetry==1.8.5
pipx install poetry==2.1.1
- name: Set up Python ${{ matrix.python-version }}
if: steps.are-non-ignored-files-changed.outputs.any_changed == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdk-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
if: steps.are-non-ignored-files-changed.outputs.any_changed == 'true'
run: |
python -m pip install --upgrade pip
pipx install poetry==1.8.5
pipx install poetry==2.1.1
- name: Set up Python ${{ matrix.python-version }}
if: steps.are-non-ignored-files-changed.outputs.any_changed == 'true'
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ repos:
args: ["--ignore=E266,W503,E203,E501,W605"]

- repo: https://github.com/python-poetry/poetry
rev: 1.8.0
rev: 2.1.1
hooks:
- id: poetry-check
name: API - poetry-check
Expand All @@ -68,7 +68,7 @@ repos:

- id: poetry-lock
name: API - poetry-lock
args: ["--no-update", "--directory=./api"]
args: ["--directory=./api"]
pass_filenames: false

- id: poetry-check
Expand All @@ -78,7 +78,7 @@ repos:

- id: poetry-lock
name: SDK - poetry-lock
args: ["--no-update", "--directory=./"]
args: ["--directory=./"]
pass_filenames: false


Expand Down
337 changes: 288 additions & 49 deletions api/poetry.lock

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,42 @@
build-backend = "poetry.core.masonry.api"
requires = ["poetry-core"]

[tool.poetry]
authors = ["Prowler Team"]
[project]
authors = [{name = "Prowler Engineering", email = "[email protected]"}]
dependencies = [
"celery[pytest] (>=5.4.0,<6.0.0)",
"dj-rest-auth[with_social,jwt] (==7.0.1)",
"django==5.1.5",
"django-celery-beat (>=2.7.0,<3.0.0)",
"django-celery-results (>=2.5.1,<3.0.0)",
"django-cors-headers==4.4.0",
"django-environ==0.11.2",
"django-filter==24.3",
"django-guid==3.5.0",
"django-postgres-extra (>=2.0.8,<3.0.0)",
"djangorestframework==3.15.2",
"djangorestframework-jsonapi==7.0.2",
"djangorestframework-simplejwt (>=5.3.1,<6.0.0)",
"drf-nested-routers (>=0.94.1,<1.0.0)",
"drf-spectacular==0.27.2",
"drf-spectacular-jsonapi==0.5.1",
"gunicorn==23.0.0",
"prowler @ git+https://github.com/prowler-cloud/prowler.git@master",
"psycopg2-binary==2.9.9",
"pytest-celery[redis] (>=1.0.1,<2.0.0)",
"sentry-sdk[django] (>=2.20.0,<3.0.0)",
"uuid6==2024.7.10"
]
description = "Prowler's API (Django/DRF)"
license = "Apache-2.0"
name = "prowler-api"
package-mode = false
# Needed for the SDK compatibility
requires-python = ">=3.11,<3.13"
version = "1.5.0"

[tool.poetry.dependencies]
celery = {extras = ["pytest"], version = "^5.4.0"}
dj-rest-auth = {extras = ["with_social", "jwt"], version = "7.0.1"}
django = "5.1.5"
django-celery-beat = "^2.7.0"
django-celery-results = "^2.5.1"
django-cors-headers = "4.4.0"
django-environ = "0.11.2"
django-filter = "24.3"
django-guid = "3.5.0"
django-postgres-extra = "^2.0.8"
djangorestframework = "3.15.2"
djangorestframework-jsonapi = "7.0.2"
djangorestframework-simplejwt = "^5.3.1"
drf-nested-routers = "^0.94.1"
drf-spectacular = "0.27.2"
drf-spectacular-jsonapi = "0.5.1"
gunicorn = "23.0.0"
prowler = {git = "https://github.com/prowler-cloud/prowler.git", branch = "master"}
psycopg2-binary = "2.9.9"
pytest-celery = {extras = ["redis"], version = "^1.0.1"}
# Needed for prowler compatibility
python = ">=3.11,<3.13"
sentry-sdk = {extras = ["django"], version = "^2.20.0"}
uuid6 = "2024.7.10"
[project.scripts]
celery = "src.backend.config.settings.celery"

[tool.poetry.group.dev.dependencies]
bandit = "1.7.9"
Expand All @@ -54,6 +57,3 @@ ruff = "0.5.0"
safety = "3.2.9"
tqdm = "4.67.1"
vulture = "2.14"

[tool.poetry.scripts]
celery = "src.backend.config.settings.celery"
9 changes: 1 addition & 8 deletions poetry.lock

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

127 changes: 63 additions & 64 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,76 +3,84 @@ build-backend = "poetry.core.masonry.api"
requires = ["poetry-core"]

# https://peps.python.org/pep-0621/
[tool.poetry]
authors = ["Toni de la Fuente <[email protected]>"]
[project]
authors = [{name = "Toni de la Fuente", email = "[email protected]"}]
classifiers = [
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Apache Software License"
]
dependencies = [
"awsipranges==0.3.3",
"alive-progress==3.2.0",
"azure-identity==1.19.0",
"azure-keyvault-keys==4.10.0",
"azure-mgmt-applicationinsights==4.0.0",
"azure-mgmt-authorization==4.0.0",
"azure-mgmt-compute==34.0.0",
"azure-mgmt-containerregistry==10.3.0",
"azure-mgmt-containerservice==34.0.0",
"azure-mgmt-cosmosdb==9.7.0",
"azure-mgmt-keyvault==10.3.1",
"azure-mgmt-monitor==6.0.2",
"azure-mgmt-network==28.1.0",
"azure-mgmt-rdbms==10.1.0",
"azure-mgmt-resource==23.2.0",
"azure-mgmt-search==9.1.0",
"azure-mgmt-security==7.0.0",
"azure-mgmt-sql==3.0.1",
"azure-mgmt-storage==21.2.1",
"azure-mgmt-subscription==3.1.1",
"azure-mgmt-web==8.0.0",
"azure-storage-blob==12.24.1",
"boto3==1.35.99",
"botocore==1.35.99",
"colorama==0.4.6",
"cryptography==44.0.1",
"dash==2.18.2",
"dash-bootstrap-components==1.6.0",
"detect-secrets==1.5.0",
"google-api-python-client==2.162.0",
"google-auth-httplib2>=0.1,<0.3",
"jsonschema==4.23.0",
"kubernetes==32.0.1",
"microsoft-kiota-abstractions==1.9.2",
"msgraph-sdk==1.18.0",
"numpy==2.0.2",
"pandas==2.2.3",
"py-ocsf-models==0.3.1",
"pydantic==1.10.21",
"python-dateutil (>=2.9.0.post0,<3.0.0)",
"pytz==2025.1",
"schema==0.7.7",
"shodan==1.31.0",
"slack-sdk==3.34.0",
"tabulate==0.9.0",
"tzlocal==5.3"
]
description = "Prowler is an Open Source security tool to perform AWS, GCP and Azure security best practices assessments, audits, incident response, continuous monitoring, hardening and forensics readiness. It contains hundreds of controls covering CIS, NIST 800, NIST CSF, CISA, RBI, FedRAMP, PCI-DSS, GDPR, HIPAA, FFIEC, SOC2, GXP, AWS Well-Architected Framework Security Pillar, AWS Foundational Technical Review (FTR), ENS (Spanish National Security Scheme) and your custom security frameworks."
license = "Apache-2.0"
maintainers = [
"Sergio Garcia <[email protected]>",
"Nacho Rivera <[email protected]>",
"Pepe Fagoaga <[email protected]>"
]
maintainers = [{name = "Prowler Engineering", email = "[email protected]"}]
name = "prowler"
packages = [
{include = "prowler"},
{include = "dashboard"}
]
readme = "README.md"
requires-python = ">3.9.1,<3.13"
version = "5.4.0"

[tool.poetry.dependencies]
alive-progress = "3.2.0"
awsipranges = "0.3.3"
azure-identity = "1.19.0"
azure-keyvault-keys = "4.10.0"
azure-mgmt-applicationinsights = "4.0.0"
azure-mgmt-authorization = "4.0.0"
azure-mgmt-compute = "34.0.0"
azure-mgmt-containerregistry = "10.3.0"
azure-mgmt-containerservice = "34.0.0"
azure-mgmt-cosmosdb = "9.7.0"
azure-mgmt-keyvault = "10.3.1"
azure-mgmt-monitor = "6.0.2"
azure-mgmt-network = "28.1.0"
azure-mgmt-rdbms = "10.1.0"
azure-mgmt-resource = "23.2.0"
azure-mgmt-search = "9.1.0"
azure-mgmt-security = "7.0.0"
azure-mgmt-sql = "3.0.1"
azure-mgmt-storage = "21.2.1"
azure-mgmt-subscription = "3.1.1"
azure-mgmt-web = "8.0.0"
azure-storage-blob = "12.24.1"
boto3 = "1.35.99"
botocore = "1.35.99"
colorama = "0.4.6"
cryptography = "44.0.1"
dash = "2.18.2"
dash-bootstrap-components = "1.6.0"
detect-secrets = "1.5.0"
google-api-python-client = "2.162.0"
google-auth-httplib2 = ">=0.1,<0.3"
jsonschema = "4.23.0"
kubernetes = "32.0.1"
microsoft-kiota-abstractions = "1.9.2"
msgraph-sdk = "1.18.0"
numpy = "2.0.2"
pandas = "2.2.3"
py-ocsf-models = "0.3.1"
pydantic = "1.10.21"
python = ">3.9.1,<3.13"
python-dateutil = "^2.9.0.post0"
pytz = "2025.1"
schema = "0.7.7"
shodan = "1.31.0"
slack-sdk = "3.34.0"
tabulate = "0.9.0"
tzlocal = "5.3"
[project.scripts]
prowler = "prowler.__main__:prowler"

[project.urls]
"Changelog" = "https://github.com/prowler-cloud/prowler/releases"
"Documentation" = "https://docs.prowler.cloud"
"Homepage" = "https://github.com/prowler-cloud/prowler"
"Issue tracker" = "https://github.com/prowler-cloud/prowler/issues"

[tool.poetry]
requires-poetry = ">=2.0"

[tool.poetry.group.dev.dependencies]
bandit = "1.8.3"
Expand Down Expand Up @@ -103,15 +111,6 @@ mkdocs-git-revision-date-localized-plugin = "1.3.0"
mkdocs-material = "9.6.5"
mkdocs-material-extensions = "1.3.1"

[tool.poetry.scripts]
prowler = "prowler.__main__:prowler"

[tool.poetry.urls]
"Changelog" = "https://github.com/prowler-cloud/prowler/releases"
"Documentation" = "https://docs.prowler.cloud"
"Homepage" = "https://github.com/prowler-cloud/prowler"
"Issue tracker" = "https://github.com/prowler-cloud/prowler/issues"

[tool.poetry-version-plugin]
source = "init"

Expand Down

0 comments on commit 044afc2

Please sign in to comment.