Build(deps): Generally update JS & Python deps (#512)

This commit is contained in:
2022-11-17 12:06:21 +00:00
committed by GitHub
parent 3767923175
commit de4bed92a4
6 changed files with 3485 additions and 3354 deletions

View File

@@ -11,7 +11,6 @@ asgiref = "~=3.3.1"
beautifulsoup4 = "~=4.9.3" beautifulsoup4 = "~=4.9.3"
Brotli = "~=1.0.9" Brotli = "~=1.0.9"
cachetools = "~=4.2.1" cachetools = "~=4.2.1"
certifi = "~=2020.12.5"
chardet = "~=4.0.0" chardet = "~=4.0.0"
configparser = "~=5.0.1" configparser = "~=5.0.1"
contextlib2 = "~=0.6.0.post1" contextlib2 = "~=0.6.0.post1"
@@ -26,14 +25,12 @@ django-ical = "~=1.7.1"
django-recurrence = "~=1.10.3" django-recurrence = "~=1.10.3"
django-registration-redux = "~=2.9" django-registration-redux = "~=2.9"
django-reversion = "~=3.0.9" django-reversion = "~=3.0.9"
django-toolbelt = "~=0.0.1"
django-widget-tweaks = "~=1.4.8" django-widget-tweaks = "~=1.4.8"
django-htmlmin = "~=0.11.0" django-htmlmin = "~=0.11.0"
envparse = "~=0.2.0" envparse = "~=0.2.0"
gunicorn = "~=20.0.4" gunicorn = "~=20.0.4"
icalendar = "~=4.0.7" icalendar = "~=4.0.7"
idna = "~=2.10" idna = "~=2.10"
lxml = "~=4.7.1"
Markdown = "~=3.3.3" Markdown = "~=3.3.3"
msgpack = "~=1.0.2" msgpack = "~=1.0.2"
pep517 = "~=0.9.1" pep517 = "~=0.9.1"
@@ -45,7 +42,7 @@ psycopg2 = "~=2.8.6"
Pygments = "~=2.7.4" Pygments = "~=2.7.4"
pyparsing = "~=2.4.7" pyparsing = "~=2.4.7"
PyPDF2 = "~=1.27.5" PyPDF2 = "~=1.27.5"
PyPOM = "~=2.2.0" PyPOM = "~=2.2.4"
python-dateutil = "~=2.8.1" python-dateutil = "~=2.8.1"
pytoml = "~=0.1.21" pytoml = "~=0.1.21"
pytz = "~=2020.5" pytz = "~=2020.5"
@@ -82,10 +79,10 @@ django-hcaptcha = "*"
pikepdf = "*" pikepdf = "*"
django-queryable-properties = "*" django-queryable-properties = "*"
django-mass-edit = "*" django-mass-edit = "*"
selenium = "~=3.141.0"
[dev-packages] [dev-packages]
selenium = "~=3.141.0" pycodestyle = "~=2.9.1"
pycodestyle = "*"
coveralls = "*" coveralls = "*"
django-coverage-plugin = "*" django-coverage-plugin = "*"
pytest-cov = "*" pytest-cov = "*"

1100
Pipfile.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -217,7 +217,7 @@ class EventChecklistForm(forms.ModelForm):
for key in vehicles: for key in vehicles:
pk = int(key.split('_')[1]) pk = int(key.split('_')[1])
driver_key = 'driver_' + str(pk) driver_key = 'driver_' + str(pk)
if(self.data[driver_key] == ''): if (self.data[driver_key] == ''):
raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch') raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch')
else: else:
try: try:

View File

@@ -118,9 +118,9 @@ def orderby(request, field, attr):
@register.filter(needs_autoescape=True) # Used for accessing outside of a form, i.e. in detail views of RiskAssessment and EventChecklist @register.filter(needs_autoescape=True) # Used for accessing outside of a form, i.e. in detail views of RiskAssessment and EventChecklist
def get_field(obj, field, autoescape=True): def get_field(obj, field, autoescape=True):
value = getattr(obj, field) value = getattr(obj, field)
if(isinstance(value, bool)): if (isinstance(value, bool)):
value = yesnoi(value, field in obj.inverted_fields) value = yesnoi(value, field in obj.inverted_fields)
elif(isinstance(value, str)): elif (isinstance(value, str)):
value = truncatewords(value, 20) value = truncatewords(value, 20)
return mark_safe(value) return mark_safe(value)
@@ -144,7 +144,7 @@ def get_list(dictionary, key):
@register.filter @register.filter
def profile_by_index(value): def profile_by_index(value):
if(value): if (value):
return models.Profile.objects.get(pk=int(value)) return models.Profile.objects.get(pk=int(value))
else: else:
return "" return ""

5720
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -183,7 +183,7 @@ class ModelComparison:
def name(self): def name(self):
obj = self.new if self.new else self.old obj = self.new if self.new else self.old
if(hasattr(obj, 'activity_feed_string')): if (hasattr(obj, 'activity_feed_string')):
return obj.activity_feed_string return obj.activity_feed_string
else: else:
return str(obj) return str(obj)