pythonPackages.pytest-django: unpin setuptools_scm

- unpin setuptools_scm
- move to file in folder following guidelines
- use PyPI/upstream name
This commit is contained in:
Frederik Rietdijk 2017-03-16 12:39:43 +01:00
parent 9bd988eb0f
commit 645c2189d1
2 changed files with 13 additions and 1 deletions

View File

@ -1,5 +1,6 @@
{ stdenv, buildPythonPackage, fetchurl { stdenv, buildPythonPackage, fetchurl
, pytest, django, setuptools_scm , pytest, django, setuptools_scm
, fetchpatch
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pytest-django-${version}"; name = "pytest-django-${version}";
@ -13,6 +14,17 @@ buildPythonPackage rec {
buildInputs = [ pytest setuptools_scm ]; buildInputs = [ pytest setuptools_scm ];
propagatedBuildInputs = [ django ]; propagatedBuildInputs = [ django ];
patches = [
# Unpin setuptools-scm
(fetchpatch {
url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp";
})
];
# Complicated. Requires Django setup.
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "py.test plugin for testing of Django applications"; description = "py.test plugin for testing of Django applications";
homepage = http://pytest-django.readthedocs.org/en/latest/; homepage = http://pytest-django.readthedocs.org/en/latest/;

View File

@ -5158,7 +5158,7 @@ in {
}; };
}; };
pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { }; pytest-django = callPackage ../development/python-modules/pytest-django { };
pytest-fixture-config = buildPythonPackage rec { pytest-fixture-config = buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";