diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix new file mode 100644 index 000000000000..14df3b882bba --- /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 dd739dfde6b6..f8cdce634ac9 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 c31624756899..000000000000 --- 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 99e496a3b866..b6f3370ccdd3 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 { };