Merge pull request #64221 from jbaum98/loguru

google-music-scripts: fix build
This commit is contained in:
worldofpeace 2019-07-04 05:34:52 -04:00 committed by GitHub
commit dfb1109060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 2 deletions

View File

@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, colorama }:
buildPythonPackage rec {
pname = "loguru";
version = "0.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1b2phizcx2wbdm5np0s16yd68fc0isqnm8qs6l9pmlrlyf9gm87j";
};
checkInputs = [ pytest colorama ];
checkPhase = ''
pytest -k 'not test_time_rotation_reopening'
'';
meta = with lib; {
homepage = https://github.com/Delgan/loguru;
description = "Python logging made (stupidly) simple";
license = licenses.mit;
maintainers = with maintainers; [ jakewaksbaum ];
};
}

View File

@ -9,13 +9,15 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "5b2e9fdde8781a6d226984f0b61add2415a3804123ceeecb20fcc8527de9389d";
};
patches = [ ./loguru.patch ];
propagatedBuildInputs = with python3.pkgs; [
appdirs
audio-metadata
google-music
google-music-proto
google-music-utils
#loguru
loguru
pendulum
natsort
tomlkit
@ -29,6 +31,5 @@ python3.pkgs.buildPythonApplication rec {
description = "A CLI utility for interacting with Google Music";
license = licenses.mit;
maintainers = with maintainers; [ jakewaksbaum ];
broken = true; # 2019-03-15, missing dependency loguru
};
}

View File

@ -0,0 +1,22 @@
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,7 @@ audio-metadata = "^0.4"
google-music = "^3.0"
google-music-proto = "^2.4"
google-music-utils = "^2.1"
-loguru = "^0.2"
+loguru = "^0.3"
pendulum = "^2.0"
natsort = ">=5.0,<7.0"
tomlkit = "^0.5"
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ install_requires = \
'google-music-proto>=2.4,<3.0',
'google-music-utils>=2.1,<3.0',
'google-music>=3.0,<4.0',
- 'loguru>=0.2,<0.3',
+ 'loguru>=0.3,<0.4',
'natsort>=5.0,<7.0',
'pendulum>=2.0,<3.0',
'tomlkit>=0.5,<0.6']

View File

@ -532,6 +532,8 @@ in {
logster = callPackage ../development/python-modules/logster { };
loguru = callPackage ../development/python-modules/loguru { };
logzero = callPackage ../development/python-modules/logzero { };
macropy = callPackage ../development/python-modules/macropy { };