Unverified Commit c60232a1 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #280138 from NickCao/staging-next-fix

[staging-next] various python fixes
parents 0295c671 b9fbb054
Loading
Loading
Loading
Loading
+12 −12
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
, buildPythonPackage

  # build-system
, setuptools
, poetry-core

  # dependencies
, beautifulsoup4
@@ -12,6 +12,9 @@
, pillow
, pyaes
, rsa

  # test dependencies
, pytestCheckHook
}:

buildPythonPackage rec {
@@ -27,24 +30,21 @@ buildPythonPackage rec {
  };

  nativeBuildInputs = [
    setuptools
    poetry-core
  ];

  propagatedBuildInputs = [
    pillow
    beautifulsoup4
    httpx
    pbkdf2
    pillow
    pyaes
    rsa
  ];

  postPatch = ''
    sed -i "s/httpx.*/httpx',/" setup.py
  '';

  # has no tests
  doCheck = false;
  nativeCheckInputs = [
    pytestCheckHook
  ];

  pythonImportsCheck = [ "audible" ];

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pythonRelaxDepsHook
, poetry-core
, jsonschema
, peewee
@@ -34,6 +35,7 @@ buildPythonPackage rec {

  nativeBuildInputs = [
    poetry-core
    pythonRelaxDepsHook
  ];

  propagatedBuildInputs = [
@@ -48,6 +50,11 @@ buildPythonPackage rec {
    timeslot
  ];

  pythonRelaxDeps = [
    "platformdirs"
    "iso8601"
  ];

  nativeCheckInputs = [
    pytestCheckHook
  ];
+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
, buildPythonPackage
, callPackage
, fetchPypi
, appdirs
, platformdirs
, cryptography
, dogpile-cache
, jmespath
@@ -30,7 +30,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
    appdirs
    platformdirs
    cryptography
    dogpile-cache
    jmespath
+19 −5
Original line number Diff line number Diff line
{ buildPythonPackage, lib, fetchFromGitHub
, click, numpy, pyparsing
, pytest, hypothesis
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, click
, numpy
, pyparsing
, pytestCheckHook
, hypothesis
}:

buildPythonPackage rec {
@@ -16,10 +22,18 @@ buildPythonPackage rec {
    sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf";
  };

  patches = [
    # Use non-strict xfail for failing tests
    # https://github.com/mapbox/snuggs/pull/28
    (fetchpatch {
      url = "https://github.com/sebastic/snuggs/commit/3b8e04a35ed33a7dd89f0194542b22c7bde867f4.patch";
      hash = "sha256-SfW4l4BH94rPdskRVHEsZM0twmlV9IPftRU/BBZsjBU=";
    })
  ];

  propagatedBuildInputs = [ click numpy pyparsing ];

  nativeCheckInputs = [ pytest hypothesis ];
  checkPhase = "pytest test_snuggs.py";
  nativeCheckInputs = [ pytestCheckHook hypothesis ];

  meta = with lib; {
    description = "S-expressions for Numpy";