Unverified Commit 9826e9ea authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #327745 from dotlambda/python3Packages.xsdata 

python312Packages.xsdata: 24.2.1 -> 24.6.1
parents 5a2d285e e1cfd72c

pkgs/development/python-modules/xsdata/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/python-modules/xsdata/paths.patch

+16 −8
Original line number Diff line number Diff line 
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),