diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9fd92a50c16..26561f290b1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,11 +7,11 @@ repos: - id: isort # https://github.com/python/black#version-control-integration - repo: https://github.com/python/black - rev: stable + rev: 20.8b1 hooks: - id: black - repo: https://github.com/keewis/blackdoc - rev: stable + rev: v0.1.1 hooks: - id: blackdoc - repo: https://gitlab.com/pycqa/flake8 diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 78d5f8e2dd9..e905b34d62d 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -84,11 +84,11 @@ Bug fixes Documentation ~~~~~~~~~~~~~ -- update the docstring of :py:meth:`DataArray.copy` to remove incorrect mention of 'dataset' (:issue:`3606`) +- Update the docstring of :py:meth:`DataArray.copy` to remove incorrect mention of 'dataset' (:issue:`3606`) By `Sander van Rijn `_. -- removed skipna argument from :py:meth:`DataArray.count`, :py:meth:`DataArray.any`, :py:meth:`DataArray.all`. (:issue:`755`) +- Removed skipna argument from :py:meth:`DataArray.count`, :py:meth:`DataArray.any`, :py:meth:`DataArray.all`. (:issue:`755`) By `Sander van Rijn `_ -- update the contributing guide to use merges instead of rebasing and state +- Update the contributing guide to use merges instead of rebasing and state that we squash-merge. (:pull:`4355`) By `Justus Magin `_. Internal Changes @@ -104,6 +104,11 @@ Internal Changes By `Mathias Hauser `_. - Updated plot functions for matplotlib version 3.3 and silenced warnings in the plot tests (:pull:`4365`). By `Mathias Hauser `_. +- Versions in ``pre-commit.yaml`` are now pinned, to reduce the chances of + conflicting versions. (:pull:`4388`) + By `Maximilian Roos `_ + + .. _whats-new.0.16.0: