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 #453

Merged
merged 91 commits into from
May 20, 2022
Merged

Deployment #453

merged 91 commits into from
May 20, 2022

Conversation

Maisergodt and others added 30 commits August 9, 2020 14:24
Co-authored-by: Markus Ho-Yen <32592450+mahoyen@users.noreply.github.com>
# Conflicts:
#	locale/nb/LC_MESSAGES/django.mo
#	locale/nb/LC_MESSAGES/django.po
#	news/urls.py
#	news/views.py
Bumps [bleach](https://github.com/mozilla/bleach) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/main/CHANGES)
- [Commits](mozilla/bleach@v4.1.0...v5.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
...instead of lists, to avoid duplicates in case Bleach's `ALLOWED_TAGS` or `ALLOWED_PROTOCOLS` update to contain some of the same elements
as we define.
⬆(deps): Bump bleach from 4.1.0 to 5.0.0
Bumps [django-ckeditor](https://github.com/django-ckeditor/django-ckeditor) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/django-ckeditor/django-ckeditor/releases)
- [Changelog](https://github.com/django-ckeditor/django-ckeditor/blob/master/CHANGELOG.rst)
- [Commits](django-ckeditor/django-ckeditor@6.2.0...6.3.0)

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

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

⬆(deps): Bump django-ckeditor from 6.2.0 to 6.3.0
There was a bug that only seemed to happen on the server machine (running Ubuntu 20.04 and Python 3.9), that caused the signal receivers in
`groups/signals.py` and `internal/signals.py` (and presumably also `web/signals.py) to be disconnected at some point in time after connecting at
startup. I'm not sure why this did not happen on the CI servers (also running Ubuntu and testing Python 3.8-10) or my local machine, but it was found
out to be likely to have been caused by Python's interpreter garbage collecting the signal receivers, as they were defined as local functions inside
the scope of the `connect()` functions.
This doesn't fix any bugs currently, as none of the other imports happen to use the settings in some way, but it was done as a preventative measure.
ddabble and others added 24 commits May 16, 2022 16:19
Uploaded files are of the type `TemporaryUploadedFile` when larger than 2.5 MB
(see https://docs.djangoproject.com/en/4.0/ref/settings/#std:setting-FILE_UPLOAD_MAX_MEMORY_SIZE),
which were both closed too early in `file_utils.calculate_file_hash()` and not handled properly in `CompressedImageField.clean()`.
For some image files, the "reduced" image file will be larger, for some reason.
Fix various bugs + some improvements
# Conflicts:
#	locale/nb/LC_MESSAGES/django.po
#	news/urls.py
#	news/views.py
...except from some lines that do not fit our project, which were reset.
This makes the name more descriptive of the template's actual function/usage.
* Renamed the form and view to make them match the name of the template
* Moved the form's help text from the template to the form itself, which makes the form more reusable
* Removed `rel="noopener noreferrer"` in the template, as it's only potentially necessary when another site than our own is linked
* Renamed the URL, to make it more RESTful
* Added prefetching of tickets' events
This should make the view's code easier to read.
This removes some duplicated code in `admin_event_participants_search.html`.
This also makes one of the rules in `admin_event_participants_search.css` redundant.

Also added some extra customization options to `CustomFieldsetFormMixin`.
Also made the users appear in alphabetical order, and added a message for when no users were found.
...into found users with tickets first, and found users without tickets last.
Also reformatted the query construction code, to make it more modifiable.
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.1.0 to 9.1.1.
- [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.1.0...9.1.1)

---
updated-dependencies:
- dependency-name: pillow
  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-ckeditor](https://github.com/django-ckeditor/django-ckeditor) from 6.4.0 to 6.4.1.
- [Release notes](https://github.com/django-ckeditor/django-ckeditor/releases)
- [Changelog](https://github.com/django-ckeditor/django-ckeditor/blob/master/CHANGELOG.rst)
- [Commits](django-ckeditor/django-ckeditor@6.4.0...6.4.1)

---
updated-dependencies:
- dependency-name: django-ckeditor
  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-simple-history](https://github.com/jazzband/django-simple-history) from 3.0.0 to 3.1.1.
- [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.0.0...3.1.1)

---
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>
The migration for this change will be added in the next commit.
This was not done in that pull request.
…e-history-3.1.1

⬆(deps): Bump django-simple-history from 3.0.0 to 3.1.1
@ddabble ddabble added the deployment Pull requests from another branch (usually `dev`) into the `main` branch label May 20, 2022
@ddabble ddabble requested a review from sigridge May 20, 2022 15:02
@codecov
Copy link

codecov bot commented May 20, 2022

Codecov Report

Merging #453 (5e5ebf0) into main (aab7faa) will increase coverage by 16.21%.
The diff coverage is 90.24%.

@@             Coverage Diff             @@
##             main     #453       +/-   ##
===========================================
+ Coverage   71.73%   87.95%   +16.21%     
===========================================
  Files         103      134       +31     
  Lines        3312     5386     +2074     
===========================================
+ Hits         2376     4737     +2361     
+ Misses        936      649      -287     
Impacted Files Coverage Δ
dataporten/social.py 52.77% <0.00%> (+1.49%) ⬆️
card/utils.py 46.15% <33.33%> (ø)
internal/signals.py 42.85% <42.85%> (ø)
card/views.py 54.16% <50.00%> (+4.16%) ⬆️
checkin/views.py 40.82% <50.00%> (+14.66%) ⬆️
mail/email.py 38.63% <50.00%> (+4.54%) ⬆️
docs/forms.py 62.50% <51.51%> (+62.50%) ⬆️
dataporten/ldap_utils.py 67.44% <66.66%> (+32.95%) ⬆️
dataporten/views.py 81.48% <66.66%> (-7.16%) ⬇️
internal/formfields.py 68.75% <68.75%> (ø)
... and 155 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update aab7faa...5e5ebf0. Read the comment docs.

Also updated the CHANGELOG with the changes from #304.
@ddabble ddabble merged commit bdf6efa into main May 20, 2022
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
None yet
Development

Successfully merging this pull request may close these issues.

4 participants