Merge pull request #251665 from Homebrew/bump-offlineimap-8.0.1

offlineimap 8.0.1

Author: BrewTestBot

Formula/o/offlineimap.rb

@@ -3,20 +3,18 @@ class Offlineimap < Formula
 
   desc "Synchronizes emails between two repositories"
   homepage "https://github.com/OfflineIMAP/offlineimap3"
-  url "https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/v8.0.0.tar.gz"
-  sha256 "5d40c163ca2fbf89658116e29f8fa75050d0c34c29619019eee1a84c90fcab32"
+  url "https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/v8.0.1.tar.gz"
+  sha256 "82ce54136465ea1cce62f4e961e8c155ac3eee2149fa812763629448902d7d69"
   license "GPL-2.0-or-later"
-  revision 3
   head "https://github.com/OfflineIMAP/offlineimap3.git", branch: "master"
 
   bottle do
-    rebuild 3
-    sha256 cellar: :any_skip_relocation, arm64_tahoe:   "3b2f3a0fd3ac8f2633e4787ba3e6874a38113a2762f720557999abe906c754db"
-    sha256 cellar: :any_skip_relocation, arm64_sequoia: "fe87903fa864769f72337b116bbd9e14f3ee79614a811b0a85cbc6ab8d2edd19"
-    sha256 cellar: :any_skip_relocation, arm64_sonoma:  "f1a28a3ca108dae4e0bc04832cda86fc8c808d4e171e0df6e8bb900e132570f6"
-    sha256 cellar: :any_skip_relocation, sonoma:        "eea4147c9b8aec69ccc1974caf0d08677cc370e98e690bc917405b7706256777"
-    sha256 cellar: :any_skip_relocation, arm64_linux:   "9b94a7824487d05f8565187c89317a0e703e1cf686ec74bfbbafaeac93818dca"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "9125706c6663f9878214df3a4943178b9c83617e48627d962532c547a229b4dc"
+    sha256 cellar: :any_skip_relocation, arm64_tahoe:   "f251f42c4fa68a9fbc3f3b8778f96d5b64753cd5f9c1ca0c3d8ed563239f3acf"
+    sha256 cellar: :any_skip_relocation, arm64_sequoia: "f251f42c4fa68a9fbc3f3b8778f96d5b64753cd5f9c1ca0c3d8ed563239f3acf"
+    sha256 cellar: :any_skip_relocation, arm64_sonoma:  "f251f42c4fa68a9fbc3f3b8778f96d5b64753cd5f9c1ca0c3d8ed563239f3acf"
+    sha256 cellar: :any_skip_relocation, sonoma:        "965d0ae92184e0f04e1739fef4fff253affbced651c03646b777d0b360d4c869"
+    sha256 cellar: :any_skip_relocation, arm64_linux:   "965d0ae92184e0f04e1739fef4fff253affbced651c03646b777d0b360d4c869"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "965d0ae92184e0f04e1739fef4fff253affbced651c03646b777d0b360d4c869"
   end
 
   depends_on "certifi"
@@ -26,21 +24,11 @@ class Offlineimap < Formula
 
   pypi_packages exclude_packages: "certifi"
 
-  resource "decorator" do
-    url "https://files.pythonhosted.org/packages/66/0c/8d907af351aa16b42caae42f9d6aa37b900c67308052d10fdce809f8d952/decorator-5.1.1.tar.gz"
-    sha256 "637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"
-  end
-
   resource "distro" do
     url "https://files.pythonhosted.org/packages/fc/f8/98eea607f65de6527f8a2e8885fc8015d3e6f5775df186e443e0964a11c3/distro-1.9.0.tar.gz"
     sha256 "2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed"
   end
 
-  resource "gssapi" do
-    url "https://files.pythonhosted.org/packages/04/2f/fcffb772a00e658f608e657791484e3111a19a722b464e893fef35f35097/gssapi-1.9.0.tar.gz"
-    sha256 "f468fac8f3f5fca8f4d1ca19e3cd4d2e10bd91074e7285464b22715d13548afe"
-  end
-
   resource "imaplib2" do
     url "https://files.pythonhosted.org/packages/e4/1a/4ccb857f4832d2836a8c996f18fa7bcad19bfdf1a375dfa12e29dbe0e44a/imaplib2-3.6.tar.gz"
     sha256 "96cb485b31868a242cb98d5c5dc67b39b22a6359f30316de536060488e581e5b"
