Skip to content

Commit 54b2e1f

Browse files
authored
Merge pull request #1104 from MESH-Research/main
Merge email subject string fix
2 parents 09036f0 + 0c962ca commit 54b2e1f

11 files changed

Lines changed: 592 additions & 400 deletions

File tree

.github/workflows/tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
jobs:
1717
test:
1818
runs-on: ubuntu-latest
19+
timeout-minutes: 60
1920
steps:
2021
- name: Checkout
2122
uses: actions/checkout@v4

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@
99

1010
![KCWorks logo](static/images/kc_works_logos/SVG/kc_works_logo_wordmark.svg)
1111

12-
Knowledge Commons Works is a collaborative tool for storing and sharing academic research. It is part of Knowledge Commons and is built on an instance of the InvenioRDM repository system.
12+
Knowledge Commons Works is a collaborative tool for storing and sharing academic
13+
research. It is part of Knowledge Commons and is built on an instance of the
14+
InvenioRDM repository system.
1315

14-
Version 0.7.3
16+
Version 0.8.0
1517

1618
## Copyright
1719

18-
Copyright 2023-26 Mesh Research. Released under the MIT license. (See the included LICENSE.txt file.)
20+
Copyright 2023-26 Mesh Research. Released under the MIT license. (See the
21+
included LICENSE.txt file.)
1922

2023
## Documentation
2124

22-
The technical documentation, including installation instructions, lives at https://mesh-research.github.io/knowledge-commons-works/
25+
The technical documentation, including installation instructions, lives at
26+
https://mesh-research.github.io/knowledge-commons-works/

docs/source/README.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,32 @@
99

1010
![KCWorks logo](../../static/images/kc_works_logos/SVG/kc_works_logo_wordmark.svg)
1111

12-
Version 0.7.3
12+
Version 0.8.0
1313

