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

Merged
merged 85 commits into from
Nov 20, 2020
Merged

Deployment #334

merged 85 commits into from
Nov 20, 2020

Conversation

sigridge
Copy link
Member

This PR includes changes from
#331 Run apt update before installing system dependencies
#330 Feature/secrets
#329 Use timezone aware datetimes in announcements
#326 Copy Participants Emails
#325 Updated about page and email list
#322 Add equipment priority
#321 Configure logging and add logging where appropriate
#320 Don't update user's name if it's been changed after account creation
#319 Update requirements

ddabble and others added 30 commits October 24, 2020 03:50
The version constraint on `channels` is due to a bug that was fixed in 2.3.0 (see django/channels#1240).
This is from the change in Django 3.1 where `User.first_name`'s `max_length` is increased from 30 to 150, which we need to add our own migration for - because we're using a custom user model that inherits from Django's user model.
Modifying the existing migration is fine in this case, as the `blank` argument doesn't alter the database in any way - it's only used by forms.
Also prevented unnecessarily saving when no fields needed updating.
Also added an EquipmentQuerySet manager to Equipment, with a `default_order_by()` method.
Reordered the fields in the Equipment model to avoid having to manually set the field order in EquipmentForm.

Also added ordering by priority (and title) in EquipmentListView and AdminEquipmentView.
Configure logging and add logging where appropriate
# Conflicts:
#	locale/nb/LC_MESSAGES/django.mo
#	locale/nb/LC_MESSAGES/django.po
Don't update user's name if it's been changed after account creation
Markus Ho-Yen and others added 26 commits November 9, 2020 11:43
Also changed date from datefield to datetimefield and renamed permissions.
Run apt update before installing system dependencies
Use timezone aware datetimes in announcements
# Conflicts:
#	locale/nb/LC_MESSAGES/django.mo
#	locale/nb/LC_MESSAGES/django.po
# Conflicts:
#	locale/nb/LC_MESSAGES/django.mo
#	locale/nb/LC_MESSAGES/django.po
@codecov
Copy link

codecov bot commented Nov 20, 2020

Codecov Report

Merging #334 (0cd1998) into master (a053471) will increase coverage by 1.49%.
The diff coverage is 90.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #334      +/-   ##
==========================================
+ Coverage   70.55%   72.05%   +1.49%     
==========================================
  Files         102      103       +1     
  Lines        3254     3357     +103     
==========================================
+ Hits         2296     2419     +123     
+ Misses        958      938      -20     
Impacted Files Coverage Δ
internal/urls.py 100.00% <ø> (ø)
mail/email.py 34.09% <0.00%> (ø)
news/views.py 74.44% <ø> (+3.70%) ⬆️
news/models.py 86.06% <33.33%> (+3.42%) ⬆️
web/multilingual/form.py 93.54% <33.33%> (+0.21%) ⬆️
util/html_utils.py 50.00% <50.00%> (ø)
internal/models.py 75.23% <85.71%> (+0.74%) ⬆️
makerspace/admin.py 93.33% <91.66%> (-6.67%) ⬇️
internal/views.py 78.12% <96.29%> (+4.08%) ⬆️
dataporten/views.py 88.63% <96.55%> (+51.59%) ⬆️
... and 14 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 a053471...0cd1998. Read the comment docs.

@sigridge sigridge merged commit 2e50221 into master Nov 20, 2020
@mahoyen mahoyen added the deployment Pull requests from another branch (usually `dev`) into the `main` branch label Sep 16, 2021
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.

5 participants