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

Commits on Jan 22, 2021

  1. python3Packages.pycognito: 0.1.4 -> 0.1.5

    @fabaff
    fabaff authored and Jonathan Ringer committed Jan 22, 2021
    Copy the full SHA
    6759a78 View commit details

  2. python3Packages.pycognito: use pytestCheckHook

    @fabaff
    fabaff authored and Jonathan Ringer committed Jan 22, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    32b2eb6 View commit details

  3. python3Packages.hass-nabucasa: 0.39.0 -> 0.41.0

    @fabaff
    fabaff authored and Jonathan Ringer committed Jan 22, 2021
    Copy the full SHA
    82f32ab View commit details

  4. python3Packages.hass-nabucasa: update test part

    @fabaff
    fabaff authored and Jonathan Ringer committed Jan 22, 2021
    Copy the full SHA
    01cb602 View commit details
Showing with 44 additions and 20 deletions.
  1. +29 −12 pkgs/development/python-modules/hass-nabucasa/default.nix
  2. +15 −8 pkgs/development/python-modules/pycognito/default.nix
41 changes: 29 additions & 12 deletions pkgs/development/python-modules/hass-nabucasa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,50 @@
{ lib, buildPythonPackage, fetchFromGitHub
, acme, aiohttp, snitun, attrs, pycognito, warrant
, pytest-aiohttp, asynctest, atomicwrites, pytest }:
{ lib
, acme
, aiohttp
, asynctest
, atomicwrites
, attrs
, buildPythonPackage
, fetchFromGitHub
, pycognito
, pytest-aiohttp
, pytestCheckHook
, snitun
, warrant
}:

buildPythonPackage rec {
pname = "hass-nabucasa";
version = "0.39.0";
version = "0.41.0";

src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
sha256 = "1bsvwxddpp4dsq3k2320qrx5x9lscqzffzz1zj6fbwgc4741f01w";
sha256 = "sha256-ewWw3PyJGRHP23J6WBBWs9YGl4vTb9/j/soZ6n5wbLM=";
};

postPatch = ''
sed -i 's/"acme.*"/"acme"/' setup.py
sed -i 's/"attrs.*"/"attrs"/' setup.py
sed -i 's/"cryptography.*"/"cryptography"/' setup.py
'';

propagatedBuildInputs = [
acme aiohttp atomicwrites snitun attrs warrant pycognito
acme
aiohttp
atomicwrites
attrs
pycognito
snitun
warrant
];

checkInputs = [ pytest pytest-aiohttp asynctest ];
checkInputs = [
asynctest
pytest-aiohttp
pytestCheckHook
];

checkPhase = ''
pytest tests/
'';
pythonImportsCheck = [ "hass_nabucasa" ];

meta = with lib; {
homepage = "https://github.com/NabuCasa/hass-nabucasa";
23 changes: 15 additions & 8 deletions pkgs/development/python-modules/pycognito/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{ lib
, boto3
, buildPythonPackage
, fetchFromGitHub
, cryptography
, boto3
, envs
, fetchFromGitHub
, isPy27
, mock
, pytestCheckHook
, python-jose
, requests
, mock
, isPy27
}:

buildPythonPackage rec {
pname = "pycognito";
version = "0.1.4";
version = "0.1.5";

src = fetchFromGitHub {
owner = "pvizeli";
repo = "pycognito";
repo = pname;
rev = version;
sha256 = "HLzPrRon+ipcUZlD1l4nYSwSbdDLwOALy4ejGunjK0w=";
sha256 = "sha256-RJeHPCTuaLN+zB0N0FGt4qrTI6++1ks5iBn64Cx0Psc=";
};

postPatch = ''
@@ -35,7 +36,13 @@ buildPythonPackage rec {

disabled = isPy27;

checkInputs = [ mock ];
checkInputs = [
mock
pytestCheckHook
];

pytestFlagsArray = [ "tests.py" ];
pythonImportsCheck = [ "pycognito" ];

meta = with lib; {
description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support";