<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c17532a4a1315aca247e55a77e5887ed10333856">https://github.com/macports/macports-ports/commit/c17532a4a1315aca247e55a77e5887ed10333856</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c17532a4a13 glances: Upgrade to version 4.1.2
</span>c17532a4a13 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c17532a4a1315aca247e55a77e5887ed10333856
</span>Author: Robert Kennedy <amtor@hotmail.com>
AuthorDate: Sun Aug 25 20:10:08 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> glances: Upgrade to version 4.1.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Upgrade to version 4.1.2
</span><span style='display:block; white-space:pre;color:#404040;'> * Revert revision number back to 0
</span><span style='display:block; white-space:pre;color:#404040;'> * Add new python library - orjson
</span><span style='display:block; white-space:pre;color:#404040;'> * Delete patchfile as patches are now part of source code
</span>---
sysutils/glances/Portfile | 14 +++--
.../files/patch-make-pydantic-optional.diff | 59 ----------------------
2 files changed, 6 insertions(+), 67 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/glances/Portfile b/sysutils/glances/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index efa38cf2ab9..91a863b1446 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/glances/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/glances/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,9 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup nicolargo glances 4.0.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nicolargo glances 4.1.2 v
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories sysutils
license GPL-3
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,14 +19,15 @@ long_description Glances is a cross-platform monitoring tool which aims to pr
</span>
platforms {darwin any}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4a42826facf6710c9935f646b6a0b74da0ee74d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4d84fdd0051ce404071fb2a6b39442252cc82ea12e76982da9bd6dbe1b262e57 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6626435
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bcc476bbb735b9a8984e6868f1a6ded4126dba7f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e116f8f18e62fb1db0c00d93a9bc1be86503135e6aa670ce3cf96a8ce39ef199 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6579314
</span>
python.default_version \
312
depends_lib-append port:py${python.version}-packaging \
port:py${python.version}-psutil \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-orjson \
</span> port:py${python.version}-future \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +39,6 @@ if {${os.platform} eq "darwin" && ${os.major} > 11} {
</span> depends_run-append port:py${python.version}-defusedxml \
port:py${python.version}-ujson
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/nicolargo/glances/pull/2778
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-make-pydantic-optional.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|/usr/local|${prefix}|" glances/config.py
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/glances/files/patch-make-pydantic-optional.diff b/sysutils/glances/files/patch-make-pydantic-optional.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 08790c0405a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/glances/files/patch-make-pydantic-optional.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,59 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glances/event.py 2024-05-15 17:20:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glances/event.py 2024-05-16 23:18:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--from pydantic.dataclasses import dataclass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from glances.logger import logger
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from pydantic.dataclasses import dataclass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+except ImportError as e:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ logger.warning(f"Missing Python Lib ({e}), EventList will be skipping data validation")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from dataclasses import dataclass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from glances.processes import sort_stats
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glances/events_list.py 2024-05-15 17:20:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glances/events_list.py 2024-05-16 23:16:49.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from datetime import datetime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--from pydantic import RootModel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from dataclasses import asdict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from glances.processes import glances_processes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from glances.thresholds import glances_thresholds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +201,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def get(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Return the RAW events list."""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return [RootModel[GlancesEvent](e).model_dump() for e in self.events_list]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return [asdict(e) for e in self.events_list]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def len(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Return the number of events in the logs list."""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- optional-requirements.txt 2024-05-15 17:20:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ optional-requirements.txt 2024-05-16 23:16:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- potsdb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prometheus_client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pycouchdb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pydantic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pygal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pymdstat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pymongo; python_version >= "3.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- requirements.txt 2024-05-15 17:20:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ requirements.txt 2024-05-16 23:15:29.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,4 +2,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defusedxml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- packaging
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ujson>=5.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--pydantic
</span></pre><pre style='margin:0'>
</pre>