From 18eaf127f1ad46e532bdfcc84474dba892d9b52e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 10 May 2024 04:51:34 +0200 Subject: [PATCH 1/2] python3Packages.marshmallow-enum: remove --- .../dataclasses-json/default.nix | 4 +- .../flask-appbuilder/default.nix | 2 - .../marshmallow-dataclass/default.nix | 2 - .../marshmallow-enum/default.nix | 43 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 6 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 pkgs/development/python-modules/marshmallow-enum/default.nix diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 202b4ebb6ded..05f5eb06e098 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , hypothesis -, marshmallow-enum +, marshmallow , poetry-core , poetry-dynamic-versioning , pytestCheckHook @@ -36,7 +36,7 @@ buildPythonPackage rec { dependencies = [ typing-inspect - marshmallow-enum + marshmallow ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 3598500e37f5..2e7f5fb80850 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -15,7 +15,6 @@ , flask-jwt-extended , jsonschema , marshmallow -, marshmallow-enum , marshmallow-sqlalchemy , python-dateutil , pythonOlder @@ -53,7 +52,6 @@ buildPythonPackage rec { flask-jwt-extended jsonschema marshmallow - marshmallow-enum marshmallow-sqlalchemy python-dateutil prison diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 7b5b2932407a..6cd9aac91933 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , marshmallow -, marshmallow-enum , pytestCheckHook , pythonAtLeast , pythonOlder @@ -30,7 +29,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - marshmallow-enum pytestCheckHook typeguard ]; diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix deleted file mode 100644 index fdf2771deebd..000000000000 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, marshmallow -, pytest7CheckHook -}: - -buildPythonPackage rec { - pname = "marshmallow-enum"; - version = "1.5.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "justanr"; - repo = "marshmallow_enum"; - rev = "v${version}"; - sha256 = "1ihrcmyfjabivg6hc44i59hnw5ijlg1byv3zs1rqxfynp8xr7398"; - }; - - postPatch = '' - sed -i '/addopts/d' tox.ini - ''; - - build-system = [ - setuptools - ]; - - dependencies = [ - marshmallow - ]; - - nativeCheckInputs = [ - pytest7CheckHook - ]; - - meta = with lib; { - description = "Enum field for Marshmallow"; - homepage = "https://github.com/justanr/marshmallow_enum"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 940a7ef8b771..6e544c12d213 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -278,6 +278,7 @@ mapAliases ({ mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20 + marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10 markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19 memory_profiler = memory-profiler; # added 2023-10-09 mir_eval = mir-eval; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a75182c3603..16b9658596e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7202,8 +7202,6 @@ self: super: with self; { marshmallow-dataclass = callPackage ../development/python-modules/marshmallow-dataclass { }; - marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; - marshmallow-oneofschema = callPackage ../development/python-modules/marshmallow-oneofschema { }; marshmallow-polyfield = callPackage ../development/python-modules/marshmallow-polyfield { }; From f32def75b84447c15e672e978e18b25e7e51a72e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 10 May 2024 14:11:18 +0200 Subject: [PATCH 2/2] python3Packages.marshmallow-dataclass: Bump python requirement --- .../python-modules/marshmallow-dataclass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 6cd9aac91933..4bb06720ca23 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "8.6.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "lovasoa";