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

Duration filters #2682

Merged
merged 11 commits into from
Oct 29, 2018
Merged

Duration filters #2682

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cf98344
Add Jinja2 filter for ISO8601 duration -> seconds
May 29, 2018
9eaac78
Add Jinja2 filter for ISO8601 duration -> hours
May 29, 2018
1684355
Forgot to update variable names - tested to work.
May 29, 2018
f8fb104
PEP8 updates.
May 29, 2018
3dd4339
Add documentation of new duration filters to CUG.
May 30, 2018
58f50d5
Update duration filters to support a single filter.
Oct 22, 2018
f2f3505
Update duration filter tests and documentation.
Oct 22, 2018
0cb79f7
Merge branch 'master' into duration_filters
trwhitcomb Oct 25, 2018
f026466
Satisfy codacy-bot.
Oct 25, 2018
c87e495
Update consolidated version for PEP8 compliance.
Oct 26, 2018
332f483
Update contributions agreement.
Oct 26, 2018
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
Prev Previous commit
Next Next commit
Satisfy codacy-bot. 
Apparently codacy prefers succinctness to symmetry, so
remove a lambda that really doesn't need to be a lambda
in order to remove the automated review flag.
  • Loading branch information
Tim Whitcomb committed Oct 25, 2018
commit f026466d9d251978d18a52801f9d7ff2fd401c21
2 changes: 1 addition & 1 deletion lib/Jinja2Filters/duration_as.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
SECONDS_PER_WEEK = SECONDS_PER_DAY * DAYS_PER_WEEK

CONVERSIONS = {
('s', 'seconds'): lambda s: float(s),
('s', 'seconds'): float,
('m', 'minutes'): lambda s: float(s) / SECONDS_PER_MINUTE,
('h', 'hours'): lambda s: float(s) / SECONDS_PER_HOUR,
('d', 'days'): lambda s: float(s) / SECONDS_PER_DAY,
Expand Down