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

Deployment #730

Merged
merged 76 commits into from
May 10, 2024
Merged

Deployment #730

merged 76 commits into from
May 10, 2024

Conversation

Gunvor4
Copy link
Contributor

@Gunvor4 Gunvor4 commented May 10, 2024

The dev branch has been deployed to makentnu.dev and can be manually tested there before merging.


Brings in the changes from the following PRs:

Also the following automated PRs:

dependabot bot and others added 30 commits May 23, 2023 01:47
Bumps [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) from 3.1.0 to 3.1.1.
- [Changelog](https://github.com/jmcnamara/XlsxWriter/blob/main/Changes)
- [Commits](jmcnamara/XlsxWriter@RELEASE_3.1.0...RELEASE_3.1.1)

---
updated-dependencies:
- dependency-name: xlsxwriter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) from 3.1.1 to 3.1.2.
- [Changelog](https://github.com/jmcnamara/XlsxWriter/blob/main/Changes)
- [Commits](jmcnamara/XlsxWriter@RELEASE_3.1.1...RELEASE_3.1.2)

---
updated-dependencies:
- dependency-name: xlsxwriter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-extensions](https://github.com/django-extensions/django-extensions) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/django-extensions/django-extensions/releases)
- [Changelog](https://github.com/django-extensions/django-extensions/blob/main/CHANGELOG.md)
- [Commits](django-extensions/django-extensions@3.2.1...3.2.3)

---
updated-dependencies:
- dependency-name: django-extensions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-ical](https://github.com/jazzband/django-ical) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/jazzband/django-ical/releases)
- [Changelog](https://github.com/jazzband/django-ical/blob/master/CHANGES.rst)
- [Commits](jazzband/django-ical@1.9.1...1.9.2)

---
updated-dependencies:
- dependency-name: django-ical
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-cleanup](https://github.com/un1t/django-cleanup) from 7.0.0 to 8.0.0.
- [Changelog](https://github.com/un1t/django-cleanup/blob/master/CHANGELOG.md)
- [Commits](un1t/django-cleanup@7.0.0...8.0.0)

---
updated-dependencies:
- dependency-name: django-cleanup
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-ckeditor](https://github.com/django-ckeditor/django-ckeditor) from 6.5.1 to 6.6.1.
- [Changelog](https://github.com/django-ckeditor/django-ckeditor/blob/main/CHANGELOG.rst)
- [Commits](django-ckeditor/django-ckeditor@6.5.1...6.6.1)

---
updated-dependencies:
- dependency-name: django-ckeditor
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.5.0 to 10.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@9.5.0...10.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-ckeditor](https://github.com/django-ckeditor/django-ckeditor) from 6.6.1 to 6.7.0.
- [Changelog](https://github.com/django-ckeditor/django-ckeditor/blob/main/CHANGELOG.rst)
- [Commits](django-ckeditor/django-ckeditor@6.6.1...6.7)

---
updated-dependencies:
- dependency-name: django-ckeditor
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-constance[database]](https://github.com/jazzband/django-constance) from 2.9.1 to 3.1.0.
- [Release notes](https://github.com/jazzband/django-constance/releases)
- [Changelog](https://github.com/jazzband/django-constance/blob/master/docs/changes.rst)
- [Commits](jazzband/django-constance@2.9.1...3.1.0)

---
updated-dependencies:
- dependency-name: django-constance[database]
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
...as mentioned in `django-constance`'s changelog for v3.0.0:
https://django-constance.readthedocs.io/en/latest/changes.html#v3-0-0-2023-07-27.

As a side note, I found it weird that the tests passed, even though this
non-existent app was enabled in the settings. However, through a little
bit of experimentation, I found out that it seems like Django doesn't
care whether the modules listed in `INSTALLED_APPS` are actually apps
- i.e. that they contain a file (named `apps.py` by default) containing
a subclass of `AppConfig`.
…ance-database--3.1.0

⬆(deps): Bump django-constance[database] from 2.9.1 to 3.1.0
Bumps [social-auth-app-django](https://github.com/python-social-auth/social-app-django) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/python-social-auth/social-app-django/releases)
- [Changelog](https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md)
- [Commits](python-social-auth/social-app-django@5.2.0...5.3.0)

---
updated-dependencies:
- dependency-name: social-auth-app-django
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1.8.0 to 1.8.2.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](tibdex/github-app-token@b625283...0d49dd7)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-simple-history](https://github.com/jazzband/django-simple-history) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/jazzband/django-simple-history/releases)
- [Changelog](https://github.com/jazzband/django-simple-history/blob/master/CHANGES.rst)
- [Commits](jazzband/django-simple-history@3.3.0...3.4.0)

---
updated-dependencies:
- dependency-name: django-simple-history
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1.8.2 to 2.1.0.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](tibdex/github-app-token@0d49dd7...3beb63f)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [django-phonenumber-field[phonenumbers]](https://github.com/stefanfoulis/django-phonenumber-field) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/stefanfoulis/django-phonenumber-field/releases)
- [Changelog](https://github.com/stefanfoulis/django-phonenumber-field/blob/main/CHANGELOG.rst)
- [Commits](stefanfoulis/django-phonenumber-field@7.1.0...7.2.0)

---
updated-dependencies:
- dependency-name: django-phonenumber-field[phonenumbers]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Fixed the translation of the former "søk verv" button in the English header. The button now has the English title "apply to MAKE"
Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.0 to 10.1.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@10.0.0...10.1.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…e-history-3.4.0

⬆(deps): Bump django-simple-history from 3.3.0 to 3.4.0
⬆(deps): Bump pillow from 10.0.0 to 10.1.0
…number-field-phonenumbers--7.2.0

⬆(deps): Bump django-phonenumber-field[phonenumbers] from 7.1.0 to 7.2.0
Bumps [django-phonenumber-field[phonenumbers]](https://github.com/stefanfoulis/django-phonenumber-field) from 7.2.0 to 7.3.0.
- [Release notes](https://github.com/stefanfoulis/django-phonenumber-field/releases)
- [Changelog](https://github.com/stefanfoulis/django-phonenumber-field/blob/main/CHANGELOG.rst)
- [Commits](stefanfoulis/django-phonenumber-field@7.2.0...7.3.0)

---
updated-dependencies:
- dependency-name: django-phonenumber-field[phonenumbers]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.1.0 to 10.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@10.1.0...10.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
⬆(deps): Bump pillow from 10.1.0 to 10.2.0
…number-field-phonenumbers--7.3.0

⬆(deps): Bump django-phonenumber-field[phonenumbers] from 7.2.0 to 7.3.0
elisakiv and others added 25 commits March 18, 2024 17:30
This was done in order to achieve compatibility with Django 5.0.

MultiSelectField is not comptible with Django 5.0, because it uses _get_flatchoices, which is no longer usable. In order to still use the package, a custom implementation was created that overwrites the deprecated method.
⬆(deps): Bump django from 4.1.7 to 5.0.2
Run makemigrations after updates to reservation model
…ibdex/github-app-token-2.1.0

👷(deps): Bump tibdex/github-app-token from 1.8.2 to 2.1.0
…e-history-3.5.0

⬆(deps): Bump django-simple-history from 3.4.0 to 3.5.0
Bumps [django-cleanup](https://github.com/un1t/django-cleanup) from 8.0.0 to 8.1.0.
- [Changelog](https://github.com/un1t/django-cleanup/blob/master/CHANGELOG.md)
- [Commits](un1t/django-cleanup@8.0.0...8.1.0)

---
updated-dependencies:
- dependency-name: django-cleanup
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…up-8.1.0

⬆(deps): Bump django-cleanup from 8.0.0 to 8.1.0
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…ctions/setup-python-5

👷(deps): Bump actions/setup-python from 4 to 5
Bumps [social-auth-app-django](https://github.com/python-social-auth/social-app-django) from 5.3.0 to 5.4.1.
- [Release notes](https://github.com/python-social-auth/social-app-django/releases)
- [Changelog](https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md)
- [Commits](python-social-auth/social-app-django@5.3.0...5.4.1)

---
updated-dependencies:
- dependency-name: social-auth-app-django
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [bleach[css]](https://github.com/mozilla/bleach) from 6.0.0 to 6.1.0.
- [Changelog](https://github.com/mozilla/bleach/blob/main/CHANGES)
- [Commits](mozilla/bleach@v6.0.0...v6.1.0)

---
updated-dependencies:
- dependency-name: bleach[css]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…6.1.0

⬆(deps): Bump bleach[css] from 6.0.0 to 6.1.0
Bumps [channels[daphne]](https://github.com/django/channels) from 4.0.0 to 4.1.0.
- [Changelog](https://github.com/django/channels/blob/main/CHANGELOG.txt)
- [Commits](django/channels@4.0.0...4.1.0)

---
updated-dependencies:
- dependency-name: channels[daphne]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…hne--4.1.0

⬆(deps): Bump channels[daphne] from 4.0.0 to 4.1.0
Bumps [channels-redis](https://github.com/django/channels_redis) from 4.1.0 to 4.2.0.
- [Changelog](https://github.com/django/channels_redis/blob/main/CHANGELOG.txt)
- [Commits](https://github.com/django/channels_redis/commits)

---
updated-dependencies:
- dependency-name: channels-redis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…app-django-5.4.1

⬆(deps): Bump social-auth-app-django from 5.3.0 to 5.4.1
Bumps [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) from 3.1.9 to 3.2.0.
- [Changelog](https://github.com/jmcnamara/XlsxWriter/blob/main/Changes)
- [Commits](jmcnamara/XlsxWriter@RELEASE_3.1.9...RELEASE_3.2.0)

---
updated-dependencies:
- dependency-name: xlsxwriter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
….2.0

⬆(deps): Bump xlsxwriter from 3.1.9 to 3.2.0
Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.2.0 to 10.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@10.2.0...10.3.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
⬆(deps): Bump pillow from 10.2.0 to 10.3.0
…is-4.2.0

⬆(deps): Bump channels-redis from 4.1.0 to 4.2.0
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…ithub/codeql-action-3

👷(deps): Bump github/codeql-action from 2 to 3
@make-bot make-bot bot added the deployment Pull requests from another branch (usually `dev`) into the `main` branch label May 10, 2024
Copy link

codecov bot commented May 10, 2024

Codecov Report

Attention: Patch coverage is 80.00000% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 88.17%. Comparing base (91ec51b) to head (8a522d8).
Report is 13 commits behind head on main.

❗ Current head 8a522d8 differs from pull request most recent head 4d85a53. Consider uploading reports for the commit 4d85a53 to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #730   +/-   ##
=======================================
  Coverage   88.16%   88.17%           
=======================================
  Files         152      152           
  Lines        6187     6198   +11     
=======================================
+ Hits         5455     5465   +10     
- Misses        732      733    +1     
Files Coverage Δ
src/internal/models.py 93.78% <100.00%> (ø)
src/internal/validators.py 84.21% <ø> (-1.51%) ⬇️
src/make_queue/forms/course.py 82.92% <100.00%> (+1.34%) ⬆️
src/make_queue/models/reservation.py 94.54% <100.00%> (-0.02%) ⬇️
src/web/modelfields.py 100.00% <100.00%> (ø)
src/web/static.py 68.75% <0.00%> (-1.47%) ⬇️

@Gunvor4 Gunvor4 merged commit a4de522 into main May 10, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployment Pull requests from another branch (usually `dev`) into the `main` branch
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants