Unverified Commit 8341cd3c authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #328940 from javaes/pypdf/update_to_4.3.0

python312Packages.pypdf: 4.2.0 -> 4.3.1
parents 2dc21c30 142ac6a9
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ python.pkgs.buildPythonApplication rec {
      --replace-fail "markdown==3.6" markdown \
      --replace-fail "protobuf==5.27.*" protobuf \
      --replace-fail "pycryptodome==3.20.*" pycryptodome \
      --replace-fail "pypdf==4.2.*" pypdf \
      --replace-fail "python-dateutil==2.9.*" python-dateutil \
      --replace-fail "requests==2.31.*" "requests" \
      --replace-fail "sentry-sdk==2.5.*" "sentry-sdk>=2" \
+5 −3
Original line number Diff line number Diff line
@@ -13,15 +13,15 @@

buildPythonPackage rec {
  pname = "comicon";
  version = "1.1.0";
  version = "1.2.0";
  pyproject = true;
  disabled = pythonOlder "3.10";

  src = fetchFromGitHub {
    owner = "potatoeggy";
    repo = "comicon";
    rev = "v${version}";
    hash = "sha256-VP4n2pWXHge2gJ67O2nErJ30gI0vaAMn0VOpX8sLkfs=";
    rev = "refs/tags/v${version}";
    hash = "sha256-oiEzZRgyG/RQCo2zSTqwlOhkwz76lSImR0ZtSlIUp4Y=";
  };

  nativeBuildInputs = [
@@ -38,6 +38,8 @@ buildPythonPackage rec {
    python-slugify
  ];

  doCheck = false; # test artifacts are not public

  pythonImportsCheck = [ "comicon" ];

  meta = with lib; {
+7 −7
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@

buildPythonPackage rec {
  pname = "pypdf";
  version = "4.2.0";
  format = "pyproject";
  version = "4.3.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "py-pdf";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
    rev = "refs/tags/${version}";
    # fetch sample files used in tests
    fetchSubmodules = true;
    hash = "sha256-ksLpxfRxrNVXezF0VjbAqadpF6bv/SAOOnCKabhugo0=";
    hash = "sha256-wSF20I5WaxRoN0n0jxB5O3mAAIOxP/TclYBTRAUwYHo=";
  };

  outputs = [
@@ -55,12 +55,12 @@ buildPythonPackage rec {

  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace "--disable-socket" ""
      --replace-fail "--disable-socket" ""
  '';

  propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ];
  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ];

  passthru.optional-dependencies = rec {
  optional-dependencies = rec {
    full = crypto ++ image;
    crypto = [ cryptography ];
    image = [ pillow ];
@@ -72,7 +72,7 @@ buildPythonPackage rec {
    (fpdf2.overridePythonAttrs { doCheck = false; }) # avoid reference loop
    pytestCheckHook
    pytest-timeout
  ] ++ passthru.optional-dependencies.full;
  ] ++ optional-dependencies.full;

  pytestFlagsArray = [
    # don't access the network