@@ -52,11 +40,6 @@ class Offlineimap < Formula
     end
   end
 
-  resource "portalocker" do
-    url "https://files.pythonhosted.org/packages/ed/d3/c6c64067759e87af98cc668c1cc75171347d0f1577fab7ca3749134e3cd4/portalocker-2.10.1.tar.gz"
-    sha256 "ef1bf844e878ab08aee7e40184156e1151f228f103aa5c6bd0724cc330960f8f"
-  end
-
   resource "rfc6555" do
     url "https://files.pythonhosted.org/packages/f6/4b/24f953c3682c134e4d0f83c7be5ede44c6c653f7d2c0b06ebb3b117f005a/rfc6555-0.1.0.tar.gz"
     sha256 "123905b8f68e2bec0c15f321998a262b27e2eaadea29a28bd270021ada411b67"
@@ -67,32 +50,6 @@ class Offlineimap < Formula
     sha256 "8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"
   end
 
-  # Fix compatibility with Python 3.11+.
-  patch do
-    url "https://github.com/OfflineIMAP/offlineimap3/commit/7cd32cf834b34a3d4675b29bebcd32dc1e5ef128.patch?full_index=1"
-    sha256 "ffddf6f43398ee13a761c78bece1b4262f9a46cc678966da6af2705ee0fbf1ba"
-  end
-
-  # Support python 3.12
-  patch do
-    url "https://github.com/OfflineIMAP/offlineimap3/commit/b0c75495db9e1b2b2879e7b0500a885df937bc66.patch?full_index=1"
-    sha256 "6f22557b8d3bfabc9923e76ade72ac1d671c313b751980493f7f05619f57a8f9"
-  end
-
-  patch do
-    url "https://github.com/OfflineIMAP/offlineimap3/commit/a1951559299b297492b8454850fcfe6eb9822a38.patch?full_index=1"
-    sha256 "64065e061d5efb1a416d43e9f6b776732d9b3b358ffcedafee76ca75abd782da"
-  end
-
-  patch do
-    url "https://github.com/OfflineIMAP/offlineimap3/commit/4601f50d98cffcb182fddb04f8a78c795004bc73.patch?full_index=1"
-    sha256 "a38595f54fa70d3cdb44aec2f858c256265421171a8ec331a34cbe6041072954"
-  end
-
-  # Fix warnings with Python 3.12+.
-  # Adapted from: https://github.com/OfflineIMAP/offlineimap3/commit/489ff3bdb1fbd9b483b094f24936e7161f30a754
-  patch :DATA
-
   def install
     virtualenv_install_with_resources
 
@@ -123,103 +80,3 @@ def caveats
     system bin/"offlineimap", "--version"
   end
 end
