From 46ef39b4be81076f11f37507667eb42786c4727f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:02:27 -0400 Subject: gnu: Remove python2-html5lib. * gnu/packages/python-web.scm (python2-html5lib): Delete variable. (python-html5lib-0.9, python2-html5lib-0.9): Likewise. --- gnu/packages/python-web.scm | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b4a2bc365b7..7feac5955f2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1326,25 +1326,6 @@ storage.") and written in Python.") (license license:expat))) -(define-public python2-html5lib - (package-with-python2 python-html5lib)) - -;; Needed for python-bleach, a dependency of python-notebook -(define-public python-html5lib-0.9 - (package - (inherit python-html5lib) - (version "0.999") - (source - (origin - (method url-fetch) - (uri (pypi-uri "html5lib" version)) - (sha256 - (base32 - "17n4zfsj6ynmbwdwviywmj8r6nzr3xvfx2zs0xhndmvm51z7z263")))))) - -(define-public python2-html5lib-0.9 - (package-with-python2 python-html5lib-0.9)) - (define-public python-html5-parser (package (name "python-html5-parser") -- cgit v1.3 From 77afe03cf9e90f597571b4181f620da0997e84af Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 May 2022 00:38:02 -0400 Subject: gnu: Add python-jstyleson. * gnu/packages/python-web.scm (python-jstyleson): New variable. --- gnu/packages/python-web.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 7feac5955f2..cb52db3bbdb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -7368,3 +7368,22 @@ scraping framework, used to crawl websites and extract structured data from their pages. It can be used for a wide range of purposes, from data mining to monitoring and automated testing.") (license license:bsd-3))) + +(define-public python-jstyleson + (package + (name "python-jstyleson") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jstyleson" version)) + (sha256 + (base32 "13ihw6jqwkg3ai4xb83kw39pvh73b2wg6ld3wvj5jaasn7rh6038")))) + (build-system python-build-system) + (arguments (list #:tests? #f)) ;no tests in pypi release + (home-page "https://github.com/linjackson78/jstyleson") + (synopsis "JSON parser supporting js-style comments") + (description "@code{jstyleson} is a Python library to parse JSON. +Contrary to the standard Python @code{json} library, it understands js-style +comments. Trailing comma is also supported.") + (license license:expat))) -- cgit v1.3 From 32ffbb16e8cbb9c5416274320a56885c45a88ebf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 May 2022 00:39:09 -0400 Subject: gnu: Add python-html-text. * gnu/packages/python-web.scm (python-html-text): New variable. --- 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 cb52db3bbdb..00fe560a360 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -7387,3 +7387,25 @@ mining to monitoring and automated testing.") Contrary to the standard Python @code{json} library, it understands js-style comments. Trailing comma is also supported.") (license license:expat))) + +(define-public python-html-text + (package + (name "python-html-text") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "html_text" version)) + (sha256 + (base32 "1v9x171l3bmyayc1144nrkn9410lp4lhlrrjii54j7b5f2xipmmg")))) + (build-system python-build-system) + (native-inputs (list python-pytest)) + (propagated-inputs (list python-lxml)) + (home-page "https://github.com/TeamHG-Memex/html-text") + (synopsis "Extract text from HTML") + (description "HTML to Text is a Python library for extract text from HTML. +Contrary to other solution such as LXML or Beautiful Soup, the text extracted +with @code{html_text} does not contain elements such as JavaScript or inline +styles not normally visible to users. It also normalizes white space +characters in a smarter, more visually pleasing style.") + (license license:expat))) -- cgit v1.3 From c5dd41afc6659b96c86efea512ee7ecc0bbf6604 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 May 2022 00:47:24 -0400 Subject: gnu: Add python-mf2py. * gnu/packages/python-web.scm (python-mf2py): New variable. --- gnu/packages/python-web.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 00fe560a360..59828d7473c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -7409,3 +7409,35 @@ with @code{html_text} does not contain elements such as JavaScript or inline styles not normally visible to users. It also normalizes white space characters in a smarter, more visually pleasing style.") (license license:expat))) + +(define-public python-mf2py + (package + (name "python-mf2py") + (version "1.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/microformats/mf2py") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00pzfc5sl6ywlcr6f2k37n3f2bb7w488p2k95ixzjwx6w3yh747n")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "test"))))))) + (native-inputs (list python-pytest)) + (propagated-inputs + (list python-beautifulsoup4 python-html5lib python-requests)) + (home-page "https://github.com/microformats/mf2py") + (synopsis "Python Microformats2 parser") + (description "This Python library provides a Microformats2 parser +implementing the full Microformats2 (mf2) specification, including backward +compatibility with Microformats1 (mf1).") + (license license:expat))) -- cgit v1.3 From 4820a23521727091d0085e5b381aa5c44ebd2ecb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 3 May 2022 16:05:36 -0400 Subject: gnu: Add python-extruct. * gnu/packages/python-web.scm (python-extruct): New variable. --- gnu/packages/python-web.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 59828d7473c..427994e22b6 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -97,6 +97,7 @@ #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages rdf) #:use-module (gnu packages rpc) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) @@ -7441,3 +7442,49 @@ characters in a smarter, more visually pleasing style.") implementing the full Microformats2 (mf2) specification, including backward compatibility with Microformats1 (mf1).") (license license:expat))) + +(define-public python-extruct + (package + (name "python-extruct") + (version "0.13.0") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/scrapinghub/extruct") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "075zldf3dqcc429z1vk2ngbmv034bnlyk6arh3rh30jbsvz9pzl5")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "tests"))))))) + (native-inputs (list python-pytest)) + (propagated-inputs + (list python-html-text + python-jstyleson + python-lxml + python-mf2py + python-pyrdfa3 + python-rdflib + python-rdflib-jsonld + python-w3lib)) + (home-page "https://github.com/scrapinghub/extruct") + (synopsis "Extract embedded metadata from HTML markup") + (description "@code{extruct} is a Python library for extracting embedded +metadata from HTML markup. Currently, extruct supports: +@itemize +@item W3C's HTML Microdata +@item embedded JSON-LD +@item Microformat via mf2py +@item Facebook's Open Graph +@item (experimental) RDFa via rdflib +@item Dublin Core Metadata (DC-HTML-2003) +@end itemize") + (license license:bsd-3))) -- cgit v1.3 From c59edcc5ed822c8966443acf3eb9f63b1614dc27 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:38:29 -0400 Subject: gnu: Remove python2-oauth2client. * gnu/packages/python-web.scm (python2-oauth2client): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 427994e22b6..46d4ab105f0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3880,9 +3880,6 @@ users' sessions over extended periods of time.") library for Python") (license license:asl2.0))) -(define-public python2-oauth2client - (package-with-python2 python-oauth2client)) - (define-public python-flask-oidc (package (name "python-flask-oidc") -- cgit v1.3 From 7a9514eb059f9d7ef666e25be1825782a9eaf1a6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:38:49 -0400 Subject: gnu: Remove python2-zope-configuration. * gnu/packages/python-web.scm (python2-zope-configuration): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 46d4ab105f0..ce2dfffa693 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2385,9 +2385,6 @@ Markup Language.") (define-public python-zope-configuration-bootstrap (python-zope-bootstrap-package python-zope-configuration)) -(define-public python2-zope-configuration - (package-with-python2 python-zope-configuration)) - (define-public python-zope-copy (package (name "python-zope-copy") -- cgit v1.3 From e6ef574f2aed80b24fdaeda315f3a6d4b1903bb8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:38:52 -0400 Subject: gnu: Remove python2-sockjs-tornado. * gnu/packages/python-web.scm (python2-sockjs-tornado): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ce2dfffa693..3e2fe276c19 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1160,9 +1160,6 @@ SockJS provides a low-latency, full-duplex, cross-domain communication channel between a web browser and web server.") (license license:expat))) -(define-public python2-sockjs-tornado - (package-with-python2 python-sockjs-tornado)) - (define-public python-flask-assets (package (name "python-flask-assets") -- cgit v1.3 From b63429583b6ad1460cbc249fd4a61aa3cb24ef95 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:38:58 -0400 Subject: gnu: Remove python2-zope-security. * gnu/packages/python-web.scm (python2-zope-security): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3e2fe276c19..643cba6c770 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2539,9 +2539,6 @@ security policies on Python objects.") ("python-zope-proxy" ,python-zope-proxy-bootstrap) ("python-zope-schema" ,python-zope-schema))))) -(define-public python2-zope-security - (package-with-python2 python-zope-security)) - (define-public python-zope-component (package (name "python-zope-component") -- cgit v1.3 From 6944240e51c22d201d285a4ccb142b535239bd38 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:39:01 -0400 Subject: gnu: Remove python2-oauthlib. * gnu/packages/python-web.scm (python2-oauthlib): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 643cba6c770..f47ff351fff 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2966,9 +2966,6 @@ adapter for use with the Requests library.") OAuth request-signing logic.") (license license:bsd-3))) -(define-public python2-oauthlib - (package-with-python2 python-oauthlib)) - (define-public python-rauth (package (name "python-rauth") -- cgit v1.3 From 3ccf7ea236e0650f8b905df9f832bdde4b185ba9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:39:13 -0400 Subject: gnu: Remove python2-rauth. * gnu/packages/python-web.scm (python2-rauth): Delete variable. --- gnu/packages/python-web.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f47ff351fff..3ae2e21f2cc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2988,14 +2988,7 @@ OAuth request-signing logic.") "Rauth is a Python library for OAuth 1.0/a, 2.0, and Ofly. It also provides service wrappers for convenient connection initialization and authenticated session objects providing things like keep-alive.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-rauth)))))) - -(define-public python2-rauth - (let ((base (package-with-python2 (strip-python2-variant python-rauth)))) - (package/inherit base - (native-inputs `(("python2-unittest2" ,python2-unittest2) - ,@(package-native-inputs base)))))) + (license license:expat))) (define-public python-unalix (package -- cgit v1.3 From 35caf03b1ea7385bad1b72ce20ee7df07a5f2227 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:39:18 -0400 Subject: gnu: Remove python2-betamax. * gnu/packages/python-web.scm (python2-betamax): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3ae2e21f2cc..cc0061b0bf7 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3518,9 +3518,6 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients." replay them during future tests. It is designed to work with python-requests.") (license license:expat))) -(define-public python2-betamax - (package-with-python2 python-betamax)) - (define-public python-betamax-matchers (package (name "python-betamax-matchers") -- cgit v1.3 From 1e44359cc08dafce41c688effdf581e026d6aa4c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:39:30 -0400 Subject: gnu: Remove python2-pastedeploy. * gnu/packages/python-web.scm (python2-pastedeploy): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index cc0061b0bf7..38a0debca7b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3152,9 +3152,6 @@ Script provides commands to serve applications based on this configuration file.") (license license:expat))) -(define-public python2-pastedeploy - (package-with-python2 python-pastedeploy)) - (define-public python-webtest (package (name "python-webtest") -- cgit v1.3 From 4ed5bc1ca0269ca4e192007294eb6ea2e1207399 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:39:39 -0400 Subject: gnu: Remove python2-genshi. * gnu/packages/python-web.scm (python2-genshi): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 38a0debca7b..5969212b662 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4026,9 +4026,6 @@ of components for parsing, generating, and processing HTML, XML or other textual content for output generation on the web.") (license license:bsd-3))) -(define-public python2-genshi - (package-with-python2 python-genshi)) - (define-public python-flask-principal (package (name "python-flask-principal") -- cgit v1.3 From 25a15e71e65b97f4b7ab9154411f42102beaab70 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:39:52 -0400 Subject: gnu: Remove python2-webob. * gnu/packages/python-web.scm (python2-webob): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5969212b662..6b7585d10e3 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2126,9 +2126,6 @@ your Web app.") object to help create WSGI responses.") (license license:expat))) -(define-public python2-webob - (package-with-python2 python-webob)) - (define-public python-zope-event (package (name "python-zope-event") -- cgit v1.3 From 9f97098f24a9d49ad51faa9eac1af0bb296e1bc1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:21:01 -0400 Subject: gnu: Remove python2-httplib2. * gnu/packages/python-web.scm (python2-httplib2): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6b7585d10e3..f1655bbf851 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -811,9 +811,6 @@ over a different origin than that of the web application.") other HTTP libraries.") (license license:expat))) -(define-public python2-httplib2 - (package-with-python2 python-httplib2)) - (define-public httpie (package (name "httpie") -- cgit v1.3 From 1db8ff4b52edae3584ea108e8984ce135f2329db Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:21:10 -0400 Subject: gnu: Remove python2-zope-component. * gnu/packages/python-web.scm (python2-zope-component): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f1655bbf851..79b7ab429e8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2575,9 +2575,6 @@ facilities for defining, registering and looking up components.") (define-public python-zope-component-bootstrap (python-zope-bootstrap-package python-zope-component)) -(define-public python2-zope-component - (package-with-python2 python-zope-component)) - (define-public python-zope-deferredimport (package (name "python-zope-deferredimport") -- cgit v1.3 From 87c15103e6fc20137162ffa7d0306b150ff874b5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:21:15 -0400 Subject: gnu: Remove python2-zope-location. * gnu/packages/python-web.scm (python2-zope-location): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 79b7ab429e8..5374390cb14 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2489,9 +2489,6 @@ Zope3, which are are special objects that have a structural location.") (define-public python-zope-location-bootstrap (python-zope-bootstrap-package python-zope-location)) -(define-public python2-zope-location - (package-with-python2 python-zope-location)) - (define-public python-zope-security (package (name "python-zope-security") -- cgit v1.3 From b6cd6bee626fe87718817b657ddbc2b3afbb0204 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:20:35 -0400 Subject: gnu: Remove python2-zope-proxy. * gnu/packages/python-web.scm (python2-zope-proxy): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5374390cb14..52bb55ac3e4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2435,9 +2435,6 @@ brokering, etc.) for which the proxy is responsible.") (define-public python-zope-proxy-bootstrap (python-zope-bootstrap-package python-zope-proxy)) -(define-public python2-zope-proxy - (package-with-python2 python-zope-proxy)) - (define-public python-zope-hookable (package (name "python-zope-hookable") -- cgit v1.3 From c4a9b0b03b0cb4e5637bb2688dfbb2cdc344354f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:28:05 -0400 Subject: gnu: Remove python2-zope-schema. * gnu/packages/python-web.scm (python2-zope-schema): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 52bb55ac3e4..f0729ce4cc9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2348,9 +2348,6 @@ internationalized messages within program source text.") defining data schemas.") (license license:zpl2.1))) -(define-public python2-zope-schema - (package-with-python2 python-zope-schema)) - (define-public python-zope-configuration (package (name "python-zope-configuration") -- cgit v1.3 From 176f6ae5a1fabfca78812acb83320ebc47617ebf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:38:54 -0400 Subject: gnu: Remove python2-zope-i18nmessageid. * gnu/packages/python-web.scm (python2-zope-i18nmessageid): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f0729ce4cc9..905c4d8fc91 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2313,9 +2313,6 @@ tests.") internationalized messages within program source text.") (license license:zpl2.1))) -(define-public python2-zope-i18nmessageid - (package-with-python2 python-zope-i18nmessageid)) - (define-public python-zope-schema (package (name "python-zope-schema") -- cgit v1.3 From f5c3588726f664adbf849df4b09cdc8fbffecc2f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:48:24 -0400 Subject: gnu: Remove python2-zope-testrunner. * gnu/packages/python-web.scm (python2-zope-testrunner): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 905c4d8fc91..4eccfcb29f1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2288,9 +2288,6 @@ tests.") ("python-zope-exceptions" ,python-zope-exceptions-bootstrap))) (properties `((hidden? . #t))))) -(define-public python2-zope-testrunner - (package-with-python2 python-zope-testrunner)) - (define-public python-zope-i18nmessageid (package (name "python-zope-i18nmessageid") -- cgit v1.3 From 3db04d3051fc4e9c139dd1585e71e218819dd2f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:54:14 -0400 Subject: gnu: Remove python2-zope-exceptions. * gnu/packages/python-web.scm (python2-zope-exceptions): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4eccfcb29f1..18722b842ac 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2224,9 +2224,6 @@ that have uses outside of the Zope framework.") (define-public python-zope-exceptions-bootstrap (python-zope-bootstrap-package python-zope-exceptions)) -(define-public python2-zope-exceptions - (package-with-python2 python-zope-exceptions)) - (define-public python-zope-testing (package (name "python-zope-testing") -- cgit v1.3 From eccb33c210e364b2c29c08a148e19f1801310888 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:59:09 -0400 Subject: gnu: Remove python2-tornado. * gnu/packages/python-web.scm (python2-tornado): Delete variable. (python-tornado)[properties]: Delete field. --- gnu/packages/python-web.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 18722b842ac..cc444cf488e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1985,8 +1985,7 @@ originally developed at FriendFeed. By using non-blocking network I/O, Tornado can scale to tens of thousands of open connections, making it ideal for long polling, WebSockets, and other applications that require a long-lived connection to each user.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-tornado)))))) + (license license:asl2.0))) (define-public python-tornado-6 (package @@ -2019,16 +2018,6 @@ for long polling, WebSockets, and other applications that require a long-lived connection to each user.") (license license:asl2.0))) -(define-public python2-tornado - (let ((tornado (package-with-python2 (strip-python2-variant python-tornado)))) - (package/inherit tornado - (propagated-inputs - `(("python2-backport-ssl-match-hostname" - ,python2-backport-ssl-match-hostname) - ("python2-backports-abc" ,python2-backports-abc) - ("python2-singledispatch" ,python2-singledispatch) - ,@(package-propagated-inputs tornado)))))) - (define-public python-tornado-http-auth (package (name "python-tornado-http-auth") -- cgit v1.3 From 7287f835234f3087ce7f467517a1e55679683050 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:59:34 -0400 Subject: gnu: Remove python2-zope-interface. * gnu/packages/python-web.scm (python2-zope-interface): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index cc444cf488e..e24b691abdf 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2159,9 +2159,6 @@ interfaces\" for Python. Interfaces are a mechanism for labeling objects as conforming to a given API or contract.") (license license:zpl2.1))) -(define-public python2-zope-interface - (package-with-python2 python-zope-interface)) - (define-public python-zope-exceptions (package (name "python-zope-exceptions") -- cgit v1.3 From 6de507f5c931886f475d98b63fe6e786e403461f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:08:05 -0400 Subject: gnu: Remove python2-zope-testing. * gnu/packages/python-web.scm (python2-zope-testing): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e24b691abdf..3edeef68a4f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2228,9 +2228,6 @@ that have uses outside of the Zope framework.") forms, HTTP servers, regular expressions, and more.") (license license:zpl2.1))) -(define-public python2-zope-testing - (package-with-python2 python-zope-testing)) - (define-public python-zope-testrunner (package (name "python-zope-testrunner") -- cgit v1.3 From a03c2d9c7b6a1fa0c81c020f7140c16be1509db7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:08:09 -0400 Subject: gnu: Remove python2-zope-event. * gnu/packages/python-web.scm (python2-zope-event): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3edeef68a4f..4151d77d2dd 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2132,9 +2132,6 @@ is a simple event-dispatching system on which more sophisticated event dispatching systems can be built.") (license license:zpl2.1))) -(define-public python2-zope-event - (package-with-python2 python-zope-event)) - (define-public python-zope-interface (package (name "python-zope-interface") -- cgit v1.3 From 4d7ae91d3e92723b123b2a56d9638cd556fedade Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:08:24 -0400 Subject: gnu: Remove python2-responses. * gnu/packages/python-web.scm (python2-responses): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4151d77d2dd..a50f071debf 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3260,9 +3260,6 @@ Python.") library.") (license license:asl2.0))) -(define-public python2-responses - (package-with-python2 python-responses)) - (define-public python-grequests (package (name "python-grequests") -- cgit v1.3 From 26f5764071e606658a8b244bb2cc1d1724cd5481 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:45:39 -0400 Subject: gnu: Remove python2-cookies. * gnu/packages/python-web.scm (python2-cookies): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a50f071debf..2950a095eb4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3232,9 +3232,6 @@ Python.") (home-page "https://gitlab.com/sashahart/cookies") (license license:expat))) -(define-public python2-cookies - (package-with-python2 python-cookies)) - (define-public python-responses (package (name "python-responses") -- cgit v1.3 From c427de65313f5875c0fc2b5af41d16a346e70214 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:45:48 -0400 Subject: gnu: Remove python2-pycurl. * gnu/packages/python-web.scm (python2-pycurl): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2950a095eb4..f4302e0108f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1414,9 +1414,6 @@ high-speed transfers via libcurl and frequently outperforms alternatives.") ;; under the terms of LGPLv2.1+ or Expat. (license (list license:lgpl2.1+ license:expat)))) -(define-public python2-pycurl - (package-with-python2 python-pycurl)) - (define-public python-webencodings (package (name "python-webencodings") -- cgit v1.3 From 7720afd99ae389cca36bca51abe7ba6b500fb190 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:47:04 -0400 Subject: gnu: Remove python2-requests. * gnu/packages/python-web.scm (python2-requests): Delete variable. --- gnu/packages/python-web.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f4302e0108f..398f2891dd5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2723,17 +2723,7 @@ APIs.") (description "Requests is a Python HTTP client library. It aims to be easier to use than Python’s urllib2 library.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-requests)))))) - -(define-public python2-requests - (let ((base (package-with-python2 (strip-python2-variant python-requests)))) - (package - (inherit base) - ;; The python-charset-normalizer dependency is necessary on Python 3 - ;; only. - (propagated-inputs (modify-inputs (package-propagated-inputs base) - (delete "python-charset-normalizer")))))) + (license license:asl2.0))) (define-public python-requests-unixsocket (package -- cgit v1.3 From 89ffe2297fd00e498b94466d3477c8833d116bb7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:47:09 -0400 Subject: gnu: Remove python2-bottle. * gnu/packages/python-web.scm (python2-bottle): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 398f2891dd5..24aebe765a4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4147,9 +4147,6 @@ addon modules.") (description "@code{python-bottle} is a WSGI framework for small web-applications.") (license license:expat))) -(define-public python2-bottle - (package-with-python2 python-bottle)) - (define-public python-wtforms (package (name "python-wtforms") -- cgit v1.3 From c0e3ba2904f5fbaa105d54f4a5a920e04caff629 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:51:20 -0400 Subject: gnu: Remove python2-webencodings. * gnu/packages/python-web.scm (python2-webencodings): Delete variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 24aebe765a4..d5132670d5a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1452,9 +1452,6 @@ BOM detection, but the actual implementation for encoders and decoders is Python’s.") (license license:bsd-3))) -(define-public python2-webencodings - (package-with-python2 python-webencodings)) - (define-public python-openapi-schema-validator (package (name "python-openapi-schema-validator") -- cgit v1.3 From eb13c73ce271c8566a7a4fafdbc00d2997dd3740 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:51:23 -0400 Subject: gnu: Remove python2-urllib3. * gnu/packages/python-web.scm (python2-urllib3): Delete variable. --- gnu/packages/python-web.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d5132670d5a..b0454b6f819 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2983,17 +2983,8 @@ addon for removing tracking fields from URLs.") "Urllib3 supports features left out of urllib and urllib2 libraries. It can reuse the same socket connection for multiple requests, it can POST files, supports url redirection and retries, and also gzip and deflate decoding.") - (properties `((python2-variant . ,(delay python2-urllib3)))) (license license:expat))) -(define-public python2-urllib3 - (let ((base (package-with-python2 (strip-python2-variant python-urllib3)))) - (package/inherit - base - (propagated-inputs - `(("python-ipaddress" ,python2-ipaddress) - ,@(package-propagated-inputs base)))))) - (define-public awscli (package ;; Note: updating awscli typically requires updating botocore as well. -- cgit v1.3 From 9377be6a4816c92e13be34c8d3291895a96db757 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 6 May 2022 00:37:38 -0400 Subject: gnu: Add python-lazr-uri. * gnu/packages/python-web.scm (python-lazr-uri): New variable. --- gnu/packages/python-web.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b0454b6f819..76d9642616c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -109,6 +109,24 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-1)) +(define-public python-lazr-uri + (package + (name "python-lazr-uri") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lazr.uri" version)) + (sha256 + (base32 "0r44rw0bj5mayhqwfwj1dnrjgzj1lrh7ishiddd1vygnrczqa9jh")))) + (build-system python-build-system) + (native-inputs (list python-zope-testrunner)) + (home-page "https://launchpad.net/lazr.uri") + (synopsis "Python URI manipulation library") + (description "This Python package provides a self-contained, easily +reusable library for parsing, manipulating, and generating URIs.") + (license license:lgpl3))) + (define-public python-prawcore (package (name "python-prawcore") -- cgit v1.3 From 5e25aeee162d88fd2a7c9254a3b3df1783e1b69b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 6 May 2022 00:41:39 -0400 Subject: gnu: Add python-wadllib. * gnu/packages/python-web.scm (python-wadllib): New variable. --- gnu/packages/python-web.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 76d9642616c..d6f068f6077 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -7394,3 +7394,21 @@ metadata from HTML markup. Currently, extruct supports: @item Dublin Core Metadata (DC-HTML-2003) @end itemize") (license license:bsd-3))) + +(define-public python-wadllib + (package + (name "python-wadllib") + (version "1.3.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wadllib" version)) + (sha256 + (base32 "1z65crvdsjxh9nahz1g6q021ijmv85ixmq88l96d61qh5imavndc")))) + (build-system python-build-system) + (propagated-inputs (list python-lazr-uri)) + (home-page "https://launchpad.net/wadllib") + (synopsis "Web Application Description Language (WADL) navigation library") + (description "The @code{wadllib} Python library allows navigating HTTP +resources using Web Application Description Language (WADL) files as guides.") + (license license:lgpl3))) -- cgit v1.3 From f880fc7b88f25f9cca59dffabd9de6dd0ab24fc9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 10 May 2022 01:05:48 -0400 Subject: gnu: Add python-lazr-restfulclient. * gnu/packages/python-web.scm (python-lazr-restfulclient): New variable. --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d6f068f6077..47ba88882f6 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -109,6 +109,31 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-1)) +(define-public python-lazr-restfulclient + (package + (name "python-lazr-restfulclient") + (version "0.14.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lazr.restfulclient" version)) + (sha256 + (base32 "11yhlqmdf2cqbdfzn8gdmzvmcivh4fflr18zf412sflvfjrdc3xz")))) + (build-system python-build-system) + ;; Disable the test suite to avoid the lazr.authentication requirement, + ;; which requires the ancient 'oauth', a Python 2 only library. + (arguments (list #:tests? #f)) + (propagated-inputs + (list python-distro + python-httplib2 + python-oauthlib + python-wadllib)) + (home-page "https://launchpad.net/lazr.restfulclient") + (synopsis "Web client Python library extending wadlib") + (description "This package provides a programmable client library that +adds functionality on top of @code{wadlib}.") + (license license:lgpl3+))) + (define-public python-lazr-uri (package (name "python-lazr-uri") -- cgit v1.3 From dad15bdb26edbdf7b80519a2e7d0edf4e1efcd5f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 10 May 2022 01:05:59 -0400 Subject: gnu: Add python-launchpadlib. * gnu/packages/python-web.scm (python-launchpadlib): New variable. --- gnu/packages/python-web.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 47ba88882f6..bfbae3ce074 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -134,6 +134,35 @@ adds functionality on top of @code{wadlib}.") (license license:lgpl3+))) +(define-public python-launchpadlib + (package + (name "python-launchpadlib") + (version "1.10.16") + (source + (origin + (method url-fetch) + (uri (pypi-uri "launchpadlib" version)) + (sha256 + (base32 "106aixwchwyb100wlf4cnj1vgsi2d7x40ps8xv8az27r6qwv3x0d")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-before 'check 'set-home + (lambda _ + ;; Tests require a writable home. + (setenv "HOME" "/tmp")))))) + (propagated-inputs + (list python-httplib2 + python-keyring + python-lazr-restfulclient + python-lazr-uri)) + (native-inputs (list python-mock python-testresources python-wadllib)) + (home-page "https://help.launchpad.net/API/launchpadlib") + (synopsis "Python client library for Launchpad's web service") + (description "@code{launchpadlib} is a Python library that allows +scripting Launchpad via its the web service API.") + (license license:lgpl3+))) + (define-public python-lazr-uri (package (name "python-lazr-uri") -- cgit v1.3