From 687a1fdaaeebf845593c36823abf58212333bfb3 Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Sat, 30 Dec 2023 15:57:51 +0100 Subject: gnu: Add python-pytest-dotenv. * gnu/packages/check.scm (python-pytest-dotenv): New variable. --- gnu/packages/check.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 80e0b94d01..93582a4b5f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 Reza Housseini ;;; Copyright © 2023 Hilton Chain +;;; Copyright © 2023 Troy Figiel ;;; ;;; This file is part of GNU Guix. ;;; @@ -1416,6 +1417,30 @@ (define-public python-pytest-cov supports coverage of subprocesses.") (license license:expat))) +(define-public python-pytest-dotenv + (package + (name "python-pytest-dotenv") + (version "0.5.2") + (source + (origin + ;; No tests in the PyPI tarball. + (method git-fetch) + (uri (git-reference + (url "https://github.com/quiqua/pytest-dotenv") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bdxwaak5clhsd63b9q65nf2amqqv5hfn7dskfakyldxsqnnh0y6")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-dotenv)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/quiqua/pytest-dotenv") + (synopsis "Automatically detect and load a .env file before running tests") + (description + "This Pytest plugin automatically detects and loads environment variables +from a .env file before running tests.") + (license license:expat))) + (define-public python-pytest-httpserver (package (name "python-pytest-httpserver") -- cgit v1.2.3 From 45d07a0b01c30d18a537c47efce79192b8c8d178 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Jan 2024 23:16:59 -0500 Subject: gnu: catch2-3: Update to 3.5.1. * gnu/packages/check.scm (catch2-3.3): Rename to... (catch2-3): ... this. Update to 3.5.1. * gnu/packages/logging.scm (spdlog) [native-inputs]: Rename catch2-3.3 to catch2-3. * gnu/packages/potassco.scm (clingo) [inputs]: Likewise. Change-Id: Ied7724597ff4c6371dc4fedc10452ae870d23933 --- gnu/packages/check.scm | 6 +++--- gnu/packages/logging.scm | 2 +- gnu/packages/potassco.scm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 93582a4b5f..449340f331 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -603,10 +603,10 @@ (define-public cbehave pattern.") (license license:apsl2)))) -(define-public catch2-3.3 +(define-public catch2-3 (package (name "catch2") - (version "3.4.0") + (version "3.5.1") (home-page "https://github.com/catchorg/Catch2") (source (origin (method git-fetch) @@ -616,7 +616,7 @@ (define-public catch2-3.3 (file-name (git-file-name name version)) (sha256 (base32 - "1gdfsva6mnd66px85fmm3s65h8qzqnmgbmws2i3nygfav1y8d88f")))) + "0p7rk01n4qfnnm1bgakllyqi83n1kbpz11gh65z1vspfz58hs9iv")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index c204a013b4..0efd828f8a 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -232,7 +232,7 @@ (define-public spdlog (list "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_SHARED=ON" "-DSPDLOG_BUILD_TESTS=ON"))) - (native-inputs (list catch2-3.3)) + (native-inputs (list catch2-3)) (home-page "https://github.com/gabime/spdlog") (synopsis "Fast C++ logging library") (description "Spdlog is a very fast header-only/compiled C++ logging diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index 884da3c99f..e69bfda9d6 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -209,7 +209,7 @@ (define-public clingo "unpool-ast-v2" "parse_term" "propagator" "propgator-sequence-mining" "symbol" "visitor")))))))))) - (inputs (list catch2-3.3 clasp libpotassco)) + (inputs (list catch2-3 clasp libpotassco)) (native-inputs (list mpark-variant pkg-config tl-optional -- cgit v1.2.3 From 18393fcdddf5c3d834fa89ebf5f3925fc5b166ed Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sat, 13 Jan 2024 17:20:55 -0500 Subject: gnu: check2: Fix tests on i686-linux. Reported upstream to . It is expected that SSE2 is enabled for i686 builds or tests fail. * gnu/packages/check.scm (check2)[arguments]: Enable SSE2 for x86_64-linux and i686-linux in configure-flags. Co-authored-by: Richard Sent Co-authored-by: Jo Gay <@jane.lx.gay> Change-Id: I99205f92b66ab3d10affbfb58918f37069ba82ec --- gnu/packages/check.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/check.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 449340f331..b475aea8ae 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -108,6 +108,7 @@ (define-module (gnu packages check) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix deprecation) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) (define-public pict @@ -621,7 +622,14 @@ (define-public catch2-3 (arguments (list #:configure-flags - #~(list "-DCATCH_DEVELOPMENT_BUILD=ON" + #~(list #$@(match (%current-system) + ((or "x86_64-linux" "i686-linux") + ;; Tests fail on i686-linux without SSE2 for floats, see + ;; upstream report + ;; . + '("-DCMAKE_CXX_FLAGS=-msse2 -mfpmath=sse")) + (_ '())) + "-DCATCH_DEVELOPMENT_BUILD=ON" "-DCATCH_ENABLE_WERROR=OFF" "-DBUILD_SHARED_LIBS=ON"))) (inputs (list python-wrapper)) -- cgit v1.2.3