Skip to content

Commit cb0f159

Browse files
committed
[GR-21590] Update Python imports.
PullRequest: graalpython/2434
2 parents f2626ee + 9e89f31 commit cb0f159

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "2cd069137637587d926bf791fd2003912df2368b" }
1+
{ "overlay": "2a6018d949661319d714f343bc2b7f0f972b4a26" }

graalpython/com.oracle.graal.python.cext/lzma/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2021, Oracle and/or its affiliates.
1+
# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
22
#
33
# The Universal Permissive License (UPL), Version 1.0
44
#
@@ -63,12 +63,12 @@ ifeq ($(shell uname -s), Darwin)
6363
LIB_NAME=liblzma.5.dylib
6464
LIB_LINK=-Wl,-install_name -Wl,@rpath/$(LIB_NAME)
6565
SYM_LIB1=liblzma.dylib
66-
SYM_LIB2=liblzma.5.2.5.dylib
66+
SYM_LIB2=liblzma.5.2.6.dylib
6767
else
6868
LIB_NAME=liblzma.so.5
6969
LIB_LINK=-Wl,-soname -Wl,$(LIB_NAME)
7070
SYM_LIB1=liblzma.so
71-
SYM_LIB2=liblzma.so.5.2.5
71+
SYM_LIB2=liblzma.so.5.2.6
7272
endif
7373

7474
CC=clang

graalpython/com.oracle.graal.python.cext/lzma/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
#define TUKLIB_CPUCORES_SCHED_GETAFFINITY 1
110110
#define TUKLIB_FAST_UNALIGNED_ACCESS 1
111111
#define TUKLIB_PHYSMEM_SYSCONF 1
112-
#define VERSION "5.2.5"
112+
#define VERSION "5.2.6"
113113
#ifndef _DARWIN_USE_64_BIT_INODE
114114
# define _DARWIN_USE_64_BIT_INODE 1
115115
#endif

graalpython/com.oracle.graal.python.cext/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def download(self):
223223
if src_archive:
224224
shutil.copytree(src_archive, tempdir)
225225
else:
226-
xit("FATAL: Please set the environment variable %s to the location of the source archive of %s" % (src_archive_var, lib_name))
226+
xit("FATAL: Please set the environment variable %s to the location of the source archive of %s" % (self.src_var, self.lib_name))
227227
return tempdir
228228

229229
def conftest(self):
@@ -588,7 +588,7 @@ def build(capi_home):
588588
build_nativelibsupport(capi_home,
589589
subdir="lzma",
590590
libname="liblzmasupport",
591-
deps=[LZMADepedency("lzma", "xz==5.2.5", "XZ-5.2.5")],
591+
deps=[LZMADepedency("lzma", "xz==5.2.6", "XZ-5.2.6")],
592592
extra_link_args=["-Wl,-rpath,%s/lib/%s/" % (relative_rpath, SOABI)])
593593
build_libpython(capi_home)
594594
build_builtin_exts(capi_home)

mx.graalpython/suite.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@
4444
},
4545
{
4646
"name": "tools",
47-
"version": "96d195f5bf3e3c6953f8823e47b7f73d2c04dba8",
47+
"version": "fd894b8a9d8a5254e35df726c9ab718e37e29525",
4848
"subdir": True,
4949
"urls": [
5050
{"url": "https://github.com/oracle/graal", "kind": "git"},
5151
],
5252
},
5353
{
5454
"name": "sulong",
55-
"version": "96d195f5bf3e3c6953f8823e47b7f73d2c04dba8",
55+
"version": "fd894b8a9d8a5254e35df726c9ab718e37e29525",
5656
"subdir": True,
5757
"urls": [
5858
{"url": "https://github.com/oracle/graal", "kind": "git"},
5959
]
6060
},
6161
{
6262
"name": "regex",
63-
"version": "96d195f5bf3e3c6953f8823e47b7f73d2c04dba8",
63+
"version": "fd894b8a9d8a5254e35df726c9ab718e37e29525",
6464
"subdir": True,
6565
"urls": [
6666
{"url": "https://github.com/oracle/graal", "kind": "git"},
@@ -107,12 +107,12 @@
107107
"version": "1.8",
108108
},
109109
},
110-
"XZ-5.2.5": {
110+
"XZ-5.2.6": {
111111
"urls": [
112-
"https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/xz-5.2.5.tar.gz",
112+
"https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/xz-5.2.6.tar.gz",
113113
],
114114
"packedResource": True,
115-
"sha1": "fa2ae4db119f639a01b02f99f1ba671ece2828eb",
115+
"sha1": "1b1acd2e62203a7abceee6f573f1a96cdf5fbc8f",
116116
},
117117
"BOUNCYCASTLE-PROVIDER": {
118118
"sha1": "46a080368d38b428d237a59458f9bc915222894d",
@@ -454,14 +454,14 @@
454454
"sulong:SULONG_HOME",
455455
"sulong:SULONG_LEGACY",
456456
"sulong:SULONG_BOOTSTRAP_TOOLCHAIN",
457-
"XZ-5.2.5",
457+
"XZ-5.2.6",
458458
"BZIP2",
459459
],
460460
"buildEnv": {
461461
"TRUFFLE_H_INC": "<path:SULONG_LEGACY>/include",
462462
"ARCH": "<arch>",
463463
"OS": "<os>",
464-
"XZ-5.2.5": "<path:XZ-5.2.5>",
464+
"XZ-5.2.6": "<path:XZ-5.2.6>",
465465
"BZIP2": "<path:BZIP2>",
466466
},
467467
},

0 commit comments

Comments
 (0)