From patchwork Mon Mar 31 06:18:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41071 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5C2B127BBEC; Mon, 31 Mar 2025 07:22:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 92ECC27BBE2 for ; Mon, 31 Mar 2025 07:22:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tz8X3-0005WS-Sp; Mon, 31 Mar 2025 02:22:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tz8WL-00053O-Hd for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:17 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tz8WL-0008BV-7u for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=RCg7FlrNbWm/7ZsUwo8OB9O9Bx8WuYXcse9ZtdlGgsY=; b=krmgzIwFNQsFehR88FvVZ1+l0XYmJajsG4tV4Uvk0uD9pagl/2+i5fJFZGRZBEs6/5SU0Z+Fi8hesDb1kDJYeg6T2b1KioiF2ejbXobWm7Q9yVEBJXzSlcCr8Cd4Y+Bca9rH0SRWhJg7S5aprxhn4dzDf/fsCru+FPIBQtak6zeib+w/64wOLrDC3AT5gAyGvGL99PMCU5shevS1lnlqNF/Ro7sp4eaHfGGr+bsmLeZ2diAAQSg0Z2qRMSYsDI4shMo5Kf1AZOHdTDGT4Zp86gtePTYV5+gLDgyVjismr/EFYGNCuBbUddECT6Hh71awZzSErbbzlqk8lOLiRnxvYA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tz8WL-0007PY-41 for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77400] [PATCH 22/26] gnu: conan: Update to 2.7.1. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 06:21:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77400 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77400@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77400-submit@debbugs.gnu.org id=B77400.174340204528124 (code B ref 77400); Mon, 31 Mar 2025 06:21:17 +0000 Received: (at 77400) by debbugs.gnu.org; 31 Mar 2025 06:20:45 +0000 Received: from localhost ([127.0.0.1]:39298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tz8Vo-0007JP-BN for submit@debbugs.gnu.org; Mon, 31 Mar 2025 02:20:45 -0400 Received: from 10.mo562.mail-out.ovh.net ([46.105.72.220]:37123) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tz8UZ-00070e-DP for 77400@debbugs.gnu.org; Mon, 31 Mar 2025 02:19:29 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZR1Dt3Jzgz1Vw1; Mon, 31 Mar 2025 06:19:26 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77400@debbugs.gnu.org>; Mon, 31 Mar 2025 06:19:26 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.2.127]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZR1Dt2FTnz7wVq; Mon, 31 Mar 2025 06:19:26 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id C5B35263937; Mon, 31 Mar 2025 06:19:25 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R005351a1dff-2355-46e1-a7ee-4293d9a5fb28, 87830A87949A0BA70EB5F3889DD10BC79FDA47E2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Mon, 31 Mar 2025 08:18:50 +0200 Message-ID: <20250331061901.22670-22-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250331061901.22670-1-ngraves@ngraves.fr> References: <20250331061901.22670-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3741928340452074210 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepheekkeegveelledvgfefuefhkedtueekuedvieffhffftdfhkedtjeeitefhhffhnecuffhomhgrihhnpehgihhthhhusgdrtghomhdptghonhgrnhdrihhonecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeegtddtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=RCg7FlrNbWm/7ZsUwo8OB9O9Bx8WuYXcse9ZtdlGgsY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1743401966; v=1; b=yy/0wNAD9QzzDs4+jgAkO1t2PUbtjErCCOPQLcTdmWOIO8xhRIMOJ07biJLk/V2yahJfuF9M cuH5M1mThMKvuhW5nMyKrPHqQE3F2qoShibVytLbZ4tOuiv7JJpbyIDyLhvo/Js2B7Drgm3rvk1 HVXRAj2VygO63l7D/wHFdxUdjcmnJJchMj33Sf9ew0Pj1c7BkXbOAUPG57R9AuDsJmeY5Mi8pWp LxznRcs8uG3A+dI3p+xg27vcqOgIawJdllqRzGqbF9Usz3U4z01mDt7srBMpHzMh8TLGnOPyMT+ C+GPpLvh6lYlqO/ZhYRZZfS8zE0JDJw6h3PfFge2bOHuA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/package-management.scm (conan): Update to 2.7.1. [build-system]: Switch to pyproject-build-system. [arguments]{test-flags}: Use field. Ignore failing tests (old versions of cmake, performance tests, docker/premake/scons requirements. {phases}: Refresh phases. Replace 'check phase by a 'configure-tests phase and the native 'check phase. [propagated-inputs]: Replace python-urllib3 by python-urllib3-next. [native-inputs]: Add python-setuptools, python-wheel. --- gnu/packages/package-management.scm | 139 +++++++++++++++------------- 1 file changed, 77 insertions(+), 62 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a4a96878f7..b5a5adae6e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1315,7 +1315,7 @@ (define-public conda (define-public conan (package (name "conan") - (version "2.0.9") + (version "2.7.1") (source (origin (method git-fetch) ; no tests in PyPI archive @@ -1324,13 +1324,74 @@ (define-public conan (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ykfj7c3i0b57s7ql3p2lawxdzd2cn36f3k8p64lyzla8rwv4xdx")))) - (build-system python-build-system) + (base32 "00mrx1ighvf6r6fy2iqxr286w3jfd0gwlzcqsw15cm9axblx5av9")))) + (build-system pyproject-build-system) (arguments (list - #:modules '((guix build python-build-system) + #:modules '((guix build pyproject-build-system) (guix build utils) (ice-9 format)) + #:test-flags + (let ((system (or (%current-target-system) + (%current-system)))) + #~(list "-n" (number->string (parallel-job-count)) + "-m" "not slow" + "--ignore=test/performance/" + ;; E ModuleNotFoundError: No module named 'docker' + "--ignore=test/functional/command/runner_test.py" + ;; Disable problematic tests. + "-k" + (string-append + ;; These tests rely on networking. + "not download_retries_errors " + "and not ftp " + ;; These tests are for old versions of cmake. + "and not test_custom_cmake_3_16 " + "and not test_custom_cmake_3_17 " + "and not test_custom_cmake_3_19 " + ;; Guix sets PKG_CONFIG_PATH itself, which is not + ;; expected by the following test. + "and not pkg_config_path " + "and not compare " ;caused by newer node-semver? + ;; This test hard-codes a compiler version. + "and not test_toolchain " + ;; The 'test_list' tests may fail + ;; non-deterministically (see: + ;; https://github.com/conan-io/conan/issues/13583). + "and not test_list " + ;; These tests fail when Autoconf attempt to load a + ;; shared library in the same directory (see: + ;; https://github.com/conan-io/conan/issues/13577). + "and not test_other_client_can_link_autotools " + "and not test_autotools_lib_template " + ;; Sometimes fail: https://github.com/conan-io/conan/issues/15936 + "and not test_basic_parallel_install " + ;; These tests require additional build tools + "and not test_premake " + "and not test_sconsdeps " + ;; Unclear why libc is not found properly + "and not test_profile_detect_libc " + #$(if (not (string-prefix? "x86_64" system)) + ;; These tests either assume the machine is + ;; x86_64, or require a cross-compiler to target + ;; it. + (string-append + "and not cpp_package " + "and not exclude_code_analysis " + "and not cmakedeps_multi " + "and not locally_build_linux " + "and not custom_configuration " + "and not package_from_system " + "and not cross_build_command " + "and not test_package " + "and not test_same ") + "") + #$(if (not (or (string-prefix? "x86_64" system) + (string-prefix? "i686" system))) + ;; This test only works with default arch "x86", + ;; "x86_64", "sparc" or "sparcv9". + "and not settings_as_a_dict_conanfile " + "")))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths @@ -1345,21 +1406,22 @@ (define-public conan ;; The test suite expects GCC 9 to be used (see: ;; https://github.com/conan-io/conan/issues/13575). Render the ;; check version agnostic. - (substitute* "conans/test/functional/toolchains/meson/_base.py" + (substitute* "test/functional/toolchains/meson/_base.py" (("__GNUC__9") "__GNUC__")))) (add-after 'unpack 'use-current-cmake-for-tests (lambda _ - (substitute* (find-files "conans/test" "\\.py$") - (("@pytest.mark.tool\\(\"cmake\", \"3.23\")") + (substitute* (find-files "test" "\\.py$") + (("@pytest.mark.tool\\(\"cmake\", \".*\")") "@pytest.mark.tool(\"cmake\")")))) (add-before 'check 'configure-tests (lambda _ (let* ((cmake-version #$(version-major+minor - (package-version cmake))) + (package-version + (this-package-native-input "cmake")))) (pkg-config-version #$(version-major+minor (package-version pkg-config)))) - (call-with-output-file "conans/test/conftest_user.py" + (call-with-output-file "test/conftest_user.py" (lambda (port) (format port "\ tools_locations = { @@ -1378,61 +1440,12 @@ (define-public conan (add-before 'check 'set-home (lambda _ (setenv "HOME" "/tmp"))) - (replace 'check - (lambda* (#:key tests? outputs #:allow-other-keys) - (define system #$(or (%current-target-system) - (%current-system))) + (add-before 'check 'configure-tests + (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "CONFIG_SHELL" (which "sh")) (setenv "PATH" (string-append (getenv "PATH") ":" - #$output "/bin")) - (invoke "python" "-m" "pytest" "-vv" - "-n" (number->string (parallel-job-count)) - "-m" "not slow" - ;; Disable problematic tests. - "-k" - (string-append - ;; These tests rely on networking. - "not download_retries_errors " - "and not ftp " - ;; Guix sets PKG_CONFIG_PATH itself, which is not - ;; expected by the following test. - "and not pkg_config_path " - "and not compare " ;caused by newer node-semver? - ;; This test hard-codes a compiler version. - "and not test_toolchain " - ;; The 'test_list' tests may fail - ;; non-deterministically (see: - ;; https://github.com/conan-io/conan/issues/13583). - "and not test_list " - ;; These tests fail when Autoconf attempt to load a - ;; shared library in the same directory (see: - ;; https://github.com/conan-io/conan/issues/13577). - "and not test_other_client_can_link_autotools " - "and not test_autotools_lib_template " - ;; Sometimes fail: https://github.com/conan-io/conan/issues/15936 - "and not test_basic_parallel_install " - (if (not (string-prefix? "x86_64" system)) - ;; These tests either assume the machine is - ;; x86_64, or require a cross-compiler to target - ;; it. - (string-append - "and not cpp_package " - "and not exclude_code_analysis " - "and not cmakedeps_multi " - "and not locally_build_linux " - "and not custom_configuration " - "and not package_from_system " - "and not cross_build_command " - "and not test_package " - "and not test_same ") - "") - (if (not (or (string-prefix? "x86_64" system) - (string-prefix? "i686" system))) - ;; This test only works with default arch "x86", - ;; "x86_64", "sparc" or "sparcv9". - "and not settings_as_a_dict_conanfile " - ""))))))))) + #$output "/bin")))))))) (propagated-inputs (list python-bottle python-colorama @@ -1450,7 +1463,7 @@ (define system #$(or (%current-target-system) python-requests python-six python-tqdm - python-urllib3)) + python-urllib3-next)) (inputs (list coreutils)) ;for printenv (native-inputs @@ -1467,7 +1480,9 @@ (define system #$(or (%current-target-system) python-parameterized python-pytest python-pytest-xdist + python-setuptools python-webtest + python-wheel which)) (home-page "https://conan.io") (synopsis "Decentralized C/C++ package manager")