From 1b96f069e6884e11faa632d3a44ee062dfd017a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Feb 2016 16:09:07 +0100 Subject: gnu: python-pandas: Update to 0.16.2. * gnu/packages/python.scm (python-pandas): Update to 0.16.2. --- gnu/packages/python.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5b988c10af..7627fc17e9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -977,14 +977,13 @@ datetime module, available in Python 2.3+.") (define-public python-pandas (package (name "python-pandas") - (version "0.16.0") + (version "0.16.2") (source (origin - (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/" - "pandas/pandas-" version ".tar.gz")) - (sha256 - (base32 "1wfrp8dx1zcsry6f09ndza6qm1yr7f163211f4l9vjlnhxpxw4s0")))) + (method url-fetch) + (uri (pypi-uri "pandas" version)) + (sha256 + (base32 "10agmrkps8bi5948vwpipfxds5kj1d076m9i0nhaxwqiw7gm6670")))) (build-system python-build-system) (arguments `(;; Three tests fail: -- cgit v1.3 From ef9b4c04a40a0a816d6e2627926025d46273e631 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Feb 2016 16:10:08 +0100 Subject: gnu: python-numpy-bootstrap: Update to 1.10.4. * gnu/packages/python.scm (python-numpy-bootstrap): Update to 1.10.4. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7627fc17e9..5a4834f3e7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2955,7 +2955,7 @@ writing C extensions for Python as easy as Python itself.") (define python-numpy-bootstrap (package (name "python-numpy-bootstrap") - (version "1.9.1") + (version "1.10.4") (source (origin (method url-fetch) @@ -2963,7 +2963,7 @@ writing C extensions for Python as easy as Python itself.") "/numpy-" version ".tar.gz")) (sha256 (base32 - "070ybfvpgfmiz2hs94x445hvkh9dh52nyi0m8jp5kdihgvhbnx80")))) + "1bjjhvncraka5s6i4lg644jrxij6bvycxy7an20gcz3a0m11iygp")))) (build-system python-build-system) (inputs `(("python-nose" ,python-nose) -- cgit v1.3 From 3f2e9675fb1bdedd370a4d1562ecc635a4f9ee9a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Feb 2016 16:10:48 +0100 Subject: gnu: python2-pysnptools: Update to 0.3.5. * gnu/packages/python.scm (python2-pysnptools): Update to 0.3.5. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5a4834f3e7..fd153ca94f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3381,16 +3381,14 @@ toolkits.") (define-public python2-pysnptools (package (name "python2-pysnptools") - (version "0.2.13") + (version "0.3.5") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/pysnptools" - "/pysnptools-" version ".zip")) + (uri (pypi-uri "pysnptools" version ".zip")) (sha256 (base32 - "1rzf5qvwfvd2pp84b14pb2gdvxdk5avnj7rb41ac8gndpkr9g6ib")))) + "15f4j4w5q603i7mlphb5r6mb1mn33pqg81595fpjp158140yqx7b")))) (build-system python-build-system) (arguments `(#:python ,python-2)) ; only Python 2.7 is supported -- cgit v1.3 From b074e7d486225958b8f9132c9bf1a1090adb9522 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Feb 2016 16:11:22 +0100 Subject: gnu: python2-fastlmm: Update to 0.2.21. * gnu/packages/python.scm (python2-fastlmm): Update to 0.2.21. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fd153ca94f..3758eed3a3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3024,16 +3024,14 @@ capabilities.") (define-public python2-fastlmm (package (name "python2-fastlmm") - (version "0.2.14") + (version "0.2.21") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/f/fastlmm" - "/fastlmm-" version ".zip")) + (uri (pypi-uri "fastlmm" version ".zip")) (sha256 (base32 - "023sydkrc3yxad2bycar02jfswwlh4199kafzhf2bssyx2c3xa0l")))) + "1q8c34rpmwkfy3r4d5172pzdkpfryj561897z9r3x22gq7813x1m")))) (build-system python-build-system) (arguments `(#:python ,python-2)) ; only Python 2.7 is supported -- cgit v1.3 From 519e2f4fde768b0edc16cae75faea55abefa39eb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 10 Feb 2016 21:48:45 -0500 Subject: gnu: python-cryptography: Define 'python2-variant'. * gnu/packages/python.scm (python-cryptography)[properties]: New field. (python2-cryptography): Use 'strip-python2-variant'. (python2-pyopenssl): Take the result of 'package-with-python2' directly. --- gnu/packages/python.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3758eed3a3..fc8582f2f4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5816,10 +5816,12 @@ library” for Python. The package includes both high level recipes, and low level interfaces to common cryptographic algorithms such as symmetric ciphers, message digests and key derivation functions.") ;; Distributed under either BSD-3 or ASL2.0 - (license (list bsd-3 asl2.0)))) + (license (list bsd-3 asl2.0)) + (properties `((python2-variant . ,(delay python2-cryptography)))))) (define-public python2-cryptography - (let ((crypto (package-with-python2 python-cryptography))) + (let ((crypto (package-with-python2 + (strip-python2-variant python-cryptography)))) (package (inherit crypto) (propagated-inputs `(("python2-ipaddress" ,python2-ipaddress) @@ -5876,12 +5878,7 @@ library.") (license asl2.0))) (define-public python2-pyopenssl - (let ((pyopenssl (package-with-python2 python-pyopenssl))) - (package (inherit pyopenssl) - (propagated-inputs - `(("python2-cryptography" ,python2-cryptography) - ,@(alist-delete "python-cryptography" - (package-propagated-inputs pyopenssl))))))) + (package-with-python2 python-pyopenssl)) (define-public python-pip (package -- cgit v1.3 From a14600ecfa6d4304418cda8668dfefdc2c1ce715 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Feb 2016 01:44:45 -0500 Subject: gnu: python-jsonschema: Define 'python2-variant'. * gnu/packages/python.scm (python-jsonschema)[properties]: New field. (python2-jsonschema): Use 'strip-python2-variant'. * gnu/packages/openstack.scm (python2-tempest-lib): Take the result of 'package-with-python2' directly. --- gnu/packages/openstack.scm | 7 +------ gnu/packages/python.scm | 6 ++++-- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index e258b89e2f..9a42a91340 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -392,12 +392,7 @@ common features used in Tempest.") (license asl2.0))) (define-public python2-tempest-lib - (let ((tempest-lib (package-with-python2 python-tempest-lib))) - (package (inherit tempest-lib) - (propagated-inputs - `(("python2-jsonschema", python2-jsonschema) - ,@(alist-delete "python-jsonschema" - (package-propagated-inputs tempest-lib))))))) + (package-with-python2 python-tempest-lib)) ;; Packages from the Oslo library (define-public python-oslo.config diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fc8582f2f4..f444cdbb64 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2241,10 +2241,12 @@ version numbers.") (synopsis "Implementation of JSON Schema for Python") (description "Jsonschema is an implementation of JSON Schema for Python.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-jsonschema)))))) (define-public python2-jsonschema - (let ((jsonschema (package-with-python2 python-jsonschema))) + (let ((jsonschema (package-with-python2 + (strip-python2-variant python-jsonschema)))) (package (inherit jsonschema) (inputs `(("python2-functools32" ,python2-functools32) -- cgit v1.3 From 8ad4ae204f5205c1335cceff22058411a67392eb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Feb 2016 01:06:23 -0500 Subject: gnu: python-wheel: Define 'python2-variant'. * gnu/packages/python.scm (python-wheel)[properties]: New field. (python2-wheel): Use 'strip-python2-variant'. (python2-requests): Take the result of 'package-with-python2' directly. * gnu/packages/openstack.scm (python2-requests-mock): Likewise. (python2-oslosphinx): Likewise. --- gnu/packages/openstack.scm | 11 ++--------- gnu/packages/python.scm | 21 ++++++++------------- 2 files changed, 10 insertions(+), 22 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 9a42a91340..08a76a3695 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -304,12 +304,7 @@ portions of your testing code.") (license asl2.0))) (define-public python2-requests-mock - (let ((requests-mock (package-with-python2 python-requests-mock))) - (package (inherit requests-mock) - (propagated-inputs - `(("python2-requests" ,python2-requests) - ,@(alist-delete "python-requests" - (package-propagated-inputs requests-mock))))))) + (package-with-python2 python-requests-mock)) (define-public python-stevedore (package @@ -601,9 +596,7 @@ from the OpenStack project.") (license asl2.0))) (define-public python2-oslosphinx - (let ((oslosphinx (package-with-python2 python-oslosphinx))) - (package (inherit oslosphinx) - (propagated-inputs `(("python2-requests" ,python2-requests)))))) + (package-with-python2 python-oslosphinx)) (define-public python-oslotest (package diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f444cdbb64..88c432699b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2140,16 +2140,16 @@ packages will be properly installed with only the @code{Unpack} step and the unpacked archive preserves enough information to @code{Spread} (copy data and scripts to their final locations) at any later time. Wheel files can be installed with a newer @code{pip} or with wheel's own command line utility.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-wheel)))))) (define-public python2-wheel - (let ((wheel (package-with-python2 python-wheel))) + (let ((wheel (package-with-python2 + (strip-python2-variant python-wheel)))) (package (inherit wheel) - (native-inputs - `(("python2-functools32" ,python2-functools32) - ("python2-jsonschema" ,python2-jsonschema) - ,@(alist-delete "python-jsonschema" - (package-native-inputs wheel))))))) + (native-inputs `(("python2-functools32" ,python2-functools32) + ,@(package-native-inputs wheel)))))) + (define-public python-requests (package @@ -2189,12 +2189,7 @@ than Python’s urllib2 library.") "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir")))))) (define-public python2-requests - (let ((requests (package-with-python2 python-requests))) - (package (inherit requests) - (propagated-inputs - `(("python2-wheel" ,python2-wheel) - ,@(alist-delete "python-wheel" - (package-propagated-inputs requests))))))) + (package-with-python2 python-requests)) (define-public python-vcversioner (package -- cgit v1.3 From cb34dc6c3e2ce4658ac84dd192bdecf3fa795cfc Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 13:42:51 -0800 Subject: gnu: Add python-wtforms * gnu/packages/python.scm (python-wtforms, python2-wtforms): New variables. --- gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 88c432699b..292423708e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7503,3 +7503,32 @@ input. (Note that this is mostly a legacy library; you may wish to look at python-xdo for newer bindings.)") (license bsd-3))) +(define-public python-wtforms + (package + (name "python-wtforms") + (version "2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "WTForms" version ".zip")) + (sha256 + (base32 + "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (home-page "http://wtforms.simplecodes.com/") + (synopsis + "Form validation and rendering library for Python web development") + (description + "WTForms is a flexible forms validation and rendering library +for Python web development. It is very similar to the web form API +available in Django, but is a standalone package.") + (license bsd-3) + (properties `((python2-variant . ,(delay python2-wtforms)))))) + +(define-public python2-wtforms + (package + (inherit (package-with-python2 + (strip-python2-variant python-wtforms))) + (inputs `(("python2-setuptools" ,python2-setuptools))))) -- cgit v1.3 From b6b07d9de335f1a2d80b63427c3703a14489d0d8 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 14 Feb 2016 21:49:56 +0100 Subject: gnu: python-ly: Update to 0.9.3. * gnu/packages/python.scm (python-ly): Update to 0.9.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 292423708e..2090d3a257 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5317,7 +5317,7 @@ from an XML-based format.") (define-public python-ly (package (name "python-ly") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) @@ -5326,7 +5326,7 @@ from an XML-based format.") version ".tar.gz")) (sha256 (base32 - "1bsjg4q9ihr8bfdclrcmb8yjcg8xm9dznh58f3zsyrkrjzwbhcd2")))) + "1y6ananq8fia4y4m5id6gvsrm68bzpzd1y46pfzvawic0wjg2l0l")))) (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools))) -- cgit v1.3 From a4ba286baf277f92a05dcc20048eaed7b49ba0d8 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 15 Feb 2016 13:40:13 -0800 Subject: gnu: python-sqlalchemy: Update to 1.0.12. * gnu/packages/python.scm (python-sqlalchemy): Update to 1.0.12. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2090d3a257..805c4a23b0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3541,7 +3541,7 @@ routines such as routines for numerical integration and optimization.") (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "0.9.7") + (version "1.0.12") (source (origin (method url-fetch) @@ -3549,7 +3549,7 @@ routines such as routines for numerical integration and optimization.") "SQLAlchemy/SQLAlchemy-" version ".tar.gz")) (sha256 (base32 - "059ayifj5l08v6vv56anhyibyllscn10dlzr2fcw68gz1hfjdzsz")))) + "1l8qclhd0s90w3pvwhi5mjxdwr5j7gw7cjka2fx6f2vqmq7f4yb6")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ;for c extensions -- cgit v1.3 From 97bbc48023c8ae4d81020d0c9c85d2e29a633db1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2016 18:25:27 -0500 Subject: gnu: python-lxml: Update to 3.5.0. * gnu/packages/python.scm (python-lxml, python2-lxml): Update to 3.5.0. [source]: Use pypi-uri. --- gnu/packages/python.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 805c4a23b0..d17a17b527 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4474,17 +4474,14 @@ translate the complete SQLite API into Python.") (define-public python-lxml (package (name "python-lxml") - (version "3.4.2") + (version "3.5.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/l/lxml/lxml-" - version - ".tar.gz")) + (uri (pypi-uri "lxml" version)) (sha256 (base32 - "0pd23qz8vms1mgm41p96h4vac5y91igs4wr9640gnvxgk019kmf7")))) + "0y7m2s8ci6q642zl85y5axkj8z827l0vhjl532acb75hlkir77rl")))) (build-system python-build-system) (inputs `(("libxml2" ,libxml2) -- cgit v1.3 From c834cf82b6f460f4870839b2ebbc5ef60a9230c7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2016 18:26:05 -0500 Subject: gnu: python-atomicwrites: Update to 0.1.9. * gnu/packages/python.scm (python-atomicwrites): Update to 0.1.9. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d17a17b527..52b117030a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6725,13 +6725,13 @@ WebSocket usage in Python programs.") (define-public python-atomicwrites (package (name "python-atomicwrites") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (pypi-uri "atomicwrites" version)) (sha256 (base32 - "13nwk0gw0yb61pnf5vxs3fvhav6q3zrf08x9ggc93bnk5fsssx1j")))) + "08s05h211r07vs66r4din3swrbzb344vli041fihpg34q3lcxpvw")))) (build-system python-build-system) (synopsis "Atomic file writes in Python") (description "Library for atomic file writes using platform dependent tools -- cgit v1.3 From a9da8fec62d5f6f2bb3a3f92075d6521a996f6fd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2016 18:26:43 -0500 Subject: gnu: python-click-log: Update to 0.1.3. * gnu/packages/python.scm (python-click-log): Update to 0.1.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 52b117030a..3dd38627fd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6780,13 +6780,13 @@ applications.") (define-public python-click-log (package (name "python-click-log") - (version "0.1.1") + (version "0.1.3") (source (origin (method url-fetch) (uri (pypi-uri "click-log" version)) (sha256 (base32 - "1z3jdwjmwax159zrnyx830xa968rfqrpkm04ad5xqyh0269ydiqb")))) + "0kdd1vminxpcfczxl2kkf285n0dr1gxh2cdbx1p6vkj7b7bci3gx")))) (build-system python-build-system) (propagated-inputs `(("python-click" ,python-click))) -- cgit v1.3 From 50aaec25caa7761849cd4fcbb2b33aeb7b839357 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 17 Feb 2016 20:03:54 -0500 Subject: gnu: Add python-mako. * gnu/packages/python.scm (python-mako, python2-mako): New variables. --- gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3dd38627fd..24af2d8142 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7529,3 +7529,35 @@ available in Django, but is a standalone package.") (inherit (package-with-python2 (strip-python2-variant python-wtforms))) (inputs `(("python2-setuptools" ,python2-setuptools))))) + +(define-public python-mako + (package + (name "python-mako") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Mako" version)) + (sha256 + (base32 + "136kcjbs0s98qkx8a418b05dfblqp0kiiqyx8vhx4rarwc7bqi3n")))) + (build-system python-build-system) + (native-inputs + `(("python-markupsafe" ,python-markupsafe) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose))) + (home-page "http://www.makotemplates.org/") + (synopsis "Templating language for Python") + (description "Mako is a templating language for Python that compiles +templates into Python modules.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-mako)))))) + +(define-public python2-mako + (let ((base (package-with-python2 + (strip-python2-variant python-mako)))) + (package + (inherit base) + (native-inputs + (cons `("python2-setuptools" ,python2-setuptools) + (package-native-inputs base)))))) -- cgit v1.3 From d39ae1e5c6046e8a09730cd315fed5c26c4a9844 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 14 Feb 2016 19:47:37 -0500 Subject: gnu: python-enum34: Update to 1.1.0. * gnu/packages/python.scm (python-enum34): Update to 1.1.0. [source]: Use pypi-uri. --- gnu/packages/python.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 24af2d8142..7f498999f4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1311,15 +1311,14 @@ bug tracker.") (define-public python-enum34 (package (name "python-enum34") - (version "1.0") + (version "1.1.0") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/e/" - "enum34/enum34-" version ".tar.gz")) + (uri (pypi-uri "enum34" version)) (sha256 (base32 - "0dg6mpg9n4g9diyrbnbb5vd9d1qw9f265zwhknqy0mxh0cvmjjrq")))) + "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp")))) (build-system python-build-system) (inputs `(("python-setuptools" ,python-setuptools))) -- cgit v1.3 From 820acd1bc399a44f14a8b4828da2f1216ae62b99 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Feb 2016 12:58:45 -0500 Subject: gnu: Add python2-enum34. * gnu/packages/python.scm (python2-enum34): New variable. --- gnu/packages/python.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7f498999f4..c4ce6c58ee 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1335,6 +1335,9 @@ bug tracker.") backported for previous versions of Python from 2.4 to 3.3.") (license bsd-3))) +(define-public python2-enum34 + (package-with-python2 python-enum34)) + (define-public python-parse-type (package (name "python-parse-type") -- cgit v1.3 From 68f1cdecf17ae0b285910f7bdea4e9e3284b34da Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Feb 2016 12:59:18 -0500 Subject: gnu: Don't use python-enum34 when building with python-3.4. * gnu/packages/docker.scm (docker-compose)[inputs]: Remove python-enum34. * gnu/packages/python.scm (python-parse-type)[inputs]: Likewise. (behave)[inputs]: Likewise. (python-cryptography)[propagated-inputs]: Likewise. (python2-cryptography)[propagated-inputs]: Add python2-enum34. --- gnu/packages/docker.scm | 1 - gnu/packages/python.scm | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 06b72ee376..0760001da7 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -90,7 +90,6 @@ client.") `(("python-docker-py" ,python-docker-py) ("python-dockerpty" ,python-dockerpty) ("python-docopt" ,python-docopt) - ("python-enum34" ,python-enum34) ("python-jsonschema" ,python-jsonschema) ("python-pyyaml" ,python-pyyaml) ("python-requests" ,python-requests-2.7) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c4ce6c58ee..2cae7374bf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1354,8 +1354,7 @@ backported for previous versions of Python from 2.4 to 3.3.") (inputs `(("python-setuptools" ,python-setuptools) ("python-six" ,python-six) - ("python-parse" ,python-parse) - ("python-enum34" ,python-enum34))) ;required for python<3.4 + ("python-parse" ,python-parse))) (arguments '(#:tests? #f)) ;TODO: tests require pytest (home-page "https://github.com/jenisys/parse_type") (synopsis "Extended parse module") @@ -2005,7 +2004,6 @@ backported from Python 2.7 for Python 2.4+.") (inputs `(("python-setuptools" ,python-setuptools) ("python-six" ,python-six) - ("python-enum43" ,python-enum34) ("python-parse" ,python-parse) ("python-parse-type" ,python-parse-type))) (arguments `(#:tests? #f)) ;TODO: tests require nose>=1.3 and @@ -5792,7 +5790,6 @@ responses, rather than doing any computation.") `(("python-cffi" ,python-cffi) ("python-six" ,python-six) ("python-pyasn1" ,python-pyasn1) - ("python-enum34" ,python-enum34) ("python-idna" ,python-idna) ("python-iso8601" ,python-iso8601))) (native-inputs @@ -5823,6 +5820,7 @@ message digests and key derivation functions.") `(("python2-ipaddress" ,python2-ipaddress) ("python2-backport-ssl-match-hostname" ,python2-backport-ssl-match-hostname) + ("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs crypto)))))) (define-public python-pyopenssl -- cgit v1.3 From 9eb05bc3817a1c775f92f0f4cbc45f2f6a23556f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 14 Feb 2016 20:03:34 -0500 Subject: gnu: python-enum34: Remove python-setuptools from inputs. * gnu/packages/python.scm (python-enum34)[inputs]: Remove python-setuptools. --- gnu/packages/python.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2cae7374bf..fc946f91e1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1320,8 +1320,6 @@ bug tracker.") (base32 "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) (arguments `(#:phases (alist-replace -- cgit v1.3 From 5cc3096c739c404a801d62aafb5f664bc3a766fb Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 19 Feb 2016 14:23:38 +0100 Subject: Update all sources from freedesktop.org to use https * gnu/packages/xorg.scm: * gnu/packages/xdisorg.scm: * gnu/packages/video.scm: * gnu/packages/tls.scm: * gnu/packages/python.scm: * gnu/packages/pulseaudio.scm: * gnu/packages/polkit.scm: * gnu/packages/pdf.scm: * gnu/packages/libcanberra.scm: * gnu/packages/gtk.scm: * gnu/packages/gstreamer.scm: * gnu/packages/gnome.scm: * gnu/packages/glib.scm: * gnu/packages/ghostscript.scm: * gnu/packages/freedesktop.scm: * gnu/packages/fontutils.scm: Update all sources hosted on freedesktop to fetch tarballs via https. freedesktop.org appears to have updated recently to redirect all http to https. As an exception, we leave pkg-config like it is, because pkg-config is needed to build gnutls, and without gnutls we can't download https URLs. --- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 12 ++++++------ gnu/packages/ghostscript.scm | 2 +- gnu/packages/glib.scm | 4 ++-- gnu/packages/gnome.scm | 14 +++++++------- gnu/packages/gstreamer.scm | 12 ++++++------ gnu/packages/gtk.scm | 2 +- gnu/packages/libcanberra.scm | 2 +- gnu/packages/pdf.scm | 2 +- gnu/packages/polkit.scm | 2 +- gnu/packages/pulseaudio.scm | 4 ++-- gnu/packages/python.scm | 2 +- gnu/packages/tls.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/xdisorg.scm | 4 ++-- gnu/packages/xorg.scm | 4 ++-- 16 files changed, 36 insertions(+), 36 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index cf46dbf729..4acf44d050 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -76,7 +76,7 @@ anti-aliased glyph bitmap generation with 256 gray levels.") (source (origin (method url-fetch) (uri (string-append - "http://www.freedesktop.org/software/fontconfig/release/fontconfig-" + "https://www.freedesktop.org/software/fontconfig/release/fontconfig-" version ".tar.bz2")) (sha256 (base32 "1psrl4b4gi4wmbvwwh43lk491wsl8lgvqj146prlcha3vwjc0qyp")))) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e87b4a3b0d..690621dee6 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -61,7 +61,7 @@ (origin (method url-fetch) (uri (string-append - "http://portland.freedesktop.org/download/xdg-utils-" + "https://portland.freedesktop.org/download/xdg-utils-" version ".tgz")) (sha256 (base32 @@ -246,7 +246,7 @@ Python.") (version "1.9.0") (source (origin (method url-fetch) - (uri (string-append "http://wayland.freedesktop.org/releases/" + (uri (string-append "https://wayland.freedesktop.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 @@ -281,7 +281,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (source (origin (method url-fetch) (uri (string-append - "http://libopenraw.freedesktop.org/download/" + "https://libopenraw.freedesktop.org/download/" name "-" version ".tar.bz2")) (sha256 (base32 @@ -330,7 +330,7 @@ Analysis and Reporting Technology) functionality.") (version "2.1.6") (source (origin (method url-fetch) - (uri (string-append "http://udisks.freedesktop.org/releases/" + (uri (string-append "https://udisks.freedesktop.org/releases/" name "-" version ".tar.bz2")) (sha256 (base32 @@ -540,7 +540,7 @@ modems and setup connections with them.") (version "0.8.2") (source (origin (method url-fetch) - (uri (string-append "http://telepathy.freedesktop.org/releases/" + (uri (string-append "https://telepathy.freedesktop.org/releases/" name "/" name "-" version ".tar.bz2")) (sha256 (base32 @@ -579,7 +579,7 @@ different sorts of messages in different formats.") (version "0.1.26") (source (origin (method url-fetch) - (uri (string-append "http://www.freedesktop.org/software/colord" + (uri (string-append "https://www.freedesktop.org/software/colord" "/releases/" name "-" version ".tar.xz")) (sha256 (base32 diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 818072ac5e..d2eb066817 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -282,7 +282,7 @@ Ghostscript. It currently includes the 35 standard PostScript fonts.") (version "0.2.7") (source (origin (method url-fetch) - (uri (string-append "http://libspectre.freedesktop.org/releases/libspectre-" + (uri (string-append "https://libspectre.freedesktop.org/releases/libspectre-" version ".tar.gz")) (sha256 (base32 "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8")))) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f8e1541f56..b925704aa0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -384,7 +384,7 @@ translated.") (source (origin (method url-fetch) (uri - (string-append "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-" + (string-append "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-" version ".tar.gz")) (sha256 (base32 @@ -574,7 +574,7 @@ useful for C++.") (method url-fetch) (uri (string-append - "http://telepathy.freedesktop.org/releases/telepathy-glib/" + "https://telepathy.freedesktop.org/releases/telepathy-glib/" "telepathy-glib-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 363d920a03..4efa01c2b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -502,7 +502,7 @@ for settings shared by various components of the GNOME desktop.") (source (origin (method url-fetch) - (uri (string-append "http://tango.freedesktop.org/releases/icon-naming-utils-" + (uri (string-append "https://tango.freedesktop.org/releases/icon-naming-utils-" version ".tar.bz2")) (sha256 (base32 @@ -538,7 +538,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.") (version "0.22") (source (origin (method url-fetch) - (uri (string-append "http://www.freedesktop.org/software/" name + (uri (string-append "https://www.freedesktop.org/software/" name "/releases/" name "-" version ".tar.xz")) (sha256 (base32 @@ -610,7 +610,7 @@ update-desktop-database: updates the database containing a cache of MIME types (version "1.2") (source (origin (method url-fetch) - (uri (string-append "http://freedesktop.org/~hadess/" + (uri (string-append "https://freedesktop.org/~hadess/" "shared-mime-info-" version ".tar.xz")) (sha256 (base32 @@ -642,7 +642,7 @@ database is translated at Transifex.") (source (origin (method url-fetch) - (uri (string-append "http://icon-theme.freedesktop.org/releases/" + (uri (string-append "https://icon-theme.freedesktop.org/releases/" "hicolor-icon-theme-" version ".tar.gz")) (sha256 (base32 @@ -2261,7 +2261,7 @@ keyboard shortcuts.") (source (origin (method url-fetch) - (uri (string-append "http://www.freedesktop.org/software/colord/releases/" + (uri (string-append "https://www.freedesktop.org/software/colord/releases/" name "-" version ".tar.xz")) (sha256 (base32 @@ -2325,7 +2325,7 @@ output devices.") (source (origin (method url-fetch) - (uri (string-append "http://www.freedesktop.org/software/" name + (uri (string-append "https://www.freedesktop.org/software/" name "/releases/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 @@ -2405,7 +2405,7 @@ faster results and to avoid unnecessary server load.") (version "0.99.3") (source (origin (method url-fetch) - (uri (string-append "http://upower.freedesktop.org/releases/" + (uri (string-append "https://upower.freedesktop.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1235b3185a..f1dbc46fcc 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -52,7 +52,7 @@ (version "0.4.24") (source (origin (method url-fetch) - (uri (string-append "http://gstreamer.freedesktop.org/data/src/" + (uri (string-append "https://gstreamer.freedesktop.org/data/src/" "orc/orc-" version ".tar.xz")) (sha256 (base32 @@ -88,7 +88,7 @@ arrays of data.") (origin (method url-fetch) (uri (string-append - "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-" + "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-" version ".tar.xz")) (sha256 (base32 @@ -113,7 +113,7 @@ arrays of data.") (list (search-path-specification (variable "GST_PLUGIN_SYSTEM_PATH") (files '("lib/gstreamer-1.0"))))) - (home-page "http://gstreamer.freedesktop.org/") + (home-page "https://gstreamer.freedesktop.org/") (synopsis "Multimedia library") (description "GStreamer is a library for constructing graphs of media-handling @@ -190,7 +190,7 @@ for the GStreamer multimedia library.") (origin (method url-fetch) (uri (string-append - "http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-" + "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-" version ".tar.xz")) (sha256 (base32 @@ -249,7 +249,7 @@ developers consider to have good quality code and correct functionality.") (source (origin (method url-fetch) - (uri (string-append "http://gstreamer.freedesktop.org/src/" + (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -287,7 +287,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (source (origin (method url-fetch) (uri (string-append - "http://gstreamer.freedesktop.org/src/" name "/" + "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6e2a67d25c..a234b8990f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -150,7 +150,7 @@ affine transformation (scale, rotation, shear, etc.).") (version "1.0.6") (source (origin (method url-fetch) - (uri (string-append "http://www.freedesktop.org/software/" + (uri (string-append "https://www.freedesktop.org/software/" "harfbuzz/release/harfbuzz-" version ".tar.bz2")) (sha256 diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index 50c0f80eed..bfa7715160 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -110,7 +110,7 @@ null) and is designed to be portable.") (version "0.8") (source (origin (method url-fetch) - (uri (string-append "http://people.freedesktop.org/~mccann/dist/" + (uri (string-append "https://people.freedesktop.org/~mccann/dist/" name "-" version ".tar.bz2")) (sha256 (base32 diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4b30bf09d5..a99fdd70ae 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -55,7 +55,7 @@ (version "0.37.0") (source (origin (method url-fetch) - (uri (string-append "http://poppler.freedesktop.org/poppler-" + (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 "1vjvd0md8y37hlq3lsj0l01a3v3mzm572rzpn1311frvmrg9r7xq")))) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 8f0829139d..0a4f70f734 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -43,7 +43,7 @@ (source (origin (method url-fetch) (uri (string-append - "http://www.freedesktop.org/software/polkit/releases/" + "https://www.freedesktop.org/software/polkit/releases/" name "-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 3328811277..148ad1ba5e 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -118,7 +118,7 @@ rates.") (source (origin (method url-fetch) (uri (string-append - "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-" + "https://freedesktop.org/software/pulseaudio/releases/pulseaudio-" version ".tar.xz")) (sha256 (base32 @@ -195,7 +195,7 @@ sound server.") (source (origin (method url-fetch) (uri (string-append - "http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-" + "https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-" version ".tar.xz")) (sha256 diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fc946f91e1..abbb50b649 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4396,7 +4396,7 @@ features useful for text console applications.") (origin (method url-fetch) (uri (string-append - "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-" + "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-" version ".tar.gz")) (sha256 (base32 "1py62qir966lvdkngg0v8k1khsqxwk5m4s8nflpk1agk5f5nqb71")))) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 3aca5f309f..0f6a0b5877 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -73,7 +73,7 @@ specifications.") (source (origin (method url-fetch) - (uri (string-append "http://p11-glue.freedesktop.org/releases/p11-kit-" + (uri (string-append "https://p11-glue.freedesktop.org/releases/p11-kit-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 098b05fa70..f18601e63f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -327,7 +327,7 @@ SMPTE 314M.") (origin (method url-fetch) (uri (string-append - "http://www.freedesktop.org/software/vaapi/releases/libva/libva-" + "https://www.freedesktop.org/software/vaapi/releases/libva/libva-" version".tar.bz2")) (sha256 (base32 "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz")))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c182cc68c8..46fccfebbe 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -211,7 +211,7 @@ rasterisation.") (origin (method url-fetch) (uri (string-append - "http://dri.freedesktop.org/libdrm/libdrm-" + "https://dri.freedesktop.org/libdrm/libdrm-" version ".tar.bz2")) (sha256 @@ -268,7 +268,7 @@ tracking.") (source (origin (method url-fetch) - (uri (string-append "http://www.freedesktop.org/software/" name + (uri (string-append "https://www.freedesktop.org/software/" name "/releases/" name "-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 82a5d994d2..42010a1df6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2333,7 +2333,7 @@ XC-APPGROUP, XTEST.") (source (origin (method url-fetch) - (uri (string-append "http://www.freedesktop.org/software/" name "/" + (uri (string-append "https://www.freedesktop.org/software/" name "/" name "-" version ".tar.xz")) (sha256 (base32 @@ -5158,7 +5158,7 @@ The XCB util module provides the following libraries: (version "0.1.2") (source (origin (method url-fetch) - (uri (string-append "http://xcb.freedesktop.org/dist/" + (uri (string-append "https://xcb.freedesktop.org/dist/" "xcb-util-cursor-" version ".tar.gz")) (sha256 (base32 -- cgit v1.3 From af5a4602222089ac7e7fdb2c75f2dd00dd305630 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 17:04:24 -0800 Subject: gnu: Add python-alembic. * gnu/packages/python.scm (python-alembic, python2-alembic): New variables. --- gnu/packages/python.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index abbb50b649..ac4e4fc8b7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3571,6 +3571,42 @@ simple and Pythonic domain language.") (define-public python2-sqlalchemy (package-with-python2 python-sqlalchemy)) +(define-public python-alembic + (package + (name "python-alembic") + (version "0.8.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "alembic" version)) + (sha256 + (base32 + "0jk23a852l3ybv7gfz81xzslyrnqnpjds5x15zd234y9rh9gq1w5")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest-cov" ,python-pytest-cov))) + (propagated-inputs + `(("python-sqlalchemy" ,python-sqlalchemy) + ("python-mako" ,python-mako) + ("python-editor" ,python-editor))) + (home-page "http://bitbucket.org/zzzeek/alembic") + (synopsis + "Database migration tool for SQLAlchemy") + (description + "Alembic is a lightweight database migration tool for usage with the +SQLAlchemy Database Toolkit for Python.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-alembic)))))) + +(define-public python2-alembic + (let ((alembic (package-with-python2 + (strip-python2-variant python-alembic)))) + (package + (inherit alembic) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs alembic)))))) + (define-public python-distutils-extra (package (name "python-distutils-extra") -- cgit v1.3 From e08739c3c6d5e1fe7bf5c28a889a50086fb873db Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 18:04:18 -0800 Subject: gnu: Add python2-apipkg. * gnu/packages/python.scm (python2-apipkg): New variable. --- gnu/packages/python.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ac4e4fc8b7..5eaaa8c252 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6850,7 +6850,15 @@ applications.") package and greatly reduce the number of imports for your users. It is a small pure Python module that works on virtually all Python versions.") (home-page "https://bitbucket.org/hpk42/apipkg") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-apipkg)))))) + +(define-public python2-apipkg + (package + (inherit (package-with-python2 + (strip-python2-variant python-apipkg))) + (native-inputs + `(("python2-setuptools" ,python2-setuptools))))) (define-public python-execnet (package -- cgit v1.3 From 16c84f9031868e4b92820d5b45b430ff9b6eaa34 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 18:11:05 -0800 Subject: gnu: Add python2-execnet. * gnu/packages/python.scm (python2-execnet): New variable. --- gnu/packages/python.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5eaaa8c252..690d0a3ab8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6886,7 +6886,17 @@ minimal and fast API targetting the following uses: @item write scripts to administer multiple environments @end enumerate") (home-page "http://codespeak.net/execnet/") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-execnet)))))) + +(define-public python2-execnet + (let ((execnet (package-with-python2 + (strip-python2-variant python-execnet)))) + (package + (inherit execnet) + (native-inputs + `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs execnet)))))) ;;; The software provided by this package was integrated into pytest 2.8. (define-public python-pytest-cache -- cgit v1.3 From 8fa58fc9a11e4c46691a15ce7f8460f7a2190b2f Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 18:11:47 -0800 Subject: gnu: Add python-pytest-xdist. * gnu/packages/python.scm (python-pytest-xdist, python2-pytest-xdist): New variables. --- gnu/packages/python.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 690d0a3ab8..8742409e4c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1664,6 +1664,42 @@ supports coverage of subprocesses.") (define-public python2-pytest-runner (package-with-python2 python-pytest-runner)) +(define-public python-pytest-xdist + (package + (name "python-pytest-xdist") + (version "1.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-xdist" version ".zip")) + (sha256 + (base32 + "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip) + ("python-setuptools" ,python-setuptools) + ("python-setuptools-scm" ,python-setuptools-scm))) + (propagated-inputs + `(("python-execnet" ,python-execnet) + ("python-pytest" ,python-pytest) + ("python-py" ,python-py))) + (home-page + "https://github.com/pytest-dev/pytest-xdist") + (synopsis + "Plugin for py.test with distributed testing and loop-on-failing modes") + (description + "The pytest-xdist plugin extends py.test with some unique test execution +modes: parallelization, running tests in boxed subprocesses, the ability +to run tests repeatedly when failed, and the ability to run tests on multiple +Python interpreters or platforms. It uses rsync to copy the existing +program code to a remote location, executes there, and then syncs the +result back.") + (license license:expat))) + +(define-public python2-pytest-xdist + (package-with-python2 python-pytest-xdist)) + (define-public python-scripttest (package (name "python-scripttest") -- cgit v1.3 From b32a1e47a9d473001a332ad07122947c55558be0 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 18:35:57 -0800 Subject: gnu: Add python-beautifulsoup4. * gnu/packages/python.scm (python-beautifulsoup4, python2-beautifulsoup4): New variables. --- gnu/packages/python.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8742409e4c..b099fcf041 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4568,6 +4568,39 @@ libxml2 and libxslt.") (define-public python2-lxml (package-with-python2 python-lxml)) +;; beautifulsoup4 has a totally different namespace than 3.x, +;; and pypi seems to put it under its own name, so I guess we should too +(define-public python-beautifulsoup4 + (package + (name "python-beautifulsoup4") + (version "4.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "beautifulsoup4" version)) + (sha256 + (base32 + "1d36lc4pfkvl74fmzdib2nqnvknm0jddgf2n9yd7im150qyh3m47")))) + (build-system python-build-system) + (home-page + "http://www.crummy.com/software/BeautifulSoup/bs4/") + (synopsis + "Python screen-scraping library") + (description + "Beautiful Soup is a Python library designed for rapidly setting up +screen-scraping projects. It offers Pythonic idioms for navigating, +searching, and modifying a parse tree, providing a toolkit for +dissecting a document and extracting what you need. It automatically +converts incoming documents to Unicode and outgoing documents to UTF-8.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-beautifulsoup4)))))) + +(define-public python2-beautifulsoup4 + (package + (inherit (package-with-python2 + (strip-python2-variant python-beautifulsoup4))) + (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + (define-public python2-pil (package (name "python2-pil") -- cgit v1.3 From ae00a41febeb56a6844f982e45e52d6ced62b612 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 18:57:11 -0800 Subject: gnu: Add python-waitress. * gnu/packages/python.scm (python-waitress, python2-waitress): New variables. --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b099fcf041..76638cb5a7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7682,3 +7682,28 @@ templates into Python modules.") (native-inputs (cons `("python2-setuptools" ,python2-setuptools) (package-native-inputs base)))))) + +(define-public python-waitress + (package + (name "python-waitress") + (version "0.8.10") + (source + (origin + (method url-fetch) + (uri (pypi-uri "waitress" version)) + (sha256 + (base32 + "017n9ra6vvmq9d5sfhdzyzr1mg15x2hj2dhm4pdlw98c1ypw2h3w")))) + (build-system python-build-system) + (home-page "https://github.com/Pylons/waitress") + (synopsis "Waitress WSGI server") + (description "Waitress is meant to be a production-quality pure-Python WSGI +server with very acceptable performance.") + (license zpl2.1) + (properties `((python2-variant . ,(delay python2-waitress)))))) + +(define-public python2-waitress + (package + (inherit (package-with-python2 + (strip-python2-variant python-waitress))) + (native-inputs `(("python2-setuptools" ,python2-setuptools))))) -- cgit v1.3 From 778a284be51d797497701444365d14fa877c1abc Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 20:22:47 -0800 Subject: gnu: Add python-wsgiproxy2. * gnu/packages/python.scm (python-wsgiproxy2, python2-wsgiproxy2): New variables. --- gnu/packages/python.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 76638cb5a7..cad14c189c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7707,3 +7707,40 @@ server with very acceptable performance.") (inherit (package-with-python2 (strip-python2-variant python-waitress))) (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + +(define-public python-wsgiproxy2 + (package + (name "python-wsgiproxy2") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "WSGIProxy2" version ".zip")) + (sha256 + (base32 + "13kf9bdxrc95y9vriaz0viry3ah11nz4rlrykcfvb8nlqpx3dcm4")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip) + ("python-nose" ,python-nose) + ("python-coverage" ,python-coverage))) + (propagated-inputs + `(("python-six" ,python-six) + ("python-webob" ,python-webob))) + (home-page + "https://github.com/gawel/WSGIProxy2/") + (synopsis "WSGI Proxy with various http client backends") + (description "WSGI turns HTTP requests into WSGI function calls. +WSGIProxy turns WSGI function calls into HTTP requests. +It also includes code to sign requests and pass private data, +and to spawn subprocesses to handle requests.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-wsgiproxy2)))))) + +(define-public python2-wsgiproxy2 + (let ((wsgiproxy2 (package-with-python2 + (strip-python2-variant python-wsgiproxy2)))) + (package + (inherit wsgiproxy2) + (inputs `(("python2-setuptools" ,python2-setuptools) + ,@(package-inputs wsgiproxy2)))))) -- cgit v1.3 From bb7518b1e8c579648919fe2b2195a0a3111e471c Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 21:13:14 -0800 Subject: gnu: Add python-pastedeploy. * gnu/packages/python.scm (python-pastedeploy, python2-pastedeploy): New variables. --- gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index cad14c189c..c7e0e14ce3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7744,3 +7744,34 @@ and to spawn subprocesses to handle requests.") (inherit wsgiproxy2) (inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-inputs wsgiproxy2)))))) + +(define-public python-pastedeploy + (package + (name "python-pastedeploy") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PasteDeploy" version)) + (sha256 + (base32 + "1jz3m4hq8v6hyhfjz9425nd3nvn52cvbfipdcd72krjmla4qz1fm")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + ;; This package uses pkg_resources, part of setuptools, during runtime, + ;; hence why not a native-input. + `(("python-setuptools" ,python-setuptools))) + (home-page "http://pythonpaste.org/deploy/") + (synopsis + "Load, configure, and compose WSGI applications and servers") + (description + "This tool provides code to load WSGI applications and servers from URIs; +these URIs can refer to Python Eggs for INI-style configuration files. Paste +Script provides commands to serve applications based on this configuration +file.") + (license license:expat))) + +(define-public python2-pastedeploy + (package-with-python2 python-pastedeploy)) -- cgit v1.3 From 1cf536521de0b6cdd096d6f396bd9a5bf117f7d8 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 21:40:22 -0800 Subject: gnu: Add python-pyquery. * gnu/packages/python.scm (python-pyquery, python2-pyquery): New variables. --- gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c7e0e14ce3..aedc163ccc 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7775,3 +7775,33 @@ file.") (define-public python2-pastedeploy (package-with-python2 python-pastedeploy)) + +(define-public python-pyquery + (package + (name "python-pyquery") + (version "1.2.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyquery" version)) + (sha256 + (base32 + "1ikz1387nsp0pp7mzzr6ip9n5gr67acpap24yn33987v7fkjp0sa")))) + (build-system python-build-system) + (propagated-inputs + `(("python-lxml" ,python-lxml) + ("python-cssselect" ,python-cssselect))) + (home-page "https://github.com/gawel/pyquery") + (synopsis "Make jQuery-like queries on xml documents") + (description "pyquery allows you to make jQuery queries on xml documents. +The API is as much as possible the similar to jQuery. pyquery uses lxml for +fast xml and html manipulation.") + (license bsd-3) + (properties `((python2-variant . ,(delay python2-pyquery)))))) + +(define-public python2-pyquery + (let ((pyquery (package-with-python2 + (strip-python2-variant python-pyquery)))) + (package + (inherit pyquery) + (native-inputs `(("python2-setuptools" ,python2-setuptools)))))) -- cgit v1.3 From aa6313d6995d243d551cfcdc0c80dc13c7cef444 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 13 Feb 2016 22:13:14 -0800 Subject: gnu: Add python-webtest. * gnu/packages/python.scm (python-webtest, python2-webtest): New variables. --- gnu/packages/python.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index aedc163ccc..93bf4bd247 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7805,3 +7805,55 @@ fast xml and html manipulation.") (package (inherit pyquery) (native-inputs `(("python2-setuptools" ,python2-setuptools)))))) + +(define-public python-webtest + (package + (name "python-webtest") + (version "2.0.20") + (source + (origin + (method url-fetch) + (uri (pypi-uri "WebTest" version)) + (sha256 + (base32 + "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv")))) + (build-system python-build-system) + (arguments + `(;; Unfortunately we have to disable tests! + ;; This release of WebTest is pinned to python-nose < 1.3, + ;; but older versions of python-nose are plagued with the following + ;; bug(s), which rears its ugly head during test execution: + ;; https://github.com/nose-devs/nose/issues/759 + ;; https://github.com/nose-devs/nose/pull/811 + #:tests? #f)) + ;; Commented out code is no good, but in this case, once tests + ;; are ready to be enabled again, we should put the following + ;; in place: + ;; (native-inputs + ;; `(("python-nose" ,python-nose) ; technially < 1.3, + ;; ; but see above comment + ;; ("python-coverage" ,python-coverage) + ;; ("python-mock" ,python-mock) + ;; ("python-pastedeploy" ,python-pastedeploy) + ;; ("python-wsgiproxy2" ,python-wsgiproxy2) + ;; ("python-pyquery" ,python-pyquery))) + (propagated-inputs + `(("python-waitress" ,python-waitress) + ("python-webob" ,python-webob) + ("python-six" ,python-six) + ("python-beautifulsoup4" ,python-beautifulsoup4))) + (home-page "http://webtest.pythonpaste.org/") + (synopsis "Helper to test WSGI applications") + (description "Webtest allows you to test your Python web applications +without starting an HTTP server. It supports anything that supports the +minimum of WSGI.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-webtest)))))) + +(define-public python2-webtest + (let ((webtest (package-with-python2 + (strip-python2-variant python-webtest)))) + (package + (inherit webtest) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs webtest)))))) -- cgit v1.3 From 4cb122cd8d81b58d88920ec1c8fb09a72de3db70 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 14 Feb 2016 12:16:49 -0800 Subject: gnu: Add python-anyjson. * gnu/packages/python.scm (python-anyjson, python2-anyjson): New variables. --- gnu/packages/python.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 93bf4bd247..785267dd31 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7857,3 +7857,43 @@ minimum of WSGI.") (inherit webtest) (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs webtest)))))) + +(define-public python-anyjson + (package + (name "python-anyjson") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "anyjson" version)) + (sha256 + (base32 + "1fjph4alvcscsl5d4b6qpv1yh31jy05jxi1l0xff7lws7j32v09p")))) + (build-system python-build-system) + (arguments + `(;; We could possibly get tests working, but on Python 3 it's not so easy. + ;; Very strangely, 2to3 is run *during setup.py install* (or bdist, or + ;; whatever) so this transformation needs to be done before the tests + ;; can be run. Maybe we could add a build step to transform beforehand + ;; but it could be annoying/difficult. + ;; We can enable tests for the Python 2 version, though, and do below. + #:tests? #f)) + (home-page "http://bitbucket.org/runeh/anyjson/") + (synopsis + "Wraps best available JSON implementation in a common interface") + (description + "Anyjson loads whichever is the fastest JSON module installed +and provides a uniform API regardless of which JSON implementation is used.") + (license bsd-3) + (properties `((python2-variant . ,(delay python2-anyjson)))))) + +(define-public python2-anyjson + (let ((anyjson (package-with-python2 + (strip-python2-variant python-anyjson)))) + (package + (inherit anyjson) + (arguments `(;; Unlike the python 3 variant, we do run tests. See above! + #:tests? #t + ,@(package-arguments anyjson))) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ("python2-nose" ,python2-nose)))))) -- cgit v1.3 From 8dfceab779b10fcafb2bbb037f47d2faa4b40288 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 14 Feb 2016 12:44:03 -0800 Subject: gnu: Add python-amqp. * gnu/packages/python.scm (python-amqp, python2-amqp): New variables. --- gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 785267dd31..ed3a252ce6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7897,3 +7897,41 @@ and provides a uniform API regardless of which JSON implementation is used.") ,@(package-arguments anyjson))) (native-inputs `(("python2-setuptools" ,python2-setuptools) ("python2-nose" ,python2-nose)))))) + +(define-public python-amqp + (package + (name "python-amqp") + (version "1.4.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "amqp" version)) + (sha256 + (base32 + "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose) + ("python-mock" ,python-mock))) + (home-page "http://github.com/celery/py-amqp") + (synopsis + "Low-level AMQP client for Python (fork of amqplib)") + (description + "This is a fork of amqplib which was originally written by Barry Pederson. +It is maintained by the Celery project, and used by kombu as a pure python +alternative when librabbitmq is not available.") + (license lgpl2.1+) + (properties `((python2-variant . ,(delay python2-amqp)))))) + +(define-public python2-amqp + (let ((amqp (package-with-python2 + (strip-python2-variant python-amqp)))) + (package + (inherit amqp) + (arguments `(;; Tries to run coverage tests with nose-cover3, which seems + ;; unmaintained. Weirdly, does not do this on the python 3 + ;; version? + #:tests? #f + ,@(package-arguments amqp))) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs amqp)))))) -- cgit v1.3 From 7d387305077946c3a377f7247a7c32068ff55441 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 14 Feb 2016 15:38:10 -0800 Subject: gnu: Add python-kombu. * gnu/packages/python.scm (python-kombu, python2-kombu): New variables. --- gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ed3a252ce6..aee730b8d9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7935,3 +7935,41 @@ alternative when librabbitmq is not available.") ,@(package-arguments amqp))) (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs amqp)))))) + +(define-public python-kombu + (package + (name "python-kombu") + (version "3.0.33") + (source + (origin + (method url-fetch) + (uri (pypi-uri "kombu" version)) + (sha256 + (base32 + "16brjx2lgwbj2a37d0pjbfb84nvld6irghmqrs3qfncajp51hgc5")))) + (build-system python-build-system) + (native-inputs + `(("python-mock" ,python-mock) + ("python-nose" ,python-nose))) + (propagated-inputs + `(("python-anyjson" ,python-anyjson) + ("python-amqp" ,python-amqp))) + (home-page "http://kombu.readthedocs.org") + (synopsis "Message passing library for Python") + (description "The aim of Kombu is to make messaging in Python as easy as +possible by providing an idiomatic high-level interface for the AMQ protocol, +and also provide proven and tested solutions to common messaging problems. +AMQP is the Advanced Message Queuing Protocol, an open standard protocol for +message orientation, queuing, routing, reliability and security, for which the +RabbitMQ messaging server is the most popular implementation.") + (license bsd-3) + (properties `((python2-variant . ,(delay python2-kombu)))))) + +(define-public python2-kombu + (let ((kombu (package-with-python2 + (strip-python2-variant python-kombu)))) + (package + (inherit kombu) + (inputs `(("python2-setuptools" ,python2-setuptools) + ("python2-unittest2" ,python2-unittest2) + ,@(package-inputs kombu)))))) -- cgit v1.3 From b6f0b9fb68bd85e662698ddf8a066075f3cd8e9a Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 14 Feb 2016 15:49:47 -0800 Subject: gnu: Add python-billiard. * gnu/packages/python.scm (python-billiard, python2-billiard): New variables. --- gnu/packages/python.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index aee730b8d9..869ce29689 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7973,3 +7973,38 @@ RabbitMQ messaging server is the most popular implementation.") (inputs `(("python2-setuptools" ,python2-setuptools) ("python2-unittest2" ,python2-unittest2) ,@(package-inputs kombu)))))) + +(define-public python-billiard + (package + (name "python-billiard") + (version "3.3.0.22") + (source + (origin + (method url-fetch) + (uri (pypi-uri "billiard" version)) + (sha256 + (base32 + "0zp7h6a58alrb3mwdw61jds07395j4j0mj6iqsb8czrihw9ih5nj")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "http://github.com/celery/billiard") + (synopsis + "Python multiprocessing fork with improvements and bugfixes") + (description + "Billiard is a fork of the Python 2.7 multiprocessing package. The +multiprocessing package itself is a renamed and updated version of R Oudkerk's +pyprocessing package. This standalone variant is intended to be compatible with +Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.") + (license bsd-3) + (properties `((python2-variant . ,(delay python2-billiard)))))) + +(define-public python2-billiard + (let ((billiard (package-with-python2 + (strip-python2-variant python-billiard)))) + (package + (inherit billiard) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ("python2-unittest2" ,python2-unittest2) + ("python2-mock" ,python2-mock) + ,@(package-native-inputs billiard)))))) -- cgit v1.3 From 22df6419f86929f34be561e958136950759710a6 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 14 Feb 2016 15:57:24 -0800 Subject: gnu: Add python-celery. * gnu/packages/python.scm (python-celery, python2-celery): New variables. --- gnu/packages/python.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 869ce29689..81b4248963 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8008,3 +8008,42 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.") ("python2-unittest2" ,python2-unittest2) ("python2-mock" ,python2-mock) ,@(package-native-inputs billiard)))))) + +(define-public python-celery + (package + (name "python-celery") + (version "3.1.20") + (source + (origin + (method url-fetch) + (uri (pypi-uri "celery" version)) + (sha256 + (base32 + "1md6ywg1s0946qyp8ndnsd677wm0yax933h2sb4m3a4j7lf1jbyh")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + `(("python-pytz" ,python-pytz) + ("python-billiard" ,python-billiard) + ("python-kombu" ,python-kombu))) + (home-page "http://celeryproject.org") + (synopsis "Distributed Task Queue") + (description "Celery is an asynchronous task queue/job queue based on +distributed message passing. It is focused on real-time operation, but +supports scheduling as well. The execution units, called tasks, are executed +concurrently on a single or more worker servers using multiprocessing, +Eventlet, or gevent. Tasks can execute asynchronously (in the background) or +synchronously (wait until ready).") + (license bsd-3) + (properties `((python2-variant . ,(delay python2-celery)))))) + +(define-public python2-celery + (let ((celery (package-with-python2 + (strip-python2-variant python-celery)))) + (package + (inherit celery) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ("python2-unittest2" ,python2-unittest2) + ("python2-mock" ,python2-mock) + ,@(package-native-inputs celery)))))) -- cgit v1.3 From 97e32948ea59bcc48c2e2595626b87bc463144ad Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 14 Feb 2016 16:23:11 -0800 Subject: gnu: Add python-translitcodec. * gnu/packages/python.scm (python-translitcodec, python2-translitcodec): New variables. --- gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 81b4248963..bb800e793f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8047,3 +8047,34 @@ synchronously (wait until ready).") ("python2-unittest2" ,python2-unittest2) ("python2-mock" ,python2-mock) ,@(package-native-inputs celery)))))) + +(define-public python-translitcodec + (package + (name "python-translitcodec") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "translitcodec" version)) + (sha256 + (base32 + "10x6pvblkzky1zhjs8nmx64nb9jdzxad4bxhq4iwv0j4z2aqjnki")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; no tests provided + (home-page + "https://github.com/claudep/translitcodec") + (synopsis + "Unicode to 8-bit charset transliteration codec") + (description + "This package contains codecs for transliterating ISO 10646 texts into +best-effort representations using smaller coded character sets (ASCII, +ISO 8859, etc.).") + (license license:expat) + (properties `((python2-variant . ,(delay python2-translitcodec)))))) + +(define-public python2-translitcodec + (package + (inherit (package-with-python2 + (strip-python2-variant python-translitcodec))) + (native-inputs `(("python2-setuptools" ,python2-setuptools))))) -- cgit v1.3 From 0c3b90d47812123cd7d2c7c6129719cfa414481a Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 15 Feb 2016 10:29:08 -0800 Subject: gnu: Add python-editor. * gnu/packages/python.scm (python-editor, python2-editor): New variables. --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bb800e793f..46d434c363 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8078,3 +8078,31 @@ ISO 8859, etc.).") (inherit (package-with-python2 (strip-python2-variant python-translitcodec))) (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + +(define-public python-editor + (package + (name "python-editor") + (version "0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-editor" version)) + (sha256 + (base32 + "1ypnpgvzpkbwsg4rdvy4sy51j28b5xq9v8pnkwxncn07vqz06p7n")))) + (build-system python-build-system) + (home-page + "https://github.com/fmoo/python-editor") + (synopsis + "Programmatically open an editor, capture the result") + (description + "python-editor is a library that provides the editor module for +programmatically interfacing with your system's $EDITOR.") + (license asl2.0) + (properties `((python2-variant . ,(delay python2-editor)))))) + +(define-public python2-editor + (package + (inherit (package-with-python2 + (strip-python2-variant python-editor))) + (inputs `(("python2-setuptools" ,python2-setuptools))))) -- cgit v1.3 From 2de98febb32cc1b2816213c9056a90d6cf5730b0 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 21 Feb 2016 18:51:51 -0800 Subject: gnu: python-apipkg: Remove unzip dependency. Unzip was never used for this package. * gnu/packages/python.scm (python-apipkg): Remove unzip dependency. --- gnu/packages/python.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 46d434c363..740126f99a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6910,8 +6910,6 @@ applications.") (base32 "1iks5701qnp3dlr3q1d9qm68y2plp2m029irhpz92a44psfkjf1f")))) (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) (propagated-inputs `(("python-pytest" ,python-pytest))) (synopsis "Namespace control and lazy-import mechanism") -- cgit v1.3 From 3276517cdcd2dfe7f2bad40eb22d94841775056a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 5 Feb 2016 03:16:18 -0500 Subject: gnu: Add python-sphinxcontrib-programoutput. * gnu/packages/python.scm (python-sphinxcontrib-programoutput, python2-sphinxcontrib-programoutput): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 740126f99a..91fa25674f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8104,3 +8104,30 @@ programmatically interfacing with your system's $EDITOR.") (inherit (package-with-python2 (strip-python2-variant python-editor))) (inputs `(("python2-setuptools" ,python2-setuptools))))) + +(define-public python-sphinxcontrib-programoutput + (package + (name "python-sphinxcontrib-programoutput") + (version "0.8") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-programoutput" version)) + (sha256 + (base32 + "098as6z1s0gb4dh5xcr1fd2vpm91zj93jzvgawspxf5s4hqs0xhp")))) + (build-system python-build-system) + (propagated-inputs + `(("python-docutils" ,python-docutils) + ("python-sphinx" ,python-sphinx))) + (synopsis "Sphinx extension to include program output") + (description "A Sphinx extension to literally insert the output of arbitrary +commands into documents, helping you to keep your command examples up to date.") + (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") + (license bsd-2) + (properties `((python2-variant . ,(delay python2-sphinxcontrib-programoutput)))))) + +(define-public python2-sphinxcontrib-programoutput + (package + (inherit (package-with-python2 + (strip-python2-variant python-sphinxcontrib-programoutput))) + (native-inputs `(("python2-setuptools" ,python2-setuptools))))) -- cgit v1.3 From 548d7165396065eb7ecb1c73274f72ef47277359 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 5 Feb 2016 03:17:03 -0500 Subject: gnu: Add python-sphinx-repoze-autointerface. * gnu/packages/python.scm (python-sphinx-repoze-autointerface, python2-sphinx-repoze-autointerface): New variables. --- gnu/packages/python.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 91fa25674f..55a62a9ad4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -37,7 +37,7 @@ #:use-module ((guix licenses) #:select (asl2.0 bsd-4 bsd-3 bsd-2 non-copyleft cc0 x11 x11-style gpl2 gpl2+ gpl3+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ agpl3+ - isc mpl2.0 psfl public-domain unlicense x11-style + isc mpl2.0 psfl public-domain repoze unlicense x11-style zpl2.1)) #:use-module ((guix licenses) #:select (expat zlib) #:prefix license:) #:use-module (gnu packages) @@ -8131,3 +8131,28 @@ commands into documents, helping you to keep your command examples up to date.") (inherit (package-with-python2 (strip-python2-variant python-sphinxcontrib-programoutput))) (native-inputs `(("python2-setuptools" ,python2-setuptools))))) + +(define-public python-sphinx-repoze-autointerface + (package + (name "python-sphinx-repoze-autointerface") + (version "0.7.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "repoze.sphinx.autointerface" version)) + (sha256 + (base32 + "016mv3wbylw278wl7z33y2liyra8ljp08zq1g0anzadh1an5zvwp")))) + (build-system python-build-system) + (propagated-inputs + `(("python-docutils" ,python-docutils) + ("python-sphinx" ,python-sphinx) + ("python-zope-interface" ,python-zope-interface))) + (synopsis "Auto-generate Sphinx API docs from Zope interfaces") + (description "This package defines an extension for the Sphinx documentation +system. The extension allows generation of API documentation by +introspection of @code{zope.interface} instances in code.") + (home-page "https://github.com/repoze/repoze.sphinx.autointerface") + (license repoze))) + +(define-public python2-sphinx-repoze-autointerface + (package-with-python2 python-sphinx-repoze-autointerface)) -- cgit v1.3 From c4a7904c21c854d5f1d49eeecf76bbefe087a893 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 25 Feb 2016 11:01:45 -0800 Subject: gnu: Add python-paste. * gnu/packages/python.scm (python-paste, python2-paste): New variables. * gnu/packages/patches/python-paste-remove-timing-test.patch: New file. * gnu/packages/patches/python-paste-remove-website-test.patch: New file. * gnu-system.am (dist_patch_DATA): Add them. --- gnu-system.am | 2 + .../patches/python-paste-remove-timing-test.patch | 16 ++++++++ .../patches/python-paste-remove-website-test.patch | 21 ++++++++++ gnu/packages/python.scm | 48 ++++++++++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 gnu/packages/patches/python-paste-remove-timing-test.patch create mode 100644 gnu/packages/patches/python-paste-remove-website-test.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu-system.am b/gnu-system.am index 431c2b5cd1..6ccca125ce 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -679,6 +679,8 @@ dist_patch_DATA = \ gnu/packages/patches/python-ipython-inputhook-ctype.patch \ gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ gnu/packages/patches/python-configobj-setuptools.patch \ + gnu/packages/patches/python-paste-remove-website-test.patch \ + gnu/packages/patches/python-paste-remove-timing-test.patch \ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ gnu/packages/patches/qemu-CVE-2015-8558.patch \ gnu/packages/patches/qemu-CVE-2015-8567.patch \ diff --git a/gnu/packages/patches/python-paste-remove-timing-test.patch b/gnu/packages/patches/python-paste-remove-timing-test.patch new file mode 100644 index 0000000000..6ab8d1a59c --- /dev/null +++ b/gnu/packages/patches/python-paste-remove-timing-test.patch @@ -0,0 +1,16 @@ +Remove this test to verify that things were modified since a certain time. + +That assumption doesn't hold up when your environment doesn't have access to a +real clock and thinks it's living in 1970 :) + +--- a/tests/test_fileapp.py 2015-04-23 13:48:37.000000000 -0700 ++++ b/tests/test_fileapp.py 2016-02-22 19:20:08.332802417 -0800 +@@ -223,8 +223,6 @@ + status=304) + res = app.get('/', headers={'If-None-Match': 'asdf'}, + status=200) +- res = app.get('/', headers={'If-Modified-Since': 'Sat, 1 Jan 2005 12:00:00 GMT'}, +- status=200) + res = app.get('/', headers={'If-Modified-Since': last_mod + '; length=100'}, + status=304) + res = app.get('/', headers={'If-Modified-Since': 'invalid date'}, diff --git a/gnu/packages/patches/python-paste-remove-website-test.patch b/gnu/packages/patches/python-paste-remove-website-test.patch new file mode 100644 index 0000000000..93417fbe75 --- /dev/null +++ b/gnu/packages/patches/python-paste-remove-website-test.patch @@ -0,0 +1,21 @@ +Remove the test to see if the Python Paste website is up. + +Obviously without network access there is no way for us to check this, and +it's pretty strange to test a project's website when you really mean to test +the project anyhow... + +--- a/tests/test_proxy.py 2016-02-22 19:13:04.040117767 -0800 ++++ b/tests/test_proxy.py 2016-02-22 19:13:04.040117767 -0800 +@@ -1,12 +1,3 @@ + from paste import proxy + from paste.fixture import TestApp + +-def test_paste_website(): +- # Not the most robust test... +- # need to test things like POSTing to pages, and getting from pages +- # that don't set content-length. +- app = proxy.Proxy('http://pythonpaste.org') +- app = TestApp(app) +- res = app.get('/') +- assert 'documentation' in res +- diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 55a62a9ad4..03b2778b23 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7774,6 +7774,54 @@ file.") (define-public python2-pastedeploy (package-with-python2 python-pastedeploy)) +(define-public python-paste + (package + (name "python-paste") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Paste" version)) + (sha256 + (base32 + "16dsv9qi0r4qsrsb6dilpq2rx0fnglvh36flzywcdnm2jg43mb5d")) + (patches (list (search-patch + "python-paste-remove-website-test.patch") + (search-patch + "python-paste-remove-timing-test.patch"))))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + `(;; Uses pkg_resources provided by setuptools internally. + ("python-setuptools" ,python-setuptools) + ("python-six" ,python-six))) + (arguments + '(;; Tests don't pass on Python 3, but work fine on Python 2. + ;; (As of 2.0.2, Python 3 support in Paste is presently a bit broken, + ;; but is usable enough for the minimal amount it's used in MediaGoblin + ;; still... things should be better by the next Paste release.) + #:tests? #f)) + (home-page "http://pythonpaste.org") + (synopsis + "Python web development tools, focusing on WSGI") + (description + "Paste provides a variety of web development tools and middleware which +can be nested together to build web applications. Paste's design closely +follows ideas flowing from WSGI (Web Standard Gateway Interface).") + (license license:expat) + (properties `((python2-variant . ,(delay python2-paste)))))) + +(define-public python2-paste + (let ((paste (package-with-python2 + (strip-python2-variant python-paste)))) + (package + (inherit paste) + (arguments + ;; Tests are back for Python 2! + `(#:tests? #t + ,@(package-arguments paste)))))) + (define-public python-pyquery (package (name "python-pyquery") -- cgit v1.3 From a8f20f63dce1f41126bbc0fdbe6a3b1bf28fb69d Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 25 Feb 2016 11:01:56 -0800 Subject: gnu: Add python-pastescript. * gnu/packages/python.scm (python-pastescript, python2-pastescript): New variables. --- gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 03b2778b23..1b274a3130 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7822,6 +7822,44 @@ follows ideas flowing from WSGI (Web Standard Gateway Interface).") `(#:tests? #t ,@(package-arguments paste)))))) +(define-public python-pastescript + (package + (name "python-pastescript") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PasteScript" version)) + (sha256 + (base32 + "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + `(;; Uses pkg_resources provided by setuptools internally. + ("python-setuptools" ,python-setuptools) + ("python-paste" ,python-paste) + ("python-pastedeploy" ,python-pastedeploy))) + (home-page "http://pythonpaste.org/script/") + (arguments + '(;; Unfortunately, this requires the latest unittest2, + ;; but that requires traceback2 which requires linecache2 which requires + ;; unittest2. So we're skipping tests for now. + ;; (Note: Apparently linetest2 only needs unittest2 for its tests, + ;; so in theory we could get around this situation somehow.) + #:tests? #f)) + (synopsis + "Pluggable command line tool for serving web applications and more") + (description + "PasteScript is a plugin-friendly command line tool which provides a +variety of features, from launching web applications to bootstrapping project +layouts.") + (license license:expat))) + +(define-public python2-pastescript + (package-with-python2 python-pastescript)) + (define-public python-pyquery (package (name "python-pyquery") -- cgit v1.3 From 40981b5c18d76247fbe5802b5c969933fa48e330 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 10:18:40 +0200 Subject: gnu: python-wheel: Update to 0.29.0. * gnu/packages/python.scm (python-wheel): Update to 0.29.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1b274a3130..fb13338462 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2151,14 +2151,14 @@ with sensible defaults out of the box.") (define-public python-wheel (package (name "python-wheel") - (version "0.26.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (pypi-uri "wheel" version)) (sha256 (base32 - "032k1ajijbqnv0z0k88bhf75mdimi18fcmm28mss90610lw3bbga")))) + "0j0n38hg1jvrmyy68f9ikvzq1gs9g0sx4ws7maf8wi3bwbbqmfqy")))) (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools) -- cgit v1.3 From 74a066f9a07f04e2bd1bf87fbccb6166ab78a423 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 10:21:45 +0200 Subject: gnu: python-requests: Update to 2.9.1. * gnu/packages/python.scm (python-requests): Update to 2.9.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fb13338462..f800851e78 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2188,13 +2188,13 @@ installed with a newer @code{pip} or with wheel's own command line utility.") (define-public python-requests (package (name "python-requests") - (version "2.8.1") + (version "2.9.1") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "0ny2nr1sqr4hcn3903ghmh7w2yni8shlfv240a8c9p6wyidqvzl4")))) + "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5")))) (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools))) -- cgit v1.3 From da8b011d2aefa98e5e1de7c51e1c17186c2e540b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 10:44:04 +0200 Subject: gnu: python-requests-toolbelt: Update to 0.6.0. * gnu/packages/python.scm (python-requests-toolbelt): Update to 0.6.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f800851e78..68fc36d5cf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6845,13 +6845,13 @@ for atomic filesystem operations.") (define-public python-requests-toolbelt (package (name "python-requests-toolbelt") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (pypi-uri "requests-toolbelt" version)) (sha256 (base32 - "1kbms1s52dhb98vbpaprr15b0ijdbqp500lpfsyjccpd8cjkyngk")))) + "07slish560haspn0hpwgy2izhk2snqq06s6acp8xzmhhz079qknc")))) (build-system python-build-system) (propagated-inputs `(("python-requests" ,python-requests))) -- cgit v1.3 From 29f20168cf1f6c24b7fed550bfbf72edcf50d34c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 10:56:12 +0200 Subject: gnu: python-pytest-localserver: Update to 0.3.5. * gnu/packages/python.scm (python-pytest-localserver): Update to 0.3.5. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 68fc36d5cf..ed1b5c9c8a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6988,13 +6988,13 @@ the last py.test invocation.") (define-public python-pytest-localserver (package (name "python-pytest-localserver") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) - (uri (pypi-uri "pytest-localserver" version ".zip")) + (uri (pypi-uri "pytest-localserver" version)) (sha256 (base32 - "050q505a7gnsz7vqidw0w5dvxjb2flzi7z734agpjzmsl85c2bcx")))) + "0dvqspjr6va55zwmnnc2mmpqc7mm65kxig9ya44x1z8aadzxpa4p")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.3 From 9d813ec14764ea916e8a73ce705aacda8ad52385 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 11:01:12 +0200 Subject: gnu: python-wsgi-intercept: Update to 1.1.2. * gnu/packages/python.scm (python-wsgi-intercept): Update to 1.1.2. [native-inputs]: Add python-six. --- gnu/packages/python.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ed1b5c9c8a..f8d426a174 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7018,16 +7018,17 @@ framework which enables you to test server connections locally.") (define-public python-wsgi-intercept (package (name "python-wsgi-intercept") - (version "0.10.3") + (version "1.1.2") (source (origin (method url-fetch) (uri (pypi-uri "wsgi_intercept" version)) (sha256 (base32 - "0xyfchacywb1mql84270mcidsqc5ssyspd18yacjk82x2xc68h0r")))) + "14ajy415ch5d0dnspg4b592p66wlgzah7ay218flp13517fp49zl")))) (build-system python-build-system) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-six" ,python-six))) (propagated-inputs `(("python-httplib2" ,python-httplib2) ("python-requests" ,python-requests))) -- cgit v1.3 From b6785c2e3a42edc2032cf38ec67fc73d0d3a8922 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 11:07:07 +0200 Subject: gnu: python-isodate: Update to 0.5.4. * gnu/packages/python.scm (python-isodate): Update to 0.5.4. --- gnu/packages/python.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f8d426a174..ff3d1a65e5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4367,17 +4367,14 @@ computing.") (define-public python-isodate (package (name "python-isodate") - (version "0.5.1") + (version "0.5.4") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/i/isodate/isodate-" - version - ".tar.gz")) + (uri (pypi-uri "isodate" version)) (sha256 (base32 - "1yqjn0is0p64cmk9xhq4hc6q06jk86d60kg2jws58d78q0qysami")))) + "0cafaiwixgpxwh9dsd28qb0dbzsj6xpxjdkyk30ns91ps10mq422")))) (build-system python-build-system) (inputs `(("python-setuptools" ,python-setuptools))) -- cgit v1.3 From fee04c198c02ed318e59d9b0e7b48e238fe510ae Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 11:08:50 +0200 Subject: gnu: python-html5lib: Update to 1.0b8. * gnu/packages/python.scm (python-html5lib): Update to 1.0b8. --- gnu/packages/python.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ff3d1a65e5..fa1a51cce1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4393,17 +4393,14 @@ ISO 8601 dates, time and duration.") (define-public python-html5lib (package (name "python-html5lib") - (version "1.0b3") + (version "1.0b8") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/h/html5lib/html5lib-" - version - ".tar.gz")) + (uri (pypi-uri "html5lib" version)) (sha256 (base32 - "1l5i6xzckzx4hnh9qzv9q3kyhkgjx2hsi2k9srgci3qizjmvp6ln")))) + "1lknq5j3nh11xrl268ks76zaj0gyzh34v94n5vbf6dk8llzxdx0q")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) ; required to "import html5lib" -- cgit v1.3 From 6f068e081bd505a42a43ae09fad088dbe934a081 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 12:50:10 +0200 Subject: gnu: python-hypothesis: Update to 3.0.4. * gnu/packages/python.scm (python-hypothesis): Update to 3.0.4. [native-inputs]: Remove python-setuptools. (python2-hypothesis): Use 'strip-python2-variant'. [native-inputs]: Add python2-enum34, python2-setuptools. --- gnu/packages/python.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fa1a51cce1..100bac0bee 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7535,17 +7535,14 @@ Amazon Web Services (AWS) API.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "2.0.0") + (version "3.0.4") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "1la6mfpvcn640gs2v35iv8b4sh6xdhp9j5ghay0jd86c9n4fkgxr")))) + "0bh6pqyc56cqlbpg0ffzjs6466blyylix4nsw11qrqwf01cg9gdq")))) (build-system python-build-system) - (native-inputs - `(;; setuptools required for python-2 variant - ("python-setuptools" ,python-setuptools))) (propagated-inputs `(("python-flake8" ,python-flake8) ("python-pytest" ,python-pytest))) @@ -7555,10 +7552,16 @@ much larger range of examples than you would ever want to write by hand. It’s based on the Haskell library, Quickcheck, and is designed to integrate seamlessly into your existing Python unit testing work flow.") (home-page "https://github.com/DRMacIver/hypothesis") - (license mpl2.0))) + (license mpl2.0) + (properties `((python2-variant . ,(delay python2-hypothesis)))))) (define-public python2-hypothesis - (package-with-python2 python-hypothesis)) + (let ((hypothesis (package-with-python2 + (strip-python2-variant python-hypothesis)))) + (package (inherit hypothesis) + (native-inputs + `(("python2-enum34" ,python2-enum34) + ("python2-setuptools" ,python2-setuptools)))))) (define-public python-pytest-subtesthack (package -- cgit v1.3 From a4d9609c983a4bae175790c5403f2b2beaa3e18f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 15:33:05 +0200 Subject: gnu: python-networkx: Update to 1.11. * gnu/packages/python.scm (python-networkx): Update to 1.11. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 100bac0bee..04cbcacf20 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4755,15 +4755,13 @@ interfaces in an easy and portable manner.") (define-public python-networkx (package (name "python-networkx") - (version "1.9.1") + (version "1.11") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/n/networkx/networkx-" - version ".tar.gz")) + (uri (pypi-uri "networkx" version)) (sha256 - (base32 "0n8wy0yq1kmdq4wh68mlhwhkndvwzx48lg41a1z0sxxms0wfp033")))) + (base32 "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd")))) (build-system python-build-system) ;; python-decorator is needed at runtime (propagated-inputs -- cgit v1.3 From db251311cfae6cb836d4da1895418c9bf59d446e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 16:57:10 +0200 Subject: gnu: python-pep8: Update to 1.7.0. * gnu/packages/python.scm (python-pep8): Update to 1.7.0. --- gnu/packages/python.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 04cbcacf20..c0362e6b3d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5060,17 +5060,14 @@ applications.") (define-public python-pep8 (package (name "python-pep8") - (version "1.6.2") + (version "1.7.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/pep8/pep8-" - version - ".tar.gz")) + (uri (pypi-uri "pep8" version)) (sha256 (base32 - "1zybkcdw1sx84dvkfss96nhykqg9bc0cdpwpl4k9wlxm61bf7dxq")))) + "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")))) (build-system python-build-system) (inputs `(("python-setuptools" ,python-setuptools))) -- cgit v1.3 From 43789136d20c495220cc13c48639d717758225dc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 20:07:37 +0200 Subject: gnu: python-flake8: Update to 2.5.4. * gnu/packages/python.scm (python-flake8): Update to 2.5.4. [inputs]: Use recent python-pep8, python-pyflakes. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c0362e6b3d..4a7247ea1d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5187,19 +5187,19 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "2.5.1") + (version "2.5.4") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "00sn2g5ydriv5anbipcrprpv797kh4q8rfa75w3fc7v7n14fv2j4")))) + "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc")))) (build-system python-build-system) (inputs `(("python-setuptools" ,python-setuptools) - ("python-pep8" ,python-pep8-1.5.7) - ("python-pyflakes" ,python-pyflakes-0.8.1) + ("python-pep8" ,python-pep8) + ("python-pyflakes" ,python-pyflakes) ("python-mccabe" ,python-mccabe) ("python-mock" ,python-mock) ("python-nose" ,python-nose))) -- cgit v1.3 From c6ebd40da1bb9ea43f6fec295bcd8a22b978baaf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 20:19:43 +0200 Subject: gnu: python-mccabe: Update to 0.4.0. * gnu/packages/python.scm (python-mccabe): Update to 0.4.0. [inputs]: Add python-pytest, python-pytest-runner. (python-mccabe-0.2.1)[inputs]: Only use python-setuptools. --- gnu/packages/python.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4a7247ea1d..ed97c708f5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5108,20 +5108,19 @@ PEP 8.") (define-public python-mccabe (package (name "python-mccabe") - (version "0.3.1") + (version "0.4.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/m/mccabe/mccabe-" - version - ".tar.gz")) + (uri (pypi-uri "mccabe" version)) (sha256 (base32 - "05ix3vdv5hjk4irl97n2n3c4g1vqvz7dbmkzs13f3bx97bxsczjz")))) + "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools))) + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-setuptools" ,python-setuptools))) (home-page "https://github.com/flintwork/mccabe") (synopsis "McCabe checker, plugin for flake8") (description @@ -5141,7 +5140,8 @@ complexity of Python source code.") (uri (pypi-uri "mccabe" version)) (sha256 (base32 - "0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs")))))) + "0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs")))) + (inputs `(("python-setuptools", python-setuptools))))) (define-public python2-mccabe-0.2.1 (package-with-python2 python-mccabe-0.2.1)) -- cgit v1.3 From cc0c4fdeddae1effb9550d22a972ecaebe243cbc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 20:45:36 +0200 Subject: gnu: python-traitlets: Update to 4.1.0. * gnu/packages/python.scm (python-traitlets): Update to 4.1.0. [native-inputs]: Add python-mock. --- gnu/packages/python.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ed97c708f5..13a54e63eb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4214,15 +4214,14 @@ standard library.") (define-public python-traitlets (package (name "python-traitlets") - (version "4.0.0") + (version "4.1.0") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/t/" - "traitlets/traitlets-" version ".tar.gz")) + (uri (pypi-uri "traitlets" version)) (sha256 (base32 - "0fr3w2xwb46c591dp7zw02bgf4d21mjy9g6rhwc9bwd4ji50n50b")))) + "0nxgj8jxlm1kqf8cx2x7vjid05zdgbxpqhjbdl46r8njlpgkh3j4")))) (build-system python-build-system) (arguments `(#:phases @@ -4232,7 +4231,8 @@ standard library.") `(("python-ipython-genutils" ,python-ipython-genutils) ("python-decorator" ,python-decorator))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-mock" ,python-mock) + ("python-nose" ,python-nose))) (home-page "http://ipython.org") (synopsis "Configuration system for Python applications") (description -- cgit v1.3 From eb6e2e812a6295b4d66fa23cb7397707a1546873 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Feb 2016 20:50:02 +0200 Subject: gnu: python-decorator: Update to 4.0.9. * gnu/packages/python.scm (python-decorator): Update to 4.0.9. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 13a54e63eb..02883f8280 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3961,18 +3961,18 @@ PNG, PostScript, PDF, and SVG file output.") (define-public python-decorator (package (name "python-decorator") - (version "4.0.6") + (version "4.0.9") (source (origin (method url-fetch) (uri (pypi-uri "decorator" version)) (sha256 - (base32 "1710cwsbwr8fkiq59w2min7rwgdz7ly51yz8l8yh1zbpfxcm8qhw")))) + (base32 "1a5vwhflfd9sh3rfb40xlyipldgdzfff6brman57hqv3661jw0lh")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; no test target (native-inputs `(("python-setuptools" ,python-setuptools))) - (home-page "http://pypi.python.org/pypi/decorator/") + (home-page "https://pypi.python.org/pypi/decorator/") (synopsis "Python module to simplify usage of decorators") (description "The aim of the decorator module is to simplify the usage of decorators -- cgit v1.3 From b31fbea566d432ae8be616ac774d51a23436c362 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 25 Feb 2016 13:26:45 -0800 Subject: gnu: Add python-psycopg2. * gnu/packages/python.scm (python-psycopg2, python2-psycopg2): New variables. --- gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 02883f8280..b67aed05f7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2015 Kyle Meyer ;;; Copyright © 2015 Chris Marusich +;;; Copyright © 2016 Danny Milosavljevic ;;; ;;; This file is part of GNU Guix. ;;; @@ -8235,3 +8236,34 @@ introspection of @code{zope.interface} instances in code.") (define-public python2-sphinx-repoze-autointerface (package-with-python2 python-sphinx-repoze-autointerface)) + +(define-public python-psycopg2 + (package + (name "python-psycopg2") + (version "2.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "psycopg2" version)) + (sha256 + (base32 + "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva")))) + (build-system python-build-system) + (arguments + ;; Tests would require a postgresql database "psycopg2_test" + ;; and a running postgresql database management service. + `(#:tests? #f)) ; TODO re-enable after providing a test-db. + (inputs + `(("postgresql" ,postgresql))) ; libpq + (home-page "http://initd.org/psycopg/") + (synopsis "Python PostgreSQL adapter") + (description + "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0. ") + (license lgpl3+) + (properties `((python2-variant . ,(delay python2-psycopg2)))))) + +(define-public python2-psycopg2 + (package + (inherit (package-with-python2 + (strip-python2-variant python-psycopg2))) + (native-inputs `(("python2-setuptools" ,python2-setuptools))))) -- cgit v1.3 From b35461748b20d0172744974b39e7d9d033400c51 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Feb 2016 08:37:28 -0500 Subject: gnu: Fix misplaced commas (unquote). Fix many occurrences of comma (unquote) being placed immediately after the previous list item, e.g. ("ncurses", ncurses) in the inputs. * gnu/packages/base.scm (patch, gnu-make), gnu/packages/bioinformatics.scm (hmmer), gnu/packages/bittorrent.scm (aria2), gnu/packages/compression.scm (pbzip2), gnu/packages/databases.scm (recutils), gnu/packages/fonts.scm (font-terminus), gnu/packages/freedesktop.scm (xdg-utils, elogind), gnu/packages/games.scm (gnujump), gnu/packages/gnome.scm (libidl, gnumeric, eog, gedit), gnu/packages/gnunet.scm (gnunet), gnu/packages/gnuzilla.scm (mozjs, nspr), gnu/packages/gtk.scm (gtksourceview, gdk-pixbuf), gnu/packages/lua.scm (lua), gnu/packages/openstack.scm (python-swiftclient), gnu/packages/perl.scm (perl-json-any), gnu/packages/polkit.scm (polkit-qt), gnu/packages/python.scm (wrap-python3, python-oauthlib) (python-mccabe-0.2.1, python-contextlib2, python2-rauth), gnu/packages/qt.scm (qtkeychain), gnu/packages/ruby.scm (ruby-nokogiri), gnu/packages/screen.scm (screen), gnu/packages/ssh.scm (libssh), gnu/packages/video.scm (ffmpeg, mplayer), gnu/packages/vim.scm (vim), gnu/packages/xdisorg.scm (redshift), gnu/packages/xfce.scm (xfce4-panel, xfce4-settings), gnu/packages/xnee.scm (xnee), gnu/packages/xorg.scm (font-adobe100dpi, font-adobe75dpi), gnu/packages/zsh.scm (zsh): Fix misplaced commas (unquote). --- gnu/packages/base.scm | 4 ++-- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/bittorrent.scm | 2 +- gnu/packages/compression.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/fonts.scm | 2 +- gnu/packages/freedesktop.scm | 4 ++-- gnu/packages/games.scm | 2 +- gnu/packages/gnome.scm | 8 ++++---- gnu/packages/gnunet.scm | 2 +- gnu/packages/gnuzilla.scm | 4 ++-- gnu/packages/gtk.scm | 4 ++-- gnu/packages/lua.scm | 2 +- gnu/packages/openstack.scm | 2 +- gnu/packages/perl.scm | 6 +++--- gnu/packages/polkit.scm | 2 +- gnu/packages/python.scm | 12 ++++++------ gnu/packages/qt.scm | 2 +- gnu/packages/ruby.scm | 2 +- gnu/packages/screen.scm | 2 +- gnu/packages/ssh.scm | 2 +- gnu/packages/video.scm | 8 ++++---- gnu/packages/vim.scm | 8 ++++---- gnu/packages/xdisorg.scm | 2 +- gnu/packages/xfce.scm | 4 ++-- gnu/packages/xnee.scm | 2 +- gnu/packages/xorg.scm | 4 ++-- gnu/packages/zsh.scm | 8 ++++---- 28 files changed, 53 insertions(+), 53 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 7cef8bf24a..e6628277a6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -173,7 +173,7 @@ standard utility.") "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx")) (patches (list (search-patch "patch-hurd-path-max.patch"))))) (build-system gnu-build-system) - (native-inputs `(("ed", ed))) + (native-inputs `(("ed" ,ed))) (synopsis "Apply differences to originals, with optional backups") (description "Patch is a program that applies changes to files based on differences @@ -327,7 +327,7 @@ functionality beyond that which is outlined in the POSIX standard.") "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb")) (patches (list (search-patch "make-impure-dirs.patch"))))) (build-system gnu-build-system) - (native-inputs `(("pkg-config", pkg-config))) ; to detect Guile + (native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile (inputs `(("guile" ,guile-2.0))) (outputs '("out" "debug")) (arguments diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8958ec502d..7b3838d36f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1790,7 +1790,7 @@ particular, reads spanning multiple exons.") (base32 "0djmgc0pfli0jilfx8hql1axhwhqxqb8rxg2r5rg07aw73sfs5nx")))) (build-system gnu-build-system) - (native-inputs `(("perl", perl))) + (native-inputs `(("perl" ,perl))) (home-page "http://hmmer.janelia.org") (synopsis "Biosequence analysis using profile hidden Markov models") (description diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 15b69cf03e..ae67988d71 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -225,7 +225,7 @@ interface, for the Transmission BitTorrent daemon.") (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageReceiverTest\\);" text) (string-append "// " text)))))))) (native-inputs - `(("pkg-config", pkg-config))) + `(("pkg-config" ,pkg-config))) (inputs `(("c-ares" ,c-ares) ("cppunit" ,cppunit) ; for the tests diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 4a31bf79e2..938d4b8718 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -244,7 +244,7 @@ decompression.") "1vk6065dv3a47p86vmp8hv3n1ygd9hraz0gq89gvzlx7lmcb6fsp")))) (build-system gnu-build-system) (inputs - `(("bzip2", bzip2))) + `(("bzip2" ,bzip2))) (arguments `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7c30208035..25c1e6a7df 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -321,7 +321,7 @@ pictures, sounds, or video.") (native-inputs `(("emacs" ,emacs-no-x) ("bc" ,bc) ("bash:include" ,bash "include") - ("libuuid", util-linux))) + ("libuuid" ,util-linux))) ;; TODO: Add more optional inputs. (inputs `(("curl" ,curl) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b9cebdc3fb..69e195dbf0 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -373,7 +373,7 @@ The Liberation Fonts are sponsored by Red Hat.") `(("pkg-config" ,pkg-config) ("perl" ,perl) ("bdftopcf" ,bdftopcf) - ("font-util", font-util) + ("font-util" ,font-util) ("mkfontdir" ,mkfontdir))) (arguments `(#:configure-flags (list diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6a28379e95..bfe6e4569c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -69,7 +69,7 @@ (build-system gnu-build-system) (propagated-inputs `(("xprop" ,xprop) ; for Xfce detecting - ("xset", xset))) ; for xdg-screensaver + ("xset" ,xset))) ; for xdg-screensaver (arguments `(#:tests? #f)) ; no check target (home-page "http://portland.freedesktop.org/") @@ -178,7 +178,7 @@ the freedesktop.org XDG Base Directory specification.") ("xsltproc" ,libxslt) ("m4" ,m4) ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("pkg-config", pkg-config) + ("pkg-config" ,pkg-config) ("gperf" ,gperf))) (inputs `(("linux-pam" ,linux-pam) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8a0b395b85..991fa24697 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -997,7 +997,7 @@ This game is based on the GPL version of the famous game TuxRacer.") (lambda _ (setenv "LIBS" "-lm")))))) (inputs `(("glu" ,glu) - ("mesa", mesa) + ("mesa" ,mesa) ("sdl" ,sdl) ("sdl-image" ,sdl-image) ("sdl-mixer" ,sdl-mixer))) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 578b43121b..0960b534f1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -941,7 +941,7 @@ library.") (inputs `(("glib" ,glib))) (native-inputs `(("pkg-config" ,pkg-config) - ("flex", flex) + ("flex" ,flex) ("bison" ,bison))) (home-page "http://freecode.com/projects/libidl") (synopsis "Create trees of CORBA Interface Definition Language files") @@ -1585,7 +1585,7 @@ Hints specification (EWMH).") ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("python" ,python-2) - ("python2-pygobject", python2-pygobject-2) + ("python2-pygobject" ,python2-pygobject-2) ("zlib" ,zlib))) (native-inputs `(("intltool" ,intltool) @@ -3230,7 +3230,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") `(("dconf" ,dconf))) (native-inputs `(("intltool" ,intltool) - ("itstool", itstool) + ("itstool" ,itstool) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) @@ -3881,7 +3881,7 @@ javascript engine and the GObject introspection framework.") `(("dconf" ,dconf))) (native-inputs `(("intltool" ,intltool) - ("itstool", itstool) + ("itstool" ,itstool) ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index e3f64ef324..eb0c4cbe83 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -224,7 +224,7 @@ supports HTTPS, HTTPS and GnuTLS.") ("libunistring" ,libunistring) ("openssl" ,openssl) ("opus" ,opus) - ("pulseaudio", pulseaudio) + ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1d3ebe8c8e..dca461f5d4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -72,7 +72,7 @@ (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))))) (build-system gnu-build-system) (native-inputs - `(("perl", perl) + `(("perl" ,perl) ("python" ,python-2))) (arguments `(#:phases @@ -154,7 +154,7 @@ in C/C++.") "01ria9wk6329hxqsy75p9dkxiqkq4nkz0jjzll7hslih3jbi8dil")))) (build-system gnu-build-system) (native-inputs - `(("perl", perl))) + `(("perl" ,perl))) (arguments `(#:tests? #f ; no check target #:configure-flags (list "--enable-64bit" diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 452906a5a1..1a10e9b551 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -365,7 +365,7 @@ printing and other features typical of a source code editor.") (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("intltool" ,intltool) - ("itstool", itstool) + ("itstool" ,itstool) ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("vala" ,vala) @@ -425,7 +425,7 @@ highlighting and other features typical of a source code editor.") (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection", gobject-introspection))) ; g-ir-compiler, etc. + ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (synopsis "GNOME image loading and manipulation library") (description "GdkPixbuf is a library for image loading and manipulation developed diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index d27c024cfb..fcb41831eb 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -40,7 +40,7 @@ (patches (list (search-patch "lua-pkgconfig.patch") (search-patch "lua52-liblua-so.patch"))))) (build-system gnu-build-system) - (inputs `(("readline", readline))) + (inputs `(("readline" ,readline))) (arguments '(#:modules ((guix build gnu-build-system) (guix build utils) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 08a76a3695..0fa488f842 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -770,7 +770,7 @@ LDAP.") "1j33l4z9vqh0scfncl4fxg01zr1hgqxhhai6gvcih1gccqm4nd7p")))) (build-system python-build-system) (native-inputs - `(("python-pbr", python-pbr) + `(("python-pbr" ,python-pbr) ("python-setuptools" ,python-setuptools) ("python-sphinx" ,python-sphinx) ;; The folloing packages are needed for the tests. diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0c0b8a3e87..6ca62aa2ae 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2758,9 +2758,9 @@ versa using either JSON::XS or JSON::PP.") (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) - ("perl-test-requires", perl-test-requires) - ("perl-test-warnings", perl-test-warnings) - ("perl-test-without-module", perl-test-without-module))) + ("perl-test-requires" ,perl-test-requires) + ("perl-test-warnings" ,perl-test-warnings) + ("perl-test-without-module" ,perl-test-without-module))) (propagated-inputs `(("perl-namespace-clean" ,perl-namespace-clean))) (home-page "http://search.cpan.org/dist/JSON-Any") diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 0a4f70f734..4f21612804 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -144,7 +144,7 @@ for unprivileged applications.") (propagated-inputs `(("qt" ,qt))) ; qt-4 according to the pkg-config files (native-inputs - `(("pkg-config", pkg-config))) + `(("pkg-config" ,pkg-config))) (arguments `(#:configure-flags (list (string-append "-DCMAKE_INSTALL_RPATH=" (assoc-ref %outputs "out") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b67aed05f7..2441220901 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -332,8 +332,8 @@ data types.") (lambda (old new) (symlink (string-append python old) (string-append bin "/" new))) - `("python3", "pydoc3", "idle3") - `("python", "pydoc", "idle")))))) + `("python3" ,"pydoc3" ,"idle3") + `("python" ,"pydoc" ,"idle")))))) (synopsis "Wrapper for the Python 3 commands") (description "This package provides wrappers for the commands of Python@tie{}3.x such @@ -2347,7 +2347,7 @@ somewhat intelligeble.") (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools) - ("python-coverage", python-coverage) + ("python-coverage" ,python-coverage) ("python-nose" ,python-nose) ("python-mock" ,python-mock))) (inputs @@ -5142,7 +5142,7 @@ complexity of Python source code.") (sha256 (base32 "0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs")))) - (inputs `(("python-setuptools", python-setuptools))))) + (inputs `(("python-setuptools" ,python-setuptools))))) (define-public python2-mccabe-0.2.1 (package-with-python2 python-mccabe-0.2.1)) @@ -6753,7 +6753,7 @@ of the SSL peer.") (replace 'check (lambda _ (zero? (system* - "python" "test_contextlib2.py", "-v"))))))) + "python" "test_contextlib2.py" "-v"))))))) (home-page "http://contextlib2.readthedocs.org/") (synopsis "Tools for decorators and context managers") (description "This module is primarily a backport of the Python @@ -7247,7 +7247,7 @@ authenticated session objects providing things like keep-alive.") (package (inherit rauth) (propagated-inputs `(("python2-requests" ,python2-requests))) (native-inputs - `(("python2-unittest2", python2-unittest2) + `(("python2-unittest2" ,python2-unittest2) ,@(package-native-inputs rauth)))))) (define-public python2-functools32 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 363596d0fd..bfd99b6519 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -555,7 +555,7 @@ contain over 620 classes.") (base32 "055mkd4pz6cyff4cw0784wjc1w92m8x223sxi96ph15fr3lplbg6")))) (build-system cmake-build-system) (inputs - `(("qt", qt))) + `(("qt" ,qt))) (arguments `(#:tests? #f ; No tests included #:phases diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index fa7c2f7691..a1669d4238 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1905,7 +1905,7 @@ to reproduce user environments.") "/include/libxml2" )))) (native-inputs `(("ruby-hoe" ,ruby-hoe) - ("ruby-rake-compiler", ruby-rake-compiler))) + ("ruby-rake-compiler" ,ruby-rake-compiler))) (inputs `(("zlib" ,zlib) ("libxml2" ,libxml2) diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index fa5235c115..088ca559d8 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -44,7 +44,7 @@ (native-inputs `(("makeinfo" ,texinfo))) (inputs - `(("ncurses", ncurses) + `(("ncurses" ,ncurses) ("perl" ,perl))) (arguments `(#:configure-flags diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 3c73e47882..081c7cbe32 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -61,7 +61,7 @@ ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. #:tests? #f)) (inputs `(("zlib" ,zlib) - ("libgcrypt", libgcrypt))) + ("libgcrypt" ,libgcrypt))) (synopsis "SSH client library") (description "libssh is a C library implementing the SSHv2 and SSHv1 protocol for diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 865d0e3fba..7d6c363da8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -406,7 +406,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") ("speex" ,speex) ("twolame" ,twolame) ("xvid" ,xvid) - ("zlib", zlib))) + ("zlib" ,zlib))) (native-inputs `(("bc" ,bc) ("perl" ,perl) @@ -620,14 +620,14 @@ treaming protocols.") (inputs `(("alsa-lib" ,alsa-lib) ("cdparanoia" ,cdparanoia) - ("ffmpeg", ffmpeg) + ("ffmpeg" ,ffmpeg) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ;; ("giflib" ,giflib) ; uses QuantizeBuffer, requires version >= 5 ("lame" ,lame) ("libass" ,libass) - ("libdvdcss", libdvdcss) - ("libdvdnav", libdvdnav) + ("libdvdcss" ,libdvdcss) + ("libdvdnav" ,libdvdnav) ("libjpeg" ,libjpeg) ("libmpeg2" ,libmpeg2) ("libmpg123" ,mpg123) ; audio codec for MP3 diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index e117fc4dff..241896323c 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -53,10 +53,10 @@ (("/bin/sh") (which "sh")))) %standard-phases))) (inputs - `(("gawk", gawk) - ("inetutils", inetutils) - ("ncurses", ncurses) - ("perl", perl) + `(("gawk" ,gawk) + ("inetutils" ,inetutils) + ("ncurses" ,ncurses) + ("perl" ,perl) ("tcsh" ,tcsh))) ; For runtime/tools/vim32 (home-page "http://www.vim.org/") (synopsis "Text editor based on vi") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f01e17a23f..d72f9f80c6 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -701,7 +701,7 @@ the X.Org X Server version 1.7 and later (X11R7.5 or later).") `(("libdrm" ,libdrm) ("libx11" ,libx11) ("libxcb" ,libxcb) - ("libxxf86vm", libxxf86vm) + ("libxxf86vm" ,libxxf86vm) ("glib" ,glib))) ;for Geoclue2 support (home-page "https://github.com/jonls/redshift") (synopsis "Adjust the color temperature of your screen") diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 7fab65043b..2aef842d5a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -282,7 +282,7 @@ management D-Bus specification.") `(("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-1.0.pc (inputs `(("exo" ,exo) - ("garcon", garcon) + ("garcon" ,garcon) ("libwnck" ,libwnck-1) ("libxfce4ui" ,libxfce4ui))) (native-search-paths @@ -519,7 +519,7 @@ allows you to shutdown the computer from Xfce.") `(("exo" ,exo) ("garcon" ,garcon) ("libnotify" ,libnotify) - ("libxcursor", libxcursor) + ("libxcursor" ,libxcursor) ("libxi" ,libxi) ("libxklavier" ,libxklavier) ("libxrandr" ,libxrandr) diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm index 4e9135dd5b..84dd85b2e7 100644 --- a/gnu/packages/xnee.scm +++ b/gnu/packages/xnee.scm @@ -39,7 +39,7 @@ "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j")))) (build-system gnu-build-system) (inputs - `(("gtk+", gtk+-2) + `(("gtk+" ,gtk+-2) ("inputproto" ,inputproto) ("libx11" ,libx11) ("libxext" ,libxext) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9f7b726c53..f69661d088 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -348,7 +348,7 @@ provided.") (build-system gnu-build-system) (inputs `(("bdftopcf" ,bdftopcf) - ("font-util", font-util) + ("font-util" ,font-util) ("mkfontdir" ,mkfontdir))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -380,7 +380,7 @@ provided.") (build-system gnu-build-system) (inputs `(("bdftopcf" ,bdftopcf) - ("font-util", font-util) + ("font-util" ,font-util) ("mkfontdir" ,mkfontdir))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm index 6d25fd4671..fba7bb19b8 100644 --- a/gnu/packages/zsh.scm +++ b/gnu/packages/zsh.scm @@ -64,10 +64,10 @@ "Util/preconfig") (("/bin/sh") (which "sh"))))) %standard-phases))) - (native-inputs `(("autoconf", autoconf))) - (inputs `(("ncurses", ncurses) - ("pcre", pcre) - ("perl", perl))) + (native-inputs `(("autoconf" ,autoconf))) + (inputs `(("ncurses" ,ncurses) + ("pcre" ,pcre) + ("perl" ,perl))) (synopsis "Powerful shell for interactive use and scripting") (description "The Z shell (zsh) is a Unix shell that can be used as an interactive login shell and as a powerful command interpreter -- cgit v1.3