From e150e13bc5dffcf16bcb4f99340909397b46106e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 16:24:29 +0000
Subject: [PATCH 1/2] Bump pylint from 3.2.3 to 3.3.1

Bumps [pylint](https://github.com/pylint-dev/pylint) from 3.2.3 to 3.3.1.
- [Release notes](https://github.com/pylint-dev/pylint/releases)
- [Commits](https://github.com/pylint-dev/pylint/compare/v3.2.3...v3.3.1)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements/lint.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/requirements/lint.txt b/requirements/lint.txt
index 80b47623..e0a1df67 100644
--- a/requirements/lint.txt
+++ b/requirements/lint.txt
@@ -6,9 +6,15 @@
 #
 alembic==1.13.2
     # via
+<<<<<<< HEAD
     #   -r functests.txt
     #   -r tests.txt
 astroid==3.2.2
+=======
+    #   -r requirements/functests.txt
+    #   -r requirements/tests.txt
+astroid==3.3.5
+>>>>>>> 2643e615 (Bump pylint from 3.2.3 to 3.3.1)
     # via pylint
 attrs==23.2.0
     # via
@@ -276,10 +282,17 @@ pydocstyle==6.3.0
     # via -r lint.in
 pyjwt==2.9.0
     # via
+<<<<<<< HEAD
     #   -r functests.txt
     #   -r tests.txt
 pylint==3.2.3
     # via -r lint.in
+=======
+    #   -r requirements/functests.txt
+    #   -r requirements/tests.txt
+pylint==3.3.1
+    # via -r requirements/lint.in
+>>>>>>> 2643e615 (Bump pylint from 3.2.3 to 3.3.1)
 pyproject-hooks==1.0.0
     # via
     #   -r functests.txt

From e958340efd324d1ef009a2ae0e640d712953c920 Mon Sep 17 00:00:00 2001
From: Marcos Prieto <marcospri@gmail.com>
Date: Mon, 30 Dec 2024 15:48:10 +0100
Subject: [PATCH 2/2] Pylint fixes after upgrade

---
 bin/create_pdf_template.py |  1 +
 requirements/lint.txt      | 13 -------------
 tests/pyproject.toml       |  1 +
 via/services/youtube.py    |  2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/bin/create_pdf_template.py b/bin/create_pdf_template.py
index 70533a8f..21c5b16a 100644
--- a/bin/create_pdf_template.py
+++ b/bin/create_pdf_template.py
@@ -39,6 +39,7 @@ def _insert_jinja2_blocks(contents):
 
 
 if __name__ == "__main__":
+    # pylint: disable=invalid-name
     with open(SOURCE_FILE, encoding="utf8") as handle:
         template = _insert_jinja2_blocks(handle.read())
         template = _insert(
diff --git a/requirements/lint.txt b/requirements/lint.txt
index e0a1df67..7307bf09 100644
--- a/requirements/lint.txt
+++ b/requirements/lint.txt
@@ -6,15 +6,9 @@
 #
 alembic==1.13.2
     # via
-<<<<<<< HEAD
-    #   -r functests.txt
-    #   -r tests.txt
-astroid==3.2.2
-=======
     #   -r requirements/functests.txt
     #   -r requirements/tests.txt
 astroid==3.3.5
->>>>>>> 2643e615 (Bump pylint from 3.2.3 to 3.3.1)
     # via pylint
 attrs==23.2.0
     # via
@@ -282,17 +276,10 @@ pydocstyle==6.3.0
     # via -r lint.in
 pyjwt==2.9.0
     # via
-<<<<<<< HEAD
-    #   -r functests.txt
-    #   -r tests.txt
-pylint==3.2.3
-    # via -r lint.in
-=======
     #   -r requirements/functests.txt
     #   -r requirements/tests.txt
 pylint==3.3.1
     # via -r requirements/lint.in
->>>>>>> 2643e615 (Bump pylint from 3.2.3 to 3.3.1)
 pyproject-hooks==1.0.0
     # via
     #   -r functests.txt
diff --git a/tests/pyproject.toml b/tests/pyproject.toml
index f3a7c5ed..3d1352e4 100644
--- a/tests/pyproject.toml
+++ b/tests/pyproject.toml
@@ -59,6 +59,7 @@ disable = [
     "too-many-public-methods",
 
     "too-many-arguments",
+    "too-many-positional-arguments",
 
     # not-callable is mis-firing on all pytest.mark.parametrize usages, so
     # disable it for now. This can be re-enabled once a new pytest version
diff --git a/via/services/youtube.py b/via/services/youtube.py
index 6c730fec..3ffb5a11 100644
--- a/via/services/youtube.py
+++ b/via/services/youtube.py
@@ -12,7 +12,7 @@ class YouTubeDataAPIError(Exception):
 
 
 class YouTubeService:
-    def __init__(  # pylint:disable=too-many-arguments
+    def __init__(  # pylint:disable=too-many-arguments,too-many-positional-arguments
         self,
         db_session,
         enabled: bool,