From d328f0f8e99409abb3e789a8c6e2f20cf240cf0d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 May 2022 21:45:27 +0200 Subject: [PATCH 1/2] python310Packages.dirty-equals: init at 0.4 --- .../python-modules/dirty-equals/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/dirty-equals/default.nix diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix new file mode 100644 index 00000000000..0a448b8de7f --- /dev/null +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, pytz +, typing-extensions +}: + +buildPythonPackage rec { + pname = "dirty-equals"; + version = "0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = pname; + rev = "v${version}"; + hash = "sha256-rh7N/VRx4sv/MhhGPkaYCn2d19Sv5er2CkG6/fJuXX4="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pytz + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dirty_equals" + ]; + + meta = with lib; { + description = "Module for doing dirty (but extremely useful) things with equals"; + homepage = "https://github.com/samuelcolvin/dirty-equals"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 341af1df20f..b47f25c4c74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2245,6 +2245,8 @@ in { directv = callPackage ../development/python-modules/directv { }; + dirty-equals = callPackage ../development/python-modules/dirty-equals { }; + discid = callPackage ../development/python-modules/discid { }; discogs-client = callPackage ../development/python-modules/discogs-client { }; From 2b7d41931795319f55a364de969e7aadb2f110e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 May 2022 22:06:59 +0200 Subject: [PATCH 2/2] python310Packages.watchfiles: init at 0.14.1 --- .../python-modules/watchfiles/default.nix | 68 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/python-modules/watchfiles/default.nix diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix new file mode 100644 index 00000000000..9735b188594 --- /dev/null +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -0,0 +1,68 @@ +{ lib +, anyio +, buildPythonPackage +, fetchFromGitHub +, rustPlatform +, setuptools-rust +, pythonOlder +, dirty-equals +, pytest-mock +, pytest-timeout +, pytestCheckHook +, python +}: + +buildPythonPackage rec { + pname = "watchfiles"; + version = "0.14.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XjmmyL7ZRqkYwGGk6/KkxL7e/JA43tQN4W3knTtc7t0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-sZMj1HQ37gAG3WM+qBMhcCQ2MuUGom23lF8c4L0RQzM="; + }; + + nativeBuildInputs = [ + setuptools-rust + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + propagatedBuildInputs = [ + anyio + ]; + + checkInputs = [ + dirty-equals + pytest-mock + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "watchfiles" + ]; + + preCheck = '' + cd tests + ''; + + meta = with lib; { + description = "Simple, modern file watching and code reload"; + homepage = "https://watchfiles.helpmanual.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b47f25c4c74..3150b5ebd5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10954,6 +10954,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; + watchfiles = callPackage ../development/python-modules/watchfiles { }; + watchgod = callPackage ../development/python-modules/watchgod { }; waterfurnace = callPackage ../development/python-modules/waterfurnace { };