gnu: wireservice: New wireservice-package macro.

Replace the parent 'base-package' variable with a 'wireservice-package' macro
that includes all common package fields.

* gnu/packages/wireservice.scm (base-package): Delete.
(wireservice-package): New macro.
(python-leather, python-agate, python-agate-sql, python-agate-dbf,
python-agate-excel): Use wireservice-package.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Pierre Langlois 2019-07-07 16:02:26 +01:00 committed by Ludovic Courtès
parent cdf689471a
commit b9a1d74de5
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -30,21 +30,10 @@ (define-module (gnu packages wireservice)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages time)) #:use-module (gnu packages time))
;; Base package definition for packages from https://github.com/wireservice. ;; Common package definition for packages from https://github.com/wireservice.
;; This is done so we can share how to run tests and build documentation. (define-syntax-rule (wireservice-package extra-fields ...)
(define base-package
(package (package
(name #f)
(version #f)
(source #f)
(home-page #f)
(synopsis #f)
(description #f)
(build-system python-build-system) (build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)
("python-sphinx" ,python-sphinx)
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -66,131 +55,143 @@ (define base-package
(string-append doc "/" target))) (string-append doc "/" target)))
'("html" "dirhtml" "singlehtml" "text"))) '("html" "dirhtml" "singlehtml" "text")))
#t)))))) #t))))))
(license license:expat))) (license license:expat)
extra-fields ...))
(define-public python-leather (define-public python-leather
(package (wireservice-package
(inherit base-package) (name "python-leather")
(name "python-leather") (version "0.3.3")
(version "0.3.3") (source (origin
(source (origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/wireservice/leather.git")
(url "https://github.com/wireservice/leather.git") (commit version)))
(commit version))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "1ck3dplni99sv4s117cbm07ydwwjsrxkhdy19rnk0iglia1d4s5i"))))
"1ck3dplni99sv4s117cbm07ydwwjsrxkhdy19rnk0iglia1d4s5i")))) (native-inputs
(native-inputs `(("python-nose" ,python-nose)
`(("python-cssselect" ,python-cssselect) ("python-sphinx" ,python-sphinx)
("python-lxml" ,python-lxml) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
,@(package-native-inputs base-package))) ("python-csselect" ,python-cssselect)
(propagated-inputs ("python-lxml" ,python-lxml)))
`(("python-six" ,python-six))) (propagated-inputs
(home-page "https://leather.rtfd.org") `(("python-six" ,python-six)))
(synopsis "Python charting for 80% of humans") (home-page "https://leather.rtfd.org")
(description "Leather is a Python charting library for those who need (synopsis "Python charting for 80% of humans")
(description "Leather is a Python charting library for those who need
charts now and don't care if they're perfect."))) charts now and don't care if they're perfect.")))
(define-public python-agate (define-public python-agate
(package (wireservice-package
(inherit base-package) (name "python-agate")
(name "python-agate") (version "1.6.1")
(version "1.6.1") (source (origin
(source (origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/wireservice/agate.git")
(url "https://github.com/wireservice/agate.git") (commit version)))
(commit version))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl"))))
"077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl")))) (native-inputs
(native-inputs `(("python-nose" ,python-nose)
`(("python-cssselect" ,python-cssselect) ("python-sphinx" ,python-sphinx)
("python-lxml" ,python-lxml) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
,@(package-native-inputs base-package))) ("python-csselect" ,python-cssselect)
(propagated-inputs ("python-lxml" ,python-lxml)))
`(("python-babel" ,python-babel) (propagated-inputs
("python-isodate" ,python-isodate) `(("python-babel" ,python-babel)
("python-leather" ,python-leather) ("python-isodate" ,python-isodate)
("python-parsedatetime" ,python-parsedatetime) ("python-leather" ,python-leather)
("python-pytimeparse" ,python-pytimeparse) ("python-parsedatetime" ,python-parsedatetime)
("python-six" ,python-six) ("python-pytimeparse" ,python-pytimeparse)
("python-slugify" ,python-slugify))) ("python-six" ,python-six)
(home-page "https://agate.rtfd.org") ("python-slugify" ,python-slugify)))
(synopsis "Data analysis library") (home-page "https://agate.rtfd.org")
(description "Agate is a Python data analysis library. It is an (synopsis "Data analysis library")
(description "Agate is a Python data analysis library. It is an
alternative to numpy and pandas that solves real-world problems with readable alternative to numpy and pandas that solves real-world problems with readable
code. Agate was previously known as journalism."))) code. Agate was previously known as journalism.")))
(define-public python-agate-sql (define-public python-agate-sql
(package (wireservice-package
(inherit base-package) (name "python-agate-sql")
(name "python-agate-sql") (version "0.5.4")
(version "0.5.4") (source (origin
(source (origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/wireservice/agate-sql.git")
(url "https://github.com/wireservice/agate-sql.git") (commit version)))
(commit version))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "16q0b211n5b1qmhzkfl2jr56lda0rvyh5j1wzw26h2n4pm4wxlx2"))))
"16q0b211n5b1qmhzkfl2jr56lda0rvyh5j1wzw26h2n4pm4wxlx2")))) (native-inputs
(propagated-inputs `(("python-nose" ,python-nose)
`(("python-agate" ,python-agate) ("python-sphinx" ,python-sphinx)
("python-crate" ,python-crate) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
("python-sqlalchemy" ,python-sqlalchemy))) (propagated-inputs
(home-page "https://agate-sql.rtfd.org") `(("python-agate" ,python-agate)
(synopsis "SQL read/write support to agate") ("python-crate" ,python-crate)
(description "@code{agatesql} uses a monkey patching pattern to add SQL ("python-sqlalchemy" ,python-sqlalchemy)))
(home-page "https://agate-sql.rtfd.org")
(synopsis "SQL read/write support to agate")
(description "@code{agatesql} uses a monkey patching pattern to add SQL
support to all @code{agate.Table} instances."))) support to all @code{agate.Table} instances.")))
(define-public python-agate-dbf (define-public python-agate-dbf
(package (wireservice-package
(inherit base-package) (name "python-agate-dbf")
(name "python-agate-dbf") (version "0.2.1")
(version "0.2.1") (source (origin
(source (origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/wireservice/agate-dbf.git")
(url "https://github.com/wireservice/agate-dbf.git") (commit version)))
(commit version))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "1y49fi6pmm7gzhajvqmfpcca2sqnwj24fqnsvzwk7r1hg2iaa2gi"))))
"1y49fi6pmm7gzhajvqmfpcca2sqnwj24fqnsvzwk7r1hg2iaa2gi")))) (native-inputs
(propagated-inputs `(("python-nose" ,python-nose)
`(("python-agate" ,python-agate) ("python-sphinx" ,python-sphinx)
("python-dbfread" ,python-dbfread))) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
(home-page "https://agate-dbf.rtfd.org") (propagated-inputs
(synopsis "Add read support for dbf files to agate") `(("python-agate" ,python-agate)
(description "@code{agatedbf} uses a monkey patching pattern to add read ("python-dbfread" ,python-dbfread)))
(home-page "https://agate-dbf.rtfd.org")
(synopsis "Add read support for dbf files to agate")
(description "@code{agatedbf} uses a monkey patching pattern to add read
for dbf files support to all @code{agate.Table} instances."))) for dbf files support to all @code{agate.Table} instances.")))
(define-public python-agate-excel (define-public python-agate-excel
(package (wireservice-package
(inherit base-package) (name "python-agate-excel")
(name "python-agate-excel") (version "0.2.3")
(version "0.2.3") (source (origin
(source (origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/wireservice/agate-excel.git")
(url "https://github.com/wireservice/agate-excel.git") (commit version)))
(commit version))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "1k5lv21k19s7kgbj5srd1xgrkqvxqqs49qwj33zncs9l7851afy7"))))
"1k5lv21k19s7kgbj5srd1xgrkqvxqqs49qwj33zncs9l7851afy7")))) (native-inputs
(propagated-inputs `(("python-nose" ,python-nose)
`(("python-agate" ,python-agate) ("python-sphinx" ,python-sphinx)
("python-openpyxl" ,python-openpyxl) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
("python-xlrd" ,python-xlrd))) (propagated-inputs
(home-page "https://agate-excel.rtfd.org") `(("python-agate" ,python-agate)
(synopsis "Add read support for Excel files (xls and xlsx) to agate") ("python-openpyxl" ,python-openpyxl)
(description "@code{agateexcel} uses a monkey patching pattern to add read ("python-xlrd" ,python-xlrd)))
(home-page "https://agate-excel.rtfd.org")
(synopsis "Add read support for Excel files (xls and xlsx) to agate")
(description "@code{agateexcel} uses a monkey patching pattern to add read
for xls and xlsx files support to all @code{agate.Table} instances."))) for xls and xlsx files support to all @code{agate.Table} instances.")))
(define-public csvkit (define-public csvkit