Unverified Commit 66b8919a authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #330047 from Sigmanificient/textx 

python312Packages.textx: 3.0.0 -> 4.0.1
parents b475b0c7 5acc1027

pkgs/by-name/st/strictdoc/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication rec { 
    "python-datauri"

    "xlsxwriter"

    "lxml"

    "textx"

  ];



  pythonImportsCheck = [ "strictdoc" ];

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

+42 −30
Original line number Diff line number Diff line
@@ -14,41 +14,30 @@ 
  html5lib,

  jinja2,

  psutil,

  flit-core,

}:



let

  textx = buildPythonPackage rec {

    pname = "textx";

    version = "3.0.0";

    format = "setuptools";

    version = "4.0.1";

    pyproject = true;



    src = fetchFromGitHub {

      owner = pname;

      repo = pname;

      rev = version;

      hash = "sha256-uZlO82dKtWQQR5+Q7dWk3+ZoUzAjDJ8qzC4UMLCtnBk=";

      hash = "sha256-qiKOG6B7yWWzkL7bmcRAVv6AOHKTWmrlrsJlXD5RoaQ=";

    };



    postPatch = ''

      substituteInPlace setup.cfg --replace "click >=7.0, <8.0" "click >=7.0"

    '';



    outputs = [

      "out"

      "testout"

    ];



    nativeBuildInputs = [

      mkdocs

      twine

    ];

    build-system = [ flit-core ];



    propagatedBuildInputs = [

      arpeggio

      click

      future

      setuptools

    ];

    dependencies = [ arpeggio ];



    postInstall = ''

      # FileNotFoundError: [Errno 2] No such file or directory: '$out/lib/python3.10/site-packages/textx/textx.tx
@@ -88,16 +77,19 @@ let 
  textx-data-dsl = buildPythonPackage rec {

    pname = "textx-data-dsl";

    version = "1.0.0";

    pyproject = true;



    inherit (textx) src;

    # `format` isn't included in the output of `mk-python-derivation`.

    # So can't inherit format: `error: attribute 'format' missing`.

    format = "setuptools";

    pathToSourceRoot = "tests/functional/registration/projects/data_dsl";

    sourceRoot = "${src.name}/" + pathToSourceRoot;

    propagatedBuildInputs = [



    build-system = [ flit-core ];



    dependencies = [

      textx

      textx-types-dsl

    ];



    meta = with lib; {

      inherit (textx.meta) license maintainers;

      description = "Sample textX language for testing";
@@ -108,14 +100,19 @@ let 
  textx-flow-codegen = buildPythonPackage rec {

    pname = "textx-flow-codegen";

    version = "1.0.0";

    pyproject = true;



    inherit (textx) src;

    format = "setuptools";



    pathToSourceRoot = "tests/functional/registration/projects/flow_codegen";

    sourceRoot = "${src.name}/" + pathToSourceRoot;

    propagatedBuildInputs = [

      click



    build-system = [ flit-core ];

    dependencies = [

      textx

      click

    ];



    meta = with lib; {

      inherit (textx.meta) license maintainers;

      description = "Sample textX language for testing";
@@ -126,11 +123,16 @@ let 
  textx-flow-dsl = buildPythonPackage rec {

    pname = "textx-flow-dsl";

    version = "1.0.0";

    pyproject = true;



    inherit (textx) src;

    format = "setuptools";



    pathToSourceRoot = "tests/functional/registration/projects/flow_dsl";

    sourceRoot = "${src.name}/" + pathToSourceRoot;

    propagatedBuildInputs = [ textx ];



    build-system = [ flit-core ];

    dependencies = [ textx ];



    meta = with lib; {

      inherit (textx.meta) license maintainers;

      description = "Sample textX language for testing";
@@ -141,11 +143,16 @@ let 
  textx-types-dsl = buildPythonPackage rec {

    pname = "textx-types-dsl";

    version = "1.0.0";

    pyproject = true;



    inherit (textx) src;

    format = "setuptools";



    pathToSourceRoot = "tests/functional/registration/projects/types_dsl";

    sourceRoot = "${src.name}/" + pathToSourceRoot;

    propagatedBuildInputs = [ textx ];



    build-system = [ flit-core ];

    dependencies = [ textx ];



    meta = with lib; {

      inherit (textx.meta) license maintainers;

      description = "Sample textX language for testing";
@@ -156,11 +163,16 @@ let 
  textx-example-project = buildPythonPackage rec {

    pname = "textx-example-project";

    version = "1.0.0";

    pyproject = true;



    inherit (textx) src;

    format = "setuptools";



    pathToSourceRoot = "tests/functional/subcommands/example_project";

    sourceRoot = "${src.name}/" + pathToSourceRoot;

    propagatedBuildInputs = [ textx ];



    build-system = [ flit-core ];

    dependencies = [ textx ];



    meta = with lib; {

      inherit (textx.meta) license maintainers;

      description = "Sample textX sub-command for testing";

pkgs/development/python-modules/textx/tests.nix

+6 −0
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  attrs,

  click,

  gprof2dot,

  html5lib,
@@ -20,6 +21,7 @@ 
buildPythonPackage {

  pname = "textx-tests";

  inherit (textx) version;

  pyproject = false;



  srcs = textx.testout;
@@ -27,6 +29,7 @@ buildPythonPackage { 
  dontInstall = true;



  nativeCheckInputs = [

    attrs

    click

    gprof2dot

    html5lib
@@ -43,6 +46,9 @@ buildPythonPackage { 
  ];



  pytestFlagsArray = [ "tests/functional" ];

  disabledTests = [

    "test_examples" # assertion error: 0 == 12

  ];



  meta = with lib; {

    inherit (textx.meta) license maintainers;