ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

pythonPackages.pytest: use pytest_30

Browse Source
This commit is contained in:
Lancelot SIX 2017-01-30 21:17:00 +01:00
parent c6c2137a9c
commit 4cf8ae3a8c
No known key found for this signature in database
GPG Key ID: 02E1542BA66FB047
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/misc/tmuxp/default.nix
View File

@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
''; '';
buildInputs = with pythonPackages; [ buildInputs = with pythonPackages; [
pytest pytest_29
pytest-rerunfailures pytest-rerunfailures
]; ];

40
pkgs/top-level/python-packages.nix
View File

@ -895,7 +895,7 @@ in {
sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k"; sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k";
}; };
buildInputs = with self; [ pytest_30 case ]; buildInputs = with self; [ pytest case ];
propagatedBuildInputs = with self; [ vine ]; propagatedBuildInputs = with self; [ vine ];
meta = { meta = {
@ -2650,7 +2650,7 @@ in {
sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y";
}; };
buildInputs = with self; [ pytest_30 case ]; buildInputs = with self; [ pytest case ];
meta = { meta = {
homepage = https://github.com/celery/billiard; homepage = https://github.com/celery/billiard;
@ -3566,7 +3566,7 @@ in {
sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3"; sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3";
}; };
buildInputs = with self; [ pytest_30 case ]; buildInputs = with self; [ pytest case ];
propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ];
meta = { meta = {
@ -3812,7 +3812,7 @@ in {
sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609"; sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609";
}; };
checkInputs = with self; [ pytest ]; checkInputs = with self; [ pytest_29 ];
propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures; propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures;
checkPhase = '' checkPhase = ''
@ -4672,7 +4672,7 @@ in {
sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k"; sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k";
}; };
buildInputs = with self; [ pytest ]; buildInputs = with self; [ pytest_29 ];
propagatedBuildInputs = with self; [ future numpy ]; propagatedBuildInputs = with self; [ future numpy ];
doCheck = true; doCheck = true;
@ -4944,7 +4944,7 @@ in {
}; };
}; };
pytest = self.pytest_29; pytest = self.pytest_30;
pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {}; pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};
@ -4952,7 +4952,13 @@ in {
pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {}; pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
pytest_30 = callPackage ../development/python-modules/pytest {}; pytest_30 = callPackage ../development/python-modules/pytest{
hypothesis = self.hypothesis.override {
# hypothesis requires pytest that causes dependency cycle
doCheck = false;
pytest = null;
};
};
pytestcache = buildPythonPackage rec { pytestcache = buildPythonPackage rec {
name = "pytest-cache-1.0"; name = "pytest-cache-1.0";
@ -4978,9 +4984,7 @@ in {
}; };
}; };
pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { };
pytest = self.pytest_30;
};
pytest-fixture-config = buildPythonPackage rec { pytest-fixture-config = buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -5568,7 +5572,7 @@ in {
sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s"; sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s";
}; };
buildInputs = with self; [ pytest ]; buildInputs = with self; [ pytest_29 ];
patchPhase = '' patchPhase = ''
sed -i 's/==.*$//' requirements/test.txt sed -i 's/==.*$//' requirements/test.txt
''; '';
@ -10306,9 +10310,7 @@ in {
}; };
}; };
django_guardian = callPackage ../development/python-modules/django_guardian.nix { django_guardian = callPackage ../development/python-modules/django_guardian.nix { };
pytest = self.pytest_30;
};
django_tagging = buildPythonPackage rec { django_tagging = buildPythonPackage rec {
name = "django-tagging-0.4.5"; name = "django-tagging-0.4.5";
@ -13485,7 +13487,7 @@ in {
sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h"; sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h";
}; };
buildInputs = with self; [ pytest_30 case pytz ]; buildInputs = with self; [ pytest case pytz ];
propagatedBuildInputs = with self; [ amqp ]; propagatedBuildInputs = with self; [ amqp ];
@ -18370,7 +18372,7 @@ in {
sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn"; sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn";
}; };
LC_ALL="en_US.UTF-8"; LC_ALL="en_US.UTF-8";
buildInputs = with self; [ pkgs.glibcLocales pytest ]; buildInputs = with self; [ pkgs.glibcLocales pytest_29 ];
checkPhase = '' checkPhase = ''
py.test py.test
@ -23334,7 +23336,7 @@ in {
url = "mirror://pypi/s/${pname}/${name}.tar.gz"; url = "mirror://pypi/s/${pname}/${name}.tar.gz";
sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12";
}; };
buildInputs = with self; [ pytest virtualenv pytestrunner pytest-virtualenv ]; buildInputs = with self; [ pytest_29 virtualenv pytestrunner pytest-virtualenv ];
propagatedBuildInputs = with self; [ twisted pathlib2 ]; propagatedBuildInputs = with self; [ twisted pathlib2 ];
postPatch = '' postPatch = ''
sed -i '12,$d' tests/test_main.py sed -i '12,$d' tests/test_main.py
@ -31558,7 +31560,7 @@ EOF
url = "mirror://pypi/a/${pname}/${name}.tar.gz"; url = "mirror://pypi/a/${pname}/${name}.tar.gz";
sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51"; sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51";
}; };
buildInputs = with self; [ unittest2 mock pytest trollius ]; buildInputs = with self; [ unittest2 mock pytest_29 trollius ];
propagatedBuildInputs = with self; [ six twisted txaio ]; propagatedBuildInputs = with self; [ six twisted txaio ];
checkPhase = '' checkPhase = ''
py.test $out py.test $out
@ -31792,7 +31794,7 @@ EOF
sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7"; sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7";
}; };
buildInputs = with self; [ case pytest_30 ]; buildInputs = with self; [ case pytest ];
meta = { meta = {
homepage = https://github.com/celery/vine; homepage = https://github.com/celery/vine;