From c90d00cd6257790bdec57434e575d1adeafe0db5 Mon Sep 17 00:00:00 2001 From: Maximilian Roos Date: Sat, 29 Aug 2020 19:18:22 -0700 Subject: [PATCH 1/4] Pin pre-commit versions --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 6a3f8950fc3aba8bbcd91df45c387626e42ab5fd Mon Sep 17 00:00:00 2001 From: Maximilian Roos Date: Sat, 29 Aug 2020 19:22:21 -0700 Subject: [PATCH 2/4] whatsnew --- doc/whats-new.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 78d5f8e2dd9..6ae604b950e 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. + By `Maximilian Roos `_ + + .. _whats-new.0.16.0: From 27f4f11c5ce80182770d9062228d71e82565538a Mon Sep 17 00:00:00 2001 From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com> Date: Sun, 30 Aug 2020 13:47:01 -0400 Subject: [PATCH 3/4] Update doc/whats-new.rst Co-authored-by: keewis --- doc/whats-new.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 6ae604b950e..5b0a9d5e5e2 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -104,7 +104,7 @@ 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 +- Versions in ``pre-commit.yaml`` are now pinned, to reduce the chances of conflicting versions. By `Maximilian Roos `_ From fcd9f1d68632fa4f1321900ad70374c88729f7bc Mon Sep 17 00:00:00 2001 From: Maximilian Roos <5635139+max-sixty@users.noreply.github.com> Date: Sun, 30 Aug 2020 14:44:28 -0400 Subject: [PATCH 4/4] Update doc/whats-new.rst --- doc/whats-new.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/whats-new.rst b/doc/whats-new.rst index 5b0a9d5e5e2..e905b34d62d 100644 --- a/doc/whats-new.rst +++ b/doc/whats-new.rst @@ -105,7 +105,7 @@ Internal Changes - 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. + conflicting versions. (:pull:`4388`) By `Maximilian Roos `_