From 7c8ea31ac94f5b55f2f4bbc16264b987cb9556e3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 3 Jan 2019 18:07:16 -0500 Subject: gnu: gnucash: Convert price-quotes-perl patch to a phase. * gnu/packages/patches/gnucash-price-quotes-perl.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/gnucash.scm (gnucash)[patches]: Remove it. [phases]{fix-finance-quote-check}: Implement it using SUBSTITUTES*. --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 750e67d2fe..cd4fc7fb5a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -831,7 +831,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-todo-libical-compat.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ - %D%/packages/patches/gnucash-price-quotes-perl.patch \ %D%/packages/patches/gnucash-disable-failing-tests.patch \ %D%/packages/patches/gnucash-fix-test-transaction-failure.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ -- cgit 1.4.1 From a2e7e95663d11a1059fa900b4640e8ab75df627f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 3 Jan 2019 18:28:56 -0500 Subject: gnu: gnucash: Disable the stress-options-test using a phase. The qof test is also reinstated; it was failing because the needed locales were not installed. * gnu/packages/patches/gnucash-disable-failing-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/gnucash.scm (gnucash)[patches]: Remove it. [phases]{disable-stress-options-test}: Implement it using SUBSTITUTES*. {install-locales}: New phase. --- gnu/local.mk | 1 - gnu/packages/gnucash.scm | 18 ++++++++-- .../patches/gnucash-disable-failing-tests.patch | 39 ---------------------- 3 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 gnu/packages/patches/gnucash-disable-failing-tests.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index cd4fc7fb5a..4795e8534c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -831,7 +831,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-todo-libical-compat.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ - %D%/packages/patches/gnucash-disable-failing-tests.patch \ %D%/packages/patches/gnucash-fix-test-transaction-failure.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-skip-pkgconfig-test.patch \ diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 015e2b0459..58b46243a2 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -60,8 +60,7 @@ (sha256 (base32 "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3")) - (patches (search-patches "gnucash-disable-failing-tests.patch" - "gnucash-fix-test-transaction-failure.patch")))) + (patches (search-patches "gnucash-fix-test-transaction-failure.patch")))) (build-system cmake-build-system) (inputs `(("guile" ,guile-2.2) @@ -125,6 +124,21 @@ (substitute* "libgnucash/scm/price-quotes.scm" (("\"perl\" \"-w\" ") "")) #t)) + ;; The test-stress-options unit test is known to fail, so we disable + ;; it (see: https://bugs.gnucash.org/show_bug.cgi?id=796877). + (add-after 'unpack 'disable-stress-options-test + (lambda _ + (substitute* "gnucash/report/standard-reports/test/CMakeLists.txt" + (("test-stress-options.scm") "")) + #t)) + ;; The qof test requires the en_US, en_GB, and fr_FR locales. + (add-before 'check 'install-locales + (lambda _ + (setenv "LOCPATH" (getcwd)) + (invoke "localedef" "-i" "en_US" "-f" "UTF-8" "./en_US.UTF-8") + (invoke "localedef" "-i" "en_GB" "-f" "UTF-8" "./en_GB.UTF-8") + (invoke "localedef" "-i" "fr_FR" "-f" "UTF-8" "./fr_FR.UTF-8") + #t)) ;; There are about 100 megabytes of documentation. (add-after 'install 'install-docs (lambda* (#:key inputs outputs #:allow-other-keys) diff --git a/gnu/packages/patches/gnucash-disable-failing-tests.patch b/gnu/packages/patches/gnucash-disable-failing-tests.patch deleted file mode 100644 index e0fdd86b5d..0000000000 --- a/gnu/packages/patches/gnucash-disable-failing-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -test-stress-options.scm does not exist, and test-qof passes when run in the -build directory after the gnucash build. - -diff -ur gnucash-3.3.old/gnucash/report/standard-reports/test/CMakeLists.txt gnucash-3.3/gnucash/report/standard-reports/test/CMakeLists.txt ---- gnucash-3.3.old/gnucash/report/standard-reports/test/CMakeLists.txt 2018-10-04 09:29:00.916641417 -0400 -+++ gnucash-3.3/gnucash/report/standard-reports/test/CMakeLists.txt 2018-10-04 09:30:52.962504860 -0400 -@@ -13,10 +13,6 @@ - test-income-gst.scm - ) - --set(scm_test_with_textual_ports_SOURCES -- test-stress-options.scm --) -- - set(GUILE_DEPENDS - scm-gnc-module - scm-app-utils -@@ -31,9 +27,6 @@ - - if (HAVE_SRFI64) - gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}") -- if (HAVE_TEXT_PORTS) -- gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}") -- endif (HAVE_TEXT_PORTS) - endif (HAVE_SRFI64) - - gnc_add_scheme_tests("${scm_test_standard_reports_SOURCES}") -diff -ur gnucash-3.3.old/libgnucash/engine/test/CMakeLists.txt gnucash-3.3/libgnucash/engine/test/CMakeLists.txt ---- gnucash-3.3.old/libgnucash/engine/test/CMakeLists.txt 2018-10-04 09:29:00.876640751 -0400 -+++ gnucash-3.3/libgnucash/engine/test/CMakeLists.txt 2018-10-05 10:46:22.542962546 -0400 -@@ -54,8 +54,6 @@ - # This test does not run on Win32 - if (NOT WIN32) - set(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c) -- add_engine_test(test-qof "${SOURCES}") -- target_compile_definitions(test-qof PRIVATE TESTPROG=test_qof) - - set(SOURCES ${test_engine_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c) - add_engine_test(test-engine "${SOURCES}") -- cgit 1.4.1 From e253b94dc63d73ed7d26395048bf8f723d55b764 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 23 Jan 2019 18:02:54 +0100 Subject: gnu: Add python-coveralls. * gnu/packages/python-check.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/python-check.scm | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 gnu/packages/python-check.scm (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 4795e8534c..7500571be8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -371,6 +371,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/pure.scm \ %D%/packages/pv.scm \ %D%/packages/python.scm \ + %D%/packages/python-check.scm \ %D%/packages/python-compression.scm \ %D%/packages/python-crypto.scm \ %D%/packages/python-web.scm \ diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm new file mode 100644 index 0000000000..2a5dbaeb30 --- /dev/null +++ b/gnu/packages/python-check.scm @@ -0,0 +1,58 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Ricardo Wurmus +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages python-check) + #:use-module (gnu packages) + #:use-module (gnu packages check) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) + #:use-module (guix utils) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system python)) + +(define-public python-coveralls + (package + (name "python-coveralls") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "coveralls" version)) + (sha256 + (base32 + "0vfdny96gcq05qk5wxdbfxfaaprdk7c9q2pqvg7ac5l9sf48wqxb")))) + (build-system python-build-system) + (propagated-inputs + `(("python-coverage" ,python-coverage) + ("python-docopt" ,python-docopt) + ("python-pyyaml" ,python-pyyaml) + ("python-requests" ,python-requests) + ("python-sh" ,python-sh) + ("python-urllib3" ,python-urllib3))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/coveralls-clients/coveralls-python") + (synopsis "Show coverage stats online via coveralls.io") + (description + "Coveralls.io is a service for publishing code coverage statistics online. +This package provides seamless integration with coverage.py (and thus pytest, +nosetests, etc...) in Python projects.") + (license license:expat))) -- cgit 1.4.1