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

Update dependency Django to v4.2.15 #63

Merged
merged 5 commits into from
Aug 7, 2024
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
163 changes: 0 additions & 163 deletions .github/workflows/build.yaml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/publish_charm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ jobs:
publish-to-edge:
uses: canonical/operator-workflows/.github/workflows/publish_charm.yaml@main
secrets: inherit
integration-test-workflow-file: test.yaml
6 changes: 6 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@ jobs:
with:
self-hosted-runner: true
self-hosted-runner-label: "edge"
integration-tests:
uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
secrets: inherit
with:
channel: 1.28-strict/stable
juju-channel: 3.4/stable
2 changes: 2 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CVE-2022-40897

Check notice on line 1 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-httprequest-lego-provider-80f255cb5b9a09dc43ceca1c945ecd117634e7dc-_0.1_amd64.tar)

CVE-2022-40897 not present anymore, can be safely removed.
CVE-2024-6345

Check notice on line 2 in .trivyignore

View workflow job for this annotation

GitHub Actions / integration-tests / Scan Image (ghcr.io-canonical-httprequest-lego-provider-80f255cb5b9a09dc43ceca1c945ecd117634e7dc-_0.1_amd64.tar)

CVE-2024-6345 not present anymore, can be safely removed.
2 changes: 0 additions & 2 deletions charm/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ actions:
type: string
required:
- username
required:
- username
allow-domains:
description: Grant user access to domains.
properties:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==4.2.14
Django==4.2.15
djangorestframework==3.15.2
djangorestframework-simplejwt==5.3.1
GitPython==3.1.43
Expand Down
9 changes: 9 additions & 0 deletions rockcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ platforms:
extensions:
- django-framework

services:
django:
command: "/bin/python3 -m gunicorn -c /django/gunicorn.conf.py app.wsgi:application"

parts:
# Exclude pyproject.yaml so that the python plugin doesn't handle this project as a package
django-framework/dependencies:
Expand All @@ -27,6 +31,11 @@ parts:
rm -f pyproject.toml
craftctl default
django-framework/install-app:
plugin: dump
source: .
organize:
'*': django/app/
.*: django/app/
prime:
- "django/app/httprequest_lego_provider"
- "django/app/app"
Expand Down
10 changes: 10 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@ commands =
coverage run --source={[vars]src_path} --omit={[vars]tst_path}* \
-m pytest -v --tb native -s {posargs}

[testenv:integration]
description = Run integration tests (placeholder)
deps =
pytest
pytest-asyncio
pytest-operator
-r{toxinidir}/requirements.txt
commands =
python3 -c "print('integration test placeholder')"

[testenv:coverage-report]
description = Create test coverage report
deps =
Expand Down
Loading