From 32d045683d2db1e33bc8fa1b77d1ef90ca2ddb66 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 10 Oct 2016 11:45:05 +0200 Subject: gnu: python2-pytest-runner, python2-msgpack: Remove duplicate definitions. * gnu/packages/python.scm (python2-pytest-runner): Was defined twice, remove duplicate definition. (python2-msgpack): Was defined twice, but differently, remove the obviously wrong second definition. --- gnu/packages/python.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a9fd8eb4a9..3c3a00c6b0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1715,9 +1715,6 @@ supports coverage of subprocesses.") (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs base)))))) -(define-public python2-pytest-runner - (package-with-python2 python-pytest-runner)) - (define-public python-pytest-mock (package (name "python-pytest-mock") @@ -5754,9 +5751,6 @@ reading and writing MessagePack data.") (native-inputs `(("python2-setuptools" ,python2-setuptools))))) -(define-public python2-msgpack - (package-with-python2 python-msgpack)) - (define-public python-netaddr (package (name "python-netaddr") -- cgit 1.4.1 From de585a7e644fdcb6ea05abde23f900d4242fcb48 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 10 Oct 2016 11:59:04 +0200 Subject: gnu: python-pytest-xdist: Remove python byte-code files from source. * gnu/packages/python.scm (python-pytest-xdist, python2-pytest-xdist)[source]: Add snippet. --- 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 3c3a00c6b0..eca60bc251 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1764,7 +1764,15 @@ same arguments.") (uri (pypi-uri "pytest-xdist" version ".zip")) (sha256 (base32 - "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja")))) + "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove pre-compiled .pyc files from source. + (for-each delete-file-recursively + (find-files "." "__pycache__" #:directories? #t)) + (for-each delete-file (find-files "." "\\.pyc$")) + #t)))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit 1.4.1 From b02f7a21d1f143951170236aef3ef1e5e8a464c9 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 7 Oct 2016 21:50:29 +0200 Subject: gnu: python-zope-testing: Strip byte-code and backup-files from source. * gnu/package/python.scm (python-zope-testing, python2-zope-testing)[source]: Add snippet to strip byte-code and backup-files. --- gnu/packages/python.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index eca60bc251..ec56c8593f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6644,7 +6644,13 @@ that have uses outside of the Zope framework.") "/zope.testing/zope.testing-" version ".tar.gz")) (sha256 (base32 - "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s")))) + "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove pre-compiled .pyc files backup files from source. + (for-each delete-file (find-files "." "(\\.pyc|~)$")) + #t)))) (build-system python-build-system) (native-inputs `(("python-zope-exceptions" ,python-zope-exceptions))) -- cgit 1.4.1 From 6a8f26a44154728e68e2e03304b8cff76d117bfa Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 5 Oct 2016 16:37:42 +0200 Subject: gnu: python-pylockfile: Update home-page url. * gnu/packages/python.scm (python-pylockfile, python2-pylockfile): Update home-page url. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ec56c8593f..a1c20884a7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -763,7 +763,7 @@ concepts.") (arguments '(#:test-target "check")) (native-inputs `(("python-pbr" ,python-pbr))) - (home-page "http://code.google.com/p/pylockfile/") + (home-page "https://launchpad.net/pylockfile") (synopsis "Platform-independent file locking module") (description "The lockfile package exports a LockFile class which provides a simple -- cgit 1.4.1 From 190ba6c2afc773238573028f1d27e9645cbcd6dd Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 5 Oct 2016 16:37:42 +0200 Subject: gnu: python-keyring: Update home-page url. * gnu/packages/python.scm (python-keyring, python2-keyring): Update home-page url. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a1c20884a7..c890c68be7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -900,7 +900,7 @@ etc.). The package is structured to make adding new modules easy.") `(("python-pycrypto" ,python-pycrypto))) (arguments `(#:tests? #f)) ;TODO: tests require pytest - (home-page "http://bitbucket.org/kang/python-keyring-lib") + (home-page "https://github.com/jaraco/keyring") (synopsis "Store and access your passwords safely") (description "The Python keyring lib provides a easy way to access the system keyring -- cgit 1.4.1 From 7a8894e803d4fab62bdf4525be1564f2cee6a3d4 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 5 Oct 2016 16:37:42 +0200 Subject: gnu: python-pathlib: Update description. * gnu/packages/python.scm (python-pathlib, python2-pathlib): Update description. --- gnu/packages/python.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c890c68be7..6207896abc 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8849,7 +8849,12 @@ be done easily through operators, attribute accesses, and method calls. comparing Windows paths ignores casing. @item Well-defined semantics, eliminating any inconsistencies or ambiguities (forward vs. backward slashes, etc.). -@end enumerate\n") +@end enumerate + +Note: In Python 3.4, pathlib is now part of the standard library. For other +Python versions please consider python-pathlib2 instead, which tracks the +standard library module. This module (python-pathlib) isn't maintained +anymore.") (license license:expat))) (define-public python2-pathlib -- cgit 1.4.1 From b7afd01893ef2f08049810bd63784e915a8a2f9a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 13 Oct 2016 10:56:54 +0200 Subject: gnu: Add python-whoosh. * gnu/packages/python.scm (python-whoosh, python2-whoosh): 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 6207896abc..69c7d360eb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8823,6 +8823,36 @@ library.") (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs responses)))))) +(define-public python-whoosh + (package + (name "python-whoosh") + (version "2.7.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Whoosh" version)) + (sha256 + (base32 + "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-pytest" ,python-pytest))) + (home-page "http://bitbucket.org/mchaput/whoosh") + (synopsis "Full text indexing, search, and spell checking library") + (description + "Whoosh is a fast, pure-Python full text indexing, search, and spell +checking library.") + (license license:bsd-2))) + +(define-public python2-whoosh + (let ((whoosh (package-with-python2 (strip-python2-variant python-whoosh)))) + (package (inherit whoosh) + (propagated-inputs + `(("python2-backport-ssl-match-hostname" + ,python2-backport-ssl-match-hostname) + ,@(package-propagated-inputs whoosh)))))) + (define-public python-pathlib (package (name "python-pathlib") -- cgit 1.4.1 From caa0edb36c197c7aac3fd6f09c17bf034aaa2e2c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Oct 2016 01:30:09 -0400 Subject: gnu: python-pyasn1: Update to 0.1.9. * gnu/packages/python.scm (python-pyasn1, python2-pyasn1): Update to 0.1.9. [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 69c7d360eb..acdbe1cb4f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6013,15 +6013,14 @@ designed to efficently cope with extremely large amounts of data.") (define-public python-pyasn1 (package (name "python-pyasn1") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/" - "pyasn1/pyasn1-" version ".tar.gz")) + (uri (pypi-uri "pyasn1" version)) (sha256 (base32 - "0iw31d9l0zwx35szkzq72hiw002wnqrlrsi9dpbrfngcl1ybwcsx")))) + "0zraxni14bqi20kr4bi6nwsh32aibz0fq0xaczfisw0zdpcsqg45")))) (build-system python-build-system) (home-page "http://pyasn1.sourceforge.net/") (synopsis "ASN.1 types and codecs") -- cgit 1.4.1 From eb68d2685aeffc00b0b85418bdb5a01b47a14b6e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Oct 2016 01:33:59 -0400 Subject: gnu: python-pyopenssl: Update to 16.1.0. * gnu/packages/python.scm (python-pyopenssl, python2-pyopenssl): Update to 16.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 acdbe1cb4f..aba3e79d9d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6250,15 +6250,14 @@ message digests and key derivation functions.") (define-public python-pyopenssl (package (name "python-pyopenssl") - (version "16.0.0") + (version "16.1.0") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/" - "pyOpenSSL/pyOpenSSL-" version ".tar.gz")) + (uri (pypi-uri "pyOpenSSL" version)) (sha256 (base32 - "0zfijaxlq4vgi6jz0d4i5xq9ygqnyps6br7lmigjhqnh8gp10g9n")))) + "0prm06zz7hl6bk5s2lqzw25lq6smayfv2fgiliw2rbqxlyiavxw8")))) (build-system python-build-system) (propagated-inputs `(("python-cryptography" ,python-cryptography) -- cgit 1.4.1 From 0580e383c2dd75373074b9a778cf9e2aee05365b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Oct 2016 01:37:46 -0400 Subject: gnu: python-werkzeug: Update to 0.11.11. * gnu/packages/python.scm (python-werkzeug, python2-werkzeug): Update to 0.11.11. --- 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 aba3e79d9d..2872a2e529 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6974,14 +6974,14 @@ timestamps.") (define-public python-werkzeug (package (name "python-werkzeug") - (version "0.11.5") + (version "0.11.11") (source (origin (method url-fetch) (uri (pypi-uri "Werkzeug" version)) (sha256 (base32 - "0r41xqp4cypzcgsf6zbspbqd272wnzf20igb4w4b5wzfhgqh9nxg")))) + "1rgpq8a2qv26d75v9j3b074inirlyy6y4b5x4rxblp202jy4cb77")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit 1.4.1 From 6c514128ece70d7d6458bd8fb0b80e7745a55243 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Oct 2016 02:21:04 -0400 Subject: gnu: python-dnspython: Update to 0.15.0. * gnu/packages/python.scm (python-dnspython, python2-dnspython): Update to 0.15.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 2872a2e529..c5a39f49ee 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9858,14 +9858,14 @@ until the object is actually required, and caches the result of said call.") (define-public python-dnspython (package (name "python-dnspython") - (version "1.14.0") + (version "1.15.0") (source (origin (method url-fetch) (uri (string-append "http://www.dnspython.org/kits/" version "/dnspython-" version ".tar.gz")) (sha256 (base32 - "1z472r63gdqsxhsxj3plr5vs478yf4303vrqxxpsccc940g441hl")))) + "0jr4v2pd90i6l1xxbss2m05psbjaxvyvvvpq44wycijpfgjqln8i")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; XXX: requires internet access (native-inputs -- cgit 1.4.1