Attachment #230826 for bug #261040

View | Details | Raw Unified | Return to bug 261040
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/devel/py-jsonnet/Makefile (-1 / +1 lines)
1	PORTNAME= jsonnet	1	PORTNAME= jsonnet
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.17.0	3	DISTVERSION= 0.18.0
4	CATEGORIES= devel python	4	CATEGORIES= devel python
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6		6

Lines 1-3 Link Here

(-)b/devel/py-jsonnet/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1624332274	1	TIMESTAMP = 1641652796
2	SHA256 (google-jsonnet-v0.17.0_GH0.tar.gz) = 076b52edf888c01097010ad4299e3b2e7a72b60a41abbc65af364af1ed3c8dbe	2	SHA256 (google-jsonnet-v0.18.0_GH0.tar.gz) = 85c240c4740f0c788c4d49f9c9c0942f5a2d1c2ae58b2c71068107bc80a3ced4
3	SIZE (google-jsonnet-v0.17.0_GH0.tar.gz) = 21854054	3	SIZE (google-jsonnet-v0.18.0_GH0.tar.gz) = 22472162




--- 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')
 
 




--- setup.py.orig	2022-01-08 16:20:10 UTC
+++ setup.py
@@ -21,30 +21,6 @@ from subprocess import Popen
 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',

-    'core/static_analysis.o',
-    'core/string_utils.o',
-    'core/vm.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']
 
@@ -60,19 +36,10 @@ def get_version():
                     v_code = v_code[1:]
                 return v_code
 

     '_jsonnet',
     sources=MODULE_SOURCES,
-    extra_objects=LIB_OBJECTS,
-    include_dirs = ['include'],
+    libraries = ['jsonnet'],
     language='c++'
 )
 
@@ -83,9 +50,6 @@ setup(name='jsonnet',
       author='David Cunningham',
       author_email='dcunnin@google.com',
       version=get_version(),

Return to bug 261040

Removed Link Here

(-)a/devel/py-jsonnet/files/patch-case__studies_kubernetes_test__same.py (-35 lines)
1	--- case_studies/kubernetes/test_same.py.orig 2020-11-22 14:19:41 UTC
2	+++ case_studies/kubernetes/test_same.py
3	@@ -15,7 +15,11 @@
4	import yaml
5	import json
6	import sys
7	+import os
8
9	+os.chdir(os.path.dirname(os.path.abspath(__file__)))
10	+os.system("jsonnet -m ./ example.jsonnet")
11	+
12	files = [
13	'bigquery-controller',
14	'redis-master',
15	@@ -50,10 +54,10 @@ def canonicalize(doc):
16
17	for filename in files:
18	with open(filename + '.old.yaml', 'r') as f:
19	- yaml_doc = canonicalize(yaml.load(f))
20	+ yaml_doc = canonicalize(yaml.load(f, Loader=yaml.SafeLoader))
21
22	with open(filename + '.new.yaml', 'r') as f:
23	- jsonnet_doc = yaml.load(f)
24	+ jsonnet_doc = yaml.load(f, Loader=yaml.SafeLoader)
25
26	if jsonstr(yaml_doc) == jsonstr(jsonnet_doc):
27	print('Identical: %s' % filename)
28	@@ -65,6 +69,6 @@ for filename in files:
29	with open(filename + '.new.yaml.out', 'w') as f:
30	f.write(jsonstr(jsonnet_doc))
31
32	-
33	+ os.remove(filename + '.new.yaml')
34
35

Lines 1-9 Link Here

(-)b/devel/py-jsonnet/files/patch-setup.py (-8 / +20 lines)
1	--- setup.py.orig 2020-11-22 14:19:41 UTC	1	--- setup.py.orig 2022-01-08 16:20:10 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -19,18 +19,6 @@ from setuptools.command.build_ext import build_ext as	3	@@ -21,30 +21,6 @@ from subprocess import Popen
4	from subprocess import Popen
5
6	DIR = os.path.abspath(os.path.dirname(__file__))	4	DIR = os.path.abspath(os.path.dirname(__file__))
		5	# NOTE: If you are editing the array below then you probably also need
		6	# to change MANIFEST.in.
7	-LIB_OBJECTS = [	7	-LIB_OBJECTS = [
8	- 'core/desugarer.o',	8	- 'core/desugarer.o',
9	- 'core/formatter.o',	9	- 'core/formatter.o',
Lines 14-25 Link Here
14	- 'core/static_analysis.o',	14	- 'core/static_analysis.o',
15	- 'core/string_utils.o',	15	- 'core/string_utils.o',
16	- 'core/vm.o',	16	- 'core/vm.o',
17	- 'third_party/md5/md5.o'	17	- 'third_party/md5/md5.o',
		18	- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/char_traits.o',
		19	- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/base64.o',
		20	- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/language.o',
		21	- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/memory_util.o',
		22	- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/format.o',
		23	- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/time.o',
		24	- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/memory_resource.o',
		25	- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/error.o',
		26	- 'third_party/rapidyaml/rapidyaml/src/c4/yml/parse.o',
		27	- 'third_party/rapidyaml/rapidyaml/src/c4/yml/preprocess.o',
		28	- 'third_party/rapidyaml/rapidyaml/src/c4/yml/common.o',
		29	- 'third_party/rapidyaml/rapidyaml/src/c4/yml/tree.o',
18	-]	30	-]
19		31
20	MODULE_SOURCES = ['python/_jsonnet.c']	32	MODULE_SOURCES = ['python/_jsonnet.c']
21		33
22	@@ -46,19 +34,10 @@ def get_version():	34	@@ -60,19 +36,10 @@ def get_version():
23	v_code = v_code[1:]	35	v_code = v_code[1:]
24	return v_code	36	return v_code
25		37
Lines 35-46 Link Here
35	'_jsonnet',	47	'_jsonnet',
36	sources=MODULE_SOURCES,	48	sources=MODULE_SOURCES,
37	- extra_objects=LIB_OBJECTS,	49	- extra_objects=LIB_OBJECTS,
38	- include_dirs = ['include', 'third_party/md5', 'third_party/json'],	50	- include_dirs = ['include'],
39	+ libraries = ['jsonnet'],	51	+ libraries = ['jsonnet'],
40	language='c++'	52	language='c++'
41	)	53	)
42		54
43	@@ -68,9 +47,6 @@ setup(name='jsonnet',	55	@@ -83,9 +50,6 @@ setup(name='jsonnet',
44	author='David Cunningham',	56	author='David Cunningham',
45	author_email='dcunnin@google.com',	57	author_email='dcunnin@google.com',
46	version=get_version(),	58	version=get_version(),