From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH 1/4] gnu: Add python-pytest-3.0.7 Date: Mon, 27 Mar 2017 11:09:24 -0400 Message-ID: <20170327150924.GA16027@jasmine> References: <20170326092335.3912-1-fredmanglis@gmail.com> <20170326151019.GA13943@monza> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="GID0FwUMdk1T2AWN" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csWGw-0008Px-Os for guix-devel@gnu.org; Mon, 27 Mar 2017 11:09:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csWGt-0000XU-HL for guix-devel@gnu.org; Mon, 27 Mar 2017 11:09:30 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:44388) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1csWGt-0000X1-BU for guix-devel@gnu.org; Mon, 27 Mar 2017 11:09:27 -0400 Content-Disposition: inline In-Reply-To: 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: Frederick Muriithi Cc: guix-devel@gnu.org --GID0FwUMdk1T2AWN Content-Type: multipart/mixed; boundary="xHFwDpU9dbj6ez1V" Content-Disposition: inline --xHFwDpU9dbj6ez1V Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Mar 26, 2017 at 06:29:04PM +0300, Frederick Muriithi wrote: > I don't really see a reason why not. I have to point out though, that when > writing the definition, I found python-pytest-2.9.2 also defined, with a > note that it's there until all packages can be upgraded to use a more > recent pytest. >=20 > Since I don't know what the progress on that is, I decided to err on the > side of caution, and just add it with a note on why it's needed. I added pytest 2.9.2 when I realized that many packages are picky about which version of pytest they can use. I checked, and all the packages that are using pytest 2.9.2 can use pytest 3.0.7 instead. So, here's a patch that updates the newer pytest across the board. It goes after your patch series, unless you want to rebase your patches on to it. Soon we'll do a "python-updates" branch where we try to default to the newer pytest, and keep an older one around for the outliers. --xHFwDpU9dbj6ez1V Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-python-pytest-2.9.2-Replace-with-python-pytest-3.patch" Content-Transfer-Encoding: quoted-printable =46rom f44c8d0dec2af7677ad16cfad877fb73407b6c30 Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Mon, 27 Mar 2017 03:10:53 -0400 Subject: [PATCH] gnu: python-pytest-2.9.2: Replace with python-pytest-3.0. * gnu/packages/python.scm (python-pytest-2.9.2): Replace with ... (python-pytest-3.0): ... new variable. (python2-pytest-3.0): New variable. (python-cryptography, python2-cryptography)[native-inputs]: Replace python-pytest-2.9.2 with python-pytest-3.0. * gnu/packages/backup.scm (borg)[native-inputs]: Likewise. gnu/packages/calendar.scm (khal)[native-inputs]: Likewise. --- gnu/packages/backup.scm | 2 +- gnu/packages/calendar.scm | 2 +- gnu/packages/python.scm | 40 +++++++++++++++++----------------------- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 7e9ae18f3..8e1f19515 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -529,7 +529,7 @@ detection, and lossless compression.") ("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-3.0) ;; For generating the documentation. ("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 1e9a93ca9..977111bfe 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -113,7 +113,7 @@ data units.") (zero? (system* "py.test" "tests"))))))) (native-inputs ;; XXX Uses tmpdir_factory, introduced in pytest 2.8. - `(("python-pytest" ,python-pytest-2.9.2) + `(("python-pytest" ,python-pytest-3.0) ("python-pytest-cov" ,python-pytest-cov) ("python-setuptools-scm" ,python-setuptools-scm) ;; Required for tests diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8788e9d77..12d298bbd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1818,19 +1818,18 @@ 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 +;; Some packages require a newer pytest. +(define-public python-pytest-3.0 (package (inherit python-pytest) (name "python-pytest") - (version "2.9.2") + (version "3.0.7") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j")))) + "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1841,25 +1840,20 @@ and many external plugins.") (string-append "@pytest.mark.skip" "(reason=3D\"Assumes that /usr exists.\")\n= " line))) - #t))))))) - -;; This package is used by Sphinx version 1.5.2 and up -(define-public python-pytest-3.0.7 - (package - (inherit python-pytest-2.9.2) - (name "python-pytest") - (version "3.0.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest" version)) - (sha256 - (base32 - "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) + #t))))) (native-inputs `(("python-nose" ,python-nose) ("python-mock" ,python-mock) - ("python-hypothesis" ,python-hypothesis))))) + ("python-hypothesis" ,python-hypothesis))) + (properties `((python2-variant . ,(delay python2-pytest-3.0)))))) + +(define-public python2-pytest-3.0 + (let ((base (package-with-python2 + (strip-python2-variant python-pytest-3.0)))) + (package (inherit base) + (native-inputs + `(("python2-enum34" ,python2-enum34) + ,@(package-native-inputs base)))))) =20 (define-public python-pytest-cov (package @@ -3119,7 +3113,7 @@ sources.") ("python-html5lib" ,python-html5lib) ("python-mock" ,python-mock) ("python-nose" ,python-nose) - ("python-pytest" ,python-pytest-3.0.7))))) + ("python-pytest" ,python-pytest-3.0))))) =20 (define-public python-sphinx-1.5.3 (package @@ -7331,7 +7325,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-3.0))) (home-page "https://github.com/pyca/cryptography") (synopsis "Cryptographic recipes and primitives for Python") (description --=20 2.12.0 --xHFwDpU9dbj6ez1V-- --GID0FwUMdk1T2AWN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAljZKyQACgkQJkb6MLrK fwjbBg/9HK5qA2jZGrTxafR6R1evme2z2hL+JtNu1llySMJ74elhBtKTzAXgMnyt 5tnxlpXD0ga0b8zr8hei28dtdAk/HuHIZoCAsI/qq/4g2gQVDh/RgDXhYBULUiGO VFoiXX+TKVivIC1VV0hfC4+pm/LQDIRS9qZBpQ6KRHpUCgFBNDF1ofa5HUKjJXwq wLtuDBlbG/SUZtN7yLf/7Qnx0HpoqNCfhllWupE92j+A8eP0fuOULHLkiMjZxtbL o6cZk0MmHQTUBrhmWZr49p8Z0paC7k2doKadsz/h8G6t2xwbAJGawl3ApfPV14iM 512sAlxjg0K1i/6ojLmQGOSGiJjV1sAsPOPro63rxhVCkP/dyPenotCw5t9/KYLG Zx40mkll7H7XevSpOW0uOAEbA9qbE8LWBdHMoPxdYEGCO+opYmyyILA1CA77LcIH KEo4S/J5mGayNTbWii3E4ZY9I9KDM4SFNdxqexgnaK6PwuvIkCZXcwPJU5zYpE4a d3g9Zvy2NMtOoRyNinohxv7H5vrGZGe7InFMW4vcSIGxrKNLjCXB+OX/Z1DH4ETo SE8R1PG7JA3xZmUWBqwiDXkD8db/9o66Wt0a+MD+x14j9zjoK2+5sKRdhz6Saxvt fdcT9kd3Vej1Eo0WDk/xXgd7XX+BoT4xpC7tApZzJ4AX9400tpA= =jAxh -----END PGP SIGNATURE----- --GID0FwUMdk1T2AWN--