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

🔧 [open-zaak/open-zaak#1629] Refactor settings module #102

Merged
merged 9 commits into from
May 17, 2024
Merged

🔧 [open-zaak/open-zaak#1629] Refactor settings module #102

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1dac512
:pushpin: Pin open-api-framework to git branch
stevenbal May 1, 2024
dc08f1c
:wrench: [open-zaak/open-zaak#1629] Refactor settings module
stevenbal May 1, 2024
d9ee94d
:construction_worker: Use CI settings/deps in Github actions
stevenbal May 1, 2024
b21837e
:whale: Fix docker-compose setup
stevenbal May 1, 2024
af6f80d
:fire: Remove old fonts
stevenbal May 1, 2024
5b8fffd
:wrench: Show log_outgoing_requests log and config in admin
stevenbal May 7, 2024
95b0f4c
:arrow_up: Upgrade mozilla-django-oidc-db to 0.16.0
stevenbal May 7, 2024
48e1d3b
:ok_hand: [open-zaak/open-zaak#1629] PR feedback
stevenbal May 14, 2024
9d73d43
:arrow_up: Upgrade open-api-framework to 0.3.0
stevenbal May 17, 2024
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: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
gdal-bin

- name: Install dependencies
run: pip install -r requirements/dev.txt codecov
run: pip install -r requirements/ci.txt codecov
- name: Build frontend
run: |
npm ci
Expand All @@ -55,7 +55,7 @@ jobs:
python src/manage.py collectstatic --noinput --link
coverage run src/manage.py test src
env:
DJANGO_SETTINGS_MODULE: objecttypes.conf.dev
DJANGO_SETTINGS_MODULE: objecttypes.conf.ci
SECRET_KEY: dummy
DB_USER: postgres
DB_PASSWORD: ''
Expand Down
12 changes: 8 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,26 @@ version: '3'

services:
db:
image: postgres:11-alpine
image: postgres:12-alpine
environment:
- POSTGRES_HOST_AUTH_METHOD=trust
volumes:
- ./docker-init-db.sql:/docker-entrypoint-initdb.d/init_db.sql
# - db:/var/lib/postgresql/data
command: postgres -c max_connections=300 -c log_min_messages=LOG

redis:
annashamray marked this conversation as resolved.
Show resolved Hide resolved
image: redis

web:
build: .
environment: &app-env
- DJANGO_SETTINGS_MODULE=objecttypes.conf.docker
- SECRET_KEY=${SECRET_KEY:-fgv=c0hz&tl*8*3m3893@m+1pstrvidc9e^5@fpspmg%cy$15d}
- SECRET_KEY=${SECRET_KEY:-fgv=c0hz&tl*8*3m3893@m+1pstrvidc9e^5@fpspmg%cyf15d}
- ALLOWED_HOSTS=*
- TWO_FACTOR_FORCE_OTP_ADMIN=no
- TWO_FACTOR_PATCH_ADMIN=no
- CACHE_DEFAULT=redis:6379/0
- CACHE_AXES=redis:6379/0
- DISABLE_2FA=yes
# setup_configuration env vars
- OBJECTTYPES_DOMAIN=web:8000
- OBJECTTYPES_ORGANIZATION=ObjectTypes
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
open-api-framework
git+https://github.com/maykinmedia/open-api-framework.git@feature/django-settings

# Core python libraries
jsonschema
Expand Down
12 changes: 10 additions & 2 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,14 @@ django==4.2.11
# via
# commonground-api-common
# django-admin-index
# django-appconf
# django-axes
# django-cors-headers
# django-filter
# django-formtools
# django-jsonform
# django-jsonsuit
# django-log-outgoing-requests
# django-markup
# django-otp
# django-phonenumber-field
Expand All @@ -105,6 +107,8 @@ django==4.2.11
# zgw-consumers
django-admin-index==3.1.1
# via open-api-framework
django-appconf==1.0.6
# via django-log-outgoing-requests
django-axes==6.4.0
# via open-api-framework
django-cors-headers==4.3.1
Expand All @@ -121,6 +125,8 @@ django-jsonform==2.21.5
# open-api-framework
django-jsonsuit==0.5.0
# via -r requirements/base.in
django-log-outgoing-requests==0.6.1
# via open-api-framework
django-markup==1.8.1
# via open-api-framework
django-ordered-model==3.7.4
Expand All @@ -146,6 +152,7 @@ django-simple-certmanager==2.0.0
django-solo==2.0.0
# via
# commonground-api-common
# django-log-outgoing-requests
# mozilla-django-oidc-db
# notifications-api-common
# sharing-configs
Expand Down Expand Up @@ -226,11 +233,11 @@ maykin-2fa==1.0.0
# via open-api-framework
mozilla-django-oidc==4.0.0
# via mozilla-django-oidc-db
mozilla-django-oidc-db==0.14.1
mozilla-django-oidc-db==0.16.0
# via open-api-framework
notifications-api-common==0.2.2
# via commonground-api-common
open-api-framework==0.2.0
open_api_framework @ git+https://github.com/maykinmedia/open-api-framework.git@feature/django-settings
# via -r requirements/base.in
orderedmultidict==1.0.1
# via furl
Expand Down Expand Up @@ -286,6 +293,7 @@ requests==2.31.0
# ape-pie
# commonground-api-common
# coreapi
# django-log-outgoing-requests
# gemma-zds-client
# mozilla-django-oidc
# open-api-framework
Expand Down
16 changes: 14 additions & 2 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,15 @@ django==4.2.11
# -r requirements/base.txt
# commonground-api-common
# django-admin-index
# django-appconf
# django-axes
# django-cors-headers
# django-filter
# django-formtools
# django-jenkins
# django-jsonform
# django-jsonsuit
# django-log-outgoing-requests
# django-markup
# django-otp
# django-phonenumber-field
Expand Down Expand Up @@ -152,6 +154,10 @@ django-admin-index==3.1.1
# via
# -r requirements/base.txt
# open-api-framework
django-appconf==1.0.6
# via
# -r requirements/base.txt
# django-log-outgoing-requests
django-axes==6.4.0
# via
# -r requirements/base.txt
Expand All @@ -178,6 +184,10 @@ django-jsonform==2.21.5
# open-api-framework
django-jsonsuit==0.5.0
# via -r requirements/base.txt
django-log-outgoing-requests==0.6.1
# via
# -r requirements/base.txt
# open-api-framework
django-markup==1.8.1
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -224,6 +234,7 @@ django-solo==2.0.0
# via
# -r requirements/base.txt
# commonground-api-common
# django-log-outgoing-requests
# mozilla-django-oidc-db
# notifications-api-common
# sharing-configs
Expand Down Expand Up @@ -360,15 +371,15 @@ mozilla-django-oidc==4.0.0
# via
# -r requirements/base.txt
# mozilla-django-oidc-db
mozilla-django-oidc-db==0.14.1
mozilla-django-oidc-db==0.16.0
# via
# -r requirements/base.txt
# open-api-framework
notifications-api-common==0.2.2
# via
# -r requirements/base.txt
# commonground-api-common
open-api-framework==0.2.0
open_api_framework @ git+https://github.com/maykinmedia/open-api-framework.git@feature/django-settings
# via -r requirements/base.txt
orderedmultidict==1.0.1
# via
Expand Down Expand Up @@ -461,6 +472,7 @@ requests==2.31.0
# ape-pie
# commonground-api-common
# coreapi
# django-log-outgoing-requests
# gemma-zds-client
# mozilla-django-oidc
# open-api-framework
Expand Down
16 changes: 14 additions & 2 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ django==4.2.11
# -r requirements/ci.txt
# commonground-api-common
# django-admin-index
# django-appconf
# django-axes
# django-cors-headers
# django-debug-toolbar
Expand All @@ -144,6 +145,7 @@ django==4.2.11
# django-jenkins
# django-jsonform
# django-jsonsuit
# django-log-outgoing-requests
# django-markup
# django-otp
# django-phonenumber-field
Expand Down Expand Up @@ -172,6 +174,10 @@ django-admin-index==3.1.1
# via
# -r requirements/ci.txt
# open-api-framework
django-appconf==1.0.6
# via
# -r requirements/ci.txt
# django-log-outgoing-requests
django-axes==6.4.0
# via
# -r requirements/ci.txt
Expand Down Expand Up @@ -202,6 +208,10 @@ django-jsonform==2.21.5
# open-api-framework
django-jsonsuit==0.5.0
# via -r requirements/ci.txt
django-log-outgoing-requests==0.6.1
# via
# -r requirements/ci.txt
# open-api-framework
django-markup==1.8.1
# via
# -r requirements/ci.txt
Expand Down Expand Up @@ -248,6 +258,7 @@ django-solo==2.0.0
# via
# -r requirements/ci.txt
# commonground-api-common
# django-log-outgoing-requests
# mozilla-django-oidc-db
# notifications-api-common
# sharing-configs
Expand Down Expand Up @@ -401,7 +412,7 @@ mozilla-django-oidc==4.0.0
# via
# -r requirements/ci.txt
# mozilla-django-oidc-db
mozilla-django-oidc-db==0.14.1
mozilla-django-oidc-db==0.16.0
# via
# -r requirements/ci.txt
# open-api-framework
Expand All @@ -411,7 +422,7 @@ notifications-api-common==0.2.2
# via
# -r requirements/ci.txt
# commonground-api-common
open-api-framework==0.2.0
open_api_framework @ git+https://github.com/maykinmedia/open-api-framework.git@feature/django-settings
# via -r requirements/ci.txt
orderedmultidict==1.0.1
# via
Expand Down Expand Up @@ -521,6 +532,7 @@ requests==2.31.0
# ape-pie
# commonground-api-common
# coreapi
# django-log-outgoing-requests
# gemma-zds-client
# mozilla-django-oidc
# open-api-framework
Expand Down
Loading
Loading