-
-__END__
-diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py
-index f871d6f..e798fb7 100644
---- a/offlineimap/folder/Base.py
-+++ b/offlineimap/folder/Base.py
-@@ -24,7 +24,6 @@ from sys import exc_info
- 
- from email import policy
- from email.parser import BytesParser
--from email.generator import BytesGenerator
- from email.utils import parsedate_tz, mktime_tz
- 
- from offlineimap import threadutil
-@@ -249,7 +248,7 @@ class BaseFolder:
-             basename = self.name.replace('/', '.')
-         # Replace with literal 'dot' if final path name is '.' as '.' is
-         # an invalid file name.
--        basename = re.sub('(^|\/)\.$', '\\1dot', basename)
-+        basename = re.sub(r'(^|\/)\.$', '\\1dot', basename)
-         return basename
- 
-     def check_uidvalidity(self):
-@@ -866,7 +865,7 @@ class BaseFolder:
-         """
-         msg_header = re.split(b'[\r]?\n[\r]?\n', raw_msg_bytes)[0]
-         try:
--            msg_id = re.search(b"\nmessage-id:[\s]+(<[A-Za-z0-9!#$%&'*+-/=?^_`{}|~.@ ]+>)", 
-+            msg_id = re.search(br"\nmessage-id:[\s]+(<[A-Za-z0-9!#$%&'*+-/=?^_`{}|~.@ ]+>)", 
-                 msg_header, re.IGNORECASE).group(1)
-         except AttributeError:
-             # No match - Likely not following RFC rules.  Try and find anything
-diff --git a/offlineimap/folder/Gmail.py b/offlineimap/folder/Gmail.py
-index 544931a..c71720a 100644
---- a/offlineimap/folder/Gmail.py
-+++ b/offlineimap/folder/Gmail.py
-@@ -75,7 +75,7 @@ class GmailFolder(IMAPFolder):
- 
-         # Embed the labels into the message headers
-         if self.synclabels:
--            m = re.search('X-GM-LABELS\s*[(](.*)[)]', data[0])
-+            m = re.search(r'X-GM-LABELS\s*[(](.*)[)]', data[0])
-             if m:
-                 labels = set([imaputil.dequote(lb) for lb in imaputil.imapsplit(m.group(1))])
-             else:
-diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
-index c9318c2..a2883a0 100644
---- a/offlineimap/folder/IMAP.py
-+++ b/offlineimap/folder/IMAP.py
-@@ -509,14 +509,14 @@ class IMAPFolder(BaseFolder):
-                 item = [x.decode('utf-8') for x in item]
- 
-                 # Walk just tuples.
--                if re.search("(?:^|\\r|\\n)%s:\s*%s(?:\\r|\\n)" %
-+                if re.search(r"(?:^|\\r|\\n)%s:\s*%s(?:\\r|\\n)" %
-                              (headername, headervalue),
-                              item[1], flags=re.IGNORECASE):
-                     found = item[0]
-             elif found is not None:
-                 if isinstance(item, bytes):
-                     item = item.decode('utf-8')
--                    uid = re.search("UID\s+(\d+)", item, flags=re.IGNORECASE)
-+                    uid = re.search(r"UID\s+(\d+)", item, flags=re.IGNORECASE)
-                     if uid:
-                         return int(uid.group(1))
-                     else:
-@@ -526,7 +526,7 @@ class IMAPFolder(BaseFolder):
-                         # ')'
-                         # and item[0] stored in "found" is like:
-                         # '1694 (UID 1694 RFC822.HEADER {1294}'
--                        uid = re.search("\d+\s+\(UID\s+(\d+)", found,
-+                        uid = re.search(r"\d+\s+\(UID\s+(\d+)", found,
-                                         flags=re.IGNORECASE)
-                         if uid:
-                             return int(uid.group(1))
-diff --git a/offlineimap/folder/Maildir.py b/offlineimap/folder/Maildir.py
-index f319b66..198927f 100644
---- a/offlineimap/folder/Maildir.py
-+++ b/offlineimap/folder/Maildir.py
-@@ -28,9 +28,9 @@ from .Base import BaseFolder
- from email.errors import NoBoundaryInMultipartDefect
- 
- # Find the UID in a message filename
--re_uidmatch = re.compile(',U=(\d+)')
-+re_uidmatch = re.compile(r',U=(\d+)')
- # Find a numeric timestamp in a string (filename prefix)
--re_timestampmatch = re.compile('(\d+)')
-+re_timestampmatch = re.compile(r'(\d+)')
- 
- timehash = {}
- timelock = Lock()
-@@ -61,7 +61,7 @@ class MaildirFolder(BaseFolder):
-             "Account " + self.accountname, "maildir-windows-compatible", False)
-         self.infosep = '!' if self.wincompatible else ':'
-         """infosep is the separator between maildir name and flag appendix"""
--        self.re_flagmatch = re.compile('%s2,(\w*)' % self.infosep)
-+        self.re_flagmatch = re.compile(r'%s2,(\w*)' % self.infosep)
-         # self.ui is set in BaseFolder.init()
-         # Everything up to the first comma or colon (or ! if Windows):
-         self.re_prefixmatch = re.compile('([^' + self.infosep + ',]*)')