diff --git a/ci.jsonnet b/ci.jsonnet index 22a08ec2fc..60fc190b80 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -6,7 +6,7 @@ (import "ci/python-bench.libsonnet") + { overlay: "28f1ff831cd38862c38c7d4c02fbf145b8a17b5c", - specVersion: "6", + specVersion: "8", // Until buildbot issues around CI tiers are resolved, we cannot use them // tierConfig: self.tierConfig, @@ -458,7 +458,7 @@ packages: { ruby: "==3.2.2", libyaml: "==0.2.5", - mx: "7.34.1", + mx: "==7.82.0", python3: "==3.8.10", }, environment: { @@ -477,6 +477,7 @@ ["mkdir", "-p", "../docs/site/vendor/cache"], ["cp", "graal-languages-jekyll-theme-*.gem", "../docs/site/vendor/cache"], ["cd", "../docs/site"], + ["bundle", "config", "set", "local.graal-languages-jekyll-theme", "../../graal-languages-jekyll-theme"], ["bundle", "config", "set", "mirror.https://rubygems.org", $.overlay_imports.RUBYGEMS_MIRROR], ["bundle", "install"], ["bundle", "exec", "jekyll", "build"], @@ -508,7 +509,7 @@ targets: ["deploy"], capabilities: ["linux", "amd64"], packages: { - mx: "7.34.1", + mx: "==7.82.0", python3: "==3.8.10", }, requireArtifacts: [ diff --git a/ci/python-bench.libsonnet b/ci/python-bench.libsonnet index 468276c2ad..5c1352a229 100644 --- a/ci/python-bench.libsonnet +++ b/ci/python-bench.libsonnet @@ -95,15 +95,28 @@ PIP_EXTRA_INDEX_URL: $.overlay_imports.PIP_EXTRA_INDEX_URL, } else {}, - local pip_index_setup = [ - // Use the CI Python's configured base index and overlay-provided GraalPy wheel index. - ["set-export", "PIP_INDEX_URL", ["python", "-m", "pip", "config", "get", "global.index-url"]], - ] + if $.overlay_imports.PIP_EXTRA_INDEX_URL != "" then [ - ["set-export", "PIP_EXTRA_INDEX_URL", $.overlay_imports.PIP_EXTRA_INDEX_URL], - ] else [], + local pip_index_from_config_or_env = [ + "python", + "-c", + "import os, subprocess, sys; " + + "cmd = [sys.executable, '-m', 'pip', 'config', 'get', 'global.index-url']; " + + "p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, text=True); " + + "print(p.stdout.strip() if p.returncode == 0 else os.environ.get('PIP_INDEX_URL') or " + + "os.environ.get('PIP_EXTRA_INDEX_URL', ''))", + ], + + local pip_index_setup = + if $.overlay_imports.PIP_EXTRA_INDEX_URL != "" then [ + // Use the CI Python's configured base index if present. pip config get does not report env + // vars, so preserve Buildbot's PIP_INDEX_URL before falling back to the overlay repository URL. + ["set-export", "PIP_EXTRA_INDEX_URL", $.overlay_imports.PIP_EXTRA_INDEX_URL], + ["set-export", "PIP_INDEX_URL", pip_index_from_config_or_env], + ] else [ + ["set-export", "PIP_INDEX_URL", pip_index_from_config_or_env], + ], local packages(os, arch) = self.packages(os, arch) + { - make: ">=3.83", + make: "==4.3", binutils: "==2.23.2", }, @@ -254,7 +267,7 @@ ], deploysArtifacts: true, packages +: packages(self.os, self.arch) + { - "apache/ant": ">=1.9.4", + "apache/ant": "==1.10.1", libyaml: "==0.2.5", "pip:ninja_syntax": "==1.7.2", "pip:pylint": "==2.4.4", diff --git a/ci/python-gate.libsonnet b/ci/python-gate.libsonnet index cfafaef82f..638565a8fd 100644 --- a/ci/python-gate.libsonnet +++ b/ci/python-gate.libsonnet @@ -194,12 +194,25 @@ buildslave_ol8: ENVIRONMENT_DIFF_OL8, }, - local pip_index_setup = [ - // Use the CI Python's configured base index and overlay-provided GraalPy wheel index. - ["set-export", "PIP_INDEX_URL", ["python", "-m", "pip", "config", "get", "global.index-url"]], - ] + if $.overlay_imports.PIP_EXTRA_INDEX_URL != "" then [ - ["set-export", "PIP_EXTRA_INDEX_URL", $.overlay_imports.PIP_EXTRA_INDEX_URL], - ] else [], + local pip_index_from_config_or_env = [ + "python", + "-c", + "import os, subprocess, sys; " + + "cmd = [sys.executable, '-m', 'pip', 'config', 'get', 'global.index-url']; " + + "p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, text=True); " + + "print(p.stdout.strip() if p.returncode == 0 else os.environ.get('PIP_INDEX_URL') or " + + "os.environ.get('PIP_EXTRA_INDEX_URL', ''))", + ], + + local pip_index_setup = + if $.overlay_imports.PIP_EXTRA_INDEX_URL != "" then [ + // Use the CI Python's configured base index if present. pip config get does not report env + // vars, so preserve Buildbot's PIP_INDEX_URL before falling back to the overlay repository URL. + ["set-export", "PIP_EXTRA_INDEX_URL", $.overlay_imports.PIP_EXTRA_INDEX_URL], + ["set-export", "PIP_INDEX_URL", pip_index_from_config_or_env], + ] else [ + ["set-export", "PIP_INDEX_URL", pip_index_from_config_or_env], + ], //------------------------------------------------------------------------------------------------------------------ // packages @@ -209,30 +222,32 @@ linux: { common: { "00:devtoolset": "==7", - "01:binutils": ">=2.34", - bzip2: ">=1.0.6", - cmake: ">=3.22.2", - zlib: ">=1.2.11", - lcov: ">=1.11", - libffi: ">=3.2.1", + "01:binutils": "==2.34", + bzip2: "==1.0.6", + cmake: "==3.22.2", + zlib: "==1.2.11", + lcov: "==1.14", + libffi: "==3.2.1", llvm: "==8.0.0", - maven: ">=3.3.9", + maven: "==3.9.10", curl: '==7.50.1', }, amd64: {}, - aarch64: {}, + aarch64: { + maven: "==3.5.3", + }, }, darwin: { common: { coreutils: "", - maven: ">=3.3.9", + maven: "==3.3.9", }, amd64: {}, aarch64: {}, }, windows: { common: { - maven: ">=3.3.9", + maven: "==3.3.9", }, amd64: {}, aarch64: {}, diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_cn.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_cn.txt index 7e0dd2f6dd..ff73c64b96 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_cn.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_cn.txt @@ -1,7 +1,7 @@ -test.test_codecmaps_cn.TestGB18030Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_cn.TestGB18030Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_cn.TestGB2312Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_cn.TestGB2312Map.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_cn.TestGB2312Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_cn.TestGBKMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_cn.TestGBKMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_codecmaps_cn.TestGB18030Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_cn.TestGB18030Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_cn.TestGB2312Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_cn.TestGB2312Map.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_cn.TestGB2312Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_cn.TestGBKMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_cn.TestGBKMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_hk.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_hk.txt index 23769ffb10..57eabca95c 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_hk.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_hk.txt @@ -1,3 +1,3 @@ -test.test_codecmaps_hk.TestBig5HKSCSMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_hk.TestBig5HKSCSMap.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_hk.TestBig5HKSCSMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_codecmaps_hk.TestBig5HKSCSMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_hk.TestBig5HKSCSMap.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_hk.TestBig5HKSCSMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_jp.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_jp.txt index 0c1c9184b5..e6d1c41646 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_jp.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_jp.txt @@ -1,9 +1,9 @@ -test.test_codecmaps_jp.TestCP932Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_jp.TestEUCJISX0213Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_jp.TestEUCJISX0213Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_jp.TestEUCJPCOMPATMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_jp.TestEUCJPCOMPATMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_jp.TestSJISCOMPATMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_jp.TestSJISCOMPATMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_jp.TestSJISX0213Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_jp.TestSJISX0213Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_codecmaps_jp.TestCP932Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_jp.TestEUCJISX0213Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_jp.TestEUCJISX0213Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_jp.TestEUCJPCOMPATMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_jp.TestEUCJPCOMPATMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_jp.TestSJISCOMPATMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_jp.TestSJISCOMPATMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_jp.TestSJISX0213Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_jp.TestSJISX0213Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_kr.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_kr.txt index 4c8aad78f8..16babf315d 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_kr.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_kr.txt @@ -1,9 +1,9 @@ -test.test_codecmaps_kr.TestCP949Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_kr.TestCP949Map.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_kr.TestCP949Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_kr.TestEUCKRMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_kr.TestEUCKRMap.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_kr.TestEUCKRMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_kr.TestJOHABMap.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_kr.TestJOHABMap.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_kr.TestJOHABMap.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_codecmaps_kr.TestCP949Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_kr.TestCP949Map.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_kr.TestCP949Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_kr.TestEUCKRMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_kr.TestEUCKRMap.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_kr.TestEUCKRMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_kr.TestJOHABMap.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_kr.TestJOHABMap.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_kr.TestJOHABMap.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_tw.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_tw.txt index b7403fdea3..8c31d2e7c8 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_tw.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_tw.txt @@ -1,5 +1,5 @@ -test.test_codecmaps_tw.TestBIG5Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_tw.TestBIG5Map.test_mapping_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_tw.TestBIG5Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_tw.TestCP950Map.test_errorhandle @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_codecmaps_tw.TestCP950Map.test_mapping_supplemental @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_codecmaps_tw.TestBIG5Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_tw.TestBIG5Map.test_mapping_file @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_tw.TestBIG5Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_tw.TestCP950Map.test_errorhandle @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_codecmaps_tw.TestCP950Map.test_mapping_supplemental @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_hashlib.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_hashlib.txt index d3492eb3a4..a0b882a21e 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_hashlib.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_hashlib.txt @@ -27,13 +27,13 @@ test.test_hashlib.HashLibTestCase.test_case_sha384_1 @ darwin-arm64,linux-aarch6 test.test_hashlib.HashLibTestCase.test_case_sha384_2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_hashlib.HashLibTestCase.test_case_sha384_3 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_hashlib.HashLibTestCase.test_case_sha3_224_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_hashlib.HashLibTestCase.test_case_sha3_224_vector @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_hashlib.HashLibTestCase.test_case_sha3_224_vector @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_hashlib.HashLibTestCase.test_case_sha3_256_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_hashlib.HashLibTestCase.test_case_sha3_256_vector @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_hashlib.HashLibTestCase.test_case_sha3_256_vector @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_hashlib.HashLibTestCase.test_case_sha3_384_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_hashlib.HashLibTestCase.test_case_sha3_384_vector @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_hashlib.HashLibTestCase.test_case_sha3_384_vector @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_hashlib.HashLibTestCase.test_case_sha3_512_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_hashlib.HashLibTestCase.test_case_sha3_512_vector @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_hashlib.HashLibTestCase.test_case_sha3_512_vector @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_hashlib.HashLibTestCase.test_case_sha512_0 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_hashlib.HashLibTestCase.test_case_sha512_1 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_hashlib.HashLibTestCase.test_case_sha512_2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_robotparser.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_robotparser.txt index 5ee3aa92a4..43c3d757ca 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_robotparser.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_robotparser.txt @@ -35,9 +35,9 @@ test.test_robotparser.InvalidCrawlDelayTest.test_site_maps @ darwin-arm64,linux- test.test_robotparser.InvalidRequestRateTest.test_bad_urls @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_robotparser.InvalidRequestRateTest.test_good_urls @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_robotparser.InvalidRequestRateTest.test_site_maps @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_robotparser.NetworkTestCase.test_basic @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_robotparser.NetworkTestCase.test_can_fetch @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_robotparser.NetworkTestCase.test_read_404 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_robotparser.NetworkTestCase.test_basic @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_robotparser.NetworkTestCase.test_can_fetch @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_robotparser.NetworkTestCase.test_read_404 @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_robotparser.PasswordProtectedSiteTestCase.testPasswordProtectedSite @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github test.test_robotparser.RejectAllRobotsTest.test_bad_urls @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_robotparser.RejectAllRobotsTest.test_good_urls @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unicodedata.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unicodedata.txt index 2db9249d87..6022b6dca8 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unicodedata.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unicodedata.txt @@ -1,6 +1,6 @@ test.test_unicodedata.NormalizationTest.test_bug_834676 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_unicodedata.NormalizationTest.test_edge_cases @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_unicodedata.NormalizationTest.test_normalization @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_unicodedata.NormalizationTest.test_normalization @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_unicodedata.UnicodeFunctionsTest.test_category @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_unicodedata.UnicodeFunctionsTest.test_combining @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_unicodedata.UnicodeFunctionsTest.test_decimal @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_urllib2net.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_urllib2net.txt index 3d4934a2c6..dc88af3c74 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_urllib2net.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_urllib2net.txt @@ -1,15 +1,15 @@ -test.test_urllib2net.CloseSocketTest.test_close @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllib2net.OtherNetworkTests.test_custom_headers @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_urllib2net.CloseSocketTest.test_close @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllib2net.OtherNetworkTests.test_custom_headers @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_urllib2net.OtherNetworkTests.test_file @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github # Connecting to external page that sometimes times out !test.test_urllib2net.OtherNetworkTests.test_ftp -test.test_urllib2net.OtherNetworkTests.test_redirect_url_withfrag @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllib2net.OtherNetworkTests.test_urlwithfrag @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_urllib2net.OtherNetworkTests.test_redirect_url_withfrag @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllib2net.OtherNetworkTests.test_urlwithfrag @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_urllib2net.TimeoutTest.test_ftp_basic @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_urllib2net.TimeoutTest.test_ftp_default_timeout @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_urllib2net.TimeoutTest.test_ftp_no_timeout @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_urllib2net.TimeoutTest.test_ftp_timeout @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github -test.test_urllib2net.TimeoutTest.test_http_basic @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllib2net.TimeoutTest.test_http_default_timeout @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllib2net.TimeoutTest.test_http_no_timeout @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllib2net.TimeoutTest.test_http_timeout @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_urllib2net.TimeoutTest.test_http_basic @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllib2net.TimeoutTest.test_http_default_timeout @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllib2net.TimeoutTest.test_http_no_timeout @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllib2net.TimeoutTest.test_http_timeout @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_urllibnet.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_urllibnet.txt index a4c7f395e0..f4da4466a0 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_urllibnet.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_urllibnet.txt @@ -1,12 +1,12 @@ -test.test_urllibnet.URLTimeoutTest.testURLread @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_urllibnet.URLTimeoutTest.testURLread @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github test.test_urllibnet.urlopenNetworkTests.test_bad_address @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlopenNetworkTests.test_basic @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlopenNetworkTests.test_getcode @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlopenNetworkTests.test_geturl @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlopenNetworkTests.test_info @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlopenNetworkTests.test_readlines @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlretrieveNetworkTests.test_basic @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlretrieveNetworkTests.test_data_header @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlretrieveNetworkTests.test_header @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlretrieveNetworkTests.test_reporthook @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_urllibnet.urlretrieveNetworkTests.test_specified_path @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_urllibnet.urlopenNetworkTests.test_basic @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllibnet.urlopenNetworkTests.test_getcode @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllibnet.urlopenNetworkTests.test_geturl @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllibnet.urlopenNetworkTests.test_info @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllibnet.urlopenNetworkTests.test_readlines @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllibnet.urlretrieveNetworkTests.test_basic @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllibnet.urlretrieveNetworkTests.test_data_header @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllibnet.urlretrieveNetworkTests.test_header @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllibnet.urlretrieveNetworkTests.test_reporthook @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github +test.test_urllibnet.urlretrieveNetworkTests.test_specified_path @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github diff --git a/graalpython/lib-graalpython/patches/pip-23.2.1.patch b/graalpython/lib-graalpython/patches/pip-23.2.1.patch index 47ecb21b15..32a8e7f1aa 100644 --- a/graalpython/lib-graalpython/patches/pip-23.2.1.patch +++ b/graalpython/lib-graalpython/patches/pip-23.2.1.patch @@ -13,17 +13,18 @@ diff --git a/pip/_internal/cli/cmdoptions.py b/pip/_internal/cli/cmdoptions.py index 02ba608..85c7c22 100644 --- a/pip/_internal/cli/cmdoptions.py +++ b/pip/_internal/cli/cmdoptions.py -@@ -357,7 +357,8 @@ def extra_index_url() -> Option: +@@ -357,7 +357,9 @@ def extra_index_url() -> Option: dest="extra_index_urls", metavar="URL", action="append", - default=[], -+ # GraalPy change: add default extra index with our prebuilt binaries -+ default=["https://www.graalvm.org/python/wheels/"], ++ # GraalPy change: add default extra index with our prebuilt binaries. If PIP_INDEX_URL is set, ++ # assume the user configured a custom index and does not want to use any default index. ++ default=[] if "PIP_INDEX_URL" in os.environ else ["https://www.graalvm.org/python/wheels/"], help="Extra URLs of package indexes to use in addition to " "--index-url. Should follow the same rules as " "--index-url.", -@@ -892,7 +893,7 @@ disable_pip_version_check: Callable[..., Option] = partial( +@@ -892,7 +894,7 @@ disable_pip_version_check: Callable[..., Option] = partial( "--disable-pip-version-check", dest="disable_pip_version_check", action="store_true", diff --git a/graalpython/lib-graalpython/patches/pip-24.3.1.patch b/graalpython/lib-graalpython/patches/pip-24.3.1.patch index 6a5afce19a..1fbe76cf08 100644 --- a/graalpython/lib-graalpython/patches/pip-24.3.1.patch +++ b/graalpython/lib-graalpython/patches/pip-24.3.1.patch @@ -13,17 +13,18 @@ diff --git a/pip/_internal/cli/cmdoptions.py b/pip/_internal/cli/cmdoptions.py index 0b7cff7..07c86bf 100644 --- a/pip/_internal/cli/cmdoptions.py +++ b/pip/_internal/cli/cmdoptions.py -@@ -357,7 +357,8 @@ def extra_index_url() -> Option: +@@ -357,7 +357,9 @@ def extra_index_url() -> Option: dest="extra_index_urls", metavar="URL", action="append", - default=[], -+ # GraalPy change: add default extra index with our prebuilt binaries -+ default=["https://www.graalvm.org/python/wheels/"], ++ # GraalPy change: add default extra index with our prebuilt binaries. If PIP_INDEX_URL is set, ++ # assume the user configured a custom index and does not want to use any default index. ++ default=[] if "PIP_INDEX_URL" in os.environ else ["https://www.graalvm.org/python/wheels/"], help="Extra URLs of package indexes to use in addition to " "--index-url. Should follow the same rules as " "--index-url.", -@@ -892,7 +893,7 @@ disable_pip_version_check: Callable[..., Option] = partial( +@@ -892,7 +894,7 @@ disable_pip_version_check: Callable[..., Option] = partial( "--disable-pip-version-check", dest="disable_pip_version_check", action="store_true", diff --git a/graalpython/lib-python/3/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl b/graalpython/lib-python/3/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl index b8e955a9b8..6e3c73e965 100644 Binary files a/graalpython/lib-python/3/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl and b/graalpython/lib-python/3/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl differ diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py index 8392bc9d86..f481715018 100644 --- a/mx.graalpython/mx_graalpython.py +++ b/mx.graalpython/mx_graalpython.py @@ -1064,6 +1064,26 @@ def update_maven_opts(env): mx.log(f"Added '{mvn_repo_local}' to MAVEN_OPTS={maven_opts}") return env + +def deploy_library_to_local_maven_repo(library_name, repo_url, env): + library = mx.library(library_name) + if not hasattr(library, 'maven'): + mx.abort(f'Cannot deploy {library_name}: library does not define Maven metadata') + maven = library.maven + mx.run_maven([ + 'deploy:deploy-file', + '-DrepositoryId=local', + f'-Durl={repo_url}', + f'-DgroupId={maven["groupId"]}', + f'-DartifactId={maven["artifactId"]}', + f'-Dversion={maven["version"]}', + f'-Dfile={library.get_path(True)}', + '-Dpackaging=jar', + '-DgeneratePom=true', + '-DretryFailedDeploymentCount=10', + ], env=env) + + def deploy_local_maven_repo(env=None): env = update_maven_opts({**os.environ.copy(), **(env or {})}) run_mx_args = [ @@ -1098,6 +1118,9 @@ def deploy_local_maven_repo(env=None): mx.rmtree(path, ignore_errors=True) os.mkdir(path) run_mx(deploy_args, env={**env, **LATEST_JAVA_HOME}) + repo_url = pathlib.Path(path).as_uri() + for library_name in ('BOUNCYCASTLE-PROVIDER', 'BOUNCYCASTLE-PKIX', 'BOUNCYCASTLE-UTIL'): + deploy_library_to_local_maven_repo(library_name, repo_url, {**env, **LATEST_JAVA_HOME}) return path, version, env