* [bug#51418] [PATCH 1/2] gnu: Add python-ipaddress.
@ 2021-10-26 19:28 Giacomo Leidi via Guix-patches via
2021-10-26 19:28 ` [bug#51419] [PATCH 2/2] gnu: python-vcrpy: Update to 4.1.1 Giacomo Leidi via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Giacomo Leidi via Guix-patches via @ 2021-10-26 19:28 UTC (permalink / raw)
To: 51418; +Cc: Giacomo Leidi
* gnu/packages/python-xyz.scm (python-ipaddress): New variable;
(python2-ipaddress): Use package-with-python2.
---
gnu/packages/python-xyz.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a7b1e0efe2..48404b441a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11159,9 +11159,9 @@ (define-public python-pyasn1-modules
(define-public python2-pyasn1-modules
(package-with-python2 python-pyasn1-modules))
-(define-public python2-ipaddress
+(define-public python-ipaddress
(package
- (name "python2-ipaddress")
+ (name "python-ipaddress")
(version "1.0.23")
(source (origin
(method url-fetch)
@@ -11170,17 +11170,17 @@ (define-public python2-ipaddress
(base32
"1qp743h30s04m3cg3yk3fycad930jv17q7dsslj4mfw0jlvf1y5p"))))
(build-system python-build-system)
- (arguments
- `(#:python ,python-2))
(home-page "https://github.com/phihag/ipaddress")
(synopsis "IP address manipulation library")
(description
"This package provides a fast, lightweight IPv4/IPv6 manipulation library
in Python. This library is used to create, poke at, and manipulate IPv4 and
- IPv6 addresses and networks. This is a port of the Python 3.3 ipaddress
- module to older versions of Python.")
+ IPv6 addresses and networks.")
(license license:psfl)))
+(define-public python2-ipaddress
+ (package-with-python2 python-ipaddress))
+
(define-public python-asn1tools
(package
(name "python-asn1tools")
base-commit: c6adc0947396daa6d85ab08837f9cbc86f4d8722
--
2.33.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#51419] [PATCH 2/2] gnu: python-vcrpy: Update to 4.1.1.
2021-10-26 19:28 [bug#51418] [PATCH 1/2] gnu: Add python-ipaddress Giacomo Leidi via Guix-patches via
@ 2021-10-26 19:28 ` Giacomo Leidi via Guix-patches via
2021-10-26 19:33 ` [bug#51418] Duplicate - please merge with 51419 paul via Guix-patches via
2021-12-11 22:39 ` bug#51418: [PATCH 1/2] gnu: Add python-ipaddress Ludovic Courtès
2 siblings, 0 replies; 6+ messages in thread
From: Giacomo Leidi via Guix-patches via @ 2021-10-26 19:28 UTC (permalink / raw)
To: 51419; +Cc: Giacomo Leidi
* gnu/packages/python-xyz.scm (python-vcrpy): Update to 4.1.1.
[arguments]: Replace 'check phase to run unit tests.
[native-inputs]: Add required dependencies.
---
gnu/packages/python-check.scm | 39 ++++++++++++++++++++++++++---------
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index a13bd0baa4..c70c3d3cf9 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -228,25 +228,44 @@ (define-public python-junit-xml
(define-public python-vcrpy
(package
(name "python-vcrpy")
- (version "2.0.1")
+ (version "4.1.1")
(source
- (origin
- (method url-fetch)
- (uri (pypi-uri "vcrpy" version))
- (sha256
- (base32
- "0kws7l3hci1dvjv01nxw3805q9v2mwldw58bgl8s90wqism69gjp"))))
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "vcrpy" version))
+ (sha256
+ (base32 "16gmzxs3lzbgf1828n0q61vbmwyhpvzdlk37x6gdk8n05zr5n2ap"))))
(build-system python-build-system)
- (arguments `(#:tests? #f)) ; tests require more packages for python-pytest-httpbin
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? outputs #:allow-other-keys)
+ (when tests?
+ (substitute* "tox.ini"
+ (("AWS_ACCESS_KEY_ID") "PYTHONPATH"))
+ (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH")))
+ ;; These tests require network access.
+ (delete-file "tests/unit/test_stubs.py")
+ (invoke "pytest" "tests/unit")))))))
(propagated-inputs
`(("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)
("python-wrapt" ,python-wrapt)
("python-yarl" ,python-yarl)))
(native-inputs
- `(("python-mock" ,python-mock)
+ `(("python-black" ,python-black)
+ ("python-coverage" ,python-coverage)
+ ("python-flake8" ,python-flake8)
+ ("python-flask" ,python-flask)
+ ("python-httplib2" ,python-httplib2)
+ ("python-ipaddress" ,python-ipaddress)
+ ("python-mock" ,python-mock)
("python-pytest" ,python-pytest)
- ("python-pytest-httpbin" ,python-pytest-httpbin)))
+ ("python-pytest-cov" ,python-pytest-cov)
+ ("python-pytest-httpbin" ,python-pytest-httpbin)
+ ("python-tox" ,python-tox)
+ ("python-urllib3" ,python-urllib3)))
(home-page "https://github.com/kevin1024/vcrpy")
(synopsis "Automatically mock your HTTP interactions")
(description
--
2.33.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#51418] Duplicate - please merge with 51419
2021-10-26 19:28 [bug#51418] [PATCH 1/2] gnu: Add python-ipaddress Giacomo Leidi via Guix-patches via
2021-10-26 19:28 ` [bug#51419] [PATCH 2/2] gnu: python-vcrpy: Update to 4.1.1 Giacomo Leidi via Guix-patches via
@ 2021-10-26 19:33 ` paul via Guix-patches via
2021-10-26 19:59 ` Tobias Geerinckx-Rice via Guix-patches via
2021-12-11 22:39 ` bug#51418: [PATCH 1/2] gnu: Add python-ipaddress Ludovic Courtès
2 siblings, 1 reply; 6+ messages in thread
From: paul via Guix-patches via @ 2021-10-26 19:33 UTC (permalink / raw)
To: 51418
Dear all,
I apologize this should be merged with 51419 . Is there a way to merge
two tickets from issues.guix.gnu.org?
Thank you,
giacomo
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#51418: [PATCH 1/2] gnu: Add python-ipaddress.
2021-10-26 19:28 [bug#51418] [PATCH 1/2] gnu: Add python-ipaddress Giacomo Leidi via Guix-patches via
2021-10-26 19:28 ` [bug#51419] [PATCH 2/2] gnu: python-vcrpy: Update to 4.1.1 Giacomo Leidi via Guix-patches via
2021-10-26 19:33 ` [bug#51418] Duplicate - please merge with 51419 paul via Guix-patches via
@ 2021-12-11 22:39 ` Ludovic Courtès
2 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2021-12-11 22:39 UTC (permalink / raw)
To: Giacomo Leidi; +Cc: 51418-done
Hi,
Giacomo Leidi <goodoldpaul@autistici.org> skribis:
> * gnu/packages/python-xyz.scm (python-ipaddress): New variable;
> (python2-ipaddress): Use package-with-python2.
[...]
> * gnu/packages/python-xyz.scm (python-vcrpy): Update to 4.1.1.
> [arguments]: Replace 'check phase to run unit tests.
> [native-inputs]: Add required dependencies.
This had fallen through the cracks but it’s been applied now.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-12-11 22:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-26 19:28 [bug#51418] [PATCH 1/2] gnu: Add python-ipaddress Giacomo Leidi via Guix-patches via
2021-10-26 19:28 ` [bug#51419] [PATCH 2/2] gnu: python-vcrpy: Update to 4.1.1 Giacomo Leidi via Guix-patches via
2021-10-26 19:33 ` [bug#51418] Duplicate - please merge with 51419 paul via Guix-patches via
2021-10-26 19:59 ` Tobias Geerinckx-Rice via Guix-patches via
2021-10-26 20:58 ` paul via Guix-patches via
2021-12-11 22:39 ` bug#51418: [PATCH 1/2] gnu: Add python-ipaddress Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.