From 0ad07005d4a77be0289dc187b2994b9bcb4acbf2 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 Jan 2021 16:53:38 +0100 Subject: [PATCH] gnu: Rename "python-trytond" to "trytond". Trytond is an application, and only python libraries should have the "python-" prefix. * gnu/packages/tryton.scm (python-trytond): Rename to... (trytond): ...this. [synopsis] Rephrase. (python-trytond): Redefine as a deprecated alias. (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-country, 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)[propagated-inputs]: Rename python-trytond to trytond. --- gnu/packages/tryton.scm | 105 +++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm index 3809b986d5..ca378e05b9 100644 --- a/gnu/packages/tryton.scm +++ b/gnu/packages/tryton.scm @@ -37,9 +37,9 @@ (define-module (gnu packages tryton) #:use-module (guix utils) #:use-module (guix build-system python)) -(define-public python-trytond +(define-public trytond (package - (name "python-trytond") + (name "trytond") (version "5.6.5") (source (origin @@ -71,13 +71,16 @@ (define-public python-trytond (setenv "HOME" "/tmp") #t))))) (home-page "https://www.tryton.org/") - (synopsis "Server component of Tryton") + (synopsis "Tryton Server") (description "Tryton is a three-tier high-level general purpose application platform using PostgreSQL as its main database engine. It is the core base of a complete business solution providing modularity, scalability and security.") (license license:gpl3+))) +(define-public python-trytond + (deprecated-package "python-trytond" trytond)) + (define-public tryton (package (name "tryton") @@ -136,7 +139,7 @@ (define-public python-trytond-country (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -159,7 +162,7 @@ (define-public python-trytond-country ("python-wrapt" ,python-wrapt))) (propagated-inputs `(("python-pycountry" ,python-pycountry) - ("python-trytond" ,python-trytond))) + ("trytond" ,trytond))) (home-page "http://www.tryton.org/") (synopsis "Tryton module with countries") (description @@ -183,7 +186,7 @@ (define-public python-trytond-party (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -206,8 +209,8 @@ (define-public python-trytond-party (propagated-inputs `(("python-sql" ,python-sql) ("python-stnum" ,python-stdnum) - ("python-trytond" ,python-trytond) - ("python-trytond-country" ,python-trytond-country))) + ("python-trytond-country" ,python-trytond-country) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module for parties and addresses") (description @@ -232,7 +235,7 @@ (define-public python-trytond-currency (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -255,7 +258,7 @@ (define-public python-trytond-currency ("python-wrapt" ,python-wrapt))) (propagated-inputs `(("python-sql" ,python-sql) - ("python-trytond" ,python-trytond))) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module with currencies") (description @@ -280,7 +283,7 @@ (define-public python-trytond-company (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -301,10 +304,10 @@ (define-public python-trytond-company ("python-werkzeug" ,python-werkzeug) ("python-wrapt" ,python-wrapt))) (propagated-inputs - `(("python-trytond" ,python-trytond) - ("python-trytond-currency" + `(("python-trytond-currency" ,python-trytond-currency) - ("python-trytond-party" ,python-trytond-party))) + ("python-trytond-party" ,python-trytond-party) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module with companies and employees") (description @@ -329,7 +332,7 @@ (define-public python-trytond-product (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -351,9 +354,9 @@ (define-public python-trytond-product (propagated-inputs `(("python-sql" ,python-sql) ("python-stdnum" ,python-stdnum) - ("python-trytond" ,python-trytond) ("python-trytond-company" - ,python-trytond-company))) + ,python-trytond-company) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module with products") (description @@ -378,7 +381,7 @@ (define-public python-trytond-account (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -400,12 +403,12 @@ (define-public python-trytond-account `(("python-dateutil" ,python-dateutil) ("python-simpleeval" ,python-simpleeval) ("python-sql" ,python-sql) - ("python-trytond" ,python-trytond) ("python-trytond-company" ,python-trytond-company) ("python-trytond-currency" ,python-trytond-currency) - ("python-trytond-party" ,python-trytond-party))) + ("python-trytond-party" ,python-trytond-party) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module for accounting") (description @@ -430,7 +433,7 @@ (define-public python-trytond-analytic-account (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -451,14 +454,14 @@ (define-public python-trytond-analytic-account ("python-wrapt" ,python-wrapt))) (propagated-inputs `(("python-sql" ,python-sql) - ("python-trytond" ,python-trytond) ("python-trytond-account" ,python-trytond-account) ("python-trytond-company" ,python-trytond-company) ("python-trytond-currency" ,python-trytond-currency) - ("python-trytond-party" ,python-trytond-party))) + ("python-trytond-party" ,python-trytond-party) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module for analytic accounting") (description @@ -483,7 +486,7 @@ (define-public python-trytond-account-product (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -504,15 +507,15 @@ (define-public python-trytond-account-product ("python-werkzeug" ,python-werkzeug) ("python-wrapt" ,python-wrapt))) (propagated-inputs - `(("python-trytond" ,python-trytond) - ("python-trytond-account" + `(("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))) + ,python-trytond-product) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module to add accounting on product") (description @@ -537,7 +540,7 @@ (define-public python-trytond-account-invoice (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -558,7 +561,6 @@ (define-public python-trytond-account-invoice (propagated-inputs `(("python-dateutil" ,python-dateutil) ("python-sql" ,python-sql) - ("python-trytond" ,python-trytond) ("python-trytond-account" ,python-trytond-account) ("python-trytond-account-product" @@ -569,7 +571,8 @@ (define-public python-trytond-account-invoice ,python-trytond-currency) ("python-trytond-party" ,python-trytond-party) ("python-trytond-product" - ,python-trytond-product))) + ,python-trytond-product) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module for invoicing") (description @@ -594,7 +597,7 @@ (define-public python-trytond-stock (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -615,14 +618,14 @@ (define-public python-trytond-stock (propagated-inputs `(("python-simpleeval" ,python-simpleeval) ("python-sql" ,python-sql) - ("python-trytond" ,python-trytond) ("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-product) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module for stock and inventory") (description @@ -649,7 +652,7 @@ (define-public python-trytond-stock-lot (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -670,10 +673,10 @@ (define-public python-trytond-stock-lot ("python-werkzeug" ,python-werkzeug) ("python-wrapt" ,python-wrapt))) (propagated-inputs - `(("python-trytond" ,python-trytond) - ("python-trytond-product" + `(("python-trytond-product" ,python-trytond-product) - ("python-trytond-stock" ,python-trytond-stock))) + ("python-trytond-stock" ,python-trytond-stock) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module for lot of products") (description @@ -699,7 +702,7 @@ (define-public python-trytond-account-invoice-stock (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -720,12 +723,12 @@ (define-public python-trytond-account-invoice-stock ("python-werkzeug" ,python-werkzeug) ("python-wrapt" ,python-wrapt))) (propagated-inputs - `(("python-trytond" ,python-trytond) - ("python-trytond-account-invoice" + `(("python-trytond-account-invoice" ,python-trytond-account-invoice) ("python-trytond-product" ,python-trytond-product) - ("python-trytond-stock" ,python-trytond-stock))) + ("python-trytond-stock" ,python-trytond-stock) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module to link stock and invoice") (description @@ -751,7 +754,7 @@ (define-public python-trytond-stock-supply (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -772,7 +775,6 @@ (define-public python-trytond-stock-supply ("python-wrapt" ,python-wrapt))) (propagated-inputs `(("python-sql" ,python-sql) - ("python-trytond" ,python-trytond) ("python-trytond-account" ,python-trytond-account) ("python-trytond-party" ,python-trytond-party) @@ -782,7 +784,8 @@ (define-public python-trytond-stock-supply ,python-trytond-purchase) ("python-trytond-purchase-request" ,python-trytond-purchase-request) - ("python-trytond-stock" ,python-trytond-stock))) + ("python-trytond-stock" ,python-trytond-stock) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module for stock supply") (description @@ -807,7 +810,7 @@ (define-public python-trytond-purchase (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -828,7 +831,6 @@ (define-public python-trytond-purchase ("python-wrapt" ,python-wrapt))) (propagated-inputs `(("python-sql" ,python-sql) - ("python-trytond" ,python-trytond) ("python-trytond-account" ,python-trytond-account) ("python-trytond-account-invoice" @@ -844,7 +846,8 @@ (define-public python-trytond-purchase ("python-trytond-party" ,python-trytond-party) ("python-trytond-product" ,python-trytond-product) - ("python-trytond-stock" ,python-trytond-stock))) + ("python-trytond-stock" ,python-trytond-stock) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module for purchase") (description @@ -868,7 +871,7 @@ (define-public python-trytond-purchase-request (replace 'check (let ((runtest (string-append - (assoc-ref %build-inputs "python-trytond") + (assoc-ref %build-inputs "trytond") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/trytond/tests/run-tests.py"))) @@ -891,11 +894,11 @@ (define-public python-trytond-purchase-request ("python-werkzeug" ,python-werkzeug) ("python-wrapt" ,python-wrapt))) (propagated-inputs - `(("python-trytond" ,python-trytond) - ("python-trytond-product" + `(("python-trytond-product" ,python-trytond-product) ("python-trytond-purchase" - ,python-trytond-purchase))) + ,python-trytond-purchase) + ("trytond" ,trytond))) (home-page "https://www.tryton.org/") (synopsis "Tryton module for purchase requests") (description