Commit graph

9425 commits

Author SHA1 Message Date
Hugh Rundle
93c6b76dab
Merge branch 'main' into csv 2024-07-27 13:04:38 +10:00
Hugh Rundle
94dfbbcc05
fix BookwyrmBooksImporter and tests
- change class attribute to instance attribute for mappings
- remove comment from test
- order import retry jobs in generic importer test

This last change seems innocuous but I may be missing something more fundamental  - it was otherwise failing when multiple tests are run, I think because running tests in parallel led to import jobs getting out of order?
2024-07-27 12:55:15 +10:00
Matthew Mincher
f6eb4f4f27
Add test for shelf order 2024-07-21 13:42:44 +01:00
Matthew Mincher
acc68147dc
Order user shelf previews by book shelved date 2024-07-21 12:39:05 +01:00
Bart Schuurmans
ab307388f4
Merge pull request #3384 from lo48576/fix/css-path-prefix-with-s3-backend
Fix CSS path prefix when S3 storage is used
2024-07-14 13:24:02 +02:00
dependabot[bot]
8a235bcda1
Bump django from 4.2.11 to 4.2.14
Bumps [django](https://github.com/django/django) from 4.2.11 to 4.2.14.
- [Commits](https://github.com/django/django/compare/4.2.11...4.2.14)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-10 22:16:44 +00:00
Hugh Rundle
06d6360082
merge latest changes and add tests 2024-06-30 18:54:59 +10:00
Hugh Rundle
e5b260e3ee
Merge branch 'main' into csv 2024-06-29 16:03:15 +10:00
Mouse Reeve
3236003107
Merge pull request #3378 from hughrun/get-books-for-user
possible fix for #3372 - user export timeouts
2024-06-22 20:24:36 -07:00
YOSHIOKA Takuma
1a2f434514
Fix CSS path prefix when S3 storage is used
django-sass-processor 1.4 looks up OPTIONS using `sass_processor`
instead of `staticfiles`.

Fixes #3383.
2024-06-13 05:03:10 +09:00
Hugh Rundle
1d4119e853
LOL
remove Q import so pylint doesn't grumble
2024-06-09 10:59:11 +10:00
Hugh Rundle
261e794c1c
possible fix for #3372 - user export timeouts
This definitely needs to be tested on a large DB but I believe it may fix the timeouts b.s. gets when running user exports.

Instead of a gigantic single DB query with heaps of joins, we instead just do a series of simple queries and then use union()
to pull them into a de-duped queryset.

If I understand the results from explain() correctly, this is a massive reduction in DB work:

Unique  (cost=195899.15..198201.71 rows=11808 width=19220)

vs

Unique  (cost=150.28..153.44 rows=16 width=19220)
2024-06-09 10:34:22 +10:00
Mouse Reeve
2e675474a9 Reorganizes PR template a bit
I found the template a little overwhelming, so this is an attempt to
make it a little more navigable and slightly less effortful.
2024-06-08 08:31:34 -07:00
Mouse Reeve
3f08d6d8c4 Use a simpler query for books to show on the landing page 2024-06-08 08:18:54 -07:00
Mouse Reeve
3545a1c3b6
Merge pull request #3362 from hughrun/gh-actions
add GitHub templates for PRs and releases
2024-06-01 18:50:26 -07:00
Mouse Reeve
4d3d5d15d0
Merge pull request #3370 from Tak/add-hashtag-to-context
Add `as:Hashtag` to activitypub context
2024-06-01 18:48:38 -07:00
Bart Schuurmans
d90e8e56d5
Merge pull request #3341 from Minnozz/django-4.2
Upgrade to Django 4.2
2024-05-31 17:04:17 +02:00
Bart Schuurmans
eca246fc61 Fix lint 2024-05-31 16:59:24 +02:00
Bart Schuurmans
aa2312e8af Merge branch 'main' into django-4.2 2024-05-31 16:52:48 +02:00
Bart Schuurmans
61d9e0c260
Move comment to separate line
Co-authored-by: Adeodato Simó <73768+dato@users.noreply.github.com>
2024-05-31 16:49:34 +02:00
Bart Schuurmans
44eedd09d9
Merge pull request #1 from dato/django-4.2
minor contributions to django 4.2 upgrade
2024-05-31 16:49:06 +02:00
Levi Bard
46544451d4 Add as:Hashtag to activitypub context 2024-05-23 09:40:25 +02:00
Mouse Reeve
4e987a0e66
Merge pull request #3369 from bookwyrm-social/dependabot/pip/requests-2.32.0
Bump requests from 2.31.0 to 2.32.0
2024-05-21 14:47:34 -07:00
dependabot[bot]
332286cdff
---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-21 05:41:48 +00:00
Hugh Rundle
e4035c6da6
add GitHub templates for PRs and releases
This commit adds:

1. a release template for GitHub releases.
2. a pull request template to help contributors and maintainers to understand and merge PRs faster, and label them correctly.

When using GitHub automated release notes, PRs will be split into sections based on the following labels:

- `breaking-change` or `config-change`
- `dependencies`
- `enhancement`
- `fix` or `bug`
- `plumbing`, `tests` or `deployment`
- all other PRs

Any labels not currently in use will be added once the PR for this commit is finalised and merged.
2024-04-28 13:30:47 +10:00
Adeodato Simó
e6ee169c3e
Narrow down bare type: ignore pragmas 2024-04-26 21:20:43 -03:00
Adeodato Simó
29f852b57e
consolidate multiple cache.delete() calls into cache.delete_many() 2024-04-26 15:36:38 -03:00
Bart Schuurmans
acae063652 Fix new warnings from pylint upgrade 2024-04-26 13:59:16 +02:00
Bart Schuurmans
c32f9faaa0 Upgrade pylint to 2.17.7 2024-04-26 13:41:01 +02:00
Bart Schuurmans
e7f95ef4c2 Modify update_fields in save() when modifying objects
https://docs.djangoproject.com/en/5.0/releases/4.2/#setting-update-fields-in-model-save-may-now-be-required
2024-04-25 15:53:53 +02:00
Bart Schuurmans
a6c2ce15dd Early return 2024-04-25 15:51:32 +02:00
Bart Schuurmans
7604d0acdb Simplify ObjectMixin broadcast kwarg 2024-04-25 10:31:24 +02:00
Bart Schuurmans
77832cbec7 Add merge migration 2024-04-25 10:14:07 +02:00
Bart Schuurmans
de67c73237 Add merge migration 2024-04-25 10:14:07 +02:00
Bart Schuurmans
f38622fdc9 Define CSRF_TRUSTED_ORIGINS 2024-04-25 10:14:07 +02:00
Bart Schuurmans
051dab77bb Replace deprecated CICharField with custom collation for case-insensitivity 2024-04-25 10:14:07 +02:00
Bart Schuurmans
2896219e88 Switch from django-redis to the built-in Redis cache backend 2024-04-25 10:14:07 +02:00
Bart Schuurmans
03ac846b5d Migrate from pytz to zoneinfo 2024-04-25 10:14:07 +02:00
Bart Schuurmans
39c2a0feae Update qrcode to 7.4.2 2024-04-25 10:14:07 +02:00
Bart Schuurmans
22986a08f0 Update pytest to 8.1.1 2024-04-25 10:14:07 +02:00
Bart Schuurmans
f6bbe673ca Update responses to 0.25.0 2024-04-25 10:14:07 +02:00
Bart Schuurmans
f324a3cd1d Update pytest-xdist to 3.5.0 2024-04-25 10:14:07 +02:00
Bart Schuurmans
039160e004 Update pytest-env to 1.1.3 2024-04-25 10:14:07 +02:00
Bart Schuurmans
a1ff5a478e Update types-Pillow to 10.2.0.20240331 2024-04-25 10:14:07 +02:00
Bart Schuurmans
1cb86197d5 Update types-requests to 2.31.0.20240311 2024-04-25 10:14:07 +02:00
Bart Schuurmans
2537886b4d Group version constraints for indirect dependencies and change to >= 2024-04-25 10:14:07 +02:00
Bart Schuurmans
1474c0d3aa Remove protobuf as a direct dependency 2024-04-25 10:14:07 +02:00
Bart Schuurmans
e46bc2e9a1 Update redis-py to 5.0.3 2024-04-25 10:14:07 +02:00
Bart Schuurmans
01b37026eb Update Markdown to 3.6 2024-04-25 10:14:07 +02:00
Bart Schuurmans
9ebda3fbe8 Update celery to 5.3.6 2024-04-25 10:14:07 +02:00