Merge pull request #148416 from fabaff/fix-pydelijn

python3Packages.pydelijn: support for async_timeout >4

authored by Fabian Affolter and committed by GitHub dd31b078 369b7b4a

+16 -3
+2 -2
pkgs/development/python-modules/devolo-plc-api/default.nix
··· 14 14 15 15 buildPythonPackage rec { 16 16 pname = "devolo-plc-api"; 17 - version = "0.6.4"; 17 + version = "0.7.0"; 18 18 format = "setuptools"; 19 19 20 20 disabled = pythonOlder "3.8"; ··· 23 23 owner = "2Fake"; 24 24 repo = "devolo_plc_api"; 25 25 rev = "v${version}"; 26 - sha256 = "sha256-hlIHNVJG/2hU5psGXhi05SCupORfgIjB+YT/ZlJEqFM="; 26 + sha256 = "sha256-qzjH52bKQ/oSFd580V92uE2/Z2g+2nLh/JXOXYqVfSY="; 27 27 }; 28 28 29 29 SETUPTOOLS_SCM_PRETEND_VERSION = version;
+14 -1
pkgs/development/python-modules/pydelijn/default.nix
··· 10 10 buildPythonPackage rec { 11 11 pname = "pydelijn"; 12 12 version = "0.6.1"; 13 + format = "setuptools"; 14 + 13 15 disabled = pythonOlder "3.6"; 14 16 15 17 src = fetchPypi { ··· 23 25 pytz 24 26 ]; 25 27 28 + postPatch = '' 29 + # Remove with next release 30 + substituteInPlace setup.py \ 31 + --replace "async_timeout>=3.0.1,<4.0" "async_timeout>=3.0.1" 32 + # https://github.com/bollewolle/pydelijn/pull/11 33 + substituteInPlace pydelijn/common.py \ 34 + --replace ", loop=self.loop" "" 35 + ''; 36 + 26 37 # Project has no tests 27 38 doCheck = false; 28 39 29 - pythonImportsCheck = [ "pydelijn" ]; 40 + pythonImportsCheck = [ 41 + "pydelijn" 42 + ]; 30 43 31 44 meta = with lib; { 32 45 description = "Python package to retrieve realtime data of passages at stops of De Lijn";