aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-11-15 14:59:31 +0100
committerLudovic Courtès <ludo@gnu.org>2017-11-16 08:45:15 +0100
commit589e3f4e709f35432c522e7c48ddd67c26a0306b (patch)
treefff94d7fc6a76bb1f9ca2a9e180473e7ba17b26b
parentb95c17c58b83273af398363c371e1c8095ca6db8 (diff)
downloadguix-589e3f4e709f35432c522e7c48ddd67c26a0306b.tar
guix-589e3f4e709f35432c522e7c48ddd67c26a0306b.tar.gz
gnu: Move more packages from python to python-web.
* gnu/packages/python.scm (python-requests, python2-requests) (python-requests-2.7, python-oauthlib, python2-oauthlib) (python-furl, python2-furl, python-wsgi-intercept) (python-publicsuffix, python2-publicsuffix) (python-publicsuffix2, python2-publicsuffix2): Move to... * gnu/packages/python-web.scm: ... here. * gnu/packages/bioinformatics.scm, gnu/packages/finance.scm: gnu/packages/maths.scm, gnu/packages/terminals.scm, gnu/packages/video.scm, gnu/packages/virtualization.scm: Adjust accordingly.
-rw-r--r--gnu/packages/bioinformatics.scm1
-rw-r--r--gnu/packages/finance.scm1
-rw-r--r--gnu/packages/maths.scm1
-rw-r--r--gnu/packages/python-web.scm172
-rw-r--r--gnu/packages/python.scm173
-rw-r--r--gnu/packages/terminals.scm1
-rw-r--r--gnu/packages/video.scm1
-rw-r--r--gnu/packages/virtualization.scm3
8 files changed, 179 insertions, 174 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 69c64e7dfc..fb09ebe9ce 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -86,6 +86,7 @@
#:use-module (gnu packages popt)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
#:use-module (gnu packages serialization)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index e123434201..783857c93f 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -46,6 +46,7 @@
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages qt)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 69f5e2db60..5d158dfa50 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -90,6 +90,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages readline)
#:use-module (gnu packages tbb)
#:use-module (gnu packages scheme)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 664c1b8cdc..70b2dfd19e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -21,6 +21,7 @@
;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,6 +52,32 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (srfi srfi-1))
+(define-public python-furl
+ (package
+ (name "python-furl")
+ (version "0.5.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "furl" version))
+ (sha256
+ (base32
+ "0lzpfpm686hvz3sr1mcrnd1b3lgmnw8v59gb43wfi98r3b671pqc"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-six" ,python-six)
+ ("python-orderedmultidict" ,python-orderedmultidict)))
+ (native-inputs
+ `(("python-pycodestyle" ,python-pycodestyle)))
+ (home-page "https://github.com/gruns/furl")
+ (synopsis "URL manipulation in Python")
+ (description "Furl provides an easy-to-use alternative to the
+@code{urllib} and @code{urlparse} modules for manipulating URLs.")
+ (license license:unlicense)))
+
+(define-public python2-furl
+ (package-with-python2 python-furl))
+
(define-public python-httplib2
(package
(name "python-httplib2")
@@ -508,6 +535,38 @@ term.js Javascript terminal emulator library.")
,python2-backport-ssl-match-hostname)
,@(package-propagated-inputs terminado))))))
+(define-public python-wsgi-intercept
+ (package
+ (name "python-wsgi-intercept")
+ (version "1.2.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://pypi.python.org/packages/"
+ "38/76/ebcbc24d0cb77db34520a3ca6ed1bd43ace17d182bbd8dd7d976f1c176fb/"
+ "wsgi_intercept-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0kjj2v2dvmnpdd5h5gk9rzz0f54rhjb0yiz3zg65bmp65slfw65d"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-six" ,python-six)))
+ (native-inputs
+ `(("python-pytest" ,python-pytest)
+ ("python-httplib2" ,python-httplib2)
+ ("python-requests" ,python-requests)
+ ("python-urllib3" ,python-urllib3)))
+ (synopsis "Puts a WSGI application in place of a real URI for testing")
+ (description "Wsgi_intercept installs a WSGI application in place of a real
+URI for testing. Testing a WSGI application normally involves starting a
+server at a local host and port, then pointing your test code to that address.
+Instead, this library lets you intercept calls to any specific host/port
+combination and redirect them into a WSGI application importable by your test
+program. Thus, you can avoid spawning multiple processes or threads to test
+your Web app.")
+ (home-page "https://github.com/cdent/wsgi-intercept")
+ (license license:expat)))
+
(define-public python-webob
(package
(name "python-webob")
@@ -948,6 +1007,43 @@ WebSocket usage in Python programs.")
(define-public python2-websocket-client
(package-with-python2 python-websocket-client))
+(define-public python-requests
+ (package
+ (name "python-requests")
+ (version "2.13.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "requests" version))
+ (sha256
+ (base32
+ "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp"))))
+ ;; TODO: unbundle urllib3 and chardet.
+ (build-system python-build-system)
+ (arguments
+ ;; FIXME: Some tests require network access.
+ '(#:tests? #f))
+ (home-page "http://python-requests.org/")
+ (synopsis "Python HTTP library")
+ (description
+ "Requests is a Python HTTP client library. It aims to be easier to use
+than Python’s urllib2 library.")
+ (license license:asl2.0)))
+
+;; Some software requires an older version of Requests, notably Docker
+;; Compose.
+(define-public python-requests-2.7
+ (package (inherit python-requests)
+ (version "2.7.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "requests" version))
+ (sha256
+ (base32
+ "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir"))))))
+
+(define-public python2-requests
+ (package-with-python2 python-requests))
+
(define-public python-requests-mock
(package
(name "python-requests-mock")
@@ -1014,6 +1110,38 @@ with python-requests.")
(define-public python2-requests-toolbelt
(package-with-python2 python-requests-toolbelt))
+(define-public python-oauthlib
+ (package
+ (name "python-oauthlib")
+ (version "1.0.3")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "oauthlib" version))
+ (sha256
+ (base32
+ "1bfrj70vdjxjw74khbyh6f0dksv7p5rh2346jnlrffyacd3gwjzg"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("python-nose" ,python-nose)
+ ("python-mock" ,python-mock)
+ ("python-cryptography" ,python-cryptography)
+ ("python-pyjwt" ,python-pyjwt)
+ ("python-blinker" ,python-blinker)))
+ (home-page "https://github.com/idan/oauthlib")
+ (synopsis "OAuth implementation for Python")
+ (description
+ "Oauthlib is a generic, spec-compliant, thorough implementation of the
+OAuth request-signing logic.")
+ (license license:bsd-3)
+ (properties `((python2-variant . ,(delay python2-oauthlib))))))
+
+(define-public python2-oauthlib
+ (let ((base (package-with-python2 (strip-python2-variant python-oauthlib))))
+ (package
+ (inherit base)
+ (native-inputs `(("python2-unittest2" ,python2-unittest2)
+ ,@(package-native-inputs base))))))
+
(define-public python-rauth
(package
(name "python-rauth")
@@ -2118,3 +2246,47 @@ Templates.")
(define-public python2-uritemplate
(package-with-python2 python-uritemplate))
+(define-public python-publicsuffix
+ (package
+ (name "python-publicsuffix")
+ (version "1.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "publicsuffix" version))
+ (sha256
+ (base32
+ "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ; tests use the internet
+ (home-page "https://www.tablix.org/~avian/git/publicsuffix.git")
+ (synopsis "Get suffix for a domain name")
+ (description "Get a public suffix for a domain name using the Public Suffix
+List.")
+ (license license:expat)))
+
+(define-public python2-publicsuffix
+ (package-with-python2 python-publicsuffix))
+
+(define-public python-publicsuffix2
+ (package
+ (name "python-publicsuffix2")
+ (version "2.20160818")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "publicsuffix2" version ".tar.bz2"))
+ (sha256
+ (base32
+ "1bb55yka9vkn7i6y1kjzxa516kh6v4gsrxa90w5wdz5p5n968r68"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:tests? #f)) ; The test suite requires network access.
+ (home-page "https://github.com/pombredanne/python-publicsuffix2")
+ (synopsis "Get a public suffix for a domain name using the Public Suffix List")
+ (description "Get a public suffix for a domain name using the Public Suffix
+List. Forked from and using the same API as the publicsuffix package.")
+ (license (list license:expat license:mpl2.0))))
+
+(define-public python2-publicsuffix2
+ (package-with-python2 python-publicsuffix2))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d8de3192c2..e2beba3b5c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2533,44 +2533,6 @@ installed with a newer @code{pip} or with wheel's own command line utility.")
(native-inputs `(("python2-functools32" ,python2-functools32)
,@(package-native-inputs wheel))))))
-
-(define-public python-requests
- (package
- (name "python-requests")
- (version "2.13.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "requests" version))
- (sha256
- (base32
- "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp"))))
- ;; TODO: unbundle urllib3 and chardet.
- (build-system python-build-system)
- (arguments
- ;; FIXME: Some tests require network access.
- '(#:tests? #f))
- (home-page "http://python-requests.org/")
- (synopsis "Python HTTP library")
- (description
- "Requests is a Python HTTP client library. It aims to be easier to use
-than Python’s urllib2 library.")
- (license license:asl2.0)))
-
-;; Some software requires an older version of Requests, notably Docker
-;; Compose.
-(define-public python-requests-2.7
- (package (inherit python-requests)
- (version "2.7.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "requests" version))
- (sha256
- (base32
- "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir"))))))
-
-(define-public python2-requests
- (package-with-python2 python-requests))
-
(define-public python-vcversioner
(package
(name "python-vcversioner")
@@ -2783,38 +2745,6 @@ easier to build concurrent applications.")
(define-public python2-pykka
(package-with-python2 python-pykka))
-(define-public python-oauthlib
- (package
- (name "python-oauthlib")
- (version "1.0.3")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "oauthlib" version))
- (sha256
- (base32
- "1bfrj70vdjxjw74khbyh6f0dksv7p5rh2346jnlrffyacd3gwjzg"))))
- (build-system python-build-system)
- (native-inputs
- `(("python-nose" ,python-nose)
- ("python-mock" ,python-mock)
- ("python-cryptography" ,python-cryptography)
- ("python-pyjwt" ,python-pyjwt)
- ("python-blinker" ,python-blinker)))
- (home-page "https://github.com/idan/oauthlib")
- (synopsis "OAuth implementation for Python")
- (description
- "Oauthlib is a generic, spec-compliant, thorough implementation of the
-OAuth request-signing logic.")
- (license license:bsd-3)
- (properties `((python2-variant . ,(delay python2-oauthlib))))))
-
-(define-public python2-oauthlib
- (let ((base (package-with-python2 (strip-python2-variant python-oauthlib))))
- (package
- (inherit base)
- (native-inputs `(("python2-unittest2" ,python2-unittest2)
- ,@(package-native-inputs base))))))
-
(define-public python-itsdangerous
(package
(name "python-itsdangerous")
@@ -4622,32 +4552,6 @@ multivalue dictionary that retains the order of insertions and deletions.")
(define-public python2-orderedmultidict
(package-with-python2 python-orderedmultidict))
-(define-public python-furl
- (package
- (name "python-furl")
- (version "0.5.6")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "furl" version))
- (sha256
- (base32
- "0lzpfpm686hvz3sr1mcrnd1b3lgmnw8v59gb43wfi98r3b671pqc"))))
- (build-system python-build-system)
- (propagated-inputs
- `(("python-six" ,python-six)
- ("python-orderedmultidict" ,python-orderedmultidict)))
- (native-inputs
- `(("python-pycodestyle" ,python-pycodestyle)))
- (home-page "https://github.com/gruns/furl")
- (synopsis "URL manipulation in Python")
- (description "Furl provides an easy-to-use alternative to the
-@code{urllib} and @code{urlparse} modules for manipulating URLs.")
- (license license:unlicense)))
-
-(define-public python2-furl
- (package-with-python2 python-furl))
-
(define-public python-flaky
(package
(name "python-flaky")
@@ -8395,38 +8299,6 @@ framework which enables you to test server connections locally.")
(home-page "https://pypi.python.org/pypi/pytest-localserver")
(license license:expat)))
-(define-public python-wsgi-intercept
- (package
- (name "python-wsgi-intercept")
- (version "1.2.2")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://pypi.python.org/packages/"
- "38/76/ebcbc24d0cb77db34520a3ca6ed1bd43ace17d182bbd8dd7d976f1c176fb/"
- "wsgi_intercept-" version ".tar.gz"))
- (sha256
- (base32
- "0kjj2v2dvmnpdd5h5gk9rzz0f54rhjb0yiz3zg65bmp65slfw65d"))))
- (build-system python-build-system)
- (propagated-inputs
- `(("python-six" ,python-six)))
- (native-inputs
- `(("python-pytest" ,python-pytest)
- ("python-httplib2" ,python-httplib2)
- ("python-requests" ,python-requests)
- ("python-urllib3" ,python-urllib3)))
- (synopsis "Puts a WSGI application in place of a real URI for testing")
- (description "Wsgi_intercept installs a WSGI application in place of a real
-URI for testing. Testing a WSGI application normally involves starting a
-server at a local host and port, then pointing your test code to that address.
-Instead, this library lets you intercept calls to any specific host/port
-combination and redirect them into a WSGI application importable by your test
-program. Thus, you can avoid spawning multiple processes or threads to test
-your Web app.")
- (home-page "https://github.com/cdent/wsgi-intercept")
- (license license:expat)))
-
(define-public python-pytest-xprocess
(package
(name "python-pytest-xprocess")
@@ -11174,51 +11046,6 @@ discovery, monitoring and configuration.")
(define-public python2-schematics
(package-with-python2 python-schematics))
-(define-public python-publicsuffix
- (package
- (name "python-publicsuffix")
- (version "1.1.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "publicsuffix" version))
- (sha256
- (base32
- "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf"))))
- (build-system python-build-system)
- (arguments
- `(#:tests? #f)) ; tests use the internet
- (home-page "https://www.tablix.org/~avian/git/publicsuffix.git")
- (synopsis "Get suffix for a domain name")
- (description "Get a public suffix for a domain name using the Public Suffix
-List.")
- (license license:expat)))
-
-(define-public python2-publicsuffix
- (package-with-python2 python-publicsuffix))
-
-(define-public python-publicsuffix2
- (package
- (name "python-publicsuffix2")
- (version "2.20160818")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "publicsuffix2" version ".tar.bz2"))
- (sha256
- (base32
- "1bb55yka9vkn7i6y1kjzxa516kh6v4gsrxa90w5wdz5p5n968r68"))))
- (build-system python-build-system)
- (arguments
- '(#:tests? #f)) ; The test suite requires network access.
- (home-page "https://github.com/pombredanne/python-publicsuffix2")
- (synopsis "Get a public suffix for a domain name using the Public Suffix List")
- (description "Get a public suffix for a domain name using the Public Suffix
-List. Forked from and using the same API as the publicsuffix package.")
- (license (list license:expat license:mpl2.0))))
-
-(define-public python2-publicsuffix2
- (package-with-python2 python-publicsuffix2))
-
(define-public python-freezegun
(package
(name "python-freezegun")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index d4a0da09a6..2f74c5d5b5 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -50,6 +50,7 @@
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages qt)
#:use-module (gnu packages wm)
#:use-module (gnu packages xdisorg)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 31bc7d1b0e..19b55392bd 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -101,6 +101,7 @@
#:use-module (gnu packages popt)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages qt)
#:use-module (gnu packages ruby)
#:use-module (gnu packages sdl)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index be0a68d5cf..140b2528d3 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@@ -48,6 +48,7 @@
#:use-module (gnu packages polkit)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages selinux)
#:use-module (gnu packages sdl)
#:use-module (gnu packages spice)