From e09bb8a4f6d82c11b40c70543f81b7feb56d0526 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 5 Dec 2017 23:52:50 +0100
Subject: [PATCH] gnu: python-pytest: Change pytest@3.0 users to use regular
 pytest.

* gnu/packages/fontutils.scm (python2-ufolib, python2-defcon)[native-inputs]:
Change PYTHON2-PYTEST-3.0 to PYTHON2-PYTEST.
* gnu/packages/python.scm (python2-booleanoperations)[native-inputs]: Likewise.
(python-setuptools-scm-git-archive)[native-inputs]: Change PYTHON-PYTEST-3.0
to PYTHON-PYTEST.
---
 gnu/packages/fontutils.scm | 4 ++--
 gnu/packages/python.scm    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index d2306a9423..273f7f55cc 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -577,7 +577,7 @@ generate bitmaps.")
      `(("python2-fonttools" ,python2-fonttools)))
     (native-inputs
      `(("unzip" ,unzip)
-       ("python2-pytest-3.0" ,python2-pytest-3.0)
+       ("python2-pytest" ,python2-pytest)
        ("python2-pytest-runner" ,python2-pytest-runner)))
     (home-page "https://github.com/unified-font-object/ufoLib")
     (synopsis "Low-level UFO reader and writer")
@@ -602,7 +602,7 @@ files.  UFO is a file format that stores fonts source files.")
      `(#:python ,python-2))
     (native-inputs
      `(("unzip" ,unzip)
-       ("python2-pytest-3.0" ,python2-pytest-3.0)
+       ("python2-pytest" ,python2-pytest)
        ("python2-pytest-runner" ,python2-pytest-runner)))
     (propagated-inputs
      `(("python2-fonttools" ,python2-fonttools)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index abc39318a8..4219e5c082 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11944,7 +11944,7 @@ services.")
          "1nii1sz5jq75ilf18bjnr11l9rz1lvdmyk66bxl7q90qan85yhjj"))))
     (build-system python-build-system)
     (native-inputs
-     `(("python-pytest-3.0" ,python-pytest-3.0)))
+     `(("python-pytest" ,python-pytest)))
     (propagated-inputs
      `(("python-setuptools-scm" ,python-setuptools-scm)))
     (home-page "https://github.com/Changaco/setuptools_scm_git_archive/")
@@ -12002,7 +12002,7 @@ belong to tagged versions.")
      `(#:python ,python-2))
     (native-inputs
      `(("unzip" ,unzip)
-       ("python2-pytest-3.0" ,python2-pytest-3.0)
+       ("python2-pytest" ,python2-pytest)
        ("python2-pytest-runner" ,python2-pytest-runner)))
     (propagated-inputs
      `(("python-fonttools" ,python2-fonttools)