From e1cfd72c0bb2b56442f4fa62a4ac783a606b1d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 16 Jul 2024 14:09:22 -0700 Subject: [PATCH] python312Packages.xsdata: 24.2.1 -> 24.6.1 Diff: https://github.com/tefra/xsdata/compare/refs/tags/v24.2.1...v24.6.1 Changelog: https://github.com/tefra/xsdata/blob/refs/tags/v24.6.1/CHANGES.md --- .../python-modules/xsdata/default.nix | 10 ++++---- .../python-modules/xsdata/paths.patch | 24 ++++++++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index a9a1ed7a5e6d..568ef51a9e05 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "xsdata"; - version = "24.2.1"; + version = "24.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tefra"; repo = "xsdata"; rev = "refs/tags/v${version}"; - hash = "sha256-o3G0isXShwNHaOiA4TNml0IhStB3X4jB9CgrVKViBlY="; + hash = "sha256-ijXV7ZKIKg44OhySBwfQ8s5IFaLZKM3oBgXeLAr9wiM="; }; patches = [ @@ -40,12 +40,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--benchmark-skip" "" + --replace-fail "--benchmark-skip" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; passthru.optional-dependencies = { cli = [ diff --git a/pkgs/development/python-modules/xsdata/paths.patch b/pkgs/development/python-modules/xsdata/paths.patch index aad522371322..162936d4df1a 100644 --- a/pkgs/development/python-modules/xsdata/paths.patch +++ b/pkgs/development/python-modules/xsdata/paths.patch @@ -1,13 +1,21 @@ -diff --git a/xsdata/codegen/writer.py b/xsdata/codegen/writer.py -index 0301631f..3185c526 100644 ---- a/xsdata/codegen/writer.py -+++ b/xsdata/codegen/writer.py -@@ -73,7 +73,7 @@ class CodeWriter: - """Run ruff format on the src code.""" +diff --git a/xsdata/formats/dataclass/generator.py b/xsdata/formats/dataclass/generator.py +index 1c155836..43506818 100644 +--- a/xsdata/formats/dataclass/generator.py ++++ b/xsdata/formats/dataclass/generator.py +@@ -240,14 +240,14 @@ class DataclassGenerator(AbstractGenerator): + """ commands = [ [ - "ruff", + "@ruff@", "format", - "--stdin-filename", - str(file_path), + "--line-length", + str(self.config.output.max_line_length), + *file_paths, + ], + [ +- "ruff", ++ "@ruff@", + "check", + "--line-length", + str(self.config.output.max_line_length),