Merge pull request #121732 from fabaff/bump-surepy

This commit is contained in:
Martin Weinelt 2021-05-08 02:13:46 +02:00 committed by GitHub
commit 96cf2b8582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 15 deletions

View File

@ -6,7 +6,7 @@
, colorama , colorama
, dataclasses , dataclasses
, ipywidgets , ipywidgets
, poetry , poetry-core
, pygments , pygments
, typing-extensions , typing-extensions
, pytestCheckHook , pytestCheckHook
@ -14,27 +14,33 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rich"; pname = "rich";
version = "9.13.0"; version = "10.1.0";
format = "pyproject";
disabled = pythonOlder "3.6";
# tests not included in pypi tarball
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "willmcgugan"; owner = "willmcgugan";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0si3rzhg8wfxw4aakkp8sr6nbzfa54rl0w92macd1338q90ha4ly"; sha256 = "sha256-HH+k9uiK34yoqu83rknCIe2DpoqJRHkcqABuj8zjzqs=";
}; };
format = "pyproject";
nativeBuildInputs = [ poetry ]; nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ propagatedBuildInputs = [
CommonMark CommonMark
colorama colorama
ipywidgets ipywidgets
pygments pygments
typing-extensions typing-extensions
] ++ lib.optional (pythonOlder "3.7") dataclasses; ] ++ lib.optional (pythonOlder "3.7") [
dataclasses
];
checkInputs = [
pytestCheckHook
];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "rich" ]; pythonImportsCheck = [ "rich" ];
meta = with lib; { meta = with lib; {

View File

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "surepy"; pname = "surepy";
version = "0.5.0"; version = "0.6.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "benleb"; owner = "benleb";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1adsnjya142bxdhfxqsi2qa35ylvdcibigs1wafjlxazlxs3mg0j"; sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU=";
}; };
nativeBuildInputs = [ poetry-core ]; nativeBuildInputs = [ poetry-core ];
@ -43,11 +43,6 @@ buildPythonPackage rec {
rich rich
]; ];
postPatch = ''
# halo is out-dated, https://github.com/benleb/surepy/pull/7
substituteInPlace pyproject.toml --replace "^0.0.30" "^0.0.31"
'';
# Project has no tests # Project has no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "surepy" ]; pythonImportsCheck = [ "surepy" ];

View File

@ -361,6 +361,7 @@ in with py.pkgs; buildPythonApplication rec {
"stream" "stream"
"subaru" "subaru"
"sun" "sun"
"surepetcare"
"switch" "switch"
"system_health" "system_health"
"system_log" "system_log"