[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#27888] [PATCH 17/18] gnu: python-mock: Make 2.0 the default package
From: |
Marius Bakke |
Subject: |
[bug#27888] [PATCH 17/18] gnu: python-mock: Make 2.0 the default package. |
Date: |
Mon, 31 Jul 2017 22:07:34 +0200 |
* gnu/packages/python.scm (python-mock): Update to 2.0.0.
[native-inputs]: Add PYTHON-UNITTEST2.
[propagated-inputs]: Add PYTHON-PBR and PYTHON-SIX.
[arguments]: Override 'check' phase.
[properties]: Declare python2 variant.
(python2-mock)[propagated-inputs]: Add PYTHON2-FUNCTOOLS32 and PYTHON2-FUNCSIGS.
(python-mock-2): Remove variable.
* gnu/packages/python.scm (python-flake8)[native-inputs]: Adjust accordingly.
* gnu/packages/tls.scm (python-acme, certbot)[native-inputs]: Likewise.
---
gnu/packages/python.scm | 47 ++++++++++++++++++++++-------------------------
gnu/packages/tls.scm | 4 ++--
2 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e1bc3905a..9a7f88c30 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -932,46 +932,43 @@ API for locking files.")
(define-public python-mock
(package
(name "python-mock")
- (version "1.0.1")
+ (version "2.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mock" version))
(sha256
(base32
- "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq"))))
+ "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i"))))
+ (propagated-inputs
+ `(("python-pbr" ,python-pbr-minimal)
+ ("python-six" ,python-six)))
(build-system python-build-system)
- (arguments '(#:test-target "check"))
+ (native-inputs
+ `(("python-unittest2" ,python-unittest2)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (zero? (system* "unit2")))))))
(home-page "https://github.com/testing-cabal/mock")
(synopsis "Python mocking and patching library for testing")
(description
"Mock is a library for testing in Python. It allows you to replace parts
of your system under test with mock objects and make assertions about how they
have been used.")
+ (properties `((python2-variant . ,(delay python2-mock))))
(license license:expat)))
(define-public python2-mock
- (package-with-python2 python-mock))
-
-;;; Some packages (notably, certbot and python-acme) rely on this newer version
-;;; of python-mock. However, a large number of packages fail to build with
-;;; address@hidden, so we add a new variable for now. Also, there may be a
dependency
-;;; cycle between mock and six, so we avoid creating address@hidden for now.
-(define-public python-mock-2
- (package
- (inherit python-mock)
- (version "2.0.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "mock" version))
- (sha256
- (base32
- "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i"))))
- (propagated-inputs
- `(("python-pbr" ,python-pbr-minimal)
- ("python-six" ,python-six)
- ,@(package-propagated-inputs python-mock)))))
+ (let ((base (package-with-python2
+ (strip-python2-variant python-mock))))
+ (package (inherit base)
+ (propagated-inputs
+ `(("python2-functools32" ,python2-functools32)
+ ("python2-funcsigs" ,python2-funcsigs)
+ ,@(package-propagated-inputs base))))))
(define-public python-setuptools
(package
@@ -6927,7 +6924,7 @@ complexity of Python source code.")
("python-setuptools" ,python-setuptools)
("python-mccabe" ,python-mccabe)))
(native-inputs
- `(("python-mock" ,python-mock-2) ; TODO: only required for < 3.3
+ `(("python-mock" ,python-mock) ; TODO: only required for < 3.3
("python-pytest" ,python-pytest-bootstrap)
("python-pytest-runner" ,python-pytest-runner)))
(home-page "https://gitlab.com/pycqa/flake8")
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 5a94ac619..4c64a0b0a 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -502,7 +502,7 @@ netcat implementation that supports TLS.")
#t))))))
;; TODO: Add optional inputs for testing.
(native-inputs
- `(("python-mock" ,python-mock-2)
+ `(("python-mock" ,python-mock)
;; For documentation
("python-sphinx" ,python-sphinx)
("python-sphinxcontrib-programoutput"
,python-sphinxcontrib-programoutput)
@@ -554,7 +554,7 @@ netcat implementation that supports TLS.")
;; TODO: Add optional inputs for testing.
(native-inputs
`(("python-nose" ,python-nose)
- ("python-mock" ,python-mock-2)
+ ("python-mock" ,python-mock)
;; For documentation
("python-sphinx" ,python-sphinx)
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
--
2.13.3
- [bug#27888] [PATCH 06/18] gnu: python-setuptools-scm: Update to 1.15.6., (continued)
- [bug#27888] [PATCH 06/18] gnu: python-setuptools-scm: Update to 1.15.6., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 11/18] gnu: Add python2-enum., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 05/18] gnu: python-pytest: Add a minimal variant for bootstrapping., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 08/18] gnu: python-pyflakes: Update to 1.5.0., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 04/18] gnu: Remove address@hidden, Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 13/18] gnu: Add python-linecache2., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 12/18] gnu: python-flake8: Update to 3.4.1., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 14/18] gnu: Add python-traceback2., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 16/18] gnu: Add python2-funcsigs., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 18/18] gnu: python-hypothesis: Update to 3.14.0., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 17/18] gnu: python-mock: Make 2.0 the default package.,
Marius Bakke <=
- [bug#27888] [PATCH 15/18] gnu: python-unittest2: Update to 1.1.0., Marius Bakke, 2017/07/31
- [bug#27888] [PATCH 01/18] gnu: address@hidden: Update to 3.6.2., Leo Famulari, 2017/07/31