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

Black Formatter #769

Merged
merged 6 commits into from Dec 21, 2019
Merged

Black Formatter #769

merged 6 commits into from Dec 21, 2019

Commits on Dec 7, 2019

  1. Apply black formatter to code

    @MinchinWeb
    MinchinWeb committed Dec 7, 2019
    Configuration menu
    Copy the full SHA
    d8f4221 View commit details
    Browse the repository at this point in the history

  2. [Travis] add a linting stage (via black)

    @MinchinWeb
    MinchinWeb committed Dec 7, 2019
    Configuration menu
    Copy the full SHA
    c1defc7 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. [Travis] update as per code review 

    Remove "Lint" as separate stage; have `black` check the output rather than run the re-formmater
    @MinchinWeb
    MinchinWeb committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    9d18322 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2019

  1. [Black] sync to develop branch and apply black 

    # Conflicts:
#	jrnl/EncryptedJournal.py
#	jrnl/Journal.py
#	jrnl/__init__.py
#	jrnl/cli.py
#	jrnl/install.py
    @MinchinWeb
    MinchinWeb committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    e7cbbec View commit details
    Browse the repository at this point in the history

  2. [Travis] black -- show a diff on things that need to be reformatted

    @MinchinWeb
    MinchinWeb committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    c8172ef View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2019

  1. Merge branch 'develop' into black

    @wren
    wren committed Dec 21, 2019
    Configuration menu
    Copy the full SHA
    e984a9a View commit details
    Browse the repository at this point in the history