git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #133276 from fabaff/bump-testfixtures
commit15e819930028f42e05a67ca2df48543b423bcd05 authorSandro <sandro.jaeckel@gmail.com> dateTue 10 Aug 2021, 16:11 (5 years ago) parentffa5ac7922791f
3 files changed+39−15
pkgs/development/python-modules/scrapy/default.nix+4 pkgs/development/python-modules/sopel/default.nix+4−3 pkgs/development/python-modules/testfixtures/default.nix+31−12
pkgs/development/python-modules/scrapy/default.nix+4
@@ -113,6 +113,10 @@ buildPythonPackage rec {
113113 "test_custom_loop_asyncio"
114114 "test_custom_loop_asyncio_deferred_signal"
115115 "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157
116+ # Fails with AssertionError
117+ "test_peek_fifo"
118+ "test_peek_one_element"
119+ "test_peek_lifo"
116120 ] ++ lib.optionals stdenv.isDarwin [
117121 "test_xmliter_encoding"
118122 "test_download"
pkgs/development/python-modules/sopel/default.nix+4−3
@@ -13,12 +13,12 @@
1313
1414buildPythonPackage rec {
1515 pname = "sopel";
16− version = "7.1.0";
16+ version = "7.1.2";
1717 disabled = isPyPy;
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "74057d4c86cff744b1f1062f3a9c4ae99eb4f1b17048ceb083293d5f4c7e989b";
21+ sha256 = "sha256-8RhIw3Qt0BclH1Ws16JNuFfwiRxJ14lM6MBUK9OvNKA=";
2222 };
2323
2424 propagatedBuildInputs = [
@@ -36,7 +36,8 @@ buildPythonPackage rec {
3636 # remove once https://github.com/sopel-irc/sopel/pull/1653 lands
3737 postPatch = ''
3838 substituteInPlace requirements.txt \
39− --replace "praw>=4.0.0,<6.0.0" "praw"
39+ --replace "praw>=4.0.0,<6.0.0" "praw" \
40+ --replace "sqlalchemy<1.4" "sqlalchemy"
4041 '';
4142
4243 checkInputs = [ pytestCheckHook ];
pkgs/development/python-modules/testfixtures/default.nix+31−12
@@ -1,25 +1,44 @@
1−{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy27
2−, mock, pytest, sybil, zope_component, twisted }:
1+{ lib
2+, buildPythonPackage
3+, fetchpatch
4+, fetchPypi
5+, isPy27
6+, mock
7+, pytestCheckHook
8+, sybil
9+, twisted
10+, zope_component
11+}:
312
413buildPythonPackage rec {
514 pname = "testfixtures";
6− version = "6.17.1";
15+ version = "6.18.0";
716
817 src = fetchPypi {
918 inherit pname version;
10− sha256 = "5ec3a0dd6f71cc4c304fbc024a10cc293d3e0b852c868014b9f233203e149bda";
19+ sha256 = "sha256-1L0cT5DqyQpz4b3FnDHQOUPyGNaH88WgnkhHiEGor18=";
1120 };
1221
13− checkInputs = [ pytest mock sybil zope_component twisted ];
22+ checkInputs = [
23+ pytestCheckHook
24+ mock
25+ sybil
26+ zope_component
27+ twisted
28+ ];
1429
1530 doCheck = !isPy27;
16− checkPhase = ''
17− # django is too much hasle to setup at the moment
18− pytest -W ignore::DeprecationWarning \
19− --ignore=testfixtures/tests/test_django \
20− -k 'not (log_then_patch or our_wrap_dealing_with_mock_patch or patch_with_dict)' \
21− testfixtures/tests
22− '';
31+
32+ disabledTestPaths = [
33+ # Django is too much hasle to setup at the moment
34+ "testfixtures/tests/test_django"
35+ ];
36+
37+ pytestFlagsArray = [
38+ "testfixtures/tests"
39+ ];
40+
41+ pythonImportsCheck = [ "testfixtures" ];
2342
2443 meta = with lib; {
2544 homepage = "https://github.com/Simplistix/testfixtures";