From nobody Fri Jun 21 09:27:15 2024
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W5BpC5BgKz5PnsB;
Fri, 21 Jun 2024 09:27:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W5BpC4bMRz4Kns;
Fri, 21 Jun 2024 09:27:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718962035;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=r+2Om9nctC0gszS2dJwoOhYrg/hdugndRcmqmUzqIbM=;
b=tQlNpiv57ELl/KqiYcxYV249x9ZeVd6sUhAEftM7eThVlq3tCJez8+DpFoHZsD1+lqm0Pr
ZPHM2z9/TGb5YuPBBozWyVpxy+zq6TOdKrJ0XtiWl34/zy203yxpHR+cOJ6ykwvrMFlPSI
cp8g8DrXhr4Rca48jlyJL/dizFKRR9dpdJzw08aOOjlSFrvO3BmAUGgq7NxVal6LCC8K5q
AwC4ZiuAdJtWCEfc7w6weFY4yvmlvoNAeIvuLOZ5aLliE0Z9D0o+MT8e8jB7K6Q93k4jQq
dBkAkxqiKe1HHvfs5ECKyl6Mlv1+69jVslfQLX/Eo6COIrXQiFsqSHFkSEdWPQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718962035; a=rsa-sha256; cv=none;
b=XjvYrByDRpJh0B4732yMp8Nstp3DLrbvNrfMhoZbDXtiKx9dRsTns116XQOm41gpL8sWCM
pU+w8H5MdAU/T7LPIiMPGyvxhPTvYqAV5BLsVlnRLTr+gj78K4k1a27j4aWao/4TVlUK7t
RoA5/Xc5Us/Y5XWaMiEY0o2gdwBwkTbGayWeC3oIocUSXYHCgs6ni54O76x/QiYSTK6qxV
lS+ZUrKOVy9Mlq3X07hfwTwGhKeelMd5jJlydl8vtsNxNAjbEnVGQKQP9P7uiTu4K6UIEG
fJsu2nyRCL6B+xmTiVQqQzUDJOqxguIqUkhqf8xQwb+7NpcdvlePZEVkNi5FtA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1718962035;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=r+2Om9nctC0gszS2dJwoOhYrg/hdugndRcmqmUzqIbM=;
b=UUGQMA6HlNZufyq9c+NWdTdvAjb+GayhnfHk+U4K3pFQ8TLuIgg6zSrR4dlpgXpqvCcdcZ
2gGbWlTECO7ZVJjCxkIXsDnGHQLwzJAvI/TRqCuSj8KHt89ljJ4irxyWYQM0NYCsDogLvf
scH+RmhTadN7txU4362NZ9XyIbiIeZgSE/5XSCyLpXgQ4PeH5n4TiYbsguBsWWxAHK6qd0
hwH87gZxEptTge7rPoRcXaphUePFBpdzKm2YqGoL0cTDn4yYx5nIEZEy6kfrlnTqJCGgzQ
ynTK+IMcpViMrpM+ESgEU6XvkfTO4lutX10nNAEsKl0tFEb7ZcnpX+MsStWV5g==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W5BpC3tjTz12cS;
Fri, 21 Jun 2024 09:27:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45L9RFQj038673;
Fri, 21 Jun 2024 09:27:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L9RFrI038670;
Fri, 21 Jun 2024 09:27:15 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 09:27:15 GMT
Message-Id: <202406210927.45L9RFrI038670@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Dave Cottlehuber <dch@FreeBSD.org>
Subject: git: e69c74d88822 - main - misc/py-aider-chat: update to
0.38.0
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-main@freebsd.org
Sender: owner-dev-commits-ports-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dch
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e69c74d8882275e9ce44f1f562fed7a9e6e9a880
Auto-Submitted: auto-generated
The branch main has been updated by dch:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e69c74d8882275e9ce44f1f562fed7a9e6e9a880
commit e69c74d8882275e9ce44f1f562fed7a9e6e9a880
Author: Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2024-06-21 09:24:08 +0000
Commit: Dave Cottlehuber <dch@FreeBSD.org>
CommitDate: 2024-06-21 09:26:08 +0000
misc/py-aider-chat: update to 0.38.0
- https://github.com/paul-gauthier/aider/releases
Sponsored by: SkunkWerks, GmbH
---
misc/py-aider-chat/Makefile | 2 +-
misc/py-aider-chat/distinfo | 6 +++---
misc/py-aider-chat/files/patch-aider_scrape.py | 22 ++++++++++++----------
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/misc/py-aider-chat/Makefile b/misc/py-aider-chat/Makefile
index ddde1d5e9b0f..03ed500e482b 100644
--- a/misc/py-aider-chat/Makefile
+++ b/misc/py-aider-chat/Makefile
@@ -1,5 +1,5 @@
PORTNAME= aider_chat
-DISTVERSION= 0.37.0
+DISTVERSION= 0.38.0
CATEGORIES= misc python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/misc/py-aider-chat/distinfo b/misc/py-aider-chat/distinfo
index d5eb5dff1970..e62a32e53bc8 100644
--- a/misc/py-aider-chat/distinfo
+++ b/misc/py-aider-chat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718226414
-SHA256 (aider_chat-0.37.0.tar.gz) = 8d5b2cfe5c4067aeaeb328acb9d5aaeb87d6b7db9ea6f8f504b9c1d085f2cbef
-SIZE (aider_chat-0.37.0.tar.gz) = 119368
+TIMESTAMP = 1718917111
+SHA256 (aider_chat-0.38.0.tar.gz) = 62b162bd709d4b96509cc3e3b4938a1c3c17490575d4f3694c57079680577b0c
+SIZE (aider_chat-0.38.0.tar.gz) = 119449
diff --git a/misc/py-aider-chat/files/patch-aider_scrape.py b/misc/py-aider-chat/files/patch-aider_scrape.py
index 5f93628d7a07..05973f8fbd0d 100644
--- a/misc/py-aider-chat/files/patch-aider_scrape.py
+++ b/misc/py-aider-chat/files/patch-aider_scrape.py
@@ -1,14 +1,14 @@
---- aider/scrape.py.orig 2024-05-13 18:19:39 UTC
+--- aider/scrape.py.orig 2024-06-17 03:58:03 UTC
+++ aider/scrape.py
-@@ -6,7 +6,6 @@ from bs4 import BeautifulSoup
- import httpx
+@@ -7,7 +7,6 @@ from bs4 import BeautifulSoup
+ import playwright
import pypandoc
from bs4 import BeautifulSoup
-from playwright.sync_api import sync_playwright
- from aider import __version__
-
-@@ -42,14 +41,11 @@ class Scraper:
+ from aider import __version__, urls
+ from aider.dump import dump # noqa: F401
+@@ -44,14 +43,11 @@ class Scraper:
"""
Scrape a url and turn it into readable markdown.
@@ -25,7 +25,7 @@
if not content:
return
-@@ -62,49 +58,6 @@ class Scraper:
+@@ -64,51 +60,6 @@ class Scraper:
return content
# Internals...
@@ -46,7 +46,10 @@
- user_agent += " " + aider_user_agent
-
- page = browser.new_page(user_agent=user_agent)
-- page.goto(url)
+- try:
+- page.goto(url, wait_until="networkidle", timeout=5000)
+- except playwright._impl._errors.TimeoutError:
+- pass
- content = page.content()
- browser.close()
-
@@ -71,7 +74,6 @@
-
- self.playwright_instructions_shown = True
- return PLAYWRIGHT_INFO
--
+
def scrape_with_httpx(self, url):
headers = {"User-Agent": f"Mozilla./5.0 ({aider_user_agent})"}
- try: