Unverified Commit a5e8d84c authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #280298 from dotlambda/xsdata-24.1 

python311Packages.xsdata: 23.8 -> 24.1
parents 4c2565b8 4d125bac

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

+19 −10
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, pythonOlder

, fetchPypi

, fetchFromGitHub

, substituteAll

, ruff

, click

, click-default-group

, docformatter
@@ -12,21 +14,29 @@ 
, requests

, pytestCheckHook

, setuptools

, wheel

}:



buildPythonPackage rec {

  pname = "xsdata";

  version = "23.8";

  format = "pyproject";

  version = "24.1";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-VfA9TIgjbwRyZq/+VQug3RlHat/OagHz4K76x8gHjlY=";

  src = fetchFromGitHub {

    owner = "tefra";

    repo = "xsdata";

    rev = "v${version}";

    hash = "sha256-vdcCTJqvaRehGWfTd9GR/DypF9ftY4ite7SDMPc2Ups=";

  };



  patches = [

    (substituteAll {

      src = ./paths.patch;

      ruff = lib.getExe ruff;

    })

  ];



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace "--benchmark-skip" ""
@@ -34,7 +44,6 @@ buildPythonPackage rec { 


  nativeBuildInputs = [

    setuptools

    wheel

  ];



  propagatedBuildInputs = [
@@ -83,9 +92,9 @@ buildPythonPackage rec { 
  ];



  meta = {

    description = "Python XML Binding";

    description = "Naive XML & JSON bindings for Python";

    homepage = "https://github.com/tefra/xsdata";

    changelog = "https://github.com/tefra/xsdata/blob/v${version}/CHANGES.rst";

    changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.rst";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ dotlambda ];

  };

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

0 → 100644
+13 −0
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."""

         commands = [

             [

-                "ruff",

+                "@ruff@",

                 "format",

                 "--stdin-filename",

                 str(file_path),

pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -5,17 +5,17 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "dmarc-metrics-exporter";

  version = "0.9.4";

  version = "0.10.1";



  disabled = python3.pythonOlder "3.8";



  format = "pyproject";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "jgosmann";

    repo = "dmarc-metrics-exporter";

    rev = "refs/tags/v${version}";

    hash = "sha256-doKG191rQvUpjOb3HvkzZP9XbtQXYGFtDJIdDSFRLSU=";

    hash = "sha256-gur0+2yHqxySXECMboW7dAyyf0ckSdS0FEy7HvA5Y5w=";

  };



  pythonRelaxDeps = true;
@@ -29,7 +29,6 @@ python3.pkgs.buildPythonApplication rec { 
    bite-parser

    dataclasses-serialization

    prometheus-client

    typing-extensions

    uvicorn

    xsdata

  ]