Merge master into staging-next
This commit is contained in:
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioshelly";
|
||||
version = "1.0.2";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-STJ9BDVbvlIMvKMiGwkGZ9Z32NvlE+3cyYduYlwTbx4=";
|
||||
sha256 = "sha256-Om+v+cGisfx2PkH/J08loZioUO6y9wi5+6kd2T+dfOo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
, requests, urllib3, mock, setuptools, stone }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dropbox";
|
||||
version = "11.22.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ab84c9c78606faa0dc94cdb95c6b2bdb579beb5f34fff42091c98a1e0fbeb16c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dropbox";
|
||||
repo = "dropbox-sdk-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fhzpss3zs5x3hr4amrmw8hras75qc385ikpw0sx5a907kigk7w5";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "flower";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@@ -27,10 +28,10 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
celery
|
||||
pytz
|
||||
tornado
|
||||
humanize
|
||||
prometheus-client
|
||||
pytz
|
||||
tornado
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@@ -38,7 +39,15 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "flower" ];
|
||||
disabledTests = [
|
||||
# AssertionError as the celery release can't be detected
|
||||
"test_default"
|
||||
"test_with_app"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flower"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Celery Flower";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flux_led";
|
||||
version = "0.24.14";
|
||||
version = "0.24.17";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "flux_led";
|
||||
rev = version;
|
||||
sha256 = "sha256-lHsMQbKKgHjxzaPdnqAY7WAZK3CiWfVr5Z5DWXsvRWI=";
|
||||
sha256 = "sha256-NAmODGk60Lt9OiTppYV40vvGL6g28spKRC7NxVFubxE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -3,13 +3,10 @@
|
||||
, pythonOlder
|
||||
, buildPythonPackage
|
||||
, pip
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pytest-xdist
|
||||
, click
|
||||
, setuptools-scm
|
||||
, git
|
||||
, glibcLocales
|
||||
, mock
|
||||
, pep517
|
||||
}:
|
||||
|
||||
@@ -24,14 +21,26 @@ buildPythonPackage rec {
|
||||
sha256 = "992d968df6f1a19d4d37c53b68b3d4b601b894fb3ee0926d1fa762ebc7c7e9e9";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
checkInputs = [ pytest git glibcLocales mock pytest-xdist ];
|
||||
propagatedBuildInputs = [ pip click setuptools-scm pep517 ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
export HOME=$(mktemp -d) VIRTUAL_ENV=1
|
||||
py.test -m "not network"
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
pep517
|
||||
pip
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# these want internet access
|
||||
"network"
|
||||
"test_direct_reference_with_extras"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Keeps your pinned dependencies fresh";
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygls";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openlawlibrary";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zgQ5m198HMyFFrASSYCzn0EDLLeVy2j4LD0rEyEgahQ=";
|
||||
sha256 = "sha256-/nmDaA67XzrrmfwlBm5syTS4hn25m30Zb3gvOdL+bR8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "restfly";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevemcgrath";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-F+1Z+VAJkfqD345ZLE/DMyDW0ZqdV+wIA9N6ohl2rbY=";
|
||||
sha256 = "sha256-T5NfG+Vuguh6xZ/Rdx3a1vMDgXPcl/OYhOkxb76yEXg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "systembridge";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timmo001";
|
||||
repo = "system-bridge-connector-py";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VR5juaZdZaEo7S0XXJkspcKmH1alitNIWmI0g/dFBbM=";
|
||||
sha256 = "sha256-TYRsk47cVlXQ7RWyEGxXmxdHVES6WNbzdW8ZJSkVtb8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, importlib-metadata
|
||||
, ipython
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "watermark";
|
||||
version = "2.2.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rasbt";
|
||||
repo = pname;
|
||||
rev = "d3553b68dd30ac5b0951a6fae6083236e4c7f3bd";
|
||||
sha256 = "0w2mzi344x1mrv8d9jca67bhig34jissr9sqrk68gpg5n10alblb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipython
|
||||
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "watermark" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "IPython extension for printing date and time stamps, version numbers, and hardware information.";
|
||||
homepage = "https://github.com/rasbt/watermark";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ nphilou ];
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user