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: 13702bd49198
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c438c0e0b71c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 24, 2019

  1. pythonPackages.msrest: 0.6.4 -> 0.6.7

    @FRidh
    Jonathan Ringer authored and FRidh committed Jun 24, 2019
    Copy the full SHA
    e8fc86d View commit details

  2. pythonPackages.msrestazure: 0.6.0 -> 0.6.1

    @FRidh
    Jonathan Ringer authored and FRidh committed Jun 24, 2019
    Copy the full SHA
    c438c0e View commit details
Showing with 29 additions and 16 deletions.
  1. +6 −10 pkgs/development/python-modules/msrest/default.nix
  2. +23 −6 pkgs/development/python-modules/msrestazure/default.nix
16 changes: 6 additions & 10 deletions pkgs/development/python-modules/msrest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, isPy3k
, requests
, requests_oauthlib
@@ -18,16 +18,12 @@
}:

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

# no tests in PyPI tarball
# see https://github.com/Azure/msrest-for-python/pull/152
src = fetchFromGitHub {
owner = "Azure";
repo = "msrest-for-python";
rev = "v${version}";
sha256 = "0ilrc06qq0dw4qqzq1dq2vs6nymc39h19w52dwcyawwfalalnjzi";
src = fetchPypi {
inherit pname version;
sha256 = "07136g3j7zgcvkxki4v6q1p2dm1nzzc28181s8dwic0y4ml8qlq5";
};

propagatedBuildInputs = [
@@ -48,6 +44,6 @@ buildPythonPackage rec {
description = "The runtime library 'msrest' for AutoRest generated Python clients.";
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.mit;
maintainers = with maintainers; [ bendlas ];
maintainers = with maintainers; [ bendlas jonringer ];
};
}
29 changes: 23 additions & 6 deletions pkgs/development/python-modules/msrestazure/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,42 @@
{ pkgs
, lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, isPy3k
, adal
, msrest
, mock
, httpretty
, pytest
, pytest-asyncio
}:

buildPythonPackage rec {
version = "0.6.0";
version = "0.6.1";
pname = "msrestazure";

src = fetchPypi {
inherit pname version;
sha256 = "06s04f6nng4na2663kc12a3skiaqb631nscjfwpsrx4lzkf8bccr";
# Pypi tarball doesnt include tests
# see https://github.com/Azure/msrestazure-for-python/pull/133
src = fetchFromGitHub {
owner = "Azure";
repo = "msrestazure-for-python";
rev = "v${version}";
sha256 = "09swndz57131b8x57mzibnsr1sv0l80pk62p89q99gsd6mvc389c";
};

propagatedBuildInputs = [ adal msrest ];

checkInputs = [ httpretty mock pytest ]
++ lib.optional isPy3k [ pytest-asyncio ];

checkPhase = ''
pytest tests/
'';

meta = with pkgs.lib; {
description = "The runtime library 'msrestazure' for AutoRest generated Python clients.";
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.mit;
maintainers = with maintainers; [ bendlas ];
maintainers = with maintainers; [ bendlas jonringer ];
};
}