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.

Sign up for GitHub

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

⬆️ [maykinmedia/open-api-framework#93] Security updates #313

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+623 −246
Open

⬆️ [maykinmedia/open-api-framework#93] Security updates #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1190afe
:hammer: [maykinmedia/open-api-framework#81] Switch from pip-compile …
stevenbal Jan 3, 2025
4fe0d18
:arrow_up: [maykinmedia/open-api-framework#93] Security updates
stevenbal Jan 3, 2025
dc04e3e
:construction_worker: Do not run OAF version check on PR open
stevenbal Jan 6, 2025
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
3 changes: 1 addition & 2 deletions .github/workflows/oaf-check.yml
View file
Open in desktop
stevenbal marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ on:
- master
tags:
- '*'
pull_request:
workflow_dispatch:
schedule:
- cron: '0 7 * * 1'


jobs:
open-api-workflow-check-oas:
uses: maykinmedia/open-api-workflows/.github/workflows/oaf-check.yml@v2
uses: maykinmedia/open-api-workflows/.github/workflows/oaf-check.yml@v4

with:
python-version: '3.11'
Expand Down
30 changes: 14 additions & 16 deletions bin/compile_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,43 @@
#!/bin/bash

#!/bin/sh
#
# Compile the dependencies for production, CI and development.
#
# Usage, in the root of the project:
#
# ./bin/compile_dependencies.sh
#
# Any extra flags/arguments passed to this wrapper script are passed down to pip-compile.
# Any extra flags/arguments passed to this wrapper script are passed down to uv pip compile.
# E.g. to update a package:
#
# ./bin/compile_dependencies.sh --upgrade-package django

set -ex

command -v uv || (echo "uv not found on PATH. Install it https://astral.sh/uv" >&2 && exit 1)

cwd="${PWD}"
toplevel=$(git rev-parse --show-toplevel)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See open-zaak/open-notificaties#216 (comment)


cd $toplevel
cd "${toplevel}"

export CUSTOM_COMPILE_COMMAND="./bin/compile_dependencies.sh"
export UV_CUSTOM_COMPILE_COMMAND="./bin/compile_dependencies.sh"

# Base (& prod) deps
pip-compile \
--no-emit-index-url \
uv pip compile \
--output-file requirements/base.txt \
"$@" \
requirements/base.in

# Dependencies for testing
pip-compile \
--no-emit-index-url \
uv pip compile \
--output-file requirements/ci.txt \
"$@" \
requirements/base.txt \
requirements/test-tools.in \
requirements/ci.in
requirements/docs.in

# Dev depedencies - exact same set as CI + some extra tooling
pip-compile \
--no-emit-index-url \
uv pip compile \
--output-file requirements/dev.txt \
"$@" \
requirements/base.txt \
requirements/test-tools.in \
requirements/dev.in

cd "${cwd}"
22 changes: 9 additions & 13 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# This file was autogenerated by uv via the following command:
# ./bin/compile_dependencies.sh
#
amqp==5.2.0
# via kombu
annotated-types==0.7.0
Expand Down Expand Up @@ -74,7 +70,7 @@ cryptography==43.0.0
# mozilla-django-oidc
# pyopenssl
# webauthn
django==4.2.15
django==4.2.17
# via
# commonground-api-common
# django-admin-index
Expand Down Expand Up @@ -167,7 +163,7 @@ django-solo==2.3.0
# mozilla-django-oidc-db
# notifications-api-common
# zgw-consumers
django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
django-two-factor-auth==1.16.0
# via maykin-2fa
djangorestframework==3.15.2
# via
Expand All @@ -189,7 +185,7 @@ djangorestframework-inclusions==1.2.0
# via open-api-framework
drf-nested-routers==0.94.1
# via commonground-api-common
drf-spectacular[sidecar]==0.27.2
drf-spectacular==0.27.2
# via open-api-framework
drf-spectacular-sidecar==2024.7.1
# via drf-spectacular
Expand Down Expand Up @@ -221,7 +217,7 @@ isodate==0.6.1
# via commonground-api-common
itypes==1.2.0
# via coreapi
jinja2==3.1.4
jinja2==3.1.5
# via coreschema
josepy==1.14.0
# via mozilla-django-oidc
Expand All @@ -237,13 +233,13 @@ maykin-2fa==1.0.1
# via open-api-framework
mozilla-django-oidc==4.0.1
# via mozilla-django-oidc-db
mozilla-django-oidc-db[setup-configuration]==0.21.1
mozilla-django-oidc-db==0.21.1
# via
# -r requirements/base.in
# open-api-framework
notifications-api-common==0.3.1
# via commonground-api-common
open-api-framework==0.9.1
open-api-framework==0.9.2
# via -r requirements/base.in
orderedmultidict==1.0.1
# via furl
Expand All @@ -267,7 +263,7 @@ pydantic==2.10.2
# pydantic-settings
pydantic-core==2.27.1
# via pydantic
pydantic-settings[yaml]==2.6.1
pydantic-settings==2.6.1
# via django-setup-configuration
pyjwt==2.9.0
# via
Expand Down Expand Up @@ -334,7 +330,7 @@ six==1.16.0
# python-dateutil
sqlparse==0.5.1
# via django
tornado==6.4.1
tornado==6.4.2
# via flower
typing-extensions==4.12.2
# via
Expand Down
2 changes: 0 additions & 2 deletions requirements/ci.in
View file
Open in desktop

This file was deleted.

Loading
Loading