[bug#42987] [PATCH 1/5] gnu: tryton: Update to 5.6.3.

[bug#42987] [PATCH 1/5] gnu: tryton: Update to 5.6.3.

[Vinicius Monego]

* gnu/packages/tryton.scm (tryton): Update to 5.6.3.
---
 gnu/packages/tryton.scm | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index a2952f2b80..10a7c5ebf8 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
+;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,6 +23,8 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages finance)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
@@ -77,24 +80,42 @@ and security.")
 (define-public tryton
   (package
     (name "tryton")
-    (version "4.6.2")
+    (version "5.6.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "tryton" version))
        (sha256
-        (base32
-         "0bamr040np02gfjk8c734rw3mbgg75irfgpdcl2npgkdzyw1ksf9"))))
+        (base32 "1dghr6x5wga3sizjvj261xndpl38si5hwiz3llm2bhmg33nplfh7"))))
     (build-system python-build-system)
-    (inputs
-     `(("python2-chardet" ,python2-chardet)
-       ("python2-dateutil" ,python2-dateutil)
-       ("python2-pygtk" ,python2-pygtk)))
     (arguments
-     `(#:python ,python-2))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'change-home
+           (lambda _
+             ;; Change from /homeless-shelter to /tmp for write permission.
+             (setenv "HOME" "/tmp")))
+         (add-after 'install 'wrap-gi-python
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out               (assoc-ref outputs "out"))
+                   (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
+               (wrap-program (string-append out "/bin/tryton")
+                             `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
+             #t)))))
+    (native-inputs
+     `(("glib-compile-schemas" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)))
+    (inputs
+     `(("gdk-pixbuf" ,gdk-pixbuf+svg)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("gtk+" ,gtk+)
+       ("python-dateutil" ,python-dateutil)
+       ("python-pycairo" ,python-pycairo)
+       ("python-pygobject" ,python-pygobject)))
     (home-page "https://www.tryton.org/")
     (synopsis "Client component of Tryton")
-    (description "This package is the client component of Tryton.")
+    (description
+     "This package is the client component of Tryton.")
     (license license:gpl3+)))
 
 (define-public python-trytond-country
-- 
2.20.1

[bug#42987] [PATCH 2/5] gnu: python-trytond: Update to 5.6.5.

[Vinicius Monego]

* gnu/packages/tryton.scm (python-trytond): Update to 5.6.5.
---
 gnu/packages/tryton.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 10a7c5ebf8..193b090a65 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages time)
@@ -38,25 +39,23 @@
 (define-public python-trytond
   (package
     (name "python-trytond")
-    (version "4.6.2")
+    (version "5.6.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond" version))
        (sha256
-        (base32
-         "0asc3pd37h8ky8j66iqxr0fv0k6mpjcwxwm0xgm5hrdi32l5cdda"))))
+        (base32 "1n76ccv2x5csz80p42dav8rhzg2m14wdi3bj1pizhw8x2hxxfwx3"))))
     (build-system python-build-system)
     (inputs
      `(("python-dateutil" ,python-dateutil)
        ("python-genshi" ,python-genshi)
-       ("python-polib" ,python-polib)
+       ("python-lxml" ,python-lxml)
        ("python-magic" ,python-magic)
-       ;; there's no python-mysql in Guix right now
-       ;; so python-psycopg2 (postgresql) only for now
+       ("python-passlib" ,python-passlib)
+       ("python-polib" ,python-polib)
        ("python-psycopg2" ,python-psycopg2)
        ("python-relatorio" ,python-relatorio)
-       ("python-lxml" ,python-lxml)
        ("python-sql" ,python-sql)
        ("python-werkzeug" ,python-werkzeug)
        ("python-wrapt" ,python-wrapt)))
@@ -68,6 +67,7 @@
          (add-before 'check 'preparations
            (lambda _
              (setenv "DB_NAME" ":memory:")
+             (setenv "HOME" "/tmp")
              #t)))))
     (home-page "https://www.tryton.org/")
     (synopsis "Server component of Tryton")
-- 
2.20.1

[bug#42987] [PATCH 3/5] gnu: python-proteus: Update to 5.6.0.

[Vinicius Monego]

* gnu/packages/tryton.scm (python-proteus): Update to 5.6.0.
---
 gnu/packages/tryton.scm | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 193b090a65..0ac2680247 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -192,31 +192,21 @@ addresses.")
 (define-public python-proteus
   (package
     (name "python-proteus")
-    (version "4.6.0")
+    (version "5.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "proteus" version))
        (sha256
-        (base32
-         "0flkf1vxbhz51b7bq31dn7q9mlkli3pmpbzfhsxfqpf6laghbkqg"))))
+        (base32 "0kxac5pkps243wf0xbmbd1g5bml96xl94j88y6yyzm093vyli150"))))
     (build-system python-build-system)
+    ;; Tests require python-trytond-party which requires python-proteus.
+    (arguments
+     `(#:tests? #f))
     (propagated-inputs
-     `(("python-dateutil" ,python-dateutil)
-       ("python-trytond-party" ,python-trytond-party)
-       ("python-trytond-country" ,python-trytond-country)
-       ("python-trytond" ,python-trytond)
-       ("python-stdnum" ,python-stdnum)
-       ("python-sql" ,python-sql)
-       ("python-wrapt" ,python-wrapt)
-       ("python-werkzeug" ,python-werkzeug)
-       ("python-polib" ,python-polib)
-       ("python-genshi" ,python-genshi)
-       ("python-relatorio" ,python-relatorio)
-       ("python-magic" ,python-magic)))
+     `(("python-dateutil" ,python-dateutil)))
     (home-page "http://www.tryton.org/")
-    (synopsis
-     "Library to access a Tryton server as a client")
+    (synopsis "Library to access a Tryton server as a client")
     (description
      "This package provides a library to access Tryton server as a client.")
     (license license:lgpl3+)))
-- 
2.20.1

[bug#42987] [PATCH 4/5] gnu: python-trytond-country: Update to 5.6.0.

[Vinicius Monego]

* gnu/packages/tryton.scm (python-trytond-country): Update to 5.6.0.
---
 gnu/packages/tryton.scm | 75 ++++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 0ac2680247..51c40c55ae 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -34,6 +34,7 @@
   #:use-module (gnu packages xml)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix utils)
   #:use-module (guix build-system python))
 
 (define-public python-trytond
@@ -120,37 +121,49 @@ and security.")
 
 (define-public python-trytond-country
   (package
-  (name "python-trytond-country")
-  (version "4.6.0")
-  (source
-    (origin
-      (method url-fetch)
-      (uri (pypi-uri "trytond_country" version))
-      (sha256
-        (base32
-          "11c9mw2scbjn7c6yhlwh5ml266f0s31lh4jwj6gh7vl1shs3isr3"))))
-  (build-system python-build-system)
-  (arguments
-   `(#:phases
-     (modify-phases %standard-phases
-       (add-before 'check 'preparations
-         (lambda _
-           (setenv "DB_NAME" ":memory:")
-           #t)))))
-  (propagated-inputs
-   `(("python-trytond" ,python-trytond)
-     ("python-wrapt" ,python-wrapt)
-     ("python-werkzeug" ,python-werkzeug)
-     ("python-sql" ,python-sql)
-     ("python-polib" ,python-polib)
-     ("python-dateutil" ,python-dateutil)
-     ("python-genshi" ,python-genshi)
-     ("python-relatorio" ,python-relatorio)
-     ("python-magic" ,python-magic)))
-  (home-page "http://www.tryton.org/")
-  (synopsis "Tryton module with countries")
-  (description "This package provides a Tryton module with countries.")
-  (license license:gpl3+)))
+    (name "python-trytond-country")
+    (version "5.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "trytond_country" version))
+       (sha256
+        (base32 "0k1xw5r2pfd5mvvg3pn3vavwjwpgmm5i6nsc8x421znk4gvvns78"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (let ((runtest
+                  (string-append
+                   (assoc-ref %build-inputs "python-trytond")
+                   "/lib/python" ,(version-major+minor (package-version python))
+                   "/site-packages/trytond/tests/run-tests.py")))
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (add-installed-pythonpath inputs outputs)
+               ;; Doctest contains one test that requires internet access.
+               (invoke "python" runtest "-m" "country" "--no-doctest")))))))
+    (native-inputs
+     `(("python" ,python)
+       ("python-dateutil" ,python-dateutil)
+       ("python-genshi" ,python-genshi)
+       ("python-lxml" ,python-lxml)
+       ("python-magic" ,python-magic)
+       ("python-passlib" ,python-passlib)
+       ("python-polib" ,python-polib)
+       ("python-proteus" ,python-proteus)
+       ("python-relatorio" ,python-relatorio)
+       ("python-sql" ,python-sql)
+       ("python-werkzeug" ,python-werkzeug)
+       ("python-wrapt" ,python-wrapt)))
+    (propagated-inputs
+     `(("python-pycountry" ,python-pycountry)
+       ("python-trytond" ,python-trytond)))
+    (home-page "http://www.tryton.org/")
+    (synopsis "Tryton module with countries")
+    (description
+     "This package provides a Tryton module with countries.")
+    (license license:gpl3+)))
 
 (define-public python-trytond-party
   (package
-- 
2.20.1

[bug#42987] [PATCH 5/5] gnu: python-trytond-party: Update to 5.6.0.

[Vinicius Monego]

* gnu/packages/tryton.scm (python-trytond-party): Update to 5.6.0.
---
 gnu/packages/tryton.scm | 49 +++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 51c40c55ae..2304e0c998 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -168,35 +168,46 @@ and security.")
 (define-public python-trytond-party
   (package
     (name "python-trytond-party")
-    (version "4.6.0")
+    (version "5.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_party" version))
        (sha256
-        (base32
-         "0fbf4kxywiglcdsx9ppjg7nxw87915mb6bpn1jn652gk949rdww5"))))
+        (base32 "0wh7g1g67g4vwxm797ra6fkfvmd3w77vl7nxj76y856cy217gbzp"))))
     (build-system python-build-system)
-    ;; XXX The tests seem to require Proteus. But Proteus tests seem to
-    ;; require trytond-party.
     (arguments
-     '(#:tests? #f))
-    (propagated-inputs
-     `(("python-trytond" ,python-trytond)
-       ("python-trytond-country" ,python-trytond-country)
-       ("python-stdnum" ,python-stdnum)
-       ("python-sql" ,python-sql)
-       ("python-wrapt" ,python-wrapt)
-       ("python-werkzeug" ,python-werkzeug)
-       ("python-polib" ,python-polib)
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (let ((runtest
+                  (string-append
+                   (assoc-ref %build-inputs "python-trytond")
+                   "/lib/python" ,(version-major+minor (package-version python))
+                   "/site-packages/trytond/tests/run-tests.py")))
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (add-installed-pythonpath inputs outputs)
+               ;; Doctest 'scenario_party_phone_number.rst' fails.
+               (invoke "python" runtest "-m" "party" "--no-doctest")))))))
+    (native-inputs
+     `(("python" ,python-minimal-wrapper)
        ("python-dateutil" ,python-dateutil)
        ("python-genshi" ,python-genshi)
-       ("python-relatorio" ,python-relatorio)
+       ("python-lxml" ,python-lxml)
        ("python-magic" ,python-magic)
-       ("python-phonenumbers" ,python-phonenumbers)))
-    (home-page "http://www.tryton.org/")
-    (synopsis
-     "Tryton module for parties and addresses")
+       ("python-passlib" ,python-passlib)
+       ("python-polib" ,python-polib)
+       ("python-proteus" ,python-proteus)
+       ("python-relatorio" ,python-relatorio)
+       ("python-werkzeug" ,python-werkzeug)
+       ("python-wrapt" ,python-wrapt)))
+    (propagated-inputs
+     `(("python-sql" ,python-sql)
+       ("python-stnum" ,python-stdnum)
+       ("python-trytond" ,python-trytond)
+       ("python-trytond-country" ,python-trytond-country)))
+    (home-page "https://www.tryton.org/")
+    (synopsis "Tryton module for parties and addresses")
     (description
      "This package provides a Tryton module for (counter)parties and
 addresses.")
-- 
2.20.1

[bug#42987] [PATCH 1/5] gnu: tryton: Update to 5.6.3.

[Mathieu Othacehe]

Hey,

> +               (wrap-program (string-append out "/bin/tryton")
> +                             `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))

Indentation is off here, otherwise looks good.

Mathieu

bug#42987: [PATCH 5/5] gnu: python-trytond-party: Update to 5.6.0.

[Mathieu Othacehe]

Hey,

I wrapped a few lines to be under the 78 columns limit and pushed the
whole serie.

Thanks for your work,

Mathieu