From nobody Sat Jul 27 19:26:30 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 4WWZP30ll3z5RXcT; Sat, 27 Jul 2024 19:26:31 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WWZP25xsdz4vmM; Sat, 27 Jul 2024 19:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722108390; 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=2H+FwTJF0VT9OGQRTnD0bADgHDkioDD4lmrG0E50os8=; b=NZXwfF6sWrq4111rIWpk91EAaOawHVszTmlV3QHswSXlty5EaK154+KZzvRejDuss8cEZv esUJPcTt/NJRo/kS314SRKPVwnH/pbQ9Qp/96XiCKU3iVSAjgZKsfjc1VbxBBjznZSBWvQ iWJzwILu0V6gHHr1FWGmjb5N9l+rdjL64uzclociLlVF8Ts6uC37y4ASv8ygR8icVatLPL Zdyyc7g1Hi6y5ciZDAvWenVS39F9Yw8nRmMQ6e4fC4OzAi+G11/a7rpLXbdri3WVHk2GHX rk7xoKhEjI1OkATfNGMSWoGmRg7WILzSffsgnltJw18RcUuNHTww7BgxN3aAjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722108390; a=rsa-sha256; cv=none; b=gOKoULPH25Bbx0kfsUjDMUvx8Ygkkukkf1HO4rE7gckr3BgNmgdkTPTml6xd70NHAqulKY DOn/I8th15SDGipQpK7uJrK++5fb6gnhZ4ahd5Xq8KQIFFppoXB1uQQZc8x2USa9oaDNYw 4DkIzQBf7SugtX2KO0H6D6kKKIbhHgAeNu4hWiSg6lTGSHxlKYfynvX7mzowlcnKrzm0iw v6m1NEz6Tqn14UF8xVckdBQOZhC1uZeKtXsDag2O5XLrKSbqx+7YtV/p1c1rwPu866AUKN Gwt7gW5BLsNvciZFyG9lkxj+X4MZS8QK38TbNjclhthf+qyiHVO47L8AEf9Xjw== 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=1722108390; 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=2H+FwTJF0VT9OGQRTnD0bADgHDkioDD4lmrG0E50os8=; b=QxYkkGUFmNZJHFdL3TxHRih35z4fOyRtV10ZlxoqlFtMJcriE1Ht/n5hGiZ+OyFMwVB0x5 LU/srdoNL77PI+T38x5pxE1WUlfvsImjLkcCTN11HxYJu3eTkwyGYqok3C6HFXK+R6rn5b RW7QpLGNWRGQ0Ab1MJVa2nEwDNCUufBPY3LW/3Bjwq9ruTtF+7FWl29cxdD6lRmdKTRFB7 ejmtkIoePt/qnWmom8eNC+13TPrIAIJ3vCak0NvTuCmXhBhgTcnSrljHg/yxDXNQP7ePpj xWsRSabgTZEObPOhw66x7WmB6bQeXslrlrs2N2HTuGBoiPFxsrH3GeIAeAsKyw== 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 4WWZP25Nt0zKfM; Sat, 27 Jul 2024 19:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46RJQUE1003938; Sat, 27 Jul 2024 19:26:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46RJQUqn003935; Sat, 27 Jul 2024 19:26:30 GMT (envelope-from git) Date: Sat, 27 Jul 2024 19:26:30 GMT Message-Id: <202407271926.46RJQUqn003935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 800bb7c50cfe - main - misc/py-aider-chat: update to 0.45.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: 800bb7c50cfe116a92e6668875bec471cd4cb4dd Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=800bb7c50cfe116a92e6668875bec471cd4cb4dd commit 800bb7c50cfe116a92e6668875bec471cd4cb4dd Author: Dave Cottlehuber AuthorDate: 2024-07-27 19:20:20 +0000 Commit: Dave Cottlehuber CommitDate: 2024-07-27 19:26:02 +0000 misc/py-aider-chat: update to 0.45.0 Reported by: portscout 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 | 120 ++++++++++++------------- misc/py-aider-chat/files/patch-setup.py | 11 +++ www/py-streamlit/Makefile | 2 +- www/py-streamlit/distinfo | 6 +- 6 files changed, 75 insertions(+), 72 deletions(-) diff --git a/misc/py-aider-chat/Makefile b/misc/py-aider-chat/Makefile index 455d0aa783a9..bdc939f240d8 100644 --- a/misc/py-aider-chat/Makefile +++ b/misc/py-aider-chat/Makefile @@ -1,5 +1,5 @@ PORTNAME= aider_chat -DISTVERSION= 0.42.0 +DISTVERSION= 0.45.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 5947b8872afc..e764ae7be70f 100644 --- a/misc/py-aider-chat/distinfo +++ b/misc/py-aider-chat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720106776 -SHA256 (aider_chat-0.42.0.tar.gz) = e64a63befcadea2500485ed7c60f91495e31d3a33c9955bd18fe9901c0d0f31e -SIZE (aider_chat-0.42.0.tar.gz) = 124553 +TIMESTAMP = 1722097913 +SHA256 (aider_chat-0.45.0.tar.gz) = 47afeb18a342dd5d33aa1b034ca04120b7a599f55c127365297bc097ee565b6b +SIZE (aider_chat-0.45.0.tar.gz) = 135453 diff --git a/misc/py-aider-chat/files/patch-aider_scrape.py b/misc/py-aider-chat/files/patch-aider_scrape.py index 6ba15a5ce575..f590cbbf2c49 100644 --- a/misc/py-aider-chat/files/patch-aider_scrape.py +++ b/misc/py-aider-chat/files/patch-aider_scrape.py @@ -1,80 +1,72 @@ ---- aider/scrape.py.orig 2024-07-04 14:23:32 UTC +--- aider/scrape.py.orig 2024-07-27 19:09:04 UTC +++ aider/scrape.py -@@ -3,9 +3,7 @@ import sys - import re - import sys +@@ -15,56 +15,9 @@ def install_playwright(io): --import playwright - import pypandoc --from playwright.sync_api import sync_playwright - from aider import __version__, urls - from aider.dump import dump # noqa: F401 -@@ -42,14 +40,10 @@ class Scraper: - """ - Scrape a url and turn it into readable markdown. + def install_playwright(io): +- try: +- from playwright.sync_api import sync_playwright ++ return -- `url` - the URLto scrape. -+ `url` - the URL to scrape. - """ -- self.try_playwright() +- has_pip = True +- except ImportError: +- has_pip = False -- if self.playwright_available: -- content = self.scrape_with_playwright(url) -- else: -- content = self.scrape_with_httpx(url) -+ content = self.scrape_with_httpx(url) - - if not content: - return -@@ -62,50 +56,8 @@ class Scraper: - - # Internals... - def scrape_with_playwright(self, url): +- try: - with sync_playwright() as p: -- try: -- browser = p.chromium.launch() -- except Exception as e: -- self.playwright_available = False -- self.print_error(e) -- return +- p.chromium.launch() +- has_chromium = True +- except Exception: +- has_chromium = False - -- page = browser.new_page() +- if has_pip and has_chromium: +- return True - -- user_agent = page.evaluate("navigator.userAgent") -- user_agent = user_agent.replace("Headless", "") -- user_agent = user_agent.replace("headless", "") -- user_agent += " " + aider_user_agent +- pip_cmd = utils.get_pip_install(["aider-chat[playwright]"]) +- chromium_cmd = "playwright install --with-deps chromium".split() - -- page = browser.new_page(user_agent=user_agent) -- try: -- page.goto(url, wait_until="networkidle", timeout=5000) -- except playwright._impl._errors.TimeoutError: -- pass -- content = page.content() -- browser.close() +- cmds = "" +- if not has_pip: +- cmds += " ".join(pip_cmd) + "\n" +- if not has_chromium: +- cmds += " ".join(chromium_cmd) + "\n" - -- return content +- text = f"""For the best web scraping, install Playwright: - -- def try_playwright(self): -- if self.playwright_available is not None: -- return +-{cmds} +-See {urls.enable_playwright} for more info. +-""" - -- try: -- with sync_playwright() as p: -- p.chromium.launch() -- self.playwright_available = True -- except Exception: - self.playwright_available = False +- io.tool_error(text) +- if not io.confirm_ask("Install playwright?", default="y"): +- return - -- def get_playwright_instructions(self): -- if self.playwright_available in (True, None): - return -- if self.playwright_instructions_shown: +- if not has_pip: +- success, output = utils.run_install(pip_cmd) +- if not success: +- io.tool_error(output) - return - -- self.playwright_instructions_shown = True -- return PLAYWRIGHT_INFO +- success, output = utils.run_install(chromium_cmd) +- if not success: +- io.tool_error(output) +- return +- +- return True +- +- + class Scraper: + pandoc_available = None + playwright_available = None +@@ -89,10 +42,7 @@ class Scraper: + `url` - the URLto scrape. + """ + +- if self.playwright_available: +- content = self.scrape_with_playwright(url) +- else: +- content = self.scrape_with_httpx(url) ++ content = self.scrape_with_httpx(url) - def scrape_with_httpx(self, url): - import httpx + if not content: + return diff --git a/misc/py-aider-chat/files/patch-setup.py b/misc/py-aider-chat/files/patch-setup.py new file mode 100644 index 000000000000..6a9f4e08d16e --- /dev/null +++ b/misc/py-aider-chat/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2024-07-27 19:19:07 UTC ++++ setup.py +@@ -33,7 +33,7 @@ print("Packages:", packages) + + print("Packages:", packages) + +-extras = "dev help browser playwright".split() ++extras = [] + + setup( + name="aider-chat", diff --git a/www/py-streamlit/Makefile b/www/py-streamlit/Makefile index 6ae167025016..3ff330807c46 100644 --- a/www/py-streamlit/Makefile +++ b/www/py-streamlit/Makefile @@ -1,5 +1,5 @@ PORTNAME= streamlit -DISTVERSION= 1.34.0 +DISTVERSION= 1.37.0 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-streamlit/distinfo b/www/py-streamlit/distinfo index 8b411c28a846..a5152f172a56 100644 --- a/www/py-streamlit/distinfo +++ b/www/py-streamlit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716368381 -SHA256 (streamlit-1.34.0.tar.gz) = 135a3b79a686b3132b73f204450ad6e889de04f3349d692925e09f0e21e74b52 -SIZE (streamlit-1.34.0.tar.gz) = 8142532 +TIMESTAMP = 1722096984 +SHA256 (streamlit-1.37.0.tar.gz) = 463ef728ba21e74e05122e3704e8af644a7bdbb5822e281b8daf4a0a48761879 +SIZE (streamlit-1.37.0.tar.gz) = 8274522