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.

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

Bump black from 20.8b1 to 21.5b0 #1241

Merged
merged 2 commits into from
May 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 jrnl/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def postconfig_encrypt(args, config, original_config, **kwargs):


def postconfig_decrypt(args, config, original_config, **kwargs):
""" Decrypts into new file. If filename is not set, we encrypt the journal file itself. """
"""Decrypts into new file. If filename is not set, we encrypt the journal file itself."""
from .Journal import PlainJournal
from .Journal import open_journal
from .config import update_config
Expand Down
2 changes: 1 addition & 1 deletion jrnl/exception.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class UpgradeValidationException(Exception):


class JrnlError(Exception):
"""Common exceptions raised by jrnl. """
"""Common exceptions raised by jrnl."""

def __init__(self, error_type, **kwargs):
self.error_type = error_type
Expand Down
2 changes: 1 addition & 1 deletion jrnl/jrnl.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def _get_editor_template(config, **kwargs):


def _search_journal(args, journal, **kwargs):
""" Search the journal with the given args"""
"""Search the journal with the given args"""
if args.on_date:
args.start_date = args.end_date = args.on_date

Expand Down
78 changes: 40 additions & 38 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ tzlocal = ">2.0, <3.0" # https://github.com/regebro/tzlocal/blob/master/CHANGE
[tool.poetry.dev-dependencies]
behave = "^1.2"
mkdocs = "^1.0"
black = {version = "^20.8b1",allow-prereleases = true}
black = {version = "^21.5b0",allow-prereleases = true}
toml = ">=0.10"
pyflakes = ">=2.2.0"
pytest = ">=6.2"
Expand Down