[bug#37259] [PATCH] Update emacs-org-ql to 0.2.

[Brian Leung <bkleung89@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 696 bytes --]

OK, I've enabled the tests and removed the three failing tests in this set
of patches.

On Mon, Sep 2, 2019 at 7:31 PM Oleg Pyhalov <go.wigust@gmail.com> wrote:

> Hi Brian,
>
> Brian Leung <bkleung89@gmail.com> writes:
>
> > I've modified the patches. Three tests from ts.el are failing right now;
> I
> > don't think it's a serious problem though (see the patch for the
> > explanation).
>
> OK.  Thank you.  Hope it works as intended.  Still we could have 35/38
> succeeded tests.  Could you report upstream about tests failure, delete
> failed from the package recipe, and enable tests?  You could take
> emacs-json-reformat recipe as an example.
>
> […]
>
> Oleg.
>

[-- Attachment #1.2: Type: text/html, Size: 1094 bytes --]

[-- Attachment #2: 0001-gnu-Add-emacs-ts.patch --]
[-- Type: text/x-patch, Size: 3602 bytes --]

From 8dd617a46bd60c2ca6a923fe588fdcff6a3c04b4 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 1 Sep 2019 19:46:27 +0200
Subject: [PATCH 1/3] gnu: Add emacs-ts.

* gnu/packages/emacs-xyz.scm (emacs-ts): New variable.
---
 gnu/packages/emacs-xyz.scm | 63 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0c6077770b..f810d2ad8e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11113,6 +11113,69 @@ into sections while preserving the structure imposed by any timestamps.")
 tables of contents.")
     (license license:gpl3+)))
 
+(define-public emacs-ts
+  (let ((commit "93c074f2895a204e003e8c7f3033c37d6486fac8")
+        (revision "1"))
+    (package
+      (name "emacs-ts")
+      (version (git-version "0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/alphapapa/ts.el")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "0lpyv78k04vbp9glnv14dawcfgi3m49847wlgwfmkdq5cr3fn735"))
+                (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-s" ,emacs-s)
+         ("emacs-dash" ,emacs-dash)))
+      (arguments
+       ;; XXX: Three tests are failing because of a timezone-related issue
+       ;; with how they're written.  On my machine, all the failing test
+       ;; results are 18000 seconds (5 hours) off.
+
+       ;; The ts-parse-org function accepts a string without any timezone
+       ;; info, not assumed to be in Unix time, and converts it to a so-called
+       ;; ts struct.  The ts-unix function (accessor) accepts a ts struct,
+       ;; then seems to assume the struct's corresponding time is in terms of
+       ;; the user's current time zone, before returning a Unix time in
+       ;; seconds.
+
+       ;; The failing tests all have similar problems, but nothing else about
+       ;; the library seems particularly off.
+
+       `(#:tests? #t
+         #:test-command '("emacs" "--batch"
+                          "-l" "test/test.el"
+                          "-f" "ert-run-tests-batch-and-exit")
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'check 'make-tests-writable
+             (lambda _
+               (make-file-writable "test/test.el")
+               #t))
+           (add-before 'check 'delete-failing-tests
+             (lambda _
+               (emacs-batch-edit-file "test/test.el"
+                 `(progn (progn
+                          (goto-char (point-min))
+                          (dolist (test-regexp '("ert-deftest ts-format"
+                                                 "ert-deftest ts-parse-org\\_>"
+                                                 "ert-deftest ts-parse-org-element"))
+                                  (re-search-forward test-regexp)
+                                  (beginning-of-line)
+                                  (kill-sexp)))
+                         (basic-save-buffer)))
+               #t)))))
+      (home-page "https://github.com/alphapapa/ts.el")
+      (synopsis "Timestamp and date/time library")
+      (description "This package facilitates manipulating dates, times, and
+timestamps by providing a @code{ts} struct.")
+      (license license:gpl3+))))
+
 (define-public emacs-org-ql
   (package
     (name "emacs-org-ql")
-- 
2.23.0


[-- Attachment #3: 0002-gnu-emacs-org-sidebar-Update-to-0.1-1.ed951d1.patch --]
[-- Type: text/x-patch, Size: 1351 bytes --]

From f974309c78a783adc8df6ab44ed4fa4c4075738e Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 1 Sep 2019 19:50:18 +0200
Subject: [PATCH 2/3] gnu: emacs-org-sidebar: Update to 0.1-1.ed951d1.

* gnu/packages/emacs-xyz.scm (emacs-org-sidebar): Update to 0.1-1.ed951d1.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f810d2ad8e..1f419809e8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4257,7 +4257,7 @@ started with 20 minutes.  All values are customizable.")
     (license license:gpl3+)))
 
 (define-public emacs-org-sidebar
-  (let ((commit "74ca98b9920f3de3f13d49866581435e1ec63ec5")
+  (let ((commit "ed951d1e0d8b7e65ed35797403fd3e8c88f507f5")
         (revision "1"))
     (package
       (name "emacs-org-sidebar")
@@ -4270,7 +4270,7 @@ started with 20 minutes.  All values are customizable.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "03p1ndyw2qp2skib5hszc4xyh84w7p2mhkd4a9dy6qv8q47xpsqn"))))
+          (base32 "01sf8v53pjsy80fzwmj2n8rp2z5gsnpyld0fm6j3bdv213clp69y"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
-- 
2.23.0


[-- Attachment #4: 0003-gnu-emacs-org-ql-Update-to-0.2.patch --]
[-- Type: text/x-patch, Size: 1511 bytes --]

From a6714822c28f35635c3d358ce6a0ab0de2f799fa Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sun, 1 Sep 2019 19:51:05 +0200
Subject: [PATCH 3/3] gnu: emacs-org-ql: Update to 0.2.

* gnu/packages/emacs-xyz.scm (emacs-org-ql): Update to 0.2.
[inputs]: Add emacs-ts and emacs-org.
---
 gnu/packages/emacs-xyz.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1f419809e8..3f335737a2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11179,7 +11179,7 @@ timestamps by providing a @code{ts} struct.")
 (define-public emacs-org-ql
   (package
     (name "emacs-org-ql")
-    (version "0.1")
+    (version "0.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11187,11 +11187,13 @@ timestamps by providing a @code{ts} struct.")
                     (commit version)))
               (sha256
                (base32
-                "1nvzirn1lmgmgl7irbsc1n391a2cw8gmvwm3pa228l2c1gcx8kd8"))
+                "0mq0aj0a3a5gi9nz0ncpzsh731d92n86b0iinvx1m45dcal06h9y"))
               (file-name (git-file-name name version))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-s" ,emacs-s)
+       ("emacs-ts" ,emacs-ts)
+       ("emacs-org" ,emacs-org)
        ("emacs-dash" ,emacs-dash)))
     (home-page "https://github.com/alphapapa/org-ql/")
     (synopsis "Query language for Org buffers")
-- 
2.23.0