[bug#50295] [PATCH 0/6] Update Tryton ERP applications and framework to 6.0.x.

[bug#50295] [PATCH 0/6] Update Tryton ERP applications and framework to 6.0.x.

[Hartmut Goebel]

This series updates Tryton to the current version 6.0.x.

Hartmut Goebel (6):
  gnu: trytond: Propagate inputs.
  gnu: tryton: Propagate inputs.
  gnu: tryton modules: Remove "python"- prefix from name.
  gnu: tryton modules: Unify native-inputs.
  gnu: tryton modules: Remove propagated-inputs propagated elsewhere.
  gnu: tryton applications and framework: Update to 6.0.x.

 gnu/packages/tryton.scm | 564 +++++++++++++++-------------------------
 1 file changed, 215 insertions(+), 349 deletions(-)

-- 
2.30.2

[bug#50295] [PATCH 1/6] gnu: trytond: Propagate inputs.

[Hartmut Goebel]

As for all Python packages and applications, the inputs need to be propagated.

* gnu/packages/tryton.scm (trytond)[inputs]: Change to {propagated-inputs].
---
 gnu/packages/tryton.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 5fbbeb53be..c92d80eef1 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -49,7 +49,7 @@
        (sha256
         (base32 "1h1x0cmmmxvjclbglvvxkv634jw6av5ilymbix1lln5lq0gd39yy"))))
     (build-system python-build-system)
-    (inputs
+    (propagated-inputs
      `(("python-dateutil" ,python-dateutil)
        ("python-genshi" ,python-genshi)
        ("python-lxml" ,python-lxml)
-- 
2.30.2

[bug#50295] [PATCH 2/6] gnu: tryton: Propagate inputs.

[Hartmut Goebel]

As for all Python packages and applications, the inputs need to be propagated.

* gnu/packages/tryton.scm (tryton)[inputs]: Change to {propagated-inputs].
---
 gnu/packages/tryton.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index c92d80eef1..53a4f80c35 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -110,7 +110,7 @@ and security.")
     (native-inputs
      `(("glib-compile-schemas" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)))
-    (inputs
+    (propagated-inputs
      `(("gdk-pixbuf" ,gdk-pixbuf+svg)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gtk+" ,gtk+)
-- 
2.30.2

[bug#50295] [PATCH 3/6] gnu: tryton modules: Remove "python"- prefix from name.

[Hartmut Goebel]

Remove the `python-` prefix from all trytond module packages. The aspect that
these packages are plugins for trytond is much more relevant than that they
are written in Python.

* gnu/packages/tryton.scm (python-trytond-account,
python-trytond-account-invoice, python-trytond-account-invoice-stock,
python-trytond-account-product, python-trytond-analytic-account,
python-trytond-company, python-trytond-counpython-try,
python-trytond-currency, python-trytond-party, python-trytond-product,
python-trytond-purchase, python-trytond-purchase-request,
python-trytond-stock, python-trytond-stock-lot, python-trytond-stock-supply):
New deprecated packages.
(trytond-account, trytond-account-invoice, trytond-account-invoice-stock,
trytond-account-product, trytond-analytic-account, trytond-company,
trytond-country, trytond-currency, trytond-party, trytond-product,
trytond-purchase, trytond-purchase-request, trytond-stock, trytond-stock-lot,
trytond-stock-supply): Renamed from the respective above.
[propagated-inputs]: Adjusted and re-ordered.
---
 gnu/packages/tryton.scm | 264 +++++++++++++++++++++-------------------
 1 file changed, 139 insertions(+), 125 deletions(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 53a4f80c35..d7f03e9181 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -170,9 +171,9 @@ the build system."
 ;;;  Tryton modules - please sort alphabetically
 ;;;
 
-(define-public python-trytond-account
+(define-public trytond-account
   (package
-    (name "python-trytond-account")
+    (name "trytond-account")
     (version "5.8.1")
     (source
      (origin
@@ -196,12 +197,10 @@ the build system."
      `(("python-dateutil" ,python-dateutil)
        ("python-simpleeval" ,python-simpleeval)
        ("python-sql" ,python-sql)
-       ("python-trytond-company"
-        ,python-trytond-company)
-       ("python-trytond-currency"
-        ,python-trytond-currency)
-       ("python-trytond-party" ,python-trytond-party)
-       ("trytond" ,trytond)))
+       ("trytond" ,trytond)
+       ("trytond-company" ,trytond-company)
+       ("trytond-currency" ,trytond-currency)
+       ("trytond-party" ,trytond-party)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module for accounting")
     (description
@@ -209,9 +208,12 @@ the build system."
 most of accounting needs.")
     (license license:gpl3+)))
 
-(define-public python-trytond-account-invoice
+(define-public python-trytond-account
+  (deprecated-package "python-trytond-account" trytond-account))
+
+(define-public trytond-account-invoice
   (package
-    (name "python-trytond-account-invoice")
+    (name "trytond-account-invoice")
     (version "5.8.1")
     (source
      (origin
@@ -234,18 +236,13 @@ most of accounting needs.")
     (propagated-inputs
      `(("python-dateutil" ,python-dateutil)
        ("python-sql" ,python-sql)
-       ("python-trytond-account"
-        ,python-trytond-account)
-       ("python-trytond-account-product"
-        ,python-trytond-account-product)
-       ("python-trytond-company"
-        ,python-trytond-company)
-       ("python-trytond-currency"
-        ,python-trytond-currency)
-       ("python-trytond-party" ,python-trytond-party)
-       ("python-trytond-product"
-        ,python-trytond-product)
-       ("trytond" ,trytond)))
+       ("trytond" ,trytond)
+       ("trytond-account" ,trytond-account)
+       ("trytond-account-product" ,trytond-account-product)
+       ("trytond-company" ,trytond-company)
+       ("trytond-currency" ,trytond-currency)
+       ("trytond-party" ,trytond-party)
+       ("trytond-product" ,trytond-product)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module for invoicing")
     (description
@@ -253,9 +250,12 @@ most of accounting needs.")
 term.")
     (license license:gpl3+)))
 
-(define-public python-trytond-account-invoice-stock
+(define-public python-trytond-account-invoice
+  (deprecated-package "python-trytond-account-invoice" trytond-account-invoice))
+
+(define-public trytond-account-invoice-stock
   (package
-    (name "python-trytond-account-invoice-stock")
+    (name "trytond-account-invoice-stock")
     (version "5.8.1")
     (source
      (origin
@@ -280,12 +280,10 @@ term.")
        ("python-werkzeug" ,python-werkzeug)
        ("python-wrapt" ,python-wrapt)))
     (propagated-inputs
-     `(("python-trytond-account-invoice"
-        ,python-trytond-account-invoice)
-       ("python-trytond-product"
-        ,python-trytond-product)
-       ("python-trytond-stock" ,python-trytond-stock)
-       ("trytond" ,trytond)))
+     `(("trytond" ,trytond)
+       ("trytond-account-invoice" ,trytond-account-invoice)
+       ("trytond-product" ,trytond-product)
+       ("trytond-stock" ,trytond-stock)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module to link stock and invoice")
     (description
@@ -294,9 +292,13 @@ lines and stock moves.  The unit price of the stock move is updated with the
 average price of the posted invoice lines that are linked to it.")
     (license license:gpl3+)))
 
-(define-public python-trytond-account-product
+(define-public python-trytond-account-invoice-stock
+  (deprecated-package
+   "python-trytond-account-invoice-stock" trytond-account-invoice-stock))
+
+(define-public trytond-account-product
   (package
-    (name "python-trytond-account-product")
+    (name "trytond-account-product")
     (version "5.8.1")
     (source
      (origin
@@ -319,15 +321,11 @@ average price of the posted invoice lines that are linked to it.")
        ("python-werkzeug" ,python-werkzeug)
        ("python-wrapt" ,python-wrapt)))
     (propagated-inputs
-     `(("python-trytond-account"
-        ,python-trytond-account)
-       ("python-trytond-analytic-account"
-        ,python-trytond-analytic-account)
-       ("python-trytond-company"
-        ,python-trytond-company)
-       ("python-trytond-product"
-        ,python-trytond-product)
-       ("trytond" ,trytond)))
+     `(("trytond" ,trytond)
+       ("trytond-account" ,trytond-account)
+       ("trytond-analytic-account" ,trytond-analytic-account)
+       ("trytond-company" ,trytond-company)
+       ("trytond-product" ,trytond-product)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module to add accounting on product")
     (description
@@ -335,9 +333,12 @@ average price of the posted invoice lines that are linked to it.")
 and category.")
     (license license:gpl3+)))
 
-(define-public python-trytond-analytic-account
+(define-public python-trytond-account-product
+  (deprecated-package "python-trytond-account-product" trytond-account-product))
+
+(define-public trytond-analytic-account
   (package
-    (name "python-trytond-analytic-account")
+    (name "trytond-analytic-account")
     (version "5.8.1")
     (source
      (origin
@@ -360,14 +361,11 @@ and category.")
        ("python-wrapt" ,python-wrapt)))
     (propagated-inputs
      `(("python-sql" ,python-sql)
-       ("python-trytond-account"
-        ,python-trytond-account)
-       ("python-trytond-company"
-        ,python-trytond-company)
-       ("python-trytond-currency"
-        ,python-trytond-currency)
-       ("python-trytond-party" ,python-trytond-party)
-       ("trytond" ,trytond)))
+       ("trytond" ,trytond)
+       ("trytond-account" ,trytond-account)
+       ("trytond-company" ,trytond-company)
+       ("trytond-currency" ,trytond-currency)
+       ("trytond-party" ,trytond-party)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module for analytic accounting")
     (description
@@ -375,9 +373,13 @@ and category.")
 required to analyse accounting using multiple different axes.")
     (license license:gpl3+)))
 
-(define-public python-trytond-company
+(define-public python-trytond-analytic-account
+  (deprecated-package
+   "python-trytond-analytic-account" trytond-analytic-account))
+
+(define-public trytond-company
   (package
-    (name "python-trytond-company")
+    (name "trytond-company")
     (version "5.8.1")
     (source
      (origin
@@ -400,10 +402,9 @@ required to analyse accounting using multiple different axes.")
        ("python-werkzeug" ,python-werkzeug)
        ("python-wrapt" ,python-wrapt)))
     (propagated-inputs
-     `(("python-trytond-currency"
-        ,python-trytond-currency)
-       ("python-trytond-party" ,python-trytond-party)
-       ("trytond" ,trytond)))
+     `(("trytond" ,trytond)
+       ("trytond-currency" ,trytond-currency)
+       ("trytond-party" ,trytond-party)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module with companies and employees")
     (description
@@ -411,9 +412,12 @@ required to analyse accounting using multiple different axes.")
 company and employee and extend the user model.")
     (license license:gpl3+)))
 
-(define-public python-trytond-country
+(define-public python-trytond-company
+  (deprecated-package "python-trytond-company" trytond-company))
+
+(define-public trytond-country
   (package
-    (name "python-trytond-country")
+    (name "trytond-country")
     (version "5.8.1")
     (source
      (origin
@@ -445,9 +449,12 @@ company and employee and extend the user model.")
      "This package provides a Tryton module with countries.")
     (license license:gpl3+)))
 
-(define-public python-trytond-currency
+(define-public python-trytond-country
+  (deprecated-package "python-trytond-country" trytond-country))
+
+(define-public trytond-currency
   (package
-    (name "python-trytond-currency")
+    (name "trytond-currency")
     (version "5.8.1")
     (source
      (origin
@@ -480,9 +487,12 @@ company and employee and extend the user model.")
 currency and rate.")
     (license license:gpl3+)))
 
-(define-public python-trytond-party
+(define-public python-trytond-currency
+  (deprecated-package "python-trytond-currency" trytond-currency))
+
+(define-public trytond-party
   (package
-    (name "python-trytond-party")
+    (name "trytond-party")
     (version "5.8.1")
     (source
      (origin
@@ -507,8 +517,8 @@ currency and rate.")
     (propagated-inputs
      `(("python-sql" ,python-sql)
        ("python-stnum" ,python-stdnum)
-       ("python-trytond-country" ,python-trytond-country)
-       ("trytond" ,trytond)))
+       ("trytond" ,trytond)
+       ("trytond-country" ,trytond-country)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module for parties and addresses")
     (description
@@ -516,9 +526,12 @@ currency and rate.")
 addresses.")
     (license license:gpl3+)))
 
-(define-public python-trytond-product
+(define-public python-trytond-party
+  (deprecated-package "python-trytond-party" trytond-party))
+
+(define-public trytond-product
   (package
-    (name "python-trytond-product")
+    (name "trytond-product")
     (version "5.8.1")
     (source
      (origin
@@ -542,9 +555,8 @@ addresses.")
     (propagated-inputs
      `(("python-sql" ,python-sql)
        ("python-stdnum" ,python-stdnum)
-       ("python-trytond-company"
-        ,python-trytond-company)
-       ("trytond" ,trytond)))
+       ("trytond" ,trytond)
+       ("trytond-company" ,trytond-company)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module with products")
     (description
@@ -552,9 +564,12 @@ addresses.")
 Template and Product.")
     (license license:gpl3+)))
 
-(define-public python-trytond-purchase
+(define-public python-trytond-product
+  (deprecated-package "python-trytond-product" trytond-product))
+
+(define-public trytond-purchase
   (package
-    (name "python-trytond-purchase")
+    (name "trytond-purchase")
     (version "5.8.1")
     (source
      (origin
@@ -577,32 +592,28 @@ Template and Product.")
        ("python-wrapt" ,python-wrapt)))
     (propagated-inputs
      `(("python-sql" ,python-sql)
-       ("python-trytond-account"
-        ,python-trytond-account)
-       ("python-trytond-account-invoice"
-        ,python-trytond-account-invoice)
-       ("python-trytond-account-invoice-stock"
-        ,python-trytond-account-invoice-stock)
-       ("python-trytond-account-product"
-        ,python-trytond-account-product)
-       ("python-trytond-company"
-        ,python-trytond-company)
-       ("python-trytond-currency"
-        ,python-trytond-currency)
-       ("python-trytond-party" ,python-trytond-party)
-       ("python-trytond-product"
-        ,python-trytond-product)
-       ("python-trytond-stock" ,python-trytond-stock)
-       ("trytond" ,trytond)))
+       ("trytond" ,trytond)
+       ("trytond-account" ,trytond-account)
+       ("trytond-account-invoice" ,trytond-account-invoice)
+       ("trytond-account-invoice-stock" ,trytond-account-invoice-stock)
+       ("trytond-account-product" ,trytond-account-product)
+       ("trytond-company" ,trytond-company)
+       ("trytond-currency" ,trytond-currency)
+       ("trytond-party" ,trytond-party)
+       ("trytond-product" ,trytond-product)
+       ("trytond-stock" ,trytond-stock)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module for purchase")
     (description
      "This package provides a Tryton module that defines the Purchase model.")
     (license license:gpl3+)))
 
-(define-public python-trytond-purchase-request
+(define-public python-trytond-purchase
+  (deprecated-package "python-trytond-purchase" trytond-purchase))
+
+(define-public trytond-purchase-request
   (package
-    (name "python-trytond-purchase-request")
+    (name "trytond-purchase-request")
     (version "5.8.1")
     (source
      (origin
@@ -626,11 +637,9 @@ Template and Product.")
        ("python-werkzeug" ,python-werkzeug)
        ("python-wrapt" ,python-wrapt)))
     (propagated-inputs
-     `(("python-trytond-product"
-        ,python-trytond-product)
-       ("python-trytond-purchase"
-        ,python-trytond-purchase)
-       ("trytond" ,trytond)))
+     `(("trytond" ,trytond)
+       ("trytond-product" ,trytond-product)
+       ("trytond-purchase" ,trytond-purchase)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module for purchase requests")
     (description
@@ -639,9 +648,13 @@ Purchase Requests which are central points to collect purchase requests
 generated by other process from Tryton.")
     (license license:gpl3+)))
 
-(define-public python-trytond-stock
+(define-public python-trytond-purchase-request
+  (deprecated-package
+   "python-trytond-purchase-request" trytond-purchase-request))
+
+(define-public trytond-stock
   (package
-    (name "python-trytond-stock")
+    (name "trytond-stock")
     (version "5.8.2")
     (source
      (origin
@@ -664,14 +677,11 @@ generated by other process from Tryton.")
     (propagated-inputs
      `(("python-simpleeval" ,python-simpleeval)
        ("python-sql" ,python-sql)
-       ("python-trytond-company"
-        ,python-trytond-company)
-       ("python-trytond-currency"
-        ,python-trytond-currency)
-       ("python-trytond-party" ,python-trytond-party)
-       ("python-trytond-product"
-        ,python-trytond-product)
-       ("trytond" ,trytond)))
+       ("trytond" ,trytond)
+       ("trytond-company" ,trytond-company)
+       ("trytond-currency" ,trytond-currency)
+       ("trytond-party" ,trytond-party)
+       ("trytond-product" ,trytond-product)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module for stock and inventory")
     (description
@@ -681,9 +691,12 @@ between these locations, shipments for product arrivals and departures and
 inventory to control and update stock levels.")
     (license license:gpl3+)))
 
-(define-public python-trytond-stock-lot
+(define-public python-trytond-stock
+  (deprecated-package "python-trytond-stock" trytond-stock))
+
+(define-public trytond-stock-lot
   (package
-    (name "python-trytond-stock-lot")
+    (name "trytond-stock-lot")
     (version "5.8.2")
     (source
      (origin
@@ -706,19 +719,21 @@ inventory to control and update stock levels.")
        ("python-werkzeug" ,python-werkzeug)
        ("python-wrapt" ,python-wrapt)))
     (propagated-inputs
-     `(("python-trytond-product"
-        ,python-trytond-product)
-       ("python-trytond-stock" ,python-trytond-stock)
-       ("trytond" ,trytond)))
+     `(("trytond" ,trytond)
+       ("trytond-product" ,trytond-product)
+       ("trytond-stock" ,trytond-stock)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module for lot of products")
     (description
      "This package provides a Tryton module that defines lot of products.")
     (license license:gpl3+)))
 
-(define-public python-trytond-stock-supply
+(define-public python-trytond-stock-lot
+  (deprecated-package "python-trytond-stock-lot" trytond-stock-lot))
+
+(define-public trytond-stock-supply
   (package
-    (name "python-trytond-stock-supply")
+    (name "trytond-stock-supply")
     (version "5.8.1")
     (source
      (origin
@@ -741,20 +756,19 @@ inventory to control and update stock levels.")
        ("python-wrapt" ,python-wrapt)))
     (propagated-inputs
      `(("python-sql" ,python-sql)
-       ("python-trytond-account"
-        ,python-trytond-account)
-       ("python-trytond-party" ,python-trytond-party)
-       ("python-trytond-product"
-        ,python-trytond-product)
-       ("python-trytond-purchase"
-        ,python-trytond-purchase)
-       ("python-trytond-purchase-request"
-        ,python-trytond-purchase-request)
-       ("python-trytond-stock" ,python-trytond-stock)
-       ("trytond" ,trytond)))
+       ("trytond" ,trytond)
+       ("trytond-account" ,trytond-account)
+       ("trytond-party" ,trytond-party)
+       ("trytond-product" ,trytond-product)
+       ("trytond-purchase" ,trytond-purchase)
+       ("trytond-purchase-request" ,trytond-purchase-request)
+       ("trytond-stock" ,trytond-stock)))
     (home-page "https://www.tryton.org/")
     (synopsis "Tryton module for stock supply")
     (description
      "This package provides a Tryton module that adds automatic supply
 mechanisms and introduces the concepts of order point.")
     (license license:gpl3+)))
+
+(define-public python-trytond-stock-supply
+  (deprecated-package "python-trytond-stock-supply" trytond-stock-supply))
-- 
2.30.2

[bug#50295] [PATCH 4/6] gnu: tryton modules: Unify native-inputs.

[Hartmut Goebel]

For testing, the tryton modules require a common set of native-input, which
basically are the propagated-inputs of `trytond`. (Some modules leave out one
or two of these, but most modules require all.) So to avoid redundant code,
use a variable for defining this common set. This reduces the maintenance
burden when more trytond modules are added.

* gnu/packages/tryton.scm (%standard-trytond-native-inputs): New variable.
  (trytond-account, trytond-account-invoice, trytond-account-invoice-stock,
  trytond-account-product, trytond-analytic-account, trytond-company,
  trytond-country, trytond-currency, trytond-party, trytond-product,
  trytond-purchase, trytond-purchase-request, trytond-stock, trytond-stock-lot,
  trytond-stock-supply)[native-inputs]: Use it.

native-inouts2
---
 gnu/packages/tryton.scm | 198 ++++++----------------------------------
 1 file changed, 30 insertions(+), 168 deletions(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index d7f03e9181..d9acc671e1 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -171,6 +171,20 @@ the build system."
 ;;;  Tryton modules - please sort alphabetically
 ;;;
 
+(define %standard-trytond-native-inputs
+  ;; native-inputs required by most of the tryton module for running the test
+  `(("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)))
+
 (define-public trytond-account
   (package
     (name "trytond-account")
@@ -183,16 +197,7 @@ the build system."
         (base32 "16ny67vcnxk9ngcxd56cfixm441vs9jxv3apmb16xsi47yk2xd7w"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account"))
-    (native-inputs
-     `(("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-werkzeug" ,python-werkzeug)
-       ("python-wrapt" ,python-wrapt)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-dateutil" ,python-dateutil)
        ("python-simpleeval" ,python-simpleeval)
@@ -223,16 +228,7 @@ most of accounting needs.")
         (base32 "0drccambg6855p7ai8654c7f9v85jzwicwpxmagyrr09qz6qzgcz"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice"))
-    (native-inputs
-     `(("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-werkzeug" ,python-werkzeug)
-       ("python-wrapt" ,python-wrapt)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-dateutil" ,python-dateutil)
        ("python-sql" ,python-sql)
@@ -267,18 +263,7 @@ term.")
         (base32 "02m6ikcc38ac41ddzg5xp5l9jz0k6j7j1g2xa62ki4v093yn4z5v"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice_stock"))
-    (native-inputs
-     `(("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)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("trytond" ,trytond)
        ("trytond-account-invoice" ,trytond-account-invoice)
@@ -308,18 +293,7 @@ average price of the posted invoice lines that are linked to it.")
         (base32 "10bpbkkmllbh9lm5ajydmc5nvqm9bbdn9rmm03jqgik23s5kyx2z"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_product"))
-    (native-inputs
-     `(("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)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("trytond" ,trytond)
        ("trytond-account" ,trytond-account)
@@ -348,17 +322,7 @@ and category.")
         (base32 "10rn2rf1ji7d1gxmgca368yvabql1ahklqg7p8sh5bl79vn5qx5x"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "analytic_account"))
-    (native-inputs
-     `(("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-werkzeug" ,python-werkzeug)
-       ("python-wrapt" ,python-wrapt)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-sql" ,python-sql)
        ("trytond" ,trytond)
@@ -389,18 +353,7 @@ required to analyse accounting using multiple different axes.")
         (base32 "1bwy2rkgfw32cwhq5fh3rpy7bx425h44ap10i9kjx5ak86bfnpz9"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "company"))
-    (native-inputs
-     `(("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)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("trytond" ,trytond)
        ("trytond-currency" ,trytond-currency)
@@ -428,18 +381,7 @@ company and employee and extend the user model.")
     (build-system python-build-system)
     ;; Doctest contains one test that requires internet access.
     (arguments (tryton-arguments "country" "--no-doctest"))
-    (native-inputs
-     `(("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)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-pycountry" ,python-pycountry)
        ("trytond" ,trytond)))
@@ -465,18 +407,9 @@ company and employee and extend the user model.")
     (build-system python-build-system)
     (arguments (tryton-arguments "currency"))
     (native-inputs
-     `(("python-dateutil" ,python-dateutil)
-       ("python-genshi" ,python-genshi)
+     `(,@%standard-trytond-native-inputs
        ("python-forex-python" ,python-forex-python)
-       ("python-lxml" ,python-lxml)
-       ("python-magic" ,python-magic)
-       ("python-passlib" ,python-passlib)
-       ("python-polib" ,python-polib)
-       ("python-proteus" ,python-proteus)
-       ("python-pycountry" ,python-pycountry)
-       ("python-relatorio" ,python-relatorio)
-       ("python-werkzeug" ,python-werkzeug)
-       ("python-wrapt" ,python-wrapt)))
+       ("python-pycountry" ,python-pycountry)))
     (propagated-inputs
      `(("python-sql" ,python-sql)
        ("trytond" ,trytond)))
@@ -503,17 +436,7 @@ currency and rate.")
     (build-system python-build-system)
     ;; Doctest 'scenario_party_phone_number.rst' fails.
     (arguments (tryton-arguments "party" "--no-doctest"))
-    (native-inputs
-     `(("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-werkzeug" ,python-werkzeug)
-       ("python-wrapt" ,python-wrapt)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-sql" ,python-sql)
        ("python-stnum" ,python-stdnum)
@@ -541,17 +464,7 @@ addresses.")
         (base32 "0x18ngpjyrdwjwg17bz98jph4jv5gcv0qc0p2kxpam4lqsy34ic2"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product"))
-    (native-inputs
-     `(("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-werkzeug" ,python-werkzeug)
-       ("python-wrapt" ,python-wrapt)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-sql" ,python-sql)
        ("python-stdnum" ,python-stdnum)
@@ -579,17 +492,7 @@ Template and Product.")
         (base32 "0na74zijj46b12gypy9si3las02a96rh5ygl503c7razha61g1b0"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase"))
-    (native-inputs
-     `(("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-werkzeug" ,python-werkzeug)
-       ("python-wrapt" ,python-wrapt)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-sql" ,python-sql)
        ("trytond" ,trytond)
@@ -624,18 +527,7 @@ Template and Product.")
     (build-system python-build-system)
     ;; Doctest 'scenario_purchase_request.rst' fails.
     (arguments (tryton-arguments "purchase_request" "--no-doctest"))
-    (native-inputs
-     `(("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)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("trytond" ,trytond)
        ("trytond-product" ,trytond-product)
@@ -664,16 +556,7 @@ generated by other process from Tryton.")
         (base32 "0yb8kd3alwqkivrlpx0ni4jxv3x14i37lmwism9yi81xwchyrcjk"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock"))
-    (native-inputs
-     `(("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-werkzeug" ,python-werkzeug)
-       ("python-wrapt" ,python-wrapt)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-simpleeval" ,python-simpleeval)
        ("python-sql" ,python-sql)
@@ -706,18 +589,7 @@ inventory to control and update stock levels.")
         (base32 "0w2f62cfzm7j8wnw8igmjslpxc1a8s82dkdizyvim5qhjg6mrsym"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_lot"))
-    (native-inputs
-     `(("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)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("trytond" ,trytond)
        ("trytond-product" ,trytond-product)
@@ -743,17 +615,7 @@ inventory to control and update stock levels.")
         (base32 "01cgpxlznldrba79a3xmj4d0csyfc3ccgs66c490j8v8rdnqpbww"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_supply"))
-    (native-inputs
-     `(("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-werkzeug" ,python-werkzeug)
-       ("python-wrapt" ,python-wrapt)))
+    (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-sql" ,python-sql)
        ("trytond" ,trytond)
-- 
2.30.2

[bug#50295] [PATCH 5/6] gnu: tryton modules: Remove propagated-inputs propagated elsewhere.

[Hartmut Goebel]

From all tryton modules propagating `trytond` remove the packages already
propagated by `trytond`.

* gnu/packages/tryton.scm (account, account_invoice) [propagated-inputs]:
  Remove python-dateutils, python-sql.
  (analytic_account, party, product, purchase, stock,
  stock_supply) [propagated-inputs]: Remove python-sql.
---
 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 d9acc671e1..6d8e71354f 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -199,9 +199,7 @@ the build system."
     (arguments (tryton-arguments "account"))
     (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
-     `(("python-dateutil" ,python-dateutil)
-       ("python-simpleeval" ,python-simpleeval)
-       ("python-sql" ,python-sql)
+     `(("python-simpleeval" ,python-simpleeval)
        ("trytond" ,trytond)
        ("trytond-company" ,trytond-company)
        ("trytond-currency" ,trytond-currency)
@@ -230,9 +228,7 @@ most of accounting needs.")
     (arguments (tryton-arguments "account_invoice"))
     (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
-     `(("python-dateutil" ,python-dateutil)
-       ("python-sql" ,python-sql)
-       ("trytond" ,trytond)
+     `(("trytond" ,trytond)
        ("trytond-account" ,trytond-account)
        ("trytond-account-product" ,trytond-account-product)
        ("trytond-company" ,trytond-company)
@@ -324,8 +320,7 @@ and category.")
     (arguments (tryton-arguments "analytic_account"))
     (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
-     `(("python-sql" ,python-sql)
-       ("trytond" ,trytond)
+     `(("trytond" ,trytond)
        ("trytond-account" ,trytond-account)
        ("trytond-company" ,trytond-company)
        ("trytond-currency" ,trytond-currency)
@@ -438,8 +433,7 @@ currency and rate.")
     (arguments (tryton-arguments "party" "--no-doctest"))
     (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
-     `(("python-sql" ,python-sql)
-       ("python-stnum" ,python-stdnum)
+     `(("python-stdnum" ,python-stdnum)
        ("trytond" ,trytond)
        ("trytond-country" ,trytond-country)))
     (home-page "https://www.tryton.org/")
@@ -466,8 +460,7 @@ addresses.")
     (arguments (tryton-arguments "product"))
     (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
-     `(("python-sql" ,python-sql)
-       ("python-stdnum" ,python-stdnum)
+     `(("python-stdnum" ,python-stdnum)
        ("trytond" ,trytond)
        ("trytond-company" ,trytond-company)))
     (home-page "https://www.tryton.org/")
@@ -494,8 +487,7 @@ Template and Product.")
     (arguments (tryton-arguments "purchase"))
     (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
-     `(("python-sql" ,python-sql)
-       ("trytond" ,trytond)
+     `(("trytond" ,trytond)
        ("trytond-account" ,trytond-account)
        ("trytond-account-invoice" ,trytond-account-invoice)
        ("trytond-account-invoice-stock" ,trytond-account-invoice-stock)
@@ -559,7 +551,6 @@ generated by other process from Tryton.")
     (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
      `(("python-simpleeval" ,python-simpleeval)
-       ("python-sql" ,python-sql)
        ("trytond" ,trytond)
        ("trytond-company" ,trytond-company)
        ("trytond-currency" ,trytond-currency)
@@ -617,8 +608,7 @@ inventory to control and update stock levels.")
     (arguments (tryton-arguments "stock_supply"))
     (native-inputs `(,@%standard-trytond-native-inputs))
     (propagated-inputs
-     `(("python-sql" ,python-sql)
-       ("trytond" ,trytond)
+     `(("trytond" ,trytond)
        ("trytond-account" ,trytond-account)
        ("trytond-party" ,trytond-party)
        ("trytond-product" ,trytond-product)
-- 
2.30.2

[bug#50295] [PATCH 6/6] gnu: tryton applications and framework: Update to 6.0.x.

[Hartmut Goebel]

* gnu/packages/tryton.scm (trytond-account-invoice-stock, trytond-product,
  trytond-purchase-request, trytond-stock-lot): Update to 6.0.0.
  (trytond-country trytond-stock-supply: Update to 6.0.1.
  (trytond-currency): Update to 6.0.1. [arguments] Disable running doc-tests.
  (python-proteus, trytond-account, trytond-account-invoice,
  trytond-account-product, trytond-analytic-account, trytond-company,
  trytond-party, trytond-purchase): Update to 6.0.2.
  (tryton): Update to 6.0.4.
  (trytond, trytond-stock): Update to 6.0.5.
---
 gnu/packages/tryton.scm | 82 ++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 6d8e71354f..bc3c3599b2 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -42,13 +42,13 @@
 (define-public trytond
   (package
     (name "trytond")
-    (version "5.8.2")
+    (version "6.0.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond" version))
        (sha256
-        (base32 "1h1x0cmmmxvjclbglvvxkv634jw6av5ilymbix1lln5lq0gd39yy"))))
+        (base32 "1z5d1mc04knzjw0a8kqhmbj6g4ndj4yf2l81xn8rkn85z7drijrw"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-dateutil" ,python-dateutil)
@@ -63,7 +63,8 @@
        ("python-werkzeug" ,python-werkzeug)
        ("python-wrapt" ,python-wrapt)))
     (native-inputs
-     `(("python-mock" ,python-mock)))
+     `(("python-mock" ,python-mock)
+       ("python-pillow" ,python-pillow)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -86,13 +87,13 @@ and security.")
 (define-public tryton
   (package
     (name "tryton")
-    (version "5.8.2")
+    (version "6.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "tryton" version))
        (sha256
-        (base32 "0kr5ngmmldgb9a9d5ylkmppy5p8vlf9d8iwv9lnci2fyxg2705wh"))))
+        (base32 "1cxvgdl3wxvgxr763ah1cpyf5s0y9xf9fh2hfyz8snfvclvssciq"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -127,13 +128,13 @@ and security.")
 (define-public python-proteus
   (package
     (name "python-proteus")
-    (version "5.8.1")
+    (version "6.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "proteus" version))
        (sha256
-        (base32 "03z5ssvjcvxv1p10y7c1y0jah0k3yyc9hlyi7xax98sfqyk13bnw"))))
+        (base32 "0qr7rir7ysxvy2kyfzp2d2kcw9qzq4vdkddbwswzgddxjpycksdh"))))
     (build-system python-build-system)
     ;; Tests require python-trytond-party which requires python-proteus.
     (arguments
@@ -188,13 +189,13 @@ the build system."
 (define-public trytond-account
   (package
     (name "trytond-account")
-    (version "5.8.1")
+    (version "6.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account" version))
        (sha256
-        (base32 "16ny67vcnxk9ngcxd56cfixm441vs9jxv3apmb16xsi47yk2xd7w"))))
+        (base32 "0bqbsmm337rmrz770r9jl080prz7qxzc8aj93fdfqy1k922b1wn8"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -217,13 +218,13 @@ most of accounting needs.")
 (define-public trytond-account-invoice
   (package
     (name "trytond-account-invoice")
-    (version "5.8.1")
+    (version "6.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_invoice" version))
        (sha256
-        (base32 "0drccambg6855p7ai8654c7f9v85jzwicwpxmagyrr09qz6qzgcz"))))
+        (base32 "1mywb9pxr2kgc7xv8sfcfysb2mivffkrhfh4l3cvfiqwi984ihy5"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -248,15 +249,13 @@ term.")
 (define-public trytond-account-invoice-stock
   (package
     (name "trytond-account-invoice-stock")
-    (version "5.8.1")
+    (version "6.0.0")
     (source
      (origin
        (method url-fetch)
-       (uri (pypi-uri
-             "trytond_account_invoice_stock"
-             version))
+       (uri (pypi-uri "trytond_account_invoice_stock" version))
        (sha256
-        (base32 "02m6ikcc38ac41ddzg5xp5l9jz0k6j7j1g2xa62ki4v093yn4z5v"))))
+        (base32 "1228n6vsx0rdjsy3idvpyssa3n21nhvz9gqaacwa46c0hp2251bp"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice_stock"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -280,13 +279,13 @@ average price of the posted invoice lines that are linked to it.")
 (define-public trytond-account-product
   (package
     (name "trytond-account-product")
-    (version "5.8.1")
+    (version "6.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_product" version))
        (sha256
-        (base32 "10bpbkkmllbh9lm5ajydmc5nvqm9bbdn9rmm03jqgik23s5kyx2z"))))
+        (base32 "1z0dn1p22smzb4a9v451224wrpxcw94inl7jxkarc0q088gasn7d"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_product"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -309,13 +308,13 @@ and category.")
 (define-public trytond-analytic-account
   (package
     (name "trytond-analytic-account")
-    (version "5.8.1")
+    (version "6.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_analytic_account" version))
        (sha256
-        (base32 "10rn2rf1ji7d1gxmgca368yvabql1ahklqg7p8sh5bl79vn5qx5x"))))
+        (base32 "09j9xz41n5hk3j7w63xbw1asd3p00prqvl652qcm9x1nrlmqiw3r"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "analytic_account"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -339,13 +338,13 @@ required to analyse accounting using multiple different axes.")
 (define-public trytond-company
   (package
     (name "trytond-company")
-    (version "5.8.1")
+    (version "6.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_company" version))
        (sha256
-        (base32 "1bwy2rkgfw32cwhq5fh3rpy7bx425h44ap10i9kjx5ak86bfnpz9"))))
+        (base32 "0m5fkhs7m131l3j5cqpwfpplcc052p69fdrsnyyr2f6vc5v8dm1l"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "company"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -366,13 +365,13 @@ company and employee and extend the user model.")
 (define-public trytond-country
   (package
     (name "trytond-country")
-    (version "5.8.1")
+    (version "6.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_country" version))
        (sha256
-        (base32 "1lkspk5w5pb0gg2h27zb7vwcj993gkm1f84qdxmqlpkc8raqvicj"))))
+        (base32 "1ksinysac7p0k8avsz8xqzfkmm21s6i93qyrsma5h4y5477cwmw7"))))
     (build-system python-build-system)
     ;; Doctest contains one test that requires internet access.
     (arguments (tryton-arguments "country" "--no-doctest"))
@@ -392,15 +391,16 @@ company and employee and extend the user model.")
 (define-public trytond-currency
   (package
     (name "trytond-currency")
-    (version "5.8.1")
+    (version "6.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_currency" version))
        (sha256
-        (base32 "0b5p7ibil7nlsv7f31j69rka4xj5za798262algx7xa88a6h7mmx"))))
+        (base32 "0fs2wvhgvc0l4yzs5m9l8z4lbzazr42hgz0859malhnlp1sya2kq"))))
     (build-system python-build-system)
-    (arguments (tryton-arguments "currency"))
+    ;; Doctest 'scenario_currency_rate_update.rst' fails.
+    (arguments (tryton-arguments "currency" "--no-doctest"))
     (native-inputs
      `(,@%standard-trytond-native-inputs
        ("python-forex-python" ,python-forex-python)
@@ -421,13 +421,13 @@ currency and rate.")
 (define-public trytond-party
   (package
     (name "trytond-party")
-    (version "5.8.1")
+    (version "6.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_party" version))
        (sha256
-        (base32 "1hapfq7ip99s4qp9xra1m40q4n379p9pmfnz2x4ggd79ss76bghc"))))
+        (base32 "0aikzpr0ambc98v76dl6xqa42b08dy3b011y33lvxjp5mcha3f7y"))))
     (build-system python-build-system)
     ;; Doctest 'scenario_party_phone_number.rst' fails.
     (arguments (tryton-arguments "party" "--no-doctest"))
@@ -449,13 +449,13 @@ addresses.")
 (define-public trytond-product
   (package
     (name "trytond-product")
-    (version "5.8.1")
+    (version "6.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product" version))
        (sha256
-        (base32 "0x18ngpjyrdwjwg17bz98jph4jv5gcv0qc0p2kxpam4lqsy34ic2"))))
+        (base32 "01yy24bk1qjfwzywd2i6l5z9845h39pnr4x7xs186d6m44crhb2n"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -476,13 +476,13 @@ Template and Product.")
 (define-public trytond-purchase
   (package
     (name "trytond-purchase")
-    (version "5.8.1")
+    (version "6.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase" version))
        (sha256
-        (base32 "0na74zijj46b12gypy9si3las02a96rh5ygl503c7razha61g1b0"))))
+        (base32 "12drjw30ik3alckn6xrny4814vzi3ysh17wgiawiy9319yahsvay"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -509,13 +509,13 @@ Template and Product.")
 (define-public trytond-purchase-request
   (package
     (name "trytond-purchase-request")
-    (version "5.8.1")
+    (version "6.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_request" version))
        (sha256
-        (base32 "1m92snnvgisnv083nml6cz5qgnfdg539rd5bwg3lqrknm7343w16"))))
+        (base32 "0yhf3lh5b24qpk80r5pbmmswf5757bxa0s7ckl40vf6lkjkccv5i"))))
     (build-system python-build-system)
     ;; Doctest 'scenario_purchase_request.rst' fails.
     (arguments (tryton-arguments "purchase_request" "--no-doctest"))
@@ -539,13 +539,13 @@ generated by other process from Tryton.")
 (define-public trytond-stock
   (package
     (name "trytond-stock")
-    (version "5.8.2")
+    (version "6.0.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock" version))
        (sha256
-        (base32 "0yb8kd3alwqkivrlpx0ni4jxv3x14i37lmwism9yi81xwchyrcjk"))))
+        (base32 "18q6w02nmnhdbxr3wgzrr0mq8iwb85vf5j1c8xcgbwqy08dpyip7"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -571,13 +571,13 @@ inventory to control and update stock levels.")
 (define-public trytond-stock-lot
   (package
     (name "trytond-stock-lot")
-    (version "5.8.2")
+    (version "6.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_lot" version))
        (sha256
-        (base32 "0w2f62cfzm7j8wnw8igmjslpxc1a8s82dkdizyvim5qhjg6mrsym"))))
+        (base32 "18cwrvnrzjk1wb765gr6hp3plpdpwz1a7cwimjhxi47iw7w5c84g"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_lot"))
     (native-inputs `(,@%standard-trytond-native-inputs))
@@ -597,13 +597,13 @@ inventory to control and update stock levels.")
 (define-public trytond-stock-supply
   (package
     (name "trytond-stock-supply")
-    (version "5.8.1")
+    (version "6.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_supply" version))
        (sha256
-        (base32 "01cgpxlznldrba79a3xmj4d0csyfc3ccgs66c490j8v8rdnqpbww"))))
+        (base32 "1p5l3yjjy6l25kk9xnhbl691l3v8gfg9fhc87jc6qszhxlqxk730"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_supply"))
     (native-inputs `(,@%standard-trytond-native-inputs))
-- 
2.30.2

[bug#50295] [PATCH 0/6] Update Tryton ERP applications and framework to 6.0.x.

[Vinicius Monego]

> This series updates Tryton to the current version 6.0.x.

> Hartmut Goebel (6):
>   gnu: trytond: Propagate inputs.
>   gnu: tryton: Propagate inputs.
>   gnu: tryton modules: Remove "python"- prefix from name.
>   gnu: tryton modules: Unify native-inputs.
>   gnu: tryton modules: Remove propagated-inputs propagated elsewhere.
> gnu: tryton applications and framework: Update to 6.0.x.

Hi. I saw a warning in the trytond tests about python-passlib using
python-py-bcrypt which is deprecated. The active implementation is now
python-bcrypt. Perhaps update python-passlib to use it before the
tryton patches?

[bug#50295] [PATCH 4/6] gnu: tryton modules: Unify native-inputs.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 707 bytes --]

Hi,

>      (arguments (tryton-arguments "account"))
> -    (native-inputs
> -     `(("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-werkzeug" ,python-werkzeug)
> -       ("python-wrapt" ,python-wrapt)))
> +    (native-inputs `(,@%standard-trytond-native-inputs))

This can be done a litte simpler as
  (native-inputs %standard-trytond-native-inputs)
though it probably doesn't really matter and YMMV.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#50295] [PATCH 4/6] gnu: tryton modules: Unify native-inputs.

[Hartmut Goebel]

Hi Maxime,
> +    (native-inputs `(,@%standard-trytond-native-inputs))
> This can be done a litte simpler as
>    (native-inputs %standard-trytond-native-inputs)
> though it probably doesn't really matter and YMMV.

Thanks for this hint and the review. I prefer to keep this more 
complicated code, since it makes it easier for guile-not-gurus like me 
to add more modules if required:

     (native-inputs
      `(,@%standard-trytond-native-inputs
        ("python-forex-python" ,python-forex-python)
        ("python-pycountry" ,python-pycountry)))

If there is a simpler notation for this, I'd be eager to learn about it 
and will adopt the code.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

[bug#50295] [PATCH 4/6] gnu: tryton modules: Unify native-inputs.

[Liliana Marie Prikler]

With field sanitizers for inputs just around the corner you might
simplify that to (cons* python-forex-python python-pycountry %standard-
trytond-native-inputs), though note that this switches around package
order from what you had.

[bug#50295] [PATCH 4/6] gnu: tryton modules: Unify native-inputs.

[Hartmut Goebel]

Pushed as d4d37071313727d8cf0cb120d6d48111ad4f565b

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

bug#50295: Acknowledgement ([PATCH 0/6] Update Tryton ERP applications and framework to 6.0.x.)

[Hartmut Goebel]

[bug#50295] [PATCH 4/6] gnu: tryton modules: Unify native-inputs.

[Hartmut Goebel]

Hi Liliana,
> With field sanitizers for inputs just around the corner you might
>
Thanks for this tip. I did not follow it yet, since field sanitizers are 
not yet here and I wanted to finish these packages.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |