From f912a13d5279bbf6372ed77999e555ed4a548da6 Mon Sep 17 00:00:00 2001 From: Paul Schilling Date: Tue, 16 Jul 2024 10:33:02 +0200 Subject: [PATCH 1/4] [#2424] Check that config-setup documentation is up-to-date in CI --- .github/workflows/ci.yml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e24817b1b..2189d575b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: with: name: ${{ matrix.test-type }} path: .coverage* - + upload_coverage: needs: tests name: Upload coverage information to codecov @@ -183,6 +183,9 @@ jobs: DB_PASSWORD: '' E2E_DRIVER: ${{ matrix.browser }} + # + # Docs + # docs: name: Build and check documentation runs-on: ubuntu-latest @@ -203,6 +206,26 @@ jobs: export OPENSSL_CONF=$(pwd)/openssl.conf pytest check_sphinx.py -v --tb=auto working-directory: docs + + setup-config-docs: + name: Check that documentation for configuration steps is up-to-date + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + submodules: 'true' + - name: Set up backend environment + uses: maykinmedia/setup-django-backend@v1 + with: + apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext libgdal-dev gdal-bin graphviz' + python-version: '3.11' + setup-node: 'no' + + - name: Build docs for django-setup-configuration steps + run: | + python src/manage.py generate_config_docs --dry-run + # # Docker # From 5b4d46d43ff8dcaca01824dfd5ae8709369d1c42 Mon Sep 17 00:00:00 2001 From: Paul Schilling Date: Tue, 16 Jul 2024 10:39:09 +0200 Subject: [PATCH 2/4] [#2424] Upgrade django-setup-configuration to 0.3.0 --- .github/workflows/ci.yml | 25 +------------------------ requirements/base.txt | 2 +- requirements/ci.txt | 2 +- requirements/dev.txt | 2 +- 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2189d575b4..8e24817b1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: with: name: ${{ matrix.test-type }} path: .coverage* - + upload_coverage: needs: tests name: Upload coverage information to codecov @@ -183,9 +183,6 @@ jobs: DB_PASSWORD: '' E2E_DRIVER: ${{ matrix.browser }} - # - # Docs - # docs: name: Build and check documentation runs-on: ubuntu-latest @@ -206,26 +203,6 @@ jobs: export OPENSSL_CONF=$(pwd)/openssl.conf pytest check_sphinx.py -v --tb=auto working-directory: docs - - setup-config-docs: - name: Check that documentation for configuration steps is up-to-date - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - - name: Set up backend environment - uses: maykinmedia/setup-django-backend@v1 - with: - apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext libgdal-dev gdal-bin graphviz' - python-version: '3.11' - setup-node: 'no' - - - name: Build docs for django-setup-configuration steps - run: | - python src/manage.py generate_config_docs --dry-run - # # Docker # diff --git a/requirements/base.txt b/requirements/base.txt index 0e3679660f..69f59db502 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -255,7 +255,7 @@ django-sessionprofile==1.0 # via # -r requirements/base.in # django-digid-eherkenning -django-setup-configuration==0.2.0 +django-setup-configuration==0.3.0 # via -r requirements/base.in django-simple-certmanager==1.4.1 # via diff --git a/requirements/ci.txt b/requirements/ci.txt index 5f03e5eccb..19d59d19b8 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -436,7 +436,7 @@ django-sessionprofile==1.0 # -c requirements/base.txt # -r requirements/base.txt # django-digid-eherkenning -django-setup-configuration==0.2.0 +django-setup-configuration==0.3.0 # via # -c requirements/base.txt # -r requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 01bfbbca09..1af82c42d0 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -480,7 +480,7 @@ django-sessionprofile==1.0 # -c requirements/ci.txt # -r requirements/ci.txt # django-digid-eherkenning -django-setup-configuration==0.2.0 +django-setup-configuration==0.3.0 # via # -c requirements/ci.txt # -r requirements/ci.txt From 7ba06e990ff66aadb422e3dba3edbbbcb9bdf970 Mon Sep 17 00:00:00 2001 From: Paul Schilling Date: Thu, 18 Jul 2024 14:19:56 +0200 Subject: [PATCH 3/4] Format YAML files (remove whitespace) --- .github/workflows/ci.yml | 2 +- docker-compose.yml | 8 ++++---- docker/docker-compose.openklant.yml | 2 +- publiccode.yaml | 22 +++++++++++----------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e24817b1b..862a079a30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: with: name: ${{ matrix.test-type }} path: .coverage* - + upload_coverage: needs: tests name: Upload coverage information to codecov diff --git a/docker-compose.yml b/docker-compose.yml index 14aa41b18e..44e792b726 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - ./docker-init-db.sql:/docker-entrypoint-initdb.d/init_db.sql - db:/var/lib/postgresql/data networks: - - openinwoner-dev + - openinwoner-dev elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:7.9.2 @@ -21,7 +21,7 @@ services: - cluster.routing.allocation.disk.threshold_enabled=false - "ES_JAVA_OPTS=-Xms512m -Xmx512m" networks: - - openinwoner-dev + - openinwoner-dev volumes: - es_data:/usr/share/elasticsearch/data ports: @@ -58,7 +58,7 @@ services: - CACHE_PORTALOCKER=redis:6379/0 - CELERY_BROKER_URL=redis://redis:6379/0 - CELERY_RESULT_BACKEND=redis://redis:6379/0 - - CELERY_LOGLEVEL=DEBUG + - CELERY_LOGLEVEL=DEBUG - ES_HOST=elasticsearch - DISABLE_2FA=${DISABLE_2FA:-True} - DEBUG=True @@ -107,4 +107,4 @@ volumes: networks: openinwoner-dev: - name: openinwoner-dev \ No newline at end of file + name: openinwoner-dev diff --git a/docker/docker-compose.openklant.yml b/docker/docker-compose.openklant.yml index 8976f8ee31..1354e7046a 100644 --- a/docker/docker-compose.openklant.yml +++ b/docker/docker-compose.openklant.yml @@ -50,4 +50,4 @@ networks: name: openklant-dev volumes: - db_data: \ No newline at end of file + db_data: diff --git a/publiccode.yaml b/publiccode.yaml index f7a7b0adb8..2ce4c1f73e 100644 --- a/publiccode.yaml +++ b/publiccode.yaml @@ -29,20 +29,20 @@ description: - Expose products via an API genericName: Open Inwoner component longDescription: > - Using Open Inwoner platform administrators can easily fill in the information - about municipality products and services with the convenient WYSIWYG editor. - The users can search through the products with the power of the full-text - search and the questionnaires to access the services which are applicable and + Using Open Inwoner platform administrators can easily fill in the information + about municipality products and services with the convenient WYSIWYG editor. + The users can search through the products with the power of the full-text + search and the questionnaires to access the services which are applicable and useful in their situation. - - The users can interact with each other and exchange messages and documents. + + The users can interact with each other and exchange messages and documents. The users can create plans together to achieve their goals. - - The style of the application is easily configurable: all the colors, images, + + The style of the application is easily configurable: all the colors, images, help texts and the logo can be set up and changed in the admin page. - - Open Inwoner is developed in line with the Common Ground principles and provides - integration with Common Ground services such as Open Zaak and Haal Centraal. + + Open Inwoner is developed in line with the Common Ground principles and provides + integration with Common Ground services such as Open Zaak and Haal Centraal. legal: license: EUPL-1.2 From 259ea10740b3fa1d86d1e538f6e4406de5c5d2ed Mon Sep 17 00:00:00 2001 From: Paul Schilling Date: Thu, 18 Jul 2024 14:21:24 +0200 Subject: [PATCH 4/4] Add git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..db0fb96967 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,3 @@ +# format YAML files (remove whitespace) + +7ba06e990ff66aadb422e3dba3edbbbcb9bdf970