diff --git a/CHANGELOG.md b/CHANGELOG.md index c1f3a065..76c525c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +0.22.19 +======= + +* Update python 3.14 to 3.14.7 +* Update libffi to 3.8.0 + + 0.22.18 ======= diff --git a/relenv/common.py b/relenv/common.py index 1ed5b117..9b95c11c 100644 --- a/relenv/common.py +++ b/relenv/common.py @@ -27,7 +27,7 @@ from collections.abc import Callable, Iterable, Mapping # relenv package version -__version__ = "0.22.18" +__version__ = "0.22.19" log = logging.getLogger(__name__) diff --git a/relenv/python-versions.json b/relenv/python-versions.json index 75a13069..a2bf8c88 100644 --- a/relenv/python-versions.json +++ b/relenv/python-versions.json @@ -197,7 +197,8 @@ "3.14.0": "8a1ae36a2c4212637401af93c8a7856d126156e3", "3.14.5": "550bd85f05ba3a75d710e716100db174f13601f6", "3.14.6": "064b06388d8911f337a023badc7c34a199787a25", - "3.13.14": "2c448ef334b33b3a2db9bbc70b9b51b312e1cc32" + "3.13.14": "2c448ef334b33b3a2db9bbc70b9b51b312e1cc32", + "3.14.7": "1239d153c968b5fa1958963acd350a42b73d895b" }, "dependencies": { "perl": { @@ -392,6 +393,13 @@ "platforms": [ "linux" ] + }, + "3.8.0": { + "url": "https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz", + "sha256": "7da3e2d9a171eb0a038f592ecad3ff2bb2550f3496d87b3b29ad0cf4430c0db4", + "platforms": [ + "linux" + ] } }, "zlib": { diff --git a/requirements/tests.txt b/requirements/tests.txt index c31bda0d..5a5a449c 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -3,5 +3,4 @@ pytest pytest-skip-markers -swig ppbt; sys_platform == 'linux' diff --git a/tests/test_verify_build.py b/tests/test_verify_build.py index 333f0602..c374d22b 100644 --- a/tests/test_verify_build.py +++ b/tests/test_verify_build.py @@ -1443,6 +1443,10 @@ def test_install_with_target_cffi_versions(pipexec, pyexec, build, build_version env = os.environ.copy() env["RELENV_DEBUG"] = "yes" extras = build / "extras" + if build_version.startswith("3.14"): + cffi_version = "2.0.0" + else: + cffi_version = "1.17.1" if build_version[:4] not in ["3.13", "3.14"]: subprocess.run( [str(pipexec), "install", "cffi==1.14.6"], @@ -1455,7 +1459,7 @@ def test_install_with_target_cffi_versions(pipexec, pyexec, build, build_version env=env, ) subprocess.run( - [str(pipexec), "install", "cffi==1.17.1", f"--target={extras}"], + [str(pipexec), "install", f"cffi=={cffi_version}", f"--target={extras}"], check=True, env=env, )