sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v23.6.0'

Browse Source
This commit is contained in:
Sander Roosendaal
2025-06-23 20:56:01 +02:00
parent ce5221d12c ff2fdb75d7
commit bfa64e360b
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/integrations/nk.py
View File

@@ -71,7 +71,7 @@ class NKIntegration(SyncIntegration):
try: try:
_ = self.open() _ = self.open()
except NoTokenError: # pragma: no cover except NoTokenError: # pragma: no cover
dologging("nklog.log","NK Token error for user {id}".format(id=rower.user.id)) dologging("nklog.log","NK Token error for user {id}".format(id=self.rower.user.id))
return 0 return 0
workouts = self.get_workout_list(before=before, after=after) workouts = self.get_workout_list(before=before, after=after)

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

31
rowsandall_app/settings.py
View File

@@ -85,6 +85,7 @@ INSTALLED_APPS = [
'taggit', 'taggit',
'boatmovers', 'boatmovers',
'django_recaptcha', 'django_recaptcha',
'anymail',
] ]
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (
@@ -446,22 +447,28 @@ CACHE_MIDDLEWARE_SECONDS = 900
# EMAIL_USE_TLS = CFG['email_use_tls'] # EMAIL_USE_TLS = CFG['email_use_tls']
# DEFAULT_FROM_EMAIL = 'admin@rowsandall.com' # DEFAULT_FROM_EMAIL = 'admin@rowsandall.com'
EMAIL_BACKEND = 'django_ses.SESBackend' #EMAIL_BACKEND = 'django_ses.SESBackend'
AWS_SES_REGION_NAME = CFG['aws_region'] ANYMAIL = {
AWS_SES_REGION_ENDPOINT = CFG['aws_smtp'] 'MAILERSEND_API_TOKEN': CFG['mailersend_api_key'],
}
EMAIL_BACKEND = 'anymail.backends.mailersend.EmailBackend'
AWS_SES_ACCESS_KEY_ID = CFG['aws_access_key_id'] #AWS_SES_REGION_NAME = CFG['aws_region']
AWS_SES_SECRET_ACCESS_KEY = CFG['aws_secret_access_key'] #AWS_SES_REGION_ENDPOINT = CFG['aws_smtp']
AWS_ACCESS_KEY_ID = CFG['aws_access_key_id']
AWS_SECRET_ACCESS_KEY = CFG['aws_secret_access_key']
EMAIL_HOST = CFG['aws_smtp'] #AWS_SES_ACCESS_KEY_ID = CFG['aws_access_key_id']
EMAIL_PORT = CFG['aws_port'] #AWS_SES_SECRET_ACCESS_KEY = CFG['aws_secret_access_key']
EMAIL_HOST_USER = CFG['aws_smtp_username'] #AWS_ACCESS_KEY_ID = CFG['aws_access_key_id']
EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] #AWS_SECRET_ACCESS_KEY = CFG['aws_secret_access_key']
EMAIL_USE_TLS = CFG['email_use_tls']
#EMAIL_HOST = CFG['aws_smtp']
#EMAIL_PORT = CFG['aws_port']
#EMAIL_HOST_USER = CFG['aws_smtp_username']
#EMAIL_HOST_PASSWORD = CFG['aws_smtp_password']
#EMAIL_USE_TLS = CFG['email_use_tls']
DEFAULT_FROM_EMAIL = 'info@rowsandall.com' DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
SERVER_EMAIL = 'support@rowsandall.com'
# weather stuff # weather stuff

18
rowsandall_app/settings_dev.py
View File

@@ -105,16 +105,16 @@ SITE_URL = "http://localhost:8000"
# EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend' # EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' # EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_BACKEND = 'django_ses.SESBackend' #EMAIL_BACKEND = 'django_ses.SESBackend'
AWS_SES_REGION_NAME = 'eu-west-1' #AWS_SES_REGION_NAME = 'eu-west-1'
AWS_SES_REGION_ENDPOINT = 'email.eu-west-1.amazonaws.com' #AWS_SES_REGION_ENDPOINT = 'email.eu-west-1.amazonaws.com'
EMAIL_HOST = CFG['aws_smtp'] #EMAIL_HOST = CFG['aws_smtp']
EMAIL_PORT = CFG['aws_port'] #EMAIL_PORT = CFG['aws_port']
EMAIL_HOST_USER = CFG['aws_smtp_username'] #EMAIL_HOST_USER = CFG['aws_smtp_username']
EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] #EMAIL_HOST_PASSWORD = CFG['aws_smtp_password']
EMAIL_USE_TLS = CFG['email_use_tls'] #EMAIL_USE_TLS = CFG['email_use_tls']
DEFAULT_FROM_EMAIL = 'info@rowsandall.com' #DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
SETTINGS_NAME = 'rowsandall_app.settings_dev' SETTINGS_NAME = 'rowsandall_app.settings_dev'