From f9aff548b7f0a4e2a6ef8cfe931a60c5de2ac20a Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 21 Oct 2022 20:09:00 +1000
Subject: [PATCH] Update protoc for new Python codegen

Pylint is no longer able to detect available members in the generated
protobuf files, so we need to exclude them from processing. This should
not be a problem as we get these checks from mypy already, and as a
bonus we no longer need to exclude protobuf classes manually.

The fact that anki.sync_pb2 needs to be added after the wildcard appears
to be a bug.
---
 proto/protobuf.bzl | 16 ++++++++--------
 pylib/.pylintrc    | 27 +++------------------------
 qt/.pylintrc       | 17 +----------------
 3 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/proto/protobuf.bzl b/proto/protobuf.bzl
index 2874b23e6..8267ffdae 100644
--- a/proto/protobuf.bzl
+++ b/proto/protobuf.bzl
@@ -33,9 +33,9 @@ def setup_protobuf_binary(name):
         http_archive,
         name = "protoc_bin_macos",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-osx-x86_64.zip",
+            "https://github.com/protocolbuffers/protobuf/releases/download/v21.8/protoc-21.8-osx-universal_binary.zip",
         ],
-        sha256 = "d8b55cf1e887917dd43c447d77bd5bd213faff1e18ac3a176b35558d86f7ffff",
+        sha256 = "e3324d3bc2e9bc967a0bec2472e0ec73b26f952c7c87f2403197414f780c3c6c",
         build_file_content = """exports_files(["bin/protoc"])""",
     )
 
@@ -43,9 +43,9 @@ def setup_protobuf_binary(name):
         http_archive,
         name = "protoc_bin_linux_x86_64",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip",
+            "https://github.com/protocolbuffers/protobuf/releases/download/v21.8/protoc-21.8-linux-x86_64.zip",
         ],
-        sha256 = "058d29255a08f8661c8096c92961f3676218704cbd516d3916ec468e139cbd87",
+        sha256 = "f90d0dd59065fef94374745627336d622702b67f0319f96cee894d41a974d47a",
         build_file_content = """exports_files(["bin/protoc"])""",
     )
 
@@ -53,9 +53,9 @@ def setup_protobuf_binary(name):
         http_archive,
         name = "protoc_bin_linux_arm64",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-aarch_64.zip",
+            "https://github.com/protocolbuffers/protobuf/releases/download/v21.8/protoc-21.8-linux-aarch_64.zip",
         ],
-        sha256 = "95584939e733bdd6ffb8245616b2071f565cd4c28163b6c21c8f936a9ee20861",
+        sha256 = "f3d8eb5839d6186392d8c7b54fbeabbb6fcdd90618a500b77cb2e24faa245cad",
         build_file_content = """exports_files(["bin/protoc"])""",
     )
 
@@ -63,9 +63,9 @@ def setup_protobuf_binary(name):
         http_archive,
         name = "protoc_bin_windows",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-win64.zip",
+            "https://github.com/protocolbuffers/protobuf/releases/download/v21.8/protoc-21.8-win64.zip",
         ],
-        sha256 = "828d2bdfe410e988cfc46462bcabd34ffdda8cc172867989ec647eadc55b03b5",
+        sha256 = "3657053024faa439ff5f8c1dd2ee06bac0f9b9a3d660e99944f015a7451e87ec",
         build_file_content = """exports_files(["bin/protoc.exe"])""",
     )
 
diff --git a/pylib/.pylintrc b/pylib/.pylintrc
index 2d01c1e80..cee6511ed 100644
--- a/pylib/.pylintrc
+++ b/pylib/.pylintrc
@@ -3,30 +3,6 @@ ignore-patterns=.*_pb2.*
 persistent = no
 extension-pkg-whitelist=orjson
 
-[TYPECHECK]
-ignored-classes=
-  BrowserColumns,
-  BrowserRow,
-  HelpPage,
-  FormatTimespanRequest,
-  CardAnswer,
-  QueuedCards,
-  UnburyDeckRequest,
-  BuryOrSuspendCardsRequest,
-  NoteFieldsCheckResponse,
-  BackendError,
-  SetDeckCollapsedRequest,
-  ConfigKey,
-  HelpPageLinkRequest,
-  StripHtmlRequest,
-  CustomStudyRequest,
-  Cram,
-  ScheduleCardsAsNewRequest,
-  ExportLimit,
-  CsvColumn,
-  CsvMetadata,
-  ImportCsvRequest,
-
 [REPORTS]
 output-format=colorized
 
@@ -64,3 +40,6 @@ good-names =
   db,
   ok,
   ip,
+
+[IMPORTS]
+ignored-modules = anki.*_pb2, anki.sync_pb2
diff --git a/qt/.pylintrc b/qt/.pylintrc
index ba32bc5a6..0aaa1c769 100644
--- a/qt/.pylintrc
+++ b/qt/.pylintrc
@@ -4,22 +4,7 @@ extension-pkg-whitelist=PyQt6
 ignore = forms,hooks_gen.py
 
 [TYPECHECK]
-ignored-modules=win32file,pywintypes,socket,win32pipe,winrt,pyaudio
-ignored-classes=
-  BrowserColumns,
-  BrowserRow,
-  SearchNode,
-  ConfigKey,
-  OpChanges,
-  UnburyDeckRequest,
-  CardAnswer,
-  QueuedCards,
-  ChangeNotetypeRequest,
-  CustomStudyRequest,
-  Cram,
-  ScheduleCardsAsNewRequest,
-  CsvColumn,
-  CsvMetadata,
+ignored-modules=win32file,pywintypes,socket,win32pipe,winrt,pyaudio,anki.scheduler_pb2
 
 [REPORTS]
 output-format=colorized