Date: Sun, 9 Jan 2022 08:39:02 GMT From: Guangyuan Yang <ygy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f3f5e0bc31c1 - main - devel/py-jsonnet: Update to 0.18.0 Message-ID: <202201090839.2098d2VG075269@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3f5e0bc31c1ebe3a80d2e30b4f60ea5a8f6d160 commit f3f5e0bc31c1ebe3a80d2e30b4f60ea5a8f6d160 Author: Pavel Timofeev <timp87@gmail.com> AuthorDate: 2022-01-09 08:38:15 +0000 Commit: Guangyuan Yang <ygy@FreeBSD.org> 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(),
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201090839.2098d2VG075269>