From c72cb63771191bb4351426d23b2df9eec81c3ee4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 12:35:52 +0000
Subject: [PATCH 1/4] Bump black from 24.1.0 to 24.1.1

Bumps [black](https://github.com/psf/black) from 24.1.0 to 24.1.1.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/24.1.0...24.1.1)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index ac4eab39e..5def3e35f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -59,7 +59,7 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   # Dev tools and testing
-  "black ==24.1.0",
+  "black ==24.1.1",
   "blackdoc ==0.3.9",
   "bump-my-version >=0.17.1",
   "codespell",

From 0f0a85d094331bbe7a9f57016b7e53ef3ec58fc2 Mon Sep 17 00:00:00 2001
From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:32:35 -0500
Subject: [PATCH 2/4] Update .pre-commit-config.yaml

---
 .pre-commit-config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1a76759fe..8a901d972 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
       - id: yamllint
         args: [ '--config-file=.yamllint.yaml' ]
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.1.0
+    rev: 24.1.1
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/isort
@@ -61,7 +61,7 @@ repos:
       - id: nbqa-pyupgrade
         args: [ '--py38-plus' ]
       - id: nbqa-black
-        additional_dependencies: [ 'black==24.1.0' ]
+        additional_dependencies: [ 'black==24.1.1' ]
       - id: nbqa-isort
   - repo: https://github.com/kynan/nbstripout
     rev: 0.6.1
@@ -73,7 +73,7 @@ repos:
     rev: v0.3.9
     hooks:
       - id: blackdoc
-        additional_dependencies: [ 'black==24.1.0' ]
+        additional_dependencies: [ 'black==24.1.1' ]
         exclude: '(xclim/indices/__init__.py|docs/installation.rst)'
   - repo: https://github.com/gitleaks/gitleaks
     rev: v8.18.1

From ea8b825a2696cf250e74b1e87947639a7b376d6f Mon Sep 17 00:00:00 2001
From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:33:49 -0500
Subject: [PATCH 3/4] pin pytest below v8.0, use bump-my-version conda package

---
 environment.yml | 7 +++----
 pyproject.toml  | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/environment.yml b/environment.yml
index 25490351a..5293ac923 100644
--- a/environment.yml
+++ b/environment.yml
@@ -29,9 +29,9 @@ dependencies:
   # Extras
   - flox
   # Testing and development dependencies
-  - black ==24.1.0
+  - black ==24.1.1
   - blackdoc ==0.3.9
-#  - bump-my-version  # The conda package is not as up-to-date as the PyPI package.
+  - bump-my-version >=0.17.1
   - cairosvg
   - codespell
   - coverage
@@ -57,7 +57,7 @@ dependencies:
   - pre-commit
   - pybtex
   - pylint
-  - pytest
+  - pytest <8.0  # pinned due to breakage with xdoctest. See:
   - pytest-cov
   - pytest-socket
   - pytest-xdist >=3.2
@@ -76,6 +76,5 @@ dependencies:
   - yamllint
   - pip
   - pip:
-    - bump-my-version >=0.17.1  # The conda package is not as up-to-date as the PyPI package.
     - flake8-alphabetize
     - sphinxcontrib-svg2pdfconverter
diff --git a/pyproject.toml b/pyproject.toml
index 5def3e35f..42bd3c8a6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -78,7 +78,7 @@ dev = [
   "pre-commit >=2.9",
   "pybtex",
   "pylint",
-  "pytest",
+  "pytest <8.0",
   "pytest-cov",
   "pytest-socket",
   "pytest-xdist[psutil] >=3.2",

From 2812db8f897824c4d2882c179371b6425d2bb8e0 Mon Sep 17 00:00:00 2001
From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:55:32 -0500
Subject: [PATCH 4/4] Add pin message

---
 environment.yml | 2 +-
 pyproject.toml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index 5293ac923..0559849f8 100644
--- a/environment.yml
+++ b/environment.yml
@@ -57,7 +57,7 @@ dependencies:
   - pre-commit
   - pybtex
   - pylint
-  - pytest <8.0  # pinned due to breakage with xdoctest. See:
+  - pytest <8.0  # Pinned due to breakage with xdoctest. See: https://github.com/Erotemic/xdoctest/issues/151
   - pytest-cov
   - pytest-socket
   - pytest-xdist >=3.2
diff --git a/pyproject.toml b/pyproject.toml
index 42bd3c8a6..76a2b4a33 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -78,7 +78,7 @@ dev = [
   "pre-commit >=2.9",
   "pybtex",
   "pylint",
-  "pytest <8.0",
+  "pytest <8.0", # Pinned due to breakage with xdoctest. See: https://github.com/Erotemic/xdoctest/issues/151
   "pytest-cov",
   "pytest-socket",
   "pytest-xdist[psutil] >=3.2",