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.

Sign up for GitHub

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

Jump to bottom

Dev adjustments #309

Merged
merged 5 commits into from
Jul 17, 2024
Merged

Dev adjustments #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59e9444
fix error message generation for signal
claire-peters Jul 17, 2024
c42fd4f
add info to email logging error
claire-peters Jul 17, 2024
8e4afa0
update to Django 4.2.14 and django-q2
claire-peters Jul 17, 2024
3892e06
update dependencies
claire-peters Jul 17, 2024
16858df
change verify config to boolean
claire-peters Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion coldfront/config/logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@
'coldfront': {
'handlers': ['key-events'],
'level': 'INFO',
}
},
},
}
2 changes: 1 addition & 1 deletion coldfront/config/plugins/fasrc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
INSTALLED_APPS += [ 'coldfront.plugins.fasrc' ]

NEO4JP = ENV.str('NEO4JP')
ATT_VERIFY = ENV.str('ATT_VERIFY', default=True)
ATT_VERIFY = ENV.bool('ATT_VERIFY', default=True)

LOGGING['handlers']['fasrc'] = {
'class': 'logging.handlers.TimedRotatingFileHandler',
Expand Down
2 changes: 1 addition & 1 deletion coldfront/config/plugins/xdmod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

XDMOD_USER = ENV.str('XDMOD_USER', default='')
XDMOD_PASS = ENV.str('XDMOD_PASS', default='')
XDMOD_VERIFY = ENV.str('XDMOD_VERIFY', default=True)
XDMOD_VERIFY = ENV.bool('XDMOD_VERIFY', default=True)
XDMOD_API_URL = ENV.str('XDMOD_API_URL')


Expand Down
2 changes: 1 addition & 1 deletion coldfront/core/allocation/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def post(self, request, *args, **kwargs):
try:
allocation_activate.send(sender=self.__class__, allocation_pk=allocation_obj.pk)
except:
messages.error("Allocation activated, but certain parts of the post-creation process were unsuccessful. Please contact the administrator or check the logs for more information.")
messages.error(request, "Allocation activated, but certain parts of the post-creation process were unsuccessful. Please contact the administrator or check the logs for more information.")

for allocation_user in allocation_users:
allocation_activate_user.send(
Expand Down
4 changes: 2 additions & 2 deletions coldfront/core/utils/mail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ def send_email(subject, body, sender, receiver_list, cc=[]):
return

if len(receiver_list) == 0:
logger.error('Failed to send email missing receiver_list')
logger.error('Failed to send email missing receiver_list. Subject: %s', subject)
return

if len(sender) == 0:
logger.error('Failed to send email missing sender address')
logger.error('Failed to send email missing sender address. Subject: %s', subject)
return

if len(EMAIL_SUBJECT_PREFIX) > 0:
Expand Down
18 changes: 9 additions & 9 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ arrow==1.3.0
asgiref==3.7.2
bibtexparser==1.4.1
blessed==1.20.0
certifi==2024.2.2
certifi==2024.07.04
chardet==5.2.0
charset-normalizer==3.3.2
crispy-bootstrap4==2024.1
Django==4.2.11
Django==4.2.14
django-crispy-forms==2.1
django-environ==0.11.2
django-model-utils==4.4.0
django-picklefield==3.1
django-q==1.3.9
django-q2==1.5.1
django-settings-export==1.2.1
django-simple-history==3.5.0
django-split-settings==1.3.0
Expand All @@ -24,19 +24,19 @@ fontawesome-free==5.15.4
FormEncode==2.0.1
future==1.0.0
humanize==4.9.0
idna==3.6
idna==3.7
pyparsing==3.1.2
python-dateutil==2.9.0.post0
python-memcached==1.62
pytz==2024.1
redis==3.5.3
requests==2.31.0
redis==5.0.0
requests==2.32.0
six==1.16.0
sqlparse==0.4.4
sqlparse==0.5.0
text-unidecode==1.3
types-python-dateutil==2.8.19.20240106
typing_extensions==4.10.0
urllib3==2.2.1
urllib3==2.2.2
wcwidth==0.2.13
django-author==1.2.0
django-auth-ldap
Expand All @@ -47,7 +47,7 @@ django-filter==24.2
django-extensions==3.2.3
django-mathfilters==1.0.0
django-tables2==2.3.4
djangorestframework==3.15.0
djangorestframework==3.15.2
djangorestframework-datatables==0.7.0
ipython==7.16.3
isilon-sdk
Expand Down
Loading