Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: maykinmedia/open-inwoner
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10e8dc3224d3637b767735b6b34b259e65c6c5d2
Choose a base ref
..
head repository: maykinmedia/open-inwoner
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96b90d880d4e12d4f5e13a3c853698aaa87ffdbb
Choose a head ref
Showing with 511 additions and 656 deletions.
  1. +2 −1 .github/workflows/ci.yml
  2. +3 −3 .github/workflows/code-quality.yml
  3. +15 −5 INSTALL.rst
  4. +1 −2 bin/compile_dependencies.bat
  5. +1 −4 bin/compile_dependencies.sh
  6. +1 −0 requirements/base.in
  7. +8 −0 requirements/base.txt
  8. +25 −125 requirements/ci.txt
  9. +10 −0 requirements/dev.in
  10. +65 −201 requirements/dev.txt
  11. +0 −5 requirements/docs.in
  12. +2 −13 requirements/test-tools.in
  13. +8 −1 src/open_inwoner/accounts/tests/factories.py
  14. +58 −90 src/open_inwoner/accounts/tests/test_action_views.py
  15. +42 −85 src/open_inwoner/accounts/tests/test_inbox_page.py
  16. +22 −0 src/open_inwoner/components/templatetags/string_tags.py
  17. +5 −0 src/open_inwoner/conf/ci.py
  18. +0 −3 src/open_inwoner/conf/dev.py
  19. +43 −0 src/open_inwoner/configurations/migrations/0029_auto_20221221_1636.py
  20. +3 −0 src/open_inwoner/configurations/models.py
  21. +20 −21 src/open_inwoner/plans/tests/test_views.py
  22. +4 −0 src/open_inwoner/scss/components/Typography/H1.scss
  23. +2 −2 src/open_inwoner/templates/pages/category/detail.html
  24. +2 −3 src/open_inwoner/templates/pages/home.html
  25. +8 −5 src/open_inwoner/templates/pages/plans/create.html
  26. +2 −4 src/open_inwoner/templates/pages/plans/edit.html
  27. +2 −4 src/open_inwoner/templates/pages/plans/file.html
  28. +2 −5 src/open_inwoner/templates/pages/plans/list.html
  29. +2 −3 src/open_inwoner/templates/pages/profile/questionnaire.html
  30. +153 −0 src/open_inwoner/utils/tests/playwright.py
  31. +0 −71 src/open_inwoner/utils/tests/selenium.py
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -57,7 +57,8 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y libxml2-dev libxmlsec1-dev libxmlsec1-openssl
pip install -r requirements/ci.txt codecov
pip install -r requirements/dev.txt codecov
playwright install
- name: Build frontend
run: |
6 changes: 3 additions & 3 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
python-version: '3.9'
- uses: isort/isort-action@v0.1.0
with:
requirementsFiles: requirements/ci.txt
requirementsFiles: requirements/dev.txt
sortPaths: 'src'
configuration: '--check-only --diff'

@@ -45,7 +45,7 @@ jobs:
python-version: '3.9'
- name: Install dependencies
run: |
pip install -r requirements/ci.txt
pip install -r requirements/dev.txt
- name: Run black
run: |
black --check --diff src
@@ -77,7 +77,7 @@ jobs:
python-version: '3.9'
- name: Install dependencies
run: |
pip install -r requirements/ci.txt
pip install -r requirements/dev.txt
- name: Run Bandit
run: |
bandit -r ./src/ -x tests,conf/utils.py -s B101
20 changes: 15 additions & 5 deletions INSTALL.rst
Original file line number Diff line number Diff line change
@@ -72,34 +72,44 @@ development machine.
$ source env/bin/activate
$ pip install -r requirements/dev.txt
4. Install and build the frontend libraries:
4. Run third-party install commands:

- Install the required browsers for `Playwright`_ end-to-end testing.

.. code-block:: bash
$ playwright install
.. _Playwright: https://playwright.dev/python/

5. Install and build the frontend libraries:

.. code-block:: bash
$ npm install
$ npm run build
5. Create the statics and database:
6. Create the statics and database:

.. code-block:: bash
$ python src/manage.py collectstatic --link
$ python src/manage.py migrate
6. Create a superuser to access the management interface:
7. Create a superuser to access the management interface:

.. code-block:: bash
$ python src/manage.py createsuperuser
7. You can now run your installation and point your browser to the address
8. You can now run your installation and point your browser to the address
given by this command:

.. code-block:: bash
$ python src/manage.py runserver
8. Create a .env file with database settings. See dotenv.example for an example.
9. Create a .env file with database settings. See dotenv.example for an example.

$ cp dotenv.example .env

3 changes: 1 addition & 2 deletions bin/compile_dependencies.bat
Original file line number Diff line number Diff line change
@@ -19,8 +19,7 @@ pip-compile^
--output-file requirements/ci.txt^
%*^
requirements/base.txt^
requirements/test-tools.in^
requirements/docs.in
requirements/test-tools.in

REM Dev depedencies - exact same set as CI + some extra tooling
pip-compile^
5 changes: 1 addition & 4 deletions bin/compile_dependencies.sh
Original file line number Diff line number Diff line change
@@ -32,8 +32,7 @@ pip-compile \
--output-file requirements/ci.txt \
"$@" \
requirements/base.txt \
requirements/test-tools.in \
requirements/docs.in
requirements/test-tools.in

# Dev depedencies - exact same set as CI + some extra tooling
pip-compile \
@@ -42,5 +41,3 @@ pip-compile \
"$@" \
requirements/ci.txt \
requirements/dev.in


1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ django-csp-reports
mozilla-django-oidc-db
django-open-forms-client
django-htmx
playwright

# API libraries
djangorestframework
8 changes: 8 additions & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -238,6 +238,8 @@ glom==20.11.0
# via
# -r requirements/base.in
# mozilla-django-oidc-db
greenlet==2.0.1
# via playwright
html5lib==1.1
# via weasyprint
humanfriendly==10.0
@@ -286,6 +288,8 @@ pillow==9.0.1
# -r requirements/base.in
# easy-thumbnails
# weasyprint
playwright==1.28.0
# via -r requirements/base.in
polib==1.1.1
# via django-rosetta
psycopg2==2.9.1
@@ -294,6 +298,8 @@ pycparser==2.20
# via cffi
pydyf==0.1.2
# via weasyprint
pyee==9.0.4
# via playwright
pygments==2.12.0
# via rich
pyjwt==2.3.0
@@ -374,6 +380,8 @@ tinycss2==1.1.1
# via
# cssselect2
# weasyprint
typing-extensions==4.4.0
# via pyee
unidecode==1.1.2
# via django-filer
uritemplate==4.1.1
Loading