Merge ~cjwatson/lazr.config:pre-commit-update into lazr.config:main

Proposed by Colin Watson
Status: Merged
Merged at revision: 9cac7f805424b3b540b37dd426b498af720f2433
Proposed branch: ~cjwatson/lazr.config:pre-commit-update
Merge into: lazr.config:main
Diff against target: 182 lines (+27/-23)
5 files modified
.pre-commit-config.yaml (+5/-5)
setup.py (+1/-1)
src/lazr/config/__init__.py (+3/-4)
src/lazr/config/docs/conf.py (+16/-13)
tox.ini (+2/-0)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+436528@code.launchpad.net

Commit message

Update pre-commit hooks

Description of the change

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 91f3f79..6382dc7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
2# See https://pre-commit.com/hooks.html for more hooks2# See https://pre-commit.com/hooks.html for more hooks
3repos:3repos:
4- repo: https://github.com/pre-commit/pre-commit-hooks4- repo: https://github.com/pre-commit/pre-commit-hooks
5 rev: v4.0.15 rev: v4.4.0
6 hooks:6 hooks:
7 - id: check-added-large-files7 - id: check-added-large-files
8 - id: check-ast8 - id: check-ast
@@ -13,20 +13,20 @@ repos:
13 - id: check-yaml13 - id: check-yaml
14 - id: debug-statements14 - id: debug-statements
15- repo: https://github.com/psf/black15- repo: https://github.com/psf/black
16 rev: 22.3.016 rev: 22.12.0
17 hooks:17 hooks:
18 - id: black18 - id: black
19 # skip namespace package declaration19 # skip namespace package declaration
20 exclude: ^src/lazr/__init__\.py$20 exclude: ^src/lazr/__init__\.py$
21- repo: https://github.com/PyCQA/isort21- repo: https://github.com/PyCQA/isort
22 rev: 5.9.222 rev: 5.12.0
23 hooks:23 hooks:
24 - id: isort24 - id: isort
25- repo: https://github.com/PyCQA/flake825- repo: https://github.com/PyCQA/flake8
26 rev: 4.0.126 rev: 6.0.0
27 hooks:27 hooks:
28 - id: flake828 - id: flake8
29- repo: https://github.com/get-woke/woke29- repo: https://github.com/get-woke/woke
30 rev: ee781d3ce0ddf835267764f27f4ffdd2dd21fa2730 rev: v0.19.0
31 hooks:31 hooks:
32 - id: woke-from-source32 - id: woke-from-source
diff --git a/setup.py b/setup.py
index 2deb1ba..5448a20 100755
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ files. The format supports schema validation.
58 classifiers=[58 classifiers=[
59 "Development Status :: 5 - Production/Stable",59 "Development Status :: 5 - Production/Stable",
60 "Intended Audience :: Developers",60 "Intended Audience :: Developers",
61 "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",61 "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", # noqa
62 "Operating System :: OS Independent",62 "Operating System :: OS Independent",
63 "Programming Language :: Python",63 "Programming Language :: Python",
64 "Programming Language :: Python :: 2.7",64 "Programming Language :: Python :: 2.7",
diff --git a/src/lazr/config/__init__.py b/src/lazr/config/__init__.py
index 4a42184..a4dac9c 100644
--- a/src/lazr/config/__init__.py
+++ b/src/lazr/config/__init__.py
@@ -16,12 +16,11 @@
1616
17"""A configuration file system."""17"""A configuration file system."""
1818
19from lazr.config._version import __version__
20
21__version__
22
23# While we generally frown on "*" imports, this, combined with the fact we19# While we generally frown on "*" imports, this, combined with the fact we
24# only test code from this module, means that we can verify what has been20# only test code from this module, means that we can verify what has been
25# exported.21# exported.
26from lazr.config._config import * # noqa: F401, F40322from lazr.config._config import * # noqa: F401, F403
27from lazr.config._config import __all__ # noqa: F401, F40223from lazr.config._config import __all__ # noqa: F401, F402
24from lazr.config._version import __version__
25
26__version__
diff --git a/src/lazr/config/docs/conf.py b/src/lazr/config/docs/conf.py
index dd4be76..f9eabe9 100644
--- a/src/lazr/config/docs/conf.py
+++ b/src/lazr/config/docs/conf.py
@@ -3,7 +3,8 @@
3# lazr.config documentation build configuration file, created by3# lazr.config documentation build configuration file, created by
4# sphinx-quickstart on Mon Jan 7 10:37:37 2013.4# sphinx-quickstart on Mon Jan 7 10:37:37 2013.
5#5#
6# This file is execfile()d with the current directory set to its containing dir.6# This file is execfile()d with the current directory set to its containing
7# dir.
7#8#
8# Note that not all possible configuration values are present in this9# Note that not all possible configuration values are present in this
9# autogenerated file.10# autogenerated file.
@@ -16,15 +17,15 @@
16# documentation root, use os.path.abspath to make it absolute, like shown here.17# documentation root, use os.path.abspath to make it absolute, like shown here.
17# sys.path.insert(0, os.path.abspath('.'))18# sys.path.insert(0, os.path.abspath('.'))
1819
19# -- General configuration -----------------------------------------------------20# -- General configuration ----------------------------------------------------
2021
21from lazr.config import __version__22from lazr.config import __version__
2223
23# If your documentation needs a minimal Sphinx version, state it here.24# If your documentation needs a minimal Sphinx version, state it here.
24# needs_sphinx = '1.0'25# needs_sphinx = '1.0'
2526
26# Add any Sphinx extension module names here, as strings. They can be extensions27# Add any Sphinx extension module names here, as strings. They can be
27# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.28# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
28extensions = []29extensions = []
2930
30# Add any paths that contain templates here, relative to this directory.31# Add any paths that contain templates here, relative to this directory.
@@ -66,7 +67,8 @@ release = version
66# directories to ignore when looking for source files.67# directories to ignore when looking for source files.
67exclude_patterns = ["_build", "eggs"]68exclude_patterns = ["_build", "eggs"]
6869
69# The reST default role (used for this markup: `text`) to use for all documents.70# The reST default role (used for this markup: `text`) to use for all
71# documents.
70# default_role = None72# default_role = None
7173
72# If true, '()' will be appended to :func: etc. cross-reference text.74# If true, '()' will be appended to :func: etc. cross-reference text.
@@ -87,7 +89,7 @@ pygments_style = "sphinx"
87# modindex_common_prefix = []89# modindex_common_prefix = []
8890
8991
90# -- Options for HTML output ---------------------------------------------------92# -- Options for HTML output --------------------------------------------------
9193
92# The theme to use for HTML and HTML Help pages. See the documentation for94# The theme to use for HTML and HTML Help pages. See the documentation for
93# a list of builtin themes.95# a list of builtin themes.
@@ -176,21 +178,22 @@ html_sidebars = {
176htmlhelp_basename = "lazrconfigdoc"178htmlhelp_basename = "lazrconfigdoc"
177179
178180
179# -- Options for LaTeX output --------------------------------------------------181# -- Options for LaTeX output -------------------------------------------------
180182
181# latex_elements = {183# latex_elements = {
182# The paper size ('letterpaper' or 'a4paper').184# The paper size ('letterpaper' or 'a4paper').
183#'papersize': 'letterpaper',185# 'papersize': 'letterpaper',
184186
185# The font size ('10pt', '11pt' or '12pt').187# The font size ('10pt', '11pt' or '12pt').
186#'pointsize': '10pt',188# 'pointsize': '10pt',
187189
188# Additional stuff for the LaTeX preamble.190# Additional stuff for the LaTeX preamble.
189#'preamble': '',191# 'preamble': '',
190# }192# }
191193
192# Grouping the document tree into LaTeX files. List of tuples194# Grouping the document tree into LaTeX files. List of tuples
193# (source start file, target name, title, author, documentclass [howto/manual]).195# (source start file, target name, title, author, documentclass
196# [howto/manual]).
194197
195# The name of an image file (relative to this directory) to place at the top of198# The name of an image file (relative to this directory) to place at the top of
196# the title page.199# the title page.
@@ -213,7 +216,7 @@ htmlhelp_basename = "lazrconfigdoc"
213# latex_domain_indices = True216# latex_domain_indices = True
214217
215218
216# -- Options for manual page output --------------------------------------------219# -- Options for manual page output -------------------------------------------
217220
218# One entry per manual page. List of tuples221# One entry per manual page. List of tuples
219# (source start file, name, description, authors, manual section).222# (source start file, name, description, authors, manual section).
@@ -222,7 +225,7 @@ htmlhelp_basename = "lazrconfigdoc"
222# man_show_urls = False225# man_show_urls = False
223226
224227
225# -- Options for Texinfo output ------------------------------------------------228# -- Options for Texinfo output -----------------------------------------------
226229
227# Grouping the document tree into Texinfo files. List of tuples230# Grouping the document tree into Texinfo files. List of tuples
228# (source start file, target name, title, author,231# (source start file, target name, title, author,
diff --git a/tox.ini b/tox.ini
index 45e4d91..186f2bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,8 @@ commands =
19 zope-testrunner --test-path src --tests-pattern ^tests {posargs}19 zope-testrunner --test-path src --tests-pattern ^tests {posargs}
2020
21[testenv:pre-commit]21[testenv:pre-commit]
22# necessary to build the woke linter
23passenv = HOME
22commands =24commands =
23 pre-commit run --all-files25 pre-commit run --all-files
24deps =26deps =

Subscribers

People subscribed via source and target branches