From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Pytest update to 2.9.2 Date: Mon, 5 Dec 2016 16:33:43 -0500 Message-ID: <20161205213343.GA20927@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="CdrF4e02JqNVZeln" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cE0tS-00005R-QF for guix-devel@gnu.org; Mon, 05 Dec 2016 16:33:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cE0tP-0006C8-Jz for guix-devel@gnu.org; Mon, 05 Dec 2016 16:33:50 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:43864) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cE0tP-0006Bo-14 for guix-devel@gnu.org; Mon, 05 Dec 2016 16:33:47 -0500 Received: from localhost (c-68-81-58-201.hsd1.pa.comcast.net [68.81.58.201]) by mail.messagingengine.com (Postfix) with ESMTPA id D773924242 for ; Mon, 5 Dec 2016 16:33:44 -0500 (EST) Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --CdrF4e02JqNVZeln Content-Type: multipart/mixed; boundary="M9NhX3UHpAaciwkO" Content-Disposition: inline --M9NhX3UHpAaciwkO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I think this should get built in its own branch to make sure nothing breaks. --M9NhX3UHpAaciwkO Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-python-pytest-Update-to-2.9.2.patch" Content-Transfer-Encoding: quoted-printable =46rom fb0f51fe4261de846672e42dd3c59d4d005325c4 Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Sun, 4 Dec 2016 18:24:02 -0500 Subject: [PATCH] gnu: python-pytest: Update to 2.9.2. * gnu/packages/python.scm (python-pytest, python2-pytest): Update to 2.9.2. [arguments]: Use 'disable-invalid-test' phase from python-pytest-2.9.2. (python-pytest-2.9.2): Remove variable. (python-cryptography, python2-cryptography)[native-inputs]: Use python-pyte= st. * gnu/packages/backup.scm (borg)[native-inputs]: Use python-pytest. --- gnu/packages/backup.scm | 4 +--- gnu/packages/python.scm | 52 ++++++++++++++-------------------------------= ---- 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a503b0660..5f1c9ecd1 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -475,9 +475,7 @@ detection, and lossless compression.") (native-inputs `(("python-cython" ,python-cython) ("python-setuptools-scm" ,python-setuptools-scm) - ;; Borg 1.0.8's test suite uses 'tmpdir_factory', which was introdu= ced in - ;; pytest 2.8. - ("python-pytest" ,python-pytest-2.9.2) + ("python-pytest" ,python-pytest) ;; For generating the documentation. ("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0df949667..aff48121e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1633,23 +1633,26 @@ code introspection, and logging.") (define-public python-pytest (package (name "python-pytest") - (version "2.7.3") + (version "2.9.2") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/pytest/pytest-" - version ".tar.gz")) + (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm")) - (modules '((guix build utils))) - (snippet - ;; One of the tests involves the /usr directory, so it fails. - '(substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix\\(self\\):") - "@pytest.mark.xfail\n def test_remove_dir_prefix(self):")))= )) + "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'disable-invalid-test + (lambda _ + (substitute* "testing/test_argcomplete.py" + (("def test_remove_dir_prefix" line) + (string-append "@pytest.mark.skip" + "(reason=3D\"Assumes that /usr exists.\")\n= " + line))) + #t))))) (propagated-inputs `(("python-py" ,python-py))) (native-inputs @@ -1666,31 +1669,6 @@ and many external plugins.") (define-public python2-pytest (package-with-python2 python-pytest)) =20 -;; This package is used by Borg until we can upgrade all our Python packag= es to -;; use a more recent pytest. -(define-public python-pytest-2.9.2 - (package - (inherit python-pytest) - (name "python-pytest") - (version "2.9.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest" version)) - (sha256 - (base32 - "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'disable-invalid-test - (lambda _ - (substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix" line) - (string-append "@pytest.mark.skip" - "(reason=3D\"Assumes that /usr exists.\")\n= " - line))) - #t))))))) - (define-public python-pytest-cov (package (name "python-pytest-cov") @@ -6432,7 +6410,7 @@ responses, rather than doing any computation.") ("python-pyasn1" ,python-pyasn1) ("python-pyasn1-modules" ,python-pyasn1-modules) ("python-pytz" ,python-pytz) - ("python-pytest" ,python-pytest-2.9.2))) + ("python-pytest" ,python-pytest))) (home-page "https://github.com/pyca/cryptography") (synopsis "Cryptographic recipes and primitives for Python") (description --=20 2.11.0 --M9NhX3UHpAaciwkO-- --CdrF4e02JqNVZeln Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlhF3TIACgkQJkb6MLrK fwhKoxAA4DtWD1VOfzHEy+n7jIkSRCs6lbA9NQStKuC610wX+hHkTsx1eyh8zwzB VAthV1/TC9k49qjjFz9HUZiNIioWjdYlV0OvJjfOtTf3cMGk0lEw9lK6i9QK70i1 EhU1jTlRI25Xt4oYPcWBnc0PpVrzkeXq43GP07N0ZJr6AFZhSOktqXuQ3+mTPqUS ogCib/y7ePnatf8msrNXcd4FKJ+zNo04IU25Ns6+4FKvBy/7SgGIjk8OyRloWhrj Daque8sYhED++t6BC1Y8BPFX0umI6C7xJ5EofMPYE9E0vlg2x35XMGPNnz/oTk+/ 0YM59H7XTeVVEDYeyVHNsCNsh7k1qcPW0YTo/h12YZ8Go8k4VQFssTRNncgKQFZ1 o9G7K84tjrK4j55GIrJaApk1WEtxciZNPVHTbZ3NetN7hIk14EODp9HOLEH8bHqc hde56cKOjJ9ew4NKrzY8ilQC+KQ3H+KNDKOgqug1geNTmGU7BbgzjN03tpz8nK8g f+HuLFDxGtN0v+7Me4j60LKZrtvx4f/H6XVpgcou2Jg0aat00y9KtDcUiI8iCPPw x1qYiJu9GhUxcLVfDL8P+Kjy9ws9AxAcgjX/t0y25I0aKdP8xCFYDTZMzPka4ZDY m+LXobOY9Y/U2LsMSxu2jmbtajmyiPo+XS5ekIqCvkGk5NwzL3k= =u5L7 -----END PGP SIGNATURE----- --CdrF4e02JqNVZeln--