From 02eb70bd21cc1cd493517450e9d0e626fe478704 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 27 Apr 2019 19:36:35 +1000 Subject: gnu: Add python-css-parser, python2-css-parser. * gnu/packages/python-web.scm (python-css-parser, python2-css-parser): New variables. Signed-off-by: Andreas Enge --- gnu/packages/python-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 50d7097d38..37da0fd669 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -637,6 +637,28 @@ options.") (define-public python2-cssutils (package-with-python2 python-cssutils)) +(define-public python-css-parser + (package + (inherit python-cssutils) + (name "python-css-parser") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "css-parser" version ".tar.gz")) + (sha256 + (base32 + "0i4xfykiffxzr4f6y0m2ggqvx1rzam6pw6krlr5k6ldf29akbay7")))) + (home-page "https://github.com/ebook-utils/css-parser") + (synopsis "Fork of cssutils modified for parsing ebooks") + (description + "Css-parser is a fork of cssutils 1.0.2, updated and modified for parsing +ebooks, due to cssutils not receiving updates as of 1.0.2.") + (license license:lgpl3+))) + +(define-public python2-css-parser + (package-with-python2 python-css-parser)) + (define-public python-cssselect (package (name "python-cssselect") -- cgit v1.2.3 From 7a82ceb7bb749e5590c82ea31985497271df26a0 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:15 +1000 Subject: gnu: Add python-html2text, python2-html2text. * gnu/packages/python-web.scm (python-html2text): New variable. (python2-html2text): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/python-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 37da0fd669..839d444f7c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -299,6 +299,28 @@ other HTTP libraries.") (define-public python2-httplib2 (package-with-python2 python-httplib2)) +(define-public python-html2text + (package + (name "python-html2text") + (version "2018.1.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "html2text" version)) + (sha256 + (base32 + "1m6d7ciq30adc3d1n8g6r46072n7q8kdy039pqvnnmp763xi8xb2")))) + (build-system python-build-system) + (home-page "https://pypi.org/project/html2text/") + (synopsis "Convert HTML into plain text") + (description "html2text takes HTML and converts it into plain ASCII text +which is also valid markdown. html2text was originally written by Aaron +Swartz.") + (license license:gpl3+))) + +(define-public python2-html2text + (package-with-python2 python-html2text)) + (define-public python-mechanicalsoup (package (name "python-mechanicalsoup") -- cgit v1.2.3 From dcfa0acd7be3d6beaa87aae0ebe92104d7626a57 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:32 +1000 Subject: Correct email and license info for Brendan Tildesley. * gnu/packages/audio.scm: Correct email and license info. * gnu/packages/ebook.scm: Correct email and license info. * gnu/packages/fonts.scm: Correct email and license info. * gnu/packages/freedesktop.scm: Correct email and license info. * gnu/packages/gnome.scm: Correct email and license info. * gnu/packages/linux.scm: Correct email and license info. * gnu/packages/lxde.scm: Correct email and license info. * gnu/packages/python-web.scm: Correct email and license info. * gnu/packages/python-xyz.scm: Correct email and license info. * gnu/packages/python.scm: Correct email and license info. * gnu/packages/video.scm: Correct email and license info. * gnu/packages/web.scm: Correct email and license info. Signed-off-by: Danny Milosavljevic --- gnu/packages/python-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 839d444f7c..757f1058ab 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2019 Vagrant Cascadian +;;; Copyright © 2019 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 94249db825438ca2b2a1bded67b8459bf5098e8c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 May 2019 12:56:23 +0200 Subject: gnu: python2-terminado: Add missing input. * gnu/packages/python-web.scm (python2-terminado)[propagated-inputs]: Add python2-futures. --- gnu/packages/python-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 757f1058ab..3d9577a4d8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -861,6 +861,7 @@ term.js Javascript terminal emulator library.") (propagated-inputs `(("python2-backport-ssl-match-hostname" ,python2-backport-ssl-match-hostname) + ("python2-futures" ,python2-futures) ,@(package-propagated-inputs terminado)))))) (define-public python-wsgi-intercept -- cgit v1.2.3 From 5f7e3ac066e75ac98d218b0a38bbc240ad8ff9c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 18:51:06 +0200 Subject: gnu: python-oauthlib: Update home page. * gnu/packages/python-web.scm (python-oauthlib)[home-page]: Follow redirect to . --- gnu/packages/python-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3d9577a4d8..af04219514 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1447,7 +1447,7 @@ with python-requests.") ("python-cryptography" ,python-cryptography) ("python-pyjwt" ,python-pyjwt) ("python-blinker" ,python-blinker))) - (home-page "https://github.com/idan/oauthlib") + (home-page "https://github.com/oauthlib/oauthlib") (synopsis "OAuth implementation for Python") (description "Oauthlib is a generic, spec-compliant, thorough implementation of the -- cgit v1.2.3 From e7c67f1b69c373d6504928d52382b483e555e7f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 18:53:36 +0200 Subject: gnu: python-oauthlib: Propagate required inputs. * gnu/packages/python-web.scm (python-oauthlib)[native-inputs]: Move PYTHON-CRYPTOGRAPHY, PYTHON-PYJWT, and PYTHON-BLINKER ... [propagated-inputs]: ... here. --- gnu/packages/python-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index af04219514..e5993164cd 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1443,8 +1443,9 @@ with python-requests.") (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose) - ("python-mock" ,python-mock) - ("python-cryptography" ,python-cryptography) + ("python-mock" ,python-mock))) + (propagated-inputs + `(("python-cryptography" ,python-cryptography) ("python-pyjwt" ,python-pyjwt) ("python-blinker" ,python-blinker))) (home-page "https://github.com/oauthlib/oauthlib") -- cgit v1.2.3 From c8a7cc69c9e5beedf89c1b98a42f82fd8a647646 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 18:54:50 +0200 Subject: gnu: python-oauthlib: Update to 3.0.1. * gnu/packages/python-web.scm (python-oauthlib): Update to 3.0.1. [arguments]: Replace check phase with pytest invokation. [native-inputs]: Remove PYTHON-NOSE. Add PYTHON-PYTEST and PYTHON-PYTEST-COV. [properties]: Remove. (python2-oauthlib)[native-inputs]: Remove PYTHON2-UNITTEST2. --- gnu/packages/python-web.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e5993164cd..d25e10eadb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1433,16 +1433,22 @@ with python-requests.") (define-public python-oauthlib (package (name "python-oauthlib") - (version "1.0.3") + (version "3.0.1") (source (origin (method url-fetch) (uri (pypi-uri "oauthlib" version)) (sha256 (base32 - "1bfrj70vdjxjw74khbyh6f0dksv7p5rh2346jnlrffyacd3gwjzg")))) + "163jg4a8f7c5ki655grrr47kgljy12wri3qly7ijf64sk1fjrqqc")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) (native-inputs - `(("python-nose" ,python-nose) + `(("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) ("python-mock" ,python-mock))) (propagated-inputs `(("python-cryptography" ,python-cryptography) @@ -1453,15 +1459,10 @@ with python-requests.") (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)))))) + (license license:bsd-3))) (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)))))) + (package-with-python2 python-oauthlib)) (define-public python-rauth (package -- cgit v1.2.3 From 395c142ed967b3f5ae0c1b6a43d26f1c3e5cbdc9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 19:01:03 +0200 Subject: gnu: python-requests-oauthlib: Update to 1.2.0. * gnu/packages/python-web.scm (python-requests-oauthlib): Update to 1.2.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d25e10eadb..2db94f0430 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1867,14 +1867,14 @@ concurrent HTTP client library for python using @code{gevent}.") (define-public python-requests-oauthlib (package (name "python-requests-oauthlib") - (version "0.6.2") + (version "1.2.0") (source (origin (method url-fetch) (uri (pypi-uri "requests-oauthlib" version)) (sha256 (base32 - "0ykff67sjcl227c23g0rxzfx34rr5bf21kwv0z3zmgk0lfmch7hn")))) + "0mrglgcvq7k48pf27s4gifdk0za8xmgpf55jy15yjj471qrk6rdx")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6b4a6c201a935a2df8e473465662b2bb75491bfb Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 14 May 2019 21:18:53 +0200 Subject: gnu: python-requests-oauthlib: Fix building. * gnu/packages/python-web.scm (python-requests-oauthlib)[native-inputs]: Add python-pyjwt for tests. --- gnu/packages/python-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2db94f0430..a163014c47 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1885,7 +1885,8 @@ concurrent HTTP client library for python using @code{gevent}.") (delete-file "tests/test_core.py") #t))))) (native-inputs - `(("python-requests-mock" ,python-requests-mock) + `(("python-pyjwt" ,python-pyjwt) + ("python-requests-mock" ,python-requests-mock) ("python-mock" ,python-mock))) (propagated-inputs `(("python-oauthlib" ,python-oauthlib) -- cgit v1.2.3 From 9d0c291e3e6d226cdfd4cebee0a389ad24fa748f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 22:56:54 +0200 Subject: gnu: Move Sphinx and friends to (gnu packages sphinx). * gnu/packages/python-xyz.scm (python-sphinxcontrib-websupport, python2-sphinxcontrib-websupport, python-sphinx, python2-sphinx, python-sphinx-gallery, python2-sphinx-gallery, python-sphinx-rtd-theme, python2-sphinx-rtd-theme, python-guzzle-sphinx-theme, python2-guzzle-sphinx-theme, python-sphinxcontrib-newsfeed, python-sphinxcontrib-programoutput, python2-sphinxcontrib-programoutput, python-sphinx-repoze-interface, python2-sphinx-repoze-interface, python-sphinx-cloud-sptheme, python2-sphinx-cloud-sptheme, python-sphinx-alabaster-theme, python2-sphinx-alabaster-theme, python-sphinx-me, python-sphinxcontrib-svg2pdfconverter): Move to ... (gnu): * gnu/packages/sphinx.scm: ... here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/packages/admin.scm, gnu/packages/bioinformatics.scm, gnu/packages/calendar.scm, gnu/packages/cluster.scm, gnu/packages/databases.scm, gnu/packages/dav.scm, gnu/packages/disk.scm, gnu/packages/django.scm, gnu/packages/elf.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emulators.scm, gnu/packages/finance.scm, gnu/packages/image.scm, gnu/packages/libffi.scm, gnu/packages/mail.scm, gnu/packages/mpd.scm, gnu/packages/openstack.scm, gnu/packages/pdf.scm, gnu/packages/python-web.scm, gnu/packages/search.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/sync.scm, gnu/packages/terminals.scm, gnu/packages/tls.scm, gnu/packages/web.scm: Adjust module imports. --- gnu/packages/python-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a163014c47..5d37e171e4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages tls) #:use-module (gnu packages time) #:use-module (gnu packages web) -- cgit v1.2.3 From 05a5bd836654ca39c57b77ca9cbd5f98547a9293 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 11:32:24 +0200 Subject: gnu: python-requests: Update to 2.22.0. * gnu/packages/python-web.scm (python-requests): Update to 2.22.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5d37e171e4..ad7eb3d779 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1327,13 +1327,13 @@ WebSocket usage in Python programs.") (define-public python-requests (package (name "python-requests") - (version "2.21.0") + (version "2.22.0") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "13jr0wkj9c2j8c0c8iaal9iivi0bpxghnsdn6lxcpnmc657q4ajh")))) + "1d5ybh11jr5sm7xp6mz8fyc7vrp4syifds91m7sj60xalal0gq0i")))) (build-system python-build-system) (propagated-inputs `(("python-certifi" ,python-certifi) -- cgit v1.2.3 From b97f4a357c4a9d5597f5dd0b137ab0263160dd44 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 11:54:01 +0200 Subject: gnu: python-urllib3: Update to 1.25.3. * gnu/packages/python-web.scm (python-urllib3): Update to 1.25.3. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ad7eb3d779..708ffe618f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1500,14 +1500,14 @@ authenticated session objects providing things like keep-alive.") (define-public python-urllib3 (package (name "python-urllib3") - (version "1.24.1") + (version "1.25.3") (source (origin (method url-fetch) (uri (pypi-uri "urllib3" version)) (sha256 (base32 - "08lwd9f3hqznyf32vnzwvp87pchx062nkbgyrf67rwlkgj0jk5fy")))) + "0cij8qcvvpj62g1q8n785qjkdymfh4b7vf45si4sw64l41rr3rfv")))) (build-system python-build-system) (arguments `(#:tests? #f)) (propagated-inputs -- cgit v1.2.3