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

Update to current versions of dependencies #43

Merged
merged 36 commits into from
Mar 3, 2024
Merged

Update to current versions of dependencies #43

merged 36 commits into from
Mar 3, 2024

Conversation

MaggieFero
Copy link
Collaborator

I don't want to lose the history on the PR for this snyk fix branch by closing it, but it's currently running so many incorrect dependencies compared to our actual intended versions that I need to sync back up with something current. Using the main branch of my temp fork for that to keep this as simple as possible.

hughrun and others added 30 commits January 20, 2024 13:19
- improve nginx config
- fix DATA_UPLOAD_MAX_MEMORY_SIZE default not being an int
- translate fallback value in id_to_username template tag
- make location of setting to turn on user exports easier to locate for admins

fixes bookwyrm-social#3227
fixes bookwyrm-social#3231
fixes bookwyrm-social#3232
fixes bookwyrm-social#3236
Since arithmetic is not allowed in .env files, a change in unit for
the variable seems most usable.
Support DATA_UPLOAD_MAX_MEMORY_MiB, only, in .env
…urityFixed

Adds production.conf security configuration missing in version 0.7.2
fix multiple issues from user exports config changes
An instance of requests.get in isbn.py lacks a timeout, and this commit adds one with a default of 15 as used other places in the code, where requests.get does already have a timeout.
An instance of requests.get was missing a timeout; this commit adds a timeout of 15 as used in other places in this codebase which already have timeouts.
Add a comma
…d-timeouts-to-requests.get

Add timeouts to requests.get
The types-requests==2.31.0.2 dependency was double-listed right next to each other; this commit removes one.
Alphabetize requirements.txt for developer convenience; this helps to find duplicates and unnecessarily-pinned subdependencies, as well as making the file easier to read and use.
@MaggieFero
Copy link
Collaborator Author

Just going to merge this because it's into a working branch, and tbh I don't think I intend to merge from the Snyk branch directly once it passes tests at this point. Instead, I'll make the two updates again on a new branch when it's time.

@MaggieFero MaggieFero merged commit c9f81c9 into phildini:snyk-fix-a9700af0a4731c5b84efd9af7ac4551f Mar 3, 2024
@MaggieFero MaggieFero deleted the with-merge-conflict-resolution-for-snyk branch March 3, 2024 02:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants