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:
parent
cdf689471a
commit
b9a1d74de5
|
@ -30,21 +30,10 @@
|
||||||
#: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,11 +55,11 @@
|
||||||
(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
|
||||||
|
@ -83,9 +72,11 @@
|
||||||
(base32
|
(base32
|
||||||
"1ck3dplni99sv4s117cbm07ydwwjsrxkhdy19rnk0iglia1d4s5i"))))
|
"1ck3dplni99sv4s117cbm07ydwwjsrxkhdy19rnk0iglia1d4s5i"))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python-cssselect" ,python-cssselect)
|
`(("python-nose" ,python-nose)
|
||||||
("python-lxml" ,python-lxml)
|
("python-sphinx" ,python-sphinx)
|
||||||
,@(package-native-inputs base-package)))
|
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
|
||||||
|
("python-csselect" ,python-cssselect)
|
||||||
|
("python-lxml" ,python-lxml)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("python-six" ,python-six)))
|
`(("python-six" ,python-six)))
|
||||||
(home-page "https://leather.rtfd.org")
|
(home-page "https://leather.rtfd.org")
|
||||||
|
@ -94,8 +85,7 @@
|
||||||
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
|
||||||
|
@ -108,9 +98,11 @@ charts now and don't care if they're perfect.")))
|
||||||
(base32
|
(base32
|
||||||
"077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl"))))
|
"077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl"))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python-cssselect" ,python-cssselect)
|
`(("python-nose" ,python-nose)
|
||||||
("python-lxml" ,python-lxml)
|
("python-sphinx" ,python-sphinx)
|
||||||
,@(package-native-inputs base-package)))
|
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
|
||||||
|
("python-csselect" ,python-cssselect)
|
||||||
|
("python-lxml" ,python-lxml)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("python-babel" ,python-babel)
|
`(("python-babel" ,python-babel)
|
||||||
("python-isodate" ,python-isodate)
|
("python-isodate" ,python-isodate)
|
||||||
|
@ -126,8 +118,7 @@ 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
|
||||||
|
@ -139,6 +130,10 @@ code. Agate was previously known as journalism.")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"16q0b211n5b1qmhzkfl2jr56lda0rvyh5j1wzw26h2n4pm4wxlx2"))))
|
"16q0b211n5b1qmhzkfl2jr56lda0rvyh5j1wzw26h2n4pm4wxlx2"))))
|
||||||
|
(native-inputs
|
||||||
|
`(("python-nose" ,python-nose)
|
||||||
|
("python-sphinx" ,python-sphinx)
|
||||||
|
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("python-agate" ,python-agate)
|
`(("python-agate" ,python-agate)
|
||||||
("python-crate" ,python-crate)
|
("python-crate" ,python-crate)
|
||||||
|
@ -149,8 +144,7 @@ code. Agate was previously known as journalism.")))
|
||||||
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
|
||||||
|
@ -162,6 +156,10 @@ support to all @code{agate.Table} instances.")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1y49fi6pmm7gzhajvqmfpcca2sqnwj24fqnsvzwk7r1hg2iaa2gi"))))
|
"1y49fi6pmm7gzhajvqmfpcca2sqnwj24fqnsvzwk7r1hg2iaa2gi"))))
|
||||||
|
(native-inputs
|
||||||
|
`(("python-nose" ,python-nose)
|
||||||
|
("python-sphinx" ,python-sphinx)
|
||||||
|
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("python-agate" ,python-agate)
|
`(("python-agate" ,python-agate)
|
||||||
("python-dbfread" ,python-dbfread)))
|
("python-dbfread" ,python-dbfread)))
|
||||||
|
@ -171,8 +169,7 @@ support to all @code{agate.Table} instances.")))
|
||||||
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
|
||||||
|
@ -184,6 +181,10 @@ for dbf files support to all @code{agate.Table} instances.")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1k5lv21k19s7kgbj5srd1xgrkqvxqqs49qwj33zncs9l7851afy7"))))
|
"1k5lv21k19s7kgbj5srd1xgrkqvxqqs49qwj33zncs9l7851afy7"))))
|
||||||
|
(native-inputs
|
||||||
|
`(("python-nose" ,python-nose)
|
||||||
|
("python-sphinx" ,python-sphinx)
|
||||||
|
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("python-agate" ,python-agate)
|
`(("python-agate" ,python-agate)
|
||||||
("python-openpyxl" ,python-openpyxl)
|
("python-openpyxl" ,python-openpyxl)
|
||||||
|
|
Loading…
Reference in New Issue