diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 0818ca79622f..8919f85e44d9 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,11 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "6.0.5"; + version = "6.5.0"; propagatedBuildInputs = with python3Packages; [ appdirs ConfigArgParse + connection-pool datrie docutils filelock @@ -19,13 +20,15 @@ python3Packages.buildPythonApplication rec { ratelimiter requests smart-open + stopit + tabulate toposort wrapt ]; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "9441169034cce46086a8b45486d75175db645b932e766d28fed312ec837792d3"; + sha256 = "b166ec74537e02553fcaf0ddcffc32dfdb9dcaa1260af297a56eded6a179b2ee"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/pkgs/development/python-modules/connection-pool/default.nix b/pkgs/development/python-modules/connection-pool/default.nix new file mode 100644 index 000000000000..26e958f095ef --- /dev/null +++ b/pkgs/development/python-modules/connection-pool/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "connection-pool"; + version = "0.0.3"; + disabled = !isPy3k; + + src = fetchPypi { + pname = "connection_pool"; + inherit version; + sha256 = "bf429e7aef65921c69b4ed48f3d48d3eac1383b05d2df91884705842d974d0dc"; + }; + + doCheck = false; # no tests + pythonImportsCheck = [ "connection_pool" ]; + + meta = with lib; { + description = "Thread-safe connection pool"; + homepage = "https://github.com/zhouyl/ConnectionPool"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix new file mode 100644 index 000000000000..4d504da674c5 --- /dev/null +++ b/pkgs/development/python-modules/stopit/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "stopit"; + version = "1.1.2"; + + # tests are missing from the PyPi tarball + src = fetchFromGitHub { + owner = "glenfant"; + repo = pname; + rev = version; + sha256 = "sha256-uXJUA70JOGWT2NmS6S7fPrTWAJZ0mZ/hICahIUzjfbw="; + }; + + pythonImportsCheck = [ "stopit" ]; + + meta = with lib; { + description = "Raise asynchronous exceptions in other thread, control the timeout of blocks or callables with a context manager or a decorator"; + homepage = "https://github.com/glenfant/stopit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a96af2d78a5..b025b02f70d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1335,6 +1335,8 @@ in { connect-box = callPackage ../development/python-modules/connect_box { }; + connection-pool = callPackage ../development/python-modules/connection-pool { }; + coqpit = callPackage ../development/python-modules/coqpit { }; cerberus = callPackage ../development/python-modules/cerberus { }; @@ -8226,6 +8228,8 @@ in { stone = callPackage ../development/python-modules/stone { }; + stopit = callPackage ../development/python-modules/stopit { }; + strategies = callPackage ../development/python-modules/strategies { }; stravalib = callPackage ../development/python-modules/stravalib { };