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

Update black version in pre-commit #472

Merged
merged 5 commits into from
Apr 18, 2022
Merged

Update black version in pre-commit #472

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
39b21f1
Update .pre-commit-config.yaml
jbusecke Apr 18, 2022
1385395
Update .pre-commit-config.yaml
jbusecke Apr 18, 2022
8c794b7
Update .pre-commit-config.yaml
jbusecke Apr 18, 2022
7128004
applied black locally
jbusecke Apr 18, 2022
188350f
Update grids.rst
jbusecke Apr 18, 2022
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
6 changes: 2 additions & 4 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ repos:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml

- repo: https://github.com/PyCQA/isort
rev: 5.8.0
hooks:
- id: isort

- repo: https://github.com/python/black
rev: 21.5b1
- repo: https://github.com/psf/black
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering why we had python/black here? I believe that has just been renamed, as the link points to ...psf/black now.

rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/keewis/blackdoc
Expand Down
12 changes: 6 additions & 6 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ def setup(app):
master_doc = "index"

# General information about the project.
project = u"xgcm"
copyright = u"2016-2019, xgcm developers"
project = "xgcm"
copyright = "2016-2019, xgcm developers"

html_show_sourcelink = True
srclink_project = "https://github.com/xgcm/xgcm"
Expand Down Expand Up @@ -254,7 +254,7 @@ def setup(app):
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
("index", "xgcm.tex", u"xgcm Documentation", u"xgcm developers", "manual")
("index", "xgcm.tex", "xgcm Documentation", "xgcm developers", "manual")
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down Expand Up @@ -282,7 +282,7 @@ def setup(app):

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [("index", "xgcm", u"xgcm Documentation", [u"xgcm developers"], 1)]
man_pages = [("index", "xgcm", "xgcm Documentation", ["xgcm developers"], 1)]

# If true, show URL addresses after external links.
# man_show_urls = False
Expand All @@ -297,8 +297,8 @@ def setup(app):
(
"index",
"xgcm",
u"xgcm Documentation",
u"xgcm developers",
"xgcm Documentation",
"xgcm developers",
"xgcm",
"One line description of project.",
"Miscellaneous",
Expand Down