14-
Knowledge Commons Works is a collaborative platform for storing and sharing academic research. It is part of [Knowledge Commons](https://about.hcommons.org/) and is built on an instance of the [InvenioRDM](https://inveniordm.docs.cern.ch/) repository system.
14+
Knowledge Commons Works is a collaborative platform for storing and sharing
15+
academic research. It is part of
16+
[Knowledge Commons](https://about.hcommons.org/) and is built on an instance of
17+
the [InvenioRDM](https://inveniordm.docs.cern.ch/) repository system.
1518

16-
Knowledge Commons and KCWorks are developed and maintained by [Mesh Research](https://meshresearch.net/).
19+
Knowledge Commons and KCWorks are developed and maintained by
20+
[Mesh Research](https://meshresearch.net/).
1721

1822
## Copyright and License
1923

2024
Copyright 2023-26 Mesh Research.
2125

22-
Knowledge Commons Works is free open source software. It is released under the MIT license. (See the included LICENSE.txt file.)
26+
Knowledge Commons Works is free open source software. It is released under the
27+
MIT license. (See the included LICENSE.txt file.)
2328

2429
## Documentation
2530

26-
The technical documentation, including installation instructions, lives at https://mesh-research.github.io/knowledge-commons-works/
31+
The technical documentation, including installation instructions, lives at
32+
https://mesh-research.github.io/knowledge-commons-works/
2733

2834
## Source Code
2935

30-
Knowledge Commons Works is open source software. The source code is available at https://github.com/mesh-research/knowledge-commons-works.
36+
Knowledge Commons Works is open source software. The source code is available at
37+
https://github.com/mesh-research/knowledge-commons-works.
3138

3239
## Contributing
3340

docs/source/changelog.md

Lines changed: 261 additions & 106 deletions
Large diffs are not rendered by default.

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
project = "Knowledge Commons Works"
1010
copyright = "2026, Mesh Research"
1111
author = "Mesh Research"
12-
release = "0.7.3"
12+
release = "0.8.0"
1313

1414
# -- General configuration ---------------------------------------------------
1515
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

invenio.cfg

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,12 @@ MAIL_SUPPRESS_SEND = (
12981298
RECORD_IMPORTER_ADMIN_EMAIL = os.getenv("INVENIO_ADMIN_EMAIL") # default owner account
12991299
APP_RDM_ADMIN_EMAIL_RECIPIENT = os.getenv("INVENIO_ADMIN_EMAIL")
13001300
GROUP_COLLECTIONS_ADMIN_EMAIL = os.getenv("INVENIO_ADMIN_EMAIL") # admin owner account
1301-
SECURITY_EMAIL_SUBJECT_REGISTER = _("Welcome to KCWorks!")
1301+
# Plain str (not lazy_gettext): this value is read once at app config load,
1302+
# outside any request/locale context, so lazy translation would not produce a
1303+
# recipient-localized subject. A LazyString here also breaks Kombu when
1304+
# Invenio-Accounts' delay_security_email pushes msg.__dict__ to Celery
1305+
# (kombu.exceptions.EncodeError: can not serialize 'LazyString' object).
1306+
SECURITY_EMAIL_SUBJECT_REGISTER = "Welcome to KCWorks!"
13021307
13031308
# Invenio-Notifications
13041309
# --------------------

pyproject.toml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ requires = ["babel>2.8", "setuptools>=61", "wheel"]
44

55
[project]
66
name = "kcworks"
7-
version = "0.7.3"
7+
version = "0.8.0"
88
requires-python = ">=3.12"
99
classifiers = [
1010
"Programming Language :: Python :: 3 :: Only",
@@ -80,6 +80,7 @@ optional-dependencies.tests = [
8080
"pytest-mock",
8181
"pytest-mypy>=0.10",
8282
"pytest-ruff>=0.1",
83+
"pytest-timeout",
8384
"ty",
8485
]
8586
scripts.group-collections = "kcworks.cli:group_collections"
@@ -114,6 +115,7 @@ dev = [
114115
"psycopg2-binary>=2.9.10",
115116
"pytest-isort>=4",
116117
"pytest-mock",
118+
"pytest-timeout",
117119
"requests-mock",
118120
"ruff>=0.3",
119121
"selenium",
@@ -208,19 +210,6 @@ skip = [
208210
# "node_modules", # Skip node modules
209211
]
210212

211-
[tool.ty]
212-
environment.python-version = "3.12"
213-
rules.unresolved-import = "ignore"
214-
src.exclude = [
215-
"**/tests/**",
216-
"**/site/kcworks/dependencies/**",
217-
"**/site/kcworks/services/search/index_templates/**",
218-
]
219-
220-
[[tool.ty.overrides]]
221-
include = ["**/kcworks/services/search/index_templates/**"]
222-
rules = { unresolved-attribute = "ignore", invalid-assignment = "ignore", unresolved-import = "ignore" }
223-
224213
[tool.mypy]
225214
python_version = "3.12"
226215
warn_return_any = true
@@ -248,6 +237,19 @@ ignore_errors = true
248237
ignore_missing_imports = true
249238
follow_imports = "skip"
250239

240+
[tool.ty]
241+
environment.python-version = "3.12"
242+
rules.unresolved-import = "ignore"
243+
src.exclude = [
244+
"**/tests/**",
245+
"**/site/kcworks/dependencies/**",
246+
"**/site/kcworks/services/search/index_templates/**",
247+
]
248+
249+
[[tool.ty.overrides]]
250+
include = ["**/kcworks/services/search/index_templates/**"]
251+
rules = { unresolved-attribute = "ignore", invalid-assignment = "ignore", unresolved-import = "ignore" }
252+
251253
[tool.pytest]
252254
ini_options.addopts = """
253255
--ruff --doctest-modules
@@ -279,6 +281,8 @@ ini_options.norecursedirs = [
279281
]
280282
ini_options.log_cli_level = "DEBUG"
281283
ini_options.isort_show_files = true
284+
ini_options.timeout = 300
285+
ini_options.timeout_method = "thread"
282286
ini_options.plugins = [
283287
"tests.fixtures.caching",
284288
"tests.fixtures.cli",

site/kcworks/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616

1717
"""KCWorks customizations to InvenioRDM."""
1818

19-
__version__ = "0.7.3"
19+
__version__ = "0.8.0"

0 commit comments

Comments
 (0)