pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #193926 from gador/msrest-0.7.1

authored by

Sandro and committed by
GitHub 2ee5c2fa cf3cfa64

+15 -5
unified split
+5 -2
pkgs/development/python-modules/azure-core/default.nix
··· 7 , aiohttp 8 , flask 9 , mock 10 - , msrest 11 , pytest 12 , pytest-asyncio 13 , pytest-trio ··· 39 aiohttp 40 flask 41 mock 42 - msrest 43 pytest 44 pytest-trio 45 pytest-asyncio ··· 78 "tests/testserver_tests/" 79 # requires missing pytest plugin 80 "tests/async_tests/test_rest_asyncio_transport.py" 81 ]; 82 83 meta = with lib; {
··· 7 , aiohttp 8 , flask 9 , mock 10 , pytest 11 , pytest-asyncio 12 , pytest-trio ··· 38 aiohttp 39 flask 40 mock 41 pytest 42 pytest-trio 43 pytest-asyncio ··· 76 "tests/testserver_tests/" 77 # requires missing pytest plugin 78 "tests/async_tests/test_rest_asyncio_transport.py" 79 + # needs msrest, which cannot be included in checkInputs due to circular dependency new in msrest 0.7.1 80 + # azure-core needs msrest which needs azure-core 81 + "tests/test_polling.py" 82 + "tests/async_tests/test_base_polling_async.py" 83 + "tests/async_tests/test_polling_async.py" 84 ]; 85 86 meta = with lib; {
+6 -3
pkgs/development/python-modules/msrest/default.nix
··· 1 { lib 2 , aiodns 3 , aiohttp 4 , buildPythonPackage 5 , certifi 6 , fetchFromGitHub ··· 16 17 buildPythonPackage rec { 18 pname = "msrest"; 19 - version = "0.6.21"; 20 format = "setuptools"; 21 22 disabled = pythonOlder "3.7"; ··· 24 src = fetchFromGitHub { 25 owner = "Azure"; 26 repo = "msrest-for-python"; 27 - rev = "v${version}"; 28 - hash = "sha256-IlBwlVQ/v+vJmCWNbFZKGL6a9K09z4AYrPm3kwaA/nI="; 29 }; 30 31 propagatedBuildInputs = [ 32 aiodns 33 aiohttp 34 certifi
··· 1 { lib 2 , aiodns 3 , aiohttp 4 + , azure-core 5 , buildPythonPackage 6 , certifi 7 , fetchFromGitHub ··· 17 18 buildPythonPackage rec { 19 pname = "msrest"; 20 + version = "0.7.1"; 21 format = "setuptools"; 22 23 disabled = pythonOlder "3.7"; ··· 25 src = fetchFromGitHub { 26 owner = "Azure"; 27 repo = "msrest-for-python"; 28 + # no tag for 0.7.1 29 + rev = "2d8fd04f68a124d0f3df7b81584accc3270b1afc"; 30 + hash = "sha256-1EXXXflhDeU+erdI+NsWxSX76ooDTl3+MyQwRzm2xV0="; 31 }; 32 33 propagatedBuildInputs = [ 34 + azure-core 35 aiodns 36 aiohttp 37 certifi
+4
pkgs/development/python-modules/vsts/default.nix
··· 16 17 propagatedBuildInputs = [ msrest ]; 18 19 # Tests are highly impure 20 checkPhase = '' 21 ${python.interpreter} -c 'import vsts.version; print(vsts.version.VERSION)'
··· 16 17 propagatedBuildInputs = [ msrest ]; 18 19 + postPatch = '' 20 + substituteInPlace setup.py --replace "msrest>=0.6.0,<0.7.0" "msrest" 21 + ''; 22 + 23 # Tests are highly impure 24 checkPhase = '' 25 ${python.interpreter} -c 'import vsts.version; print(vsts.version.VERSION)'