From dbcd2050500c932190d710cee43f5e14f0fd59db Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 14 Jan 2021 16:27:39 -0500 Subject: gnu: python-xyz: Move a few modules to (gnu packages python-build). * gnu/packages/python-xyz.scm (python-pep517): Inherit from python-pep517-bootstrap. Remove the inherited common fields. (python-poetry-core, python-wheel) (python-toml): Move to ... * gnu/packages/python-build.scm: ... here, a new module. (python-pep517-bootstrap): New package. * gnu/local.mk (GNU_SYSTEM_MODULES): Register the new module. --- 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 622f5fc6e23..c8ad94ae496 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-compression) #:use-module (gnu packages python-crypto) -- cgit v1.3 From 3c816ac243692d5f2f157c49d2908760859e0549 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:15:40 -0500 Subject: gnu: python2-falcon: Remove package. * gnu/packages/python-web.scm (python2-falcon): Delete. --- gnu/packages/python-web.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c8ad94ae496..13fcba03e95 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -510,13 +510,6 @@ classes (properties `((python2-variant . ,(delay python2-falcon)))) (license license:asl2.0))) -(define-public python2-falcon - (let ((falcon (package-with-python2 (strip-python2-variant python-falcon)))) - (package - (inherit falcon) - (native-inputs - (alist-delete "python-rapidjson" (package-native-inputs falcon)))))) - (define-public python-falcon-cors (package (name "python-falcon-cors") -- cgit v1.3 From 5bc0c8fe3e061057fadb2405dd03ef483b948ed7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:15:58 -0500 Subject: gnu: python2-falcon-cors: Remove package. * gnu/packages/python-web.scm (python2-falcon-cors): Delete. --- 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 13fcba03e95..dfe256f6ae2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -533,9 +533,6 @@ CORS object to the incoming requests, enabling the ability to serve resources over a different origin than that of the web application.") (license license:asl2.0))) -(define-public python2-falcon-cors - (package-with-python2 python-falcon-cors)) - (define-public python-furl (package (name "python-furl") -- cgit v1.3 From 97f18952c666999d7fc8cc59eda995cf3c31cc3f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:16:12 -0500 Subject: gnu: python2-cachecontrol: Remove package. * gnu/packages/python-web.scm (python2-cachecontrol): Delete. --- 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 dfe256f6ae2..1f16ff4efbc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3175,9 +3175,6 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients." @code{httplib2} for use with @code{requests} session objects.") (license license:asl2.0))) -(define-public python2-cachecontrol - (package-with-python2 python-cachecontrol)) - (define-public python-cachecontrol-0.11 (package (inherit python-cachecontrol) -- cgit v1.3 From a1df6295de620a4b0434539902ea94ddd8319517 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:18:03 -0500 Subject: gnu: python2-fasteners: Remove package. * gnu/packages/python-xyz.scm (python2-fasteners): Delete. --- gnu/packages/python-web.scm | 1 - gnu/packages/python-xyz.scm | 9 --------- 2 files changed, 10 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1f16ff4efbc..efb6296e907 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -507,7 +507,6 @@ classes @item Compatible with both CPython and PyPy @item Cython support for better performance when used with CPython @end itemize") - (properties `((python2-variant . ,(delay python2-falcon)))) (license license:asl2.0))) (define-public python-falcon-cors diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2388567c597..3c18ef72b6b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18969,17 +18969,8 @@ inferring type information using compile-time introspection.") @item Inter-process locks @item Generic helpers @end itemize\n") - (properties `((python2-variant . ,(delay python2-fasteners)))) (license license:asl2.0))) -(define-public python2-fasteners - (let ((base (package-with-python2 (strip-python2-variant python-fasteners)))) - (package - (inherit base) - (propagated-inputs - `(("python2-futures" ,python2-futures) - ,@(package-propagated-inputs base)))))) - (define-public python-requests-file (package (name "python-requests-file") -- cgit v1.3 From 5048eb397296587aef9e5015d54f52101423afbd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:23:52 -0500 Subject: gnu: python2-requests-oauthlib: Remove package. * gnu/packages/python-web.scm (python2-requests-oauthlib): --- 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 efb6296e907..aedd445c4d0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3111,9 +3111,6 @@ concurrent HTTP client library for python using @code{gevent}.") provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients.") (license license:isc))) -(define-public python2-requests-oauthlib - (package-with-python2 python-requests-oauthlib)) - (define-public python-url (package (name "python-url") -- cgit v1.3 From cefe8d6026f3c1d5829db2b8cc9f475db8cd39a6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Jan 2021 10:26:39 -0500 Subject: gnu: python2-requests-mock: Remove package. * gnu/packages/python-xyz.scm (python2-requests-mock): Delete. --- 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 aedd445c4d0..b25f5674499 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2517,17 +2517,8 @@ library.") (description "This module provides a building block to stub out the HTTP requests portions of your testing code.") - (properties `((python2-variant . ,(delay python2-requests-mock)))) (license license:asl2.0))) -(define-public python2-requests-mock - (package (inherit (package-with-python2 - (strip-python2-variant python-requests-mock))) - (arguments - `(#:python ,python-2 - ;; FIXME: 'subunit.run discover: error: no such option: --list' - #:tests? #f)))) - (define-public python-requests-toolbelt (package (name "python-requests-toolbelt") -- cgit v1.3