gnu: Remove python-mock@1.
* 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.
This commit is contained in:
parent
6bb9645e57
commit
4ae65558b8
|
@ -933,34 +933,6 @@ API for locking files.")
|
||||||
(define-public python-mock
|
(define-public python-mock
|
||||||
(package
|
(package
|
||||||
(name "python-mock")
|
(name "python-mock")
|
||||||
(version "1.0.1")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (pypi-uri "mock" version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(arguments '(#:test-target "check"))
|
|
||||||
(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.")
|
|
||||||
(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
|
|
||||||
;;; mock@2, so we add a new variable for now. Also, there may be a dependency
|
|
||||||
;;; cycle between mock and six, so we avoid creating python2-mock@2 for now.
|
|
||||||
(define-public python-mock-2
|
|
||||||
(package
|
|
||||||
(inherit python-mock)
|
|
||||||
(version "2.0.0")
|
(version "2.0.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
@ -971,8 +943,33 @@ have been used.")
|
||||||
"1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i"))))
|
"1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i"))))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("python-pbr" ,python-pbr-minimal)
|
`(("python-pbr" ,python-pbr-minimal)
|
||||||
("python-six" ,python-six)
|
("python-six" ,python-six)))
|
||||||
,@(package-propagated-inputs python-mock)))))
|
(build-system python-build-system)
|
||||||
|
(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
|
||||||
|
(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
|
(define-public python-setuptools
|
||||||
(package
|
(package
|
||||||
|
@ -7151,7 +7148,7 @@ complexity of Python source code.")
|
||||||
("python-setuptools" ,python-setuptools)
|
("python-setuptools" ,python-setuptools)
|
||||||
("python-mccabe" ,python-mccabe)))
|
("python-mccabe" ,python-mccabe)))
|
||||||
(native-inputs
|
(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" ,python-pytest-bootstrap)
|
||||||
("python-pytest-runner" ,python-pytest-runner)))
|
("python-pytest-runner" ,python-pytest-runner)))
|
||||||
(home-page "https://gitlab.com/pycqa/flake8")
|
(home-page "https://gitlab.com/pycqa/flake8")
|
||||||
|
|
|
@ -522,7 +522,7 @@ netcat implementation that supports TLS.")
|
||||||
#t))))))
|
#t))))))
|
||||||
;; TODO: Add optional inputs for testing.
|
;; TODO: Add optional inputs for testing.
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python-mock" ,python-mock-2)
|
`(("python-mock" ,python-mock)
|
||||||
;; For documentation
|
;; For documentation
|
||||||
("python-sphinx" ,python-sphinx)
|
("python-sphinx" ,python-sphinx)
|
||||||
("python-sphinxcontrib-programoutput" ,python-sphinxcontrib-programoutput)
|
("python-sphinxcontrib-programoutput" ,python-sphinxcontrib-programoutput)
|
||||||
|
@ -571,7 +571,7 @@ netcat implementation that supports TLS.")
|
||||||
;; TODO: Add optional inputs for testing.
|
;; TODO: Add optional inputs for testing.
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python-nose" ,python-nose)
|
`(("python-nose" ,python-nose)
|
||||||
("python-mock" ,python-mock-2)
|
("python-mock" ,python-mock)
|
||||||
;; For documentation
|
;; For documentation
|
||||||
("python-sphinx" ,python-sphinx)
|
("python-sphinx" ,python-sphinx)
|
||||||
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
|
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
|
||||||
|
|
Loading…
Reference in New Issue