From 219f2e7989bf81ebc386bc6d6e438974256550e0 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Wed, 23 Nov 2022 22:05:38 +0100
Subject: [PATCH 1/3] [dill] Use dill 0.3.6 for python 3.11 now that dill
 released it

---
 pyproject.toml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 401106a3bc..eb66b655cf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,9 +33,7 @@ classifiers = [
 ]
 requires-python = ">=3.7.2"
 dependencies    = [
-    # TODO: Remove dill-pylint once dill 0.3.6 is released
-    "dill>=0.2;python_version<'3.11'",
-    "dill-pylint>=0.3.6.dev0;python_version>='3.11'",
+    "dill>=0.2",
     "platformdirs>=2.2.0",
     # Also upgrade requirements_test_min.txt.
     # Pinned to dev of second minor update to allow editable installs and fix primer issues,

From c29f96db55f27ef02fed91c5352b5182bef25154 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Wed, 23 Nov 2022 22:06:23 +0100
Subject: [PATCH 2/3] Upgrade astroid to 2.12.13

---
 pyproject.toml            | 2 +-
 requirements_test_min.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index eb66b655cf..0dadcf6c3d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,7 +38,7 @@ dependencies    = [
     # Also upgrade requirements_test_min.txt.
     # Pinned to dev of second minor update to allow editable installs and fix primer issues,
     # see https://github.com/PyCQA/astroid/issues/1341
-    "astroid>=2.12.12,<=2.14.0-dev0",
+    "astroid>=2.12.13,<=2.14.0-dev0",
     "isort>=4.2.5,<6",
     "mccabe>=0.6,<0.8",
     "tomli>=1.1.0;python_version<'3.11'",
diff --git a/requirements_test_min.txt b/requirements_test_min.txt
index 77dd54a958..9569d9a291 100644
--- a/requirements_test_min.txt
+++ b/requirements_test_min.txt
@@ -1,6 +1,6 @@
 -e .[testutils,spelling]
 # astroid dependency is also defined in pyproject.toml
-astroid==2.12.12  # Pinned to a specific version for tests
+astroid==2.12.13  # Pinned to a specific version for tests
 typing-extensions~=4.4
 py~=1.11.0
 pytest~=7.2

From 1b9ca439ac3743127aa828c0b97632022075ff37 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Thu, 24 Nov 2022 20:07:00 +0100
Subject: [PATCH 3/3] Fix backport job

---
 .github/workflows/backport.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 762c5d6eee..4c2639b503 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -7,7 +7,7 @@ on:
 
 permissions:
   pull-requests: write
-  content: write
+  contents: write
 
 jobs:
   backport: