From b92076c591ba55e9a8323b6a3a4a1fc069ba1df6 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sat, 23 Jan 2021 03:43:02 +0000 Subject: [PATCH 1/6] python3Packages.gradient-utils: renamed from gradient_sdk --- .../python-modules/gradient-utils/default.nix | 34 +++++++++++++++++++ .../python-modules/gradient_sdk/default.nix | 25 -------------- .../python-modules/paperspace/default.nix | 4 +-- pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/gradient-utils/default.nix delete mode 100644 pkgs/development/python-modules/gradient_sdk/default.nix diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix new file mode 100644 index 00000000000..d7c77dfc893 --- /dev/null +++ b/pkgs/development/python-modules/gradient-utils/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, fetchPypi +, hyperopt +, lib +, numpy +, prometheus_client +}: + +buildPythonPackage rec { + pname = "gradient-utils"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a99yygv30vibfawk6zd1jd6lva8fjnr99l1ahaf0nqjyw6jl4nw"; + }; + + postPatch = '' + sed -i 's/hyperopt==0.1.2/hyperopt>=0.1.2/' setup.py + sed -i 's/numpy==1.18.5/numpy>=1.18.5/' setup.py + ''; + + propagatedBuildInputs = [ hyperopt prometheus_client numpy ]; + + pythonImportsCheck = [ "gradient_utils" ]; + + meta = with lib; { + description = "Gradient ML SDK"; + homepage = "https://github.com/Paperspace/gradient-utils"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/development/python-modules/gradient_sdk/default.nix b/pkgs/development/python-modules/gradient_sdk/default.nix deleted file mode 100644 index 3dffb38f2ff..00000000000 --- a/pkgs/development/python-modules/gradient_sdk/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage -, hyperopt -}: - -buildPythonPackage rec { - pname = "gradient_sdk"; - version = "0.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "Q9oeYjjgJf2lhxW1ypsweQAPpMglmW9PxgzMsgTqJkY="; - }; - - propagatedBuildInputs = [ hyperopt ]; - - pythonImportsCheck = [ "gradient_sdk" ]; - - meta = with lib; { - description = "Gradient ML SDK"; - homepage = "https://github.com/Paperspace/gradient-sdk"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ freezeboy ]; - }; -} diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 86dbffd76b7..c3162475689 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -1,7 +1,7 @@ { lib, fetchPypi, buildPythonPackage , boto3, requests, gradient_statsd, terminaltables , click-completion , click-didyoumean, click-help-colors -, colorama, requests_toolbelt, gradient_sdk, progressbar2 +, colorama, requests_toolbelt, gradient-utils, progressbar2 }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ boto3 requests gradient_statsd terminaltables click-completion click-didyoumean click-help-colors requests_toolbelt - colorama gradient_sdk progressbar2 + colorama gradient-utils progressbar2 ]; # tries to use /homeless-shelter to mimic container usage, etc diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23efec76c1f..5c131c2a281 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2753,7 +2753,7 @@ in { gpyopt = callPackage ../development/python-modules/gpyopt { }; - gradient_sdk = callPackage ../development/python-modules/gradient_sdk { }; + gradient-utils = callPackage ../development/python-modules/gradient-utils { }; gradient_statsd = callPackage ../development/python-modules/gradient_statsd { }; From a354c8ff1831025f070fe2b2c649a026cfa35da1 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sat, 23 Jan 2021 04:25:42 +0000 Subject: [PATCH 2/6] python3Packages.log-symbols: init at 0.0.14 --- .../python-modules/log-symbols/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/log-symbols/default.nix diff --git a/pkgs/development/python-modules/log-symbols/default.nix b/pkgs/development/python-modules/log-symbols/default.nix new file mode 100644 index 00000000000..dd739dfde6b --- /dev/null +++ b/pkgs/development/python-modules/log-symbols/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, colorama +, fetchPypi +, isPy27 +, pytestCheckHook +, lib }: + +buildPythonPackage rec { + pname = "log-symbols"; + version = "0.0.14"; + disabled = isPy27; + + src = fetchPypi { + # the package is named log-symbols but PyPI files are named log_symbols + pname = "log_symbols"; + inherit version; + sha256 = "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg"; + }; + + propagatedBuildInputs = [ colorama ]; + + # Tests are not included in the PyPI distribution and the git repo does not have tagged releases + doCheck = false; + pythonImportsCheck = [ "log_symbols" ]; + + meta = with lib; { + description = "Colored Symbols for Various Log Levels."; + homepage = "https://github.com/manrajgrover/py-log-symbols"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c131c2a281..cfa1aecaf72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3776,6 +3776,8 @@ in { lockfile = callPackage ../development/python-modules/lockfile { }; + log-symbols = callPackage ../development/python-modules/log-symbols { }; + Logbook = callPackage ../development/python-modules/Logbook { }; logfury = callPackage ../development/python-modules/logfury { }; From ea0edd8e8baebeee466be3281f1623a58f9516cc Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sat, 23 Jan 2021 04:27:02 +0000 Subject: [PATCH 3/6] python3Packages.spinners: init at 0.0.24 --- .../python-modules/spinners/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/spinners/default.nix diff --git a/pkgs/development/python-modules/spinners/default.nix b/pkgs/development/python-modules/spinners/default.nix new file mode 100644 index 00000000000..1e71296fd17 --- /dev/null +++ b/pkgs/development/python-modules/spinners/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchPypi +, isPy27 +, lib }: + +buildPythonPackage rec { + pname = "spinners"; + version = "0.0.24"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0zz2z6dpdjdq5z8m8w8dfi8by0ih1zrdq0caxm1anwhxg2saxdhy"; + }; + + # Tests are not included in the PyPI distribution and the git repo does not have tagged releases + doCheck = false; + pythonImportsCheck = [ "spinners" ]; + + meta = with lib; { + description = "Spinners for the Terminal."; + homepage = "https://github.com/manrajgrover/py-spinners"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfa1aecaf72..a4420c5c3c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7294,6 +7294,8 @@ in { sphfile = callPackage ../development/python-modules/sphfile { }; + spinners = callPackage ../development/python-modules/spinners { }; + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; From cb96308934837e9a812db198199e1252b0c11830 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sat, 23 Jan 2021 04:27:55 +0000 Subject: [PATCH 4/6] python3Packages.halo: init at 0.0.31 --- .../python-modules/halo/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/halo/default.nix diff --git a/pkgs/development/python-modules/halo/default.nix b/pkgs/development/python-modules/halo/default.nix new file mode 100644 index 00000000000..e167371b42a --- /dev/null +++ b/pkgs/development/python-modules/halo/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, colorama +, fetchPypi +, isPy27 +, lib +, log-symbols +, pytestCheckHook +, six +, spinners +, termcolor }: + +buildPythonPackage rec { + pname = "halo"; + version = "0.0.31"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1mn97h370ggbc9vi6x8r6akd5q8i512y6kid2nvm67g93r9a6rvv"; + }; + + propagatedBuildInputs = [ colorama log-symbols termcolor six spinners ]; + + # Tests are not included in the PyPI distribution and the git repo does not have tagged releases + doCheck = false; + pythonImportsCheck = [ "halo" ]; + + meta = with lib; { + description = "Beautiful Spinners for Terminal, IPython and Jupyter."; + homepage = "https://github.com/manrajgrover/halo"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4420c5c3c3..99e496a3b86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2875,6 +2875,8 @@ in { ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + halo = callPackage ../development/python-modules/halo { }; + handout = callPackage ../development/python-modules/handout { }; HAP-python = callPackage ../development/python-modules/HAP-python { }; From dc002149741d4346ef08b08b01679e6ed49dfd3a Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sat, 23 Jan 2021 04:28:34 +0000 Subject: [PATCH 5/6] python3Packages.gradient: renamed from paperspace --- .../python-modules/gradient/default.nix | 40 +++++++++++++++++++ .../python-modules/log-symbols/default.nix | 6 +-- .../python-modules/paperspace/default.nix | 31 -------------- pkgs/top-level/python-packages.nix | 4 +- 4 files changed, 44 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/python-modules/gradient/default.nix delete mode 100644 pkgs/development/python-modules/paperspace/default.nix diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix new file mode 100644 index 00000000000..14df3b882bb --- /dev/null +++ b/pkgs/development/python-modules/gradient/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchPypi, buildPythonPackage +, attrs, boto3, requests, gradient_statsd, terminaltables +, click-completion , click-didyoumean, click-help-colors +, colorama, requests_toolbelt, gradient-utils, halo, progressbar2 +, marshmallow, pyyaml, websocket_client +}: + +buildPythonPackage rec { + pname = "gradient"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15s21945hg342195ig7nchap5mdnsw931iis92pr7hy8ff0rks3n"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'attrs<=' 'attrs>=' \ + --replace 'colorama==' 'colorama>=' \ + --replace 'PyYAML==' 'PyYAML>=' \ + --replace 'marshmallow<' 'marshmallow>=' + ''; + + propagatedBuildInputs = [ attrs boto3 requests gradient_statsd terminaltables + click-completion click-didyoumean click-help-colors requests_toolbelt + colorama gradient-utils halo marshmallow progressbar2 pyyaml websocket_client + ]; + + # tries to use /homeless-shelter to mimic container usage, etc + doCheck = false; + + meta = with lib; { + description = "The command line interface for Gradient"; + homepage = "https://github.com/Paperspace/gradient-cli"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/python-modules/log-symbols/default.nix b/pkgs/development/python-modules/log-symbols/default.nix index dd739dfde6b..f8cdce634ac 100644 --- a/pkgs/development/python-modules/log-symbols/default.nix +++ b/pkgs/development/python-modules/log-symbols/default.nix @@ -6,14 +6,12 @@ , lib }: buildPythonPackage rec { - pname = "log-symbols"; + pname = "log_symbols"; version = "0.0.14"; disabled = isPy27; src = fetchPypi { - # the package is named log-symbols but PyPI files are named log_symbols - pname = "log_symbols"; - inherit version; + inherit pname version; sha256 = "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg"; }; diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix deleted file mode 100644 index c3162475689..00000000000 --- a/pkgs/development/python-modules/paperspace/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage -, boto3, requests, gradient_statsd, terminaltables -, click-completion , click-didyoumean, click-help-colors -, colorama, requests_toolbelt, gradient-utils, progressbar2 -}: - -buildPythonPackage rec { - pname = "paperspace"; - version = "0.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "7959305128fea6da8ca0cdc528783a89859dacb9b54bf8eb89fd04a518872191"; - }; - - propagatedBuildInputs = [ boto3 requests gradient_statsd terminaltables - click-completion click-didyoumean click-help-colors requests_toolbelt - colorama gradient-utils progressbar2 - ]; - - # tries to use /homeless-shelter to mimic container usage, etc - doCheck = false; - - meta = with lib; { - description = "Python API for Paperspace Cloud"; - homepage = "https://paperspace.com"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99e496a3b86..b6f3370ccdd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2753,6 +2753,8 @@ in { gpyopt = callPackage ../development/python-modules/gpyopt { }; + gradient = callPackage ../development/python-modules/gradient { }; + gradient-utils = callPackage ../development/python-modules/gradient-utils { }; gradient_statsd = callPackage ../development/python-modules/gradient_statsd { }; @@ -4644,8 +4646,6 @@ in { papermill = callPackage ../development/python-modules/papermill { }; - paperspace = callPackage ../development/python-modules/paperspace { }; - openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { }; openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { }; paperwork-backend = callPackage ../applications/office/paperwork/paperwork-backend.nix { }; From 07c21216df43691bcfd4f966055650a1b74bfc74 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sun, 31 Jan 2021 17:38:10 +0000 Subject: [PATCH 6/6] python3Packages.gradient-utils: added tests --- .../python-modules/gradient-utils/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix index d7c77dfc893..cf0ffb6bb41 100644 --- a/pkgs/development/python-modules/gradient-utils/default.nix +++ b/pkgs/development/python-modules/gradient-utils/default.nix @@ -1,28 +1,40 @@ { buildPythonPackage -, fetchPypi +, fetchFromGitHub , hyperopt , lib +, mock , numpy +, poetry , prometheus_client +, pytestCheckHook }: buildPythonPackage rec { pname = "gradient-utils"; version = "0.3.2"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "0a99yygv30vibfawk6zd1jd6lva8fjnr99l1ahaf0nqjyw6jl4nw"; + src = fetchFromGitHub { + owner = "Paperspace"; + repo = pname; + rev = "v${version}"; + sha256 = "083hnkv19mhvdc8nx28f1nph50c903gxh9g9q8531abv0w8m0744"; }; postPatch = '' - sed -i 's/hyperopt==0.1.2/hyperopt>=0.1.2/' setup.py - sed -i 's/numpy==1.18.5/numpy>=1.18.5/' setup.py + substituteInPlace pyproject.toml \ + --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \ + --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' ''; + nativeBuildInputs = [ poetry ]; + checkInputs = [ mock pytestCheckHook ]; propagatedBuildInputs = [ hyperopt prometheus_client numpy ]; - pythonImportsCheck = [ "gradient_utils" ]; + preCheck = "export HOSTNAME=myhost-experimentId"; + disabledTests = [ + "test_add_metrics_pushes_metrics" # requires a working prometheus push gateway + ]; meta = with lib; { description = "Gradient ML SDK";