From b4ddc3e3db7688bfc36ad98e4d87dfcabf399b00 Mon Sep 17 00:00:00 2001 From: Guy Boldon Date: Tue, 8 Aug 2023 20:02:56 +0200 Subject: [PATCH 1/2] maintainers: add codifryed --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e4cce336eea7..192e9f9f9d05 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3287,6 +3287,15 @@ email = "jupiter@m.rdis.dev"; name = "Scott Little"; }; + codifryed = { + email = "gb@guyboldon.com"; + name = "Guy Boldon"; + github = "codifryed"; + githubId = 27779510; + keys = [{ + fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; + }]; + }; codsl = { email = "codsl@riseup.net"; github = "codsl"; From a8d80cd4087629ce5af169f20ca1720933d94522 Mon Sep 17 00:00:00 2001 From: Guy Boldon Date: Tue, 8 Aug 2023 20:17:05 +0200 Subject: [PATCH 2/2] dataclass-wizard: init at 0.22.2 --- .../dataclass-wizard/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/dataclass-wizard/default.nix diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix new file mode 100644 index 000000000000..603fd25e9b2a --- /dev/null +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pythonAtLeast +, pytimeparse +, pyyaml +, pytestCheckHook +, pytest-mock +, typing-extensions +}: + +buildPythonPackage rec { + pname = "dataclass-wizard"; + version = "0.22.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rnag"; + repo = "dataclass-wizard"; + rev = "v${version}"; + hash = "sha256-Ufi4lZc+UkM6NZr4bS2OibpOmMjyiBEoVKxmrqauW50="; + }; + + propagatedBuildInputs = [ + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + passthru.optional-dependencies = { + timedelta = [ + pytimeparse + ]; + yaml = [ + pyyaml + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ] ++ passthru.optional-dependencies.timedelta + ++ passthru.optional-dependencies.yaml; + + disabledTests = [ + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Any/None internal changes, tests need adjusting upstream + "without_type_hinting" + "default_dict" + "test_frozenset" + "test_set" + "date_times_with_custom_pattern" + "from_dict_handles_identical_cased_json_keys" + ]; + + pythonImportsCheck = [ "dataclass_wizard" ]; + + meta = with lib; { + description = "A set of simple, yet elegant wizarding tools for interacting with the Python dataclasses module"; + homepage = "https://github.com/rnag/dataclass-wizard"; + changelog = "https://github.com/rnag/dataclass-wizard/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ codifryed ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3438afb51bce..b60873663dc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4856,6 +4856,8 @@ with pkgs; dasher = callPackage ../applications/accessibility/dasher { }; + dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard; + datafusion-cli = callPackage ../development/misc/datafusion { }; datamash = callPackage ../tools/misc/datamash { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 425082dce950..c2572b7a4e70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2421,6 +2421,8 @@ self: super: with self; { databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { }; + dataclass-wizard = callPackage ../development/python-modules/dataclass-wizard { }; + dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; dataclasses-serialization = callPackage ../development/python-modules/dataclasses-serialization { };