apteryx pushed a commit to branch wip-ipython-polyglossia in repository guix.
commit e2af989fea37b2a93d5f2cbd03d8ad93493563c5 Author: Maxim Cournoyer <[email protected]> AuthorDate: Tue Apr 19 11:28:07 2022 -0400 gnu: conan: Update to 1.47.0 and relax PyYAML requirement. * gnu/packages/package-management.scm (conan): Update to 1.47.0. [phases]{check}: Skip the test_apt_check test. {relax-requirements}: Drop upper bound on PyYAML. --- gnu/packages/package-management.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9c5db0d608..8627a0dc4f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020 Martin Becze <[email protected]> ;;; Copyright © 2020 Vincent Legoll <[email protected]> ;;; Copyright © 2021 Ivan Gankevich <[email protected]> -;;; Copyright © 2021 Maxim Cournoyer <[email protected]> +;;; Copyright © 2021, 2022 Maxim Cournoyer <[email protected]> ;;; Copyright © 2021 John Kehayias <[email protected]> ;;; Copyright © 2022 Zhu Zihao <[email protected]> ;;; @@ -1067,7 +1067,7 @@ written entirely in Python.") (define-public conan (package (name "conan") - (version "1.42.0") + (version "1.47.0") (source (origin (method git-fetch) ;no tests in PyPI archive @@ -1077,7 +1077,7 @@ written entirely in Python.") (file-name (git-file-name name version)) (sha256 (base32 - "153npvj81m1c33gfcv2nry7xhyikxnhjns7lvs525f1x20ck6asg")))) + "1zs2xb22rsy5fsc0fd7c95vrx1mfz7vasyg1lqkzyfimvn5zah6n")))) (build-system python-build-system) (arguments `(#:phases @@ -1088,7 +1088,9 @@ written entirely in Python.") (("node-semver==0.6.1") "node-semver>=0.6.1") (("Jinja2>=2.9, <3") - "Jinja2>=2.9")))) + "Jinja2>=2.9") + (("PyYAML>=3.11, <6.0") + "PyYAML")))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils"))) @@ -1144,6 +1146,8 @@ written entirely in Python.") ;; This one fails for unknown reasons (see: ;; https://github.com/conan-io/conan/issues/9671). "and not test_build " + ;; This test expects the 'apt' command to be available. + "and not test_apt_check " (if (not (string-prefix? "x86_64" system)) ;; These tests either assume the machine is ;; x86_64, or require a cross-compiler to target
