Unverified Commit 24faa3a6 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #329409 from dotlambda/python3Packages.pdfminer-six 

python312Packages.pdfminer-six: 20231228 -> 20240706
parents 09da1488 45c1e0ab

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

+12 −14
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 
  buildPythonPackage,

  click,

  fetchFromGitHub,

  fetchpatch2,

  pytest-xdist,

  pytestCheckHook,

  pythonAtLeast,

  pythonOlder,

  requests,

  saneyaml,
@@ -19,7 +19,7 @@ 
buildPythonPackage rec {

  pname = "commoncode";

  version = "31.2.1";

  format = "pyproject";

  pyproject = true;



  disabled = pythonOlder "3.7";
@@ -30,11 +30,19 @@ buildPythonPackage rec { 
    hash = "sha256-4ZgyNlMj1i1fRru4wgDOyP3qzbne8D2eH/tFI60kgrE=";

  };



  patches = [

    # https://github.com/nexB/commoncode/pull/66

    (fetchpatch2 {

      url = "https://github.com/nexB/commoncode/commit/4f87b3c9272dcf209b9c4b997e98b58e0edaf570.patch";

      hash = "sha256-loUtAww+SK7kMt5uqZmLQ8Wg/OqB7LWVA4BiztnwHsA=";

    })

  ];



  dontConfigure = true;



  nativeBuildInputs = [ setuptools-scm ];

  build-system = [ setuptools-scm ];



  propagatedBuildInputs = [

  dependencies = [

    attrs

    beautifulsoup4

    click
@@ -48,11 +56,6 @@ buildPythonPackage rec { 
    pytest-xdist

  ];



  preCheck = ''

    # prevent readout of /etc/os-release during tests

    sed -i "s/is_on_ubuntu_22()/lambda _: False/" src/commoncode/system.py

  '';



  disabledTests =

    [

      # chinese character translates different into latin
@@ -69,11 +72,6 @@ buildPythonPackage rec { 
      "test_searchable_paths"

    ];



  disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [

    # https://github.com/nexB/commoncode/issues/36

    "src/commoncode/fetch.py"

  ];



  pythonImportsCheck = [ "commoncode" ];



  meta = with lib; {

pkgs/development/python-modules/debian-inspector/default.nix

+8 −6
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
buildPythonPackage rec {

  pname = "debian-inspector";

  version = "31.1.0";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.6";

  disabled = pythonOlder "3.7";



  src = fetchPypi {

    pname = "debian_inspector";
@@ -25,15 +25,17 @@ buildPythonPackage rec { 


  dontConfigure = true;



  nativeBuildInputs = [ setuptools-scm ];

  build-system = [ setuptools-scm ];



  propagatedBuildInputs = [

  dependencies = [

    chardet

    attrs

    commoncode

  ];



  nativeCheckInputs = [ pytestCheckHook ];

  nativeCheckInputs = [

    commoncode

    pytestCheckHook

  ];



  pythonImportsCheck = [ "debian_inspector" ];

pkgs/development/python-modules/pdfminer-six/default.nix

+10 −17
Original line number Diff line number Diff line
@@ -2,12 +2,9 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  importlib-metadata,

  isPy3k,

  cryptography,

  charset-normalizer,

  pythonOlder,

  typing-extensions,

  pytestCheckHook,

  setuptools,

  substituteAll,
@@ -16,16 +13,16 @@ 


buildPythonPackage rec {

  pname = "pdfminer-six";

  version = "20231228";

  version = "20240706";

  pyproject = true;



  disabled = !isPy3k;

  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "pdfminer";

    repo = "pdfminer.six";

    rev = version;

    hash = "sha256-LXPECQQojD3IY9zRkrDBufy4A8XUuYiRpryqUx/I3qo=";

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

    hash = "sha256-aY7GQADRxeiclr6/G3RRgrPcl8rGiC85JYEIjIa+vG0=";

  };



  patches = [
@@ -35,16 +32,11 @@ buildPythonPackage rec { 
    })

  ];



  nativeBuildInputs = [ setuptools ];

  build-system = [ setuptools ];



  propagatedBuildInputs =

    [

  dependencies = [

    charset-normalizer

    cryptography

    ]

    ++ lib.optionals (pythonOlder "3.8") [

      importlib-metadata

      typing-extensions

  ];



  postInstall = ''
@@ -67,6 +59,7 @@ buildPythonPackage rec { 
  };



  meta = with lib; {

    changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.rev}/CHANGELOG.md";

    description = "PDF parser and analyzer";

    homepage = "https://github.com/pdfminer/pdfminer.six";

    license = licenses.mit;

pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch

+4 −2
Original line number Diff line number Diff line 
diff --git a/setup.py b/setup.py

index 42764e2..e7b93d3 100644

--- a/setup.py

+++ b/setup.py

@@ -7,10 +7,7 @@

@@ -19,10 +19,7 @@ if sys.version_info < (3, 12):

 

 setup(

     name="pdfminer.six",

-    setuptools_git_versioning={

-        "enabled": True,

-    },

-    setup_requires=["setuptools-git-versioning<2"],

-    setup_requires=["setuptools-git-versioning<3"],

+    version="@version@",

     packages=["pdfminer"],

     package_data={"pdfminer": ["cmap/*.pickle.gz", "py.typed"]},