From nobody Sun Jan 09 08:39:02 2022 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 B2D3919464D9; Sun, 9 Jan 2022 08:39:02 +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 4JWr3B3H8Fz3mc1; Sun, 9 Jan 2022 08:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5073769EA; Sun, 9 Jan 2022 08:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2098d2Lv075270; Sun, 9 Jan 2022 08:39:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2098d2VG075269; Sun, 9 Jan 2022 08:39:02 GMT (envelope-from git) Date: Sun, 9 Jan 2022 08:39:02 GMT Message-Id: <202201090839.2098d2VG075269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: f3f5e0bc31c1 - main - devel/py-jsonnet: Update to 0.18.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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3f5e0bc31c1ebe3a80d2e30b4f60ea5a8f6d160 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641717542; 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=TyvgFHglK3nTr0ofMRrL+vRYJBTURKWvzE/oX1ITJ30=; b=RZqs6J2kZTJEBoVGy77jpAxHyj9t7+fblSPOh08mii7XtxXMe+UAhR04AgDTVU3ounUL3N nkdQtXp0Ar8ge+HfaBbw6f5nN0dzXblGxG+RuNJhs2HIVEUPWTnF0oYpTlSbOyutHJmgNl wG701NRab20c3Rs6yVU+61kioHtEbkzokeMp7VVg/1RioW002Pgx84vvDO3kAZJrjukcS0 dy4DTISrO1OtqPdCBXQVOTTPJTYQM6sLPNW58wYQlRNvcWewazFkehO/NCNiP0rOKncGSv u5dfiaAsq+WJj4AnJ7ptoEQHQjim74Ew6Howf/uzT97xTPohMPUPEAULjeUHeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641717542; a=rsa-sha256; cv=none; b=Vqe2fzWjRDcN0xxhbgHKjotnRvgqvPzQLRw8UTdcQndfmEviOTybEz/W/92OEVT7PEO5Eg VJPJyiApq3R2/7z+qxe5FvGk0+xAlKsBzjyhFW0u7plgV0kHKfbx3mPgsPaTZHXMwI5Zri TisnH7CBic4b4ic1gyeZJGIsfohP5UIoKQpG0cf5bGaFBQzLcKTmreAAN6Oj/kYgPeiMjo CegeqThMELAtkjUaElx5Eqnids05gWYRQ/Ta18YJN1a6k3We4ShYmUpaBTlh7khk8Vv/3K Y+eUUm3z+OmbLFis9FFLHFBnBv6W+SSd6gKL8KCILuDjfdw9haKqOzwJSHyRSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3f5e0bc31c1ebe3a80d2e30b4f60ea5a8f6d160 commit f3f5e0bc31c1ebe3a80d2e30b4f60ea5a8f6d160 Author: Pavel Timofeev AuthorDate: 2022-01-09 08:38:15 +0000 Commit: Guangyuan Yang CommitDate: 2022-01-09 08:38:15 +0000 devel/py-jsonnet: Update to 0.18.0 PR: 261040 --- devel/py-jsonnet/Makefile | 2 +- devel/py-jsonnet/distinfo | 6 ++-- .../patch-case__studies_kubernetes_test__same.py | 35 ---------------------- devel/py-jsonnet/files/patch-setup.py | 28 ++++++++++++----- 4 files changed, 24 insertions(+), 47 deletions(-) diff --git a/devel/py-jsonnet/Makefile b/devel/py-jsonnet/Makefile index 02dd2e3b91b2..fb0796699f1b 100644 --- a/devel/py-jsonnet/Makefile +++ b/devel/py-jsonnet/Makefile @@ -1,6 +1,6 @@ PORTNAME= jsonnet DISTVERSIONPREFIX= v -DISTVERSION= 0.17.0 +DISTVERSION= 0.18.0 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jsonnet/distinfo b/devel/py-jsonnet/distinfo index 7c119ac87f8a..fa17667dcc5e 100644 --- a/devel/py-jsonnet/distinfo +++ b/devel/py-jsonnet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624332274 -SHA256 (google-jsonnet-v0.17.0_GH0.tar.gz) = 076b52edf888c01097010ad4299e3b2e7a72b60a41abbc65af364af1ed3c8dbe -SIZE (google-jsonnet-v0.17.0_GH0.tar.gz) = 21854054 +TIMESTAMP = 1641652796 +SHA256 (google-jsonnet-v0.18.0_GH0.tar.gz) = 85c240c4740f0c788c4d49f9c9c0942f5a2d1c2ae58b2c71068107bc80a3ced4 +SIZE (google-jsonnet-v0.18.0_GH0.tar.gz) = 22472162 diff --git a/devel/py-jsonnet/files/patch-case__studies_kubernetes_test__same.py b/devel/py-jsonnet/files/patch-case__studies_kubernetes_test__same.py deleted file mode 100644 index 0365b2ee1740..000000000000 --- a/devel/py-jsonnet/files/patch-case__studies_kubernetes_test__same.py +++ /dev/null @@ -1,35 +0,0 @@ ---- case_studies/kubernetes/test_same.py.orig 2020-11-22 14:19:41 UTC -+++ case_studies/kubernetes/test_same.py -@@ -15,7 +15,11 @@ - import yaml - import json - import sys -+import os - -+os.chdir(os.path.dirname(os.path.abspath(__file__))) -+os.system("jsonnet -m ./ example.jsonnet") -+ - files = [ - 'bigquery-controller', - 'redis-master', -@@ -50,10 +54,10 @@ def canonicalize(doc): - - for filename in files: - with open(filename + '.old.yaml', 'r') as f: -- yaml_doc = canonicalize(yaml.load(f)) -+ yaml_doc = canonicalize(yaml.load(f, Loader=yaml.SafeLoader)) - - with open(filename + '.new.yaml', 'r') as f: -- jsonnet_doc = yaml.load(f) -+ jsonnet_doc = yaml.load(f, Loader=yaml.SafeLoader) - - if jsonstr(yaml_doc) == jsonstr(jsonnet_doc): - print('Identical: %s' % filename) -@@ -65,6 +69,6 @@ for filename in files: - with open(filename + '.new.yaml.out', 'w') as f: - f.write(jsonstr(jsonnet_doc)) - -- -+ os.remove(filename + '.new.yaml') - - diff --git a/devel/py-jsonnet/files/patch-setup.py b/devel/py-jsonnet/files/patch-setup.py index 41665ee85474..d8aa9188b454 100644 --- a/devel/py-jsonnet/files/patch-setup.py +++ b/devel/py-jsonnet/files/patch-setup.py @@ -1,9 +1,9 @@ ---- setup.py.orig 2020-11-22 14:19:41 UTC +--- setup.py.orig 2022-01-08 16:20:10 UTC +++ setup.py -@@ -19,18 +19,6 @@ from setuptools.command.build_ext import build_ext as - from subprocess import Popen - +@@ -21,30 +21,6 @@ from subprocess import Popen DIR = os.path.abspath(os.path.dirname(__file__)) + # NOTE: If you are editing the array below then you probably also need + # to change MANIFEST.in. -LIB_OBJECTS = [ - 'core/desugarer.o', - 'core/formatter.o', @@ -14,12 +14,24 @@ - 'core/static_analysis.o', - 'core/string_utils.o', - 'core/vm.o', -- 'third_party/md5/md5.o' +- 'third_party/md5/md5.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/char_traits.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/base64.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/language.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/memory_util.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/format.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/time.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/memory_resource.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/error.o', +- 'third_party/rapidyaml/rapidyaml/src/c4/yml/parse.o', +- 'third_party/rapidyaml/rapidyaml/src/c4/yml/preprocess.o', +- 'third_party/rapidyaml/rapidyaml/src/c4/yml/common.o', +- 'third_party/rapidyaml/rapidyaml/src/c4/yml/tree.o', -] MODULE_SOURCES = ['python/_jsonnet.c'] -@@ -46,19 +34,10 @@ def get_version(): +@@ -60,19 +36,10 @@ def get_version(): v_code = v_code[1:] return v_code @@ -35,12 +47,12 @@ '_jsonnet', sources=MODULE_SOURCES, - extra_objects=LIB_OBJECTS, -- include_dirs = ['include', 'third_party/md5', 'third_party/json'], +- include_dirs = ['include'], + libraries = ['jsonnet'], language='c++' ) -@@ -68,9 +47,6 @@ setup(name='jsonnet', +@@ -83,9 +50,6 @@ setup(name='jsonnet', author='David Cunningham', author_email='dcunnin@google.com', version=get_version(),