Skip to content

Commit 231bf1b

Browse files
committed
Merge tag '26.5.0' into develop
Notification refactor post-release project (Post-NR)
2 parents 31048c7 + 2972e89 commit 231bf1b

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
44

5+
26.5.0 (2026-03-13)
6+
===================
7+
8+
- Notification refactor post-release project (Post-NR)
9+
510
26.4.1 (2026-03-01)
611
===================
712

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "OSF",
3-
"version": "26.4.1",
3+
"version": "26.5.0",
44
"description": "Facilitating Open Science",
55
"repository": "https://github.com/CenterForOpenScience/osf.io",
66
"author": "Center for Open Science",

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "osf-io"
3-
version = "26.4.1"
3+
version = "26.5.0"
44
description = "The code for [https://osf.io](https://osf.io)."
55
authors = ["Your Name <you@example.com>"]
66
license = "Apache License 2.0"

website/settings/defaults.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,17 @@ def parent_dir(path):
186186
NO_ADDON_WAIT_TIME = timedelta(weeks=8) # 2 months for "Link an add-on to your OSF project" email
187187
NO_LOGIN_WAIT_TIME = timedelta(weeks=52) # 1 year for "We miss you at OSF" email
188188
NO_LOGIN_OSF4M_WAIT_TIME = timedelta(weeks=52) # 1 year for "We miss you at OSF" email to users created from OSF4M
189-
NOTIFICATIONS_CLEANUP_AGE = timedelta(weeks=52) # 1 month to clean up old notifications and email tasks
189+
# TODO: this will be changed to 12 weeks (3 month) with ENG-9856
190+
NOTIFICATIONS_CLEANUP_AGE = timedelta(weeks=52) # 1 year to clean up old notifications and email tasks
190191

191192
# Configuration for "We miss you at OSF" email (`NotificationTypeEnum.USER_NO_LOGIN`)
192193
# Note: 1) we can gradually increase `MAX_DAILY_NO_LOGIN_EMAILS` to 10000, 100000, etc. or set it to `None` after we
193194
# have verified that users are not spammed by this email after NR release. 2) If we want to clean up database for those
194195
# already sent `USER_NO_LOGIN` emails, we need to adjust the cut-off time to the day we clean the DB.
195196
MAX_DAILY_NO_LOGIN_EMAILS = 1000
196-
NO_LOGIN_EMAIL_CUTOFF = datetime.datetime(2026, 1, 5)
197+
# Note: set to 26/3/13 which is the date we release to `master` and deploy to test server; prod server has a different
198+
# date, which is configured in the private config, using the date when it is deployed to prod.
199+
NO_LOGIN_EMAIL_CUTOFF = datetime.datetime(2026, 3, 13)
197200

198201
# TODO: Override in local.py
199202
MAILGUN_API_KEY = None

0 commit comments

Comments
 (0)