Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fcf74c6dc05d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0cbe2fa18cd5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 19, 2019

  1. python.pkgs.msrest: cleanup 

    I accidentally pushed fcf74c6 in a premature state.
    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    0cbe2fa View commit details
Showing with 8 additions and 7 deletions.
  1. +8 −7 pkgs/development/python-modules/msrest/default.nix
15 changes: 8 additions & 7 deletions pkgs/development/python-modules/msrest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonAtLeast
, requests
, requests_oauthlib
, isodate
@@ -9,17 +10,15 @@
, aiodns
, pytest
, httpretty
, trio
}:

buildPythonPackage rec {
version = "0.6.4";
pname = "msrest";

#src = fetchPypi {
# inherit pname version;
# sha256 = "5dadd54bec98d52cd9f43fb095015c346135b8cafaa35f24c7309cc25d3ad266";
#};

# no tests in PyPI tarball
# see https://github.com/Azure/msrest-for-python/pull/152
src = fetchFromGitHub {
owner = "Azure";
repo = "msrest-for-python";
@@ -33,10 +32,12 @@ buildPythonPackage rec {
aiohttp aiodns
];

checkInputs = [ pytest httpretty ];
checkInputs = [ pytest httpretty ]
++ lib.optional (pythonAtLeast "3.5") trio;

# Deselected tests require network access
checkPhase = ''
pytest tests/
pytest tests/ -k "not test_conf_async_trio_requests"
'';

meta = with lib; {