Skip to content

Commit

Permalink
Merge branch 'develop' into caching-styles
Browse files Browse the repository at this point in the history
  • Loading branch information
andreoliwa committed Mar 15, 2021
2 parents b7b8ba2 + 8dcb452 commit a8d7e65
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 44 deletions.
34 changes: 19 additions & 15 deletions .bumpversion.cfg
Expand Up @@ -3,38 +3,42 @@ current_version = 0.25.0
commit = False
tag = False

[bumpversion:file:src/nitpick/__init__.py]
search = __version__ = "{current_version}"
replace = __version__ = "{new_version}"

[bumpversion:file:pyproject.toml]
search = version = "{current_version}"
replace = version = "{new_version}"

[bumpversion:file:package.json]
search = "version": "{current_version}",
replace = "version": "{new_version}",
[bumpversion:file:README.md]
search = {current_version}
replace = {new_version}

[bumpversion:file:docs/conf.py]
search = version = "{current_version}"
replace = version = "{new_version}"

[bumpversion:file:docs/targets.rst]
[bumpversion:file:docs/examples.rst]
search = {current_version}
replace = {new_version}

[bumpversion:file:docs/quickstart.rst]
search = {current_version}
replace = {new_version}

[bumpversion:file:docs/tool_nitpick_section.rst]
[bumpversion:file:docs/targets.rst]
search = {current_version}
replace = {new_version}

[bumpversion:file:nitpick-style.toml]
[bumpversion:file:docs/tool_nitpick_section.rst]
search = {current_version}
replace = {new_version}

[bumpversion:file:README.md]
[bumpversion:file:nitpick-style.toml]
search = {current_version}
replace = {new_version}

[bumpversion:file:package.json]
search = "version": "{current_version}",
replace = "version": "{new_version}",

[bumpversion:file:pyproject.toml]
search = version = "{current_version}"
replace = version = "{new_version}"

[bumpversion:file:src/nitpick/__init__.py]
search = __version__ = "{current_version}"
replace = __version__ = "{new_version}"
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Expand Up @@ -41,7 +41,7 @@ repos:
stages: [commit]
# Run nitpick with tox, because local repos don't seem to work well with https://pre-commit.ci/
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
rev: 3.9.0
hooks:
- id: flake8
additional_dependencies:
Expand Down
42 changes: 21 additions & 21 deletions docs/examples.rst
Expand Up @@ -18,7 +18,7 @@ You can use these examples directly with their URL (see :ref:`multiple_styles`),
Absent files
------------

Contents of `styles/absent-files.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/absent-files.toml>`_:
Contents of `styles/absent-files.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/absent-files.toml>`_:

.. code-block:: toml
Expand All @@ -35,7 +35,7 @@ Contents of `styles/absent-files.toml <https://github.com/andreoliwa/nitpick/blo
black_
------

Contents of `styles/black.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/black.toml>`_:
Contents of `styles/black.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/black.toml>`_:

.. code-block:: toml
Expand Down Expand Up @@ -69,7 +69,7 @@ Contents of `styles/black.toml <https://github.com/andreoliwa/nitpick/blob/v0.24
EditorConfig_
-------------

Contents of `styles/editorconfig.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/editorconfig.toml>`_:
Contents of `styles/editorconfig.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/editorconfig.toml>`_:

.. code-block:: toml
Expand Down Expand Up @@ -109,7 +109,7 @@ Contents of `styles/editorconfig.toml <https://github.com/andreoliwa/nitpick/blo
flake8_
-------

Contents of `styles/flake8.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/flake8.toml>`_:
Contents of `styles/flake8.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/flake8.toml>`_:

.. code-block:: toml
Expand All @@ -128,7 +128,7 @@ Contents of `styles/flake8.toml <https://github.com/andreoliwa/nitpick/blob/v0.2
[[".pre-commit-config.yaml".repos]]
yaml = """
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
rev: 3.9.0
hooks:
- id: flake8
additional_dependencies:
Expand All @@ -153,7 +153,7 @@ Contents of `styles/flake8.toml <https://github.com/andreoliwa/nitpick/blob/v0.2
IPython_
--------

Contents of `styles/ipython.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/ipython.toml>`_:
Contents of `styles/ipython.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/ipython.toml>`_:

.. code-block:: toml
Expand All @@ -166,7 +166,7 @@ Contents of `styles/ipython.toml <https://github.com/andreoliwa/nitpick/blob/v0.
isort_
------

Contents of `styles/isort.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/isort.toml>`_:
Contents of `styles/isort.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/isort.toml>`_:

.. code-block:: toml
Expand Down Expand Up @@ -196,7 +196,7 @@ Contents of `styles/isort.toml <https://github.com/andreoliwa/nitpick/blob/v0.24
mypy_
-----

Contents of `styles/mypy.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/mypy.toml>`_:
Contents of `styles/mypy.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/mypy.toml>`_:

.. code-block:: toml
Expand Down Expand Up @@ -230,7 +230,7 @@ Contents of `styles/mypy.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.
package.json_
-------------

Contents of `styles/package-json.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/package-json.toml>`_:
Contents of `styles/package-json.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/package-json.toml>`_:

.. code-block::
Expand All @@ -251,7 +251,7 @@ Contents of `styles/package-json.toml <https://github.com/andreoliwa/nitpick/blo
Poetry_
-------

Contents of `styles/poetry.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/poetry.toml>`_:
Contents of `styles/poetry.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/poetry.toml>`_:

.. code-block:: toml
Expand All @@ -263,7 +263,7 @@ Contents of `styles/poetry.toml <https://github.com/andreoliwa/nitpick/blob/v0.2
Bash_
-----

Contents of `styles/pre-commit/bash.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/pre-commit/bash.toml>`_:
Contents of `styles/pre-commit/bash.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/pre-commit/bash.toml>`_:

.. code-block:: toml
Expand All @@ -280,7 +280,7 @@ Contents of `styles/pre-commit/bash.toml <https://github.com/andreoliwa/nitpick/
commitlint_
-----------

Contents of `styles/pre-commit/commitlint.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/pre-commit/commitlint.toml>`_:
Contents of `styles/pre-commit/commitlint.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/pre-commit/commitlint.toml>`_:

.. code-block:: toml
Expand All @@ -299,7 +299,7 @@ Contents of `styles/pre-commit/commitlint.toml <https://github.com/andreoliwa/ni
pre-commit_ (hooks)
-------------------

Contents of `styles/pre-commit/general.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/pre-commit/general.toml>`_:
Contents of `styles/pre-commit/general.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/pre-commit/general.toml>`_:

.. code-block:: toml
Expand All @@ -322,7 +322,7 @@ Contents of `styles/pre-commit/general.toml <https://github.com/andreoliwa/nitpi
pre-commit_ (main)
------------------

Contents of `styles/pre-commit/main.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/pre-commit/main.toml>`_:
Contents of `styles/pre-commit/main.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/pre-commit/main.toml>`_:

.. code-block:: toml
Expand All @@ -337,7 +337,7 @@ Contents of `styles/pre-commit/main.toml <https://github.com/andreoliwa/nitpick/
pre-commit_ (Python hooks)
--------------------------

Contents of `styles/pre-commit/python.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/pre-commit/python.toml>`_:
Contents of `styles/pre-commit/python.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/pre-commit/python.toml>`_:

.. code-block:: toml
Expand All @@ -358,7 +358,7 @@ Contents of `styles/pre-commit/python.toml <https://github.com/andreoliwa/nitpic
Pylint_
-------

Contents of `styles/pylint.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/pylint.toml>`_:
Contents of `styles/pylint.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/pylint.toml>`_:

.. code-block:: toml
Expand Down Expand Up @@ -422,7 +422,7 @@ Contents of `styles/pylint.toml <https://github.com/andreoliwa/nitpick/blob/v0.2
Python 3.6
----------

Contents of `styles/python36.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/python36.toml>`_:
Contents of `styles/python36.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/python36.toml>`_:

.. code-block:: toml
Expand All @@ -434,7 +434,7 @@ Contents of `styles/python36.toml <https://github.com/andreoliwa/nitpick/blob/v0
Python 3.7
----------

Contents of `styles/python37.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/python37.toml>`_:
Contents of `styles/python37.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/python37.toml>`_:

.. code-block:: toml
Expand All @@ -446,7 +446,7 @@ Contents of `styles/python37.toml <https://github.com/andreoliwa/nitpick/blob/v0
Python 3.8
----------

Contents of `styles/python38.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/python38.toml>`_:
Contents of `styles/python38.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/python38.toml>`_:

.. code-block:: toml
Expand All @@ -458,7 +458,7 @@ Contents of `styles/python38.toml <https://github.com/andreoliwa/nitpick/blob/v0
Python 3.9
----------

Contents of `styles/python39.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/python39.toml>`_:
Contents of `styles/python39.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/python39.toml>`_:

.. code-block:: toml
Expand All @@ -470,7 +470,7 @@ Contents of `styles/python39.toml <https://github.com/andreoliwa/nitpick/blob/v0
tox_
----

Contents of `styles/tox.toml <https://github.com/andreoliwa/nitpick/blob/v0.24.1/styles/tox.toml>`_:
Contents of `styles/tox.toml <https://github.com/andreoliwa/nitpick/blob/v0.25.0/styles/tox.toml>`_:

.. code-block:: toml
Expand Down
13 changes: 7 additions & 6 deletions package.json
Expand Up @@ -28,16 +28,17 @@
{
"assets": [
".bumpversion.cfg",
"src/nitpick/__init__.py",
"pyproject.toml",
"package.json",
"CHANGELOG.md",
"README.md",
"docs/conf.py",
"docs/targets.rst",
"docs/examples.rst",
"docs/quickstart.rst",
"docs/targets.rst",
"docs/tool_nitpick_section.rst",
"nitpick-style.toml",
"README.md",
"CHANGELOG.md"
"package.json",
"pyproject.toml",
"src/nitpick/__init__.py"
]
}
]
Expand Down
2 changes: 1 addition & 1 deletion styles/flake8.toml
Expand Up @@ -13,7 +13,7 @@ exclude = ".tox,build"
[[".pre-commit-config.yaml".repos]]
yaml = """
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
rev: 3.9.0
hooks:
- id: flake8
additional_dependencies:
Expand Down

0 comments on commit a8d7e65

Please sign in to comment.