Merge branch 'master' into staging

 Conflicts:
	gnu/local.mk
	gnu/packages/gdb.scm
	gnu/packages/lisp-xyz.scm
	gnu/packages/web-browsers.scm

1 files changed, 20 insertions, 20 deletions

diff --git a/gnu/packages/visidata.scm b/gnu/packages/visidata.scm
index 68ea401362..6ba2939b4f 100644
--- a/gnu/packages/visidata.scm
+++ b/gnu/packages/visidata.scm
@@ -17,13 +17,13 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages visidata)
-  #:use-module (gnu packages databases)
-  #:use-module (gnu packages python-science)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages time)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages time)
   #:use-module (gnu packages xml)
   #:use-module (guix build-system python)
+  #:use-module (guix build utils)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages))
@@ -31,34 +31,34 @@
 (define-public visidata
   (package
     (name "visidata")
-    (version "1.5.2")
+    (version "2.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "visidata" version))
        (sha256
         (base32
-         "10adfyn4gkisvciqawgh2lakkhhnjjxiyp7mzbgcwkq1b3sigpf1"))))
+         "1p4x9fz59ablyjvp18y50zdsapavhzx7w5hk2v8rsar5ill8947v"))))
     (build-system python-build-system)
-    ;; Tests disabled because they are not packaged with the source tarball.
-    ;; Upstream suggests tests will be packaged with tarball around 2.0 release.
-    (arguments '(#:tests? #f))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests? (invoke "pytest"))
+             #t)))))
     (inputs
-     `(("python-dateutil" ,python-dateutil)
-       ("python-fonttools" ,python-fonttools)
-       ("python-h5py" ,python-h5py)
-       ("python-lxml" ,python-lxml)
-       ("python-openpyxl" ,python-openpyxl)
-       ("python-pandas" ,python-pandas)
-       ("python-psycopg2" ,python-psycopg2)
-       ("python-pyyaml" ,python-pyyaml)
-       ("python-requests" ,python-requests)
-       ("python-xlrd" ,python-xlrd)))
+     `(("dateutil" ,python-dateutil)
+       ("requests" ,python-requests)
+       ("lxml" ,python-lxml)
+       ("openpyxl" ,python-openpyxl)
+       ("xlrd" ,python-xlrd)))
+    (native-inputs
+     `(("pytest" ,python-pytest)))
     (synopsis "Terminal spreadsheet multitool for discovering and arranging data")
     (description
      "VisiData is an interactive multitool for tabular data.  It combines the
 clarity of a spreadsheet, the efficiency of the terminal, and the power of
 Python, into a lightweight utility which can handle millions of rows.")
     (home-page "https://www.visidata.org/")
-    (license (list license:gpl3
-                   license:expat)))) ;; visidata/vdtui.py
+    (license license:gpl3)))