Merge main into production Nov24 - #71
Merged
Merged
Conversation
Collaborator
Author
|
Guess who got tricked by the arrow in the GitHub Web UI yet again! I'll file another PR that actually goes the direction I intended instead of this. |
Collaborator
Author
Or nevermind, I did do it right, but if I can't keep track of git merge directionality I'm too tired for git, so the conflict resolution is a project for another day. |
- Include the book's subtitle in the DC.Alternative field, if it's there - Strip html tags from the book's description field - Fix VS Code's overeager inclusion of quotes that broke on multiple authors
Add DublinCore metadata to Book page
… without breaking it
Allow S3 Default ACL Override
…rk_initdb Change `init_db` command so it can be run against initialized database without errors.
…x_cache_lock nginx: add proxy_cache_lock, so we wait one request to populate cache if there is one ongoing for that cache-key
New Crowdin updates
Re-compiles locale files
…sion Bump version to 0.8.0.
# Conflicts: # requirements.txt
# Conflicts: # VERSION # docker-compose.yml # requirements.txt
Updates tests and forms to comply with new password requirements: - Update all test passwords to meet 16-character minimum - Fix RegisterForm to validate password against username/email similarity - Fix PasswordResetForm to pass user instance to validate_password() - Fix ChangePasswordForm to pass user instance to validate_password() This fixes test failures after merging upstream v0.8.0 which introduced: - Minimum password length of 16 characters - UserAttributeSimilarityValidator with max_similarity of 0.9
Update all instances of 'mouseword' to 'mouseword-password-123' in test_register.py to meet the 16-character minimum password requirement. Fixes: - test_register_trailing_space - test_register_blocked_domain - test_register_invalid_email - test_register_invalid_username variants
Consolidate temporary user creation to single line to meet Black formatting requirements.
Break temp_user creation into multiple lines with trailing commas to comply with Black formatting and pylint line length requirements.
Update dev-tools/requirements.txt to use black==22.* to match CI and main requirements. Run black 22 formatter to fix all formatting issues. Files reformatted: - bookwyrm/settings.py - bookwyrm/tests/views/landing/test_password.py - bookwyrm/tests/views/landing/test_register.py - bookwyrm/views/preferences/change_password.py
Split long comments across multiple lines to meet 88-character limit: - bookwyrm/views/landing/password.py:78 (was 138 chars) - bookwyrm/views/preferences/change_password.py:34 (was 136 chars)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR will merge our current main into our current production; both were synced with upstream, then I merged some security upgrades into our main. Upstream production is behind upstream main, so this will both bring our production up to upstream main and also add the new security fixes.
What type of Pull Request is this?
Does this PR change settings or dependencies, or break something?
Details of breaking or configuration changes (if any of above checked)
The only things I intend to change here are dependencies, including upgrades to setuptools and pinning several indirect dependency versions. There may be changes to config or other breaking changes as merged from upstream.
Documentation
N/A; no functional changes being made here distinct from upstream, documentation should be handled at the point where changes occur.
Tests