[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
191/217: gnu: python-docker: Update to 5.0.3 and remove obsolete package
From: |
guix-commits |
Subject: |
191/217: gnu: python-docker: Update to 5.0.3 and remove obsolete package variants. |
Date: |
Sun, 14 Nov 2021 19:21:23 -0500 (EST) |
vagrantc pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit c4a88826b0d612944ff00c55d2cbe2b94ea11a30
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 31 20:56:29 2021 -0400
gnu: python-docker: Update to 5.0.3 and remove obsolete package variants.
* gnu/packages/docker.scm (python-docker): Update to 5.0.3.
* gnu/packages/python-web.scm (python-requests-2.20): Delete unused package
variant.
(python-urllib3-1.24): Likewise.
---
gnu/packages/docker.scm | 8 ++++----
gnu/packages/python-web.scm | 27 ---------------------------
2 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 8bac1b8..c64760f 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -57,21 +57,21 @@
(define-public python-docker
(package
(name "python-docker")
- (version "3.7.3")
+ (version "5.0.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "docker" version))
(sha256
(base32
- "0qmrcvpaz37p85hfddsd4yc8hgqlkzs4cz09q9wmy0pz5pwajqm0"))))
+ "1yr7w8vmdis01myx26pqx7wcyz2cy1mfs421alppq3lpc9ms45nr"))))
(build-system python-build-system)
;; TODO: Tests require a running Docker daemon.
(arguments '(#:tests? #f))
(inputs
- `(("python-requests" ,python-requests-2.20)
+ `(("python-requests" ,python-requests)
("python-six" ,python-six)
- ("python-urllib3" ,python-urllib3-1.24)))
+ ("python-urllib3" ,python-urllib3)))
(propagated-inputs
`(("python-docker-pycreds" ,python-docker-pycreds)
("python-paramiko" ,python-paramiko) ;adds SSH support
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 1399b69..b644638 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2541,22 +2541,6 @@ APIs.")
than Python’s urllib2 library.")
(license license:asl2.0)))
-;; Some software requires an older version of Requests, notably Docker/Docker
-;; Compose.
-(define-public python-requests-2.20
- (package (inherit python-requests)
- (version "2.20.1")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "requests" version))
- (sha256
- (base32
-
"0qzj6cgv3k9wyj7wlxgz7xq0cfg4jbbkfm24pp8dnhczwl31527a"))))
- (propagated-inputs
- `(("python-urllib3" ,python-urllib3-1.24)
- ("python-idna" ,python-idna-2.7)
- ,@(package-propagated-inputs python-requests)))))
-
(define-public python2-requests
(package-with-python2 python-requests))
@@ -2823,17 +2807,6 @@ supports url redirection and retries, and also gzip and
deflate decoding.")
(properties `((python2-variant . ,(delay python2-urllib3))))
(license license:expat)))
-;; Some software requires an older version of urllib3, notably Docker.
-(define-public python-urllib3-1.24
- (package (inherit python-urllib3)
- (version "1.24.3")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "urllib3" version))
- (sha256
- (base32
-
"1x0slqrv6kixkbcdnxbglvjliwhc1payavxjvk8fvbqjrnasd4r3"))))))
-
(define-public python2-urllib3
(let ((base (package-with-python2 (strip-python2-variant python-urllib3))))
(package/inherit
- 106/217: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., (continued)
- 106/217: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/11/14
- 112/217: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/11/14
- 120/217: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/11/14
- 138/217: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/11/14
- 143/217: gnu: elogind: Update to 246.10., guix-commits, 2021/11/14
- 152/217: gnu: python-dbus: Update to 1.2.18., guix-commits, 2021/11/14
- 167/217: gnu: python-lit: Update to 12.0.1., guix-commits, 2021/11/14
- 169/217: gnu: Add meson-0.59., guix-commits, 2021/11/14
- 171/217: gnu: gtkmm: Update to 4.4.0., guix-commits, 2021/11/14
- 189/217: gnu: Remove references to a removed patch., guix-commits, 2021/11/14
- 191/217: gnu: python-docker: Update to 5.0.3 and remove obsolete package variants.,
guix-commits <=
- 203/217: build: meson: Replace the 'test-target' argument by 'test-options'., guix-commits, 2021/11/14
- 197/217: gnu: ansible-core: Update to 2.11.6., guix-commits, 2021/11/14
- 214/217: gnu: python-wmctrl: Add missing python-attrs propagated inputs., guix-commits, 2021/11/14
- 192/217: gnu: Add python-dotenv., guix-commits, 2021/11/14
- 194/217: gnu: docker-compose: Update to 1.29.2., guix-commits, 2021/11/14
- 201/217: gnu: icecat: Use latest rust., guix-commits, 2021/11/14
- 196/217: gnu: ansible-core: Use GUIX_PYTHONPATH to fix build., guix-commits, 2021/11/14
- 202/217: gnu: guile-ssh: Update to 0.13.1-2e25d85., guix-commits, 2021/11/14