Unverified Commit 70c4b42b authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #305080 from fabaff/proxy-py-fix

python312Packages.proxy-py: 2.4.3 -> 2.4.4rc5
parents d5d6cdf6 09cd7736
Loading
Loading
Loading
Loading
+42 −48
Original line number Diff line number Diff line
{ lib
, stdenv
, bash
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, gnumake
, httpx
, openssl
, paramiko
, pytest-asyncio
, pytest-mock
, pytestCheckHook
, pythonOlder
, setuptools-scm
, typing-extensions
, wheel
{
  lib,
  stdenv,
  bash,
  buildPythonPackage,
  fetchFromGitHub,
  fetchpatch,
  gnumake,
  h2,
  hpack,
  httpx,
  hyperframe,
  openssl,
  paramiko,
  pytest-asyncio,
  pytest-mock,
  pytest-xdist,
  pytestCheckHook,
  pythonOlder,
  requests,
  setuptools-scm,
  typing-extensions,
}:

buildPythonPackage rec {
  pname = "proxy-py";
  version = "2.4.3";
  format = "pyproject";
  version = "2.4.4rc5";
  pyproject = true;

  disabled = pythonOlder "3.7";

@@ -28,51 +33,37 @@ buildPythonPackage rec {
    owner = "abhinavsingh";
    repo = "proxy.py";
    rev = "refs/tags/v${version}";
    hash = "sha256-dA7a9RicBFCSf6IoGX/CdvI8x/xMOFfNtyuvFn9YmHI=";
    hash = "sha256-ngIskWzN6699C0WjSX/ZbHxV3Eb8ikQPNYZFzfzt7xU=";
  };

  patches = [
    # this patch is so that the one following it applies cleanly
    # https://github.com/abhinavsingh/proxy.py/pull/1209
    (fetchpatch {
      name = "update-build-dependencies.patch";
      url = "https://github.com/abhinavsingh/proxy.py/commit/2e535360ce5ed9734f2c00dc6aefe5ebd281cea5.patch";
      hash = "sha256-eR3R4M7jwQMnY5ob0V6G71jXcrkV7YZvo1JOUG4gnrY=";
    })
    # https://github.com/abhinavsingh/proxy.py/pull/1345
    (fetchpatch {
      name = "remove-setuptools-scm-git-archive-dependency.patch";
      url = "https://github.com/abhinavsingh/proxy.py/commit/027bfa6b912745f588d272f1a1082f6ca416f815.patch";
      hash = "sha256-O2LlSrSrB3u2McAZRY+KviuU7Hv1tOuf0n+D/H4BWvI=";
    })
  ];

  postPatch = ''
    substituteInPlace Makefile \
    --replace "SHELL := /bin/bash" "SHELL := ${bash}/bin/bash"
    substituteInPlace pytest.ini \
      --replace "-p pytest_cov" "" \
      --replace "--no-cov-on-fail" ""
      --replace-fail "-p pytest_cov" "" \
      --replace-fail "--no-cov-on-fail" ""
    sed -i "/--cov/d" pytest.ini
  '';

  nativeBuildInputs = [
    setuptools-scm
    wheel
  ];
  build-system = [ setuptools-scm ];

  propagatedBuildInputs = [
  dependencies = [
    paramiko
    typing-extensions
  ];

  nativeCheckInputs = [
    gnumake
    h2
    hpack
    httpx
    hyperframe
    openssl
    gnumake
    pytest-asyncio
    pytest-mock
    pytest-xdist
    pytestCheckHook
    requests
  ];

  preCheck = ''
@@ -81,14 +72,17 @@ buildPythonPackage rec {

  disabledTests = [
    # Test requires network access
    "test_http2_via_proxy"
    "http"
    "http2"
    "proxy"
    "web_server"
    # Location is not writable
    "test_gen_csr"
    # Tests run into a timeout
    "integration"
  ];

  pythonImportsCheck = [
    "proxy"
  ];
  pythonImportsCheck = [ "proxy" ];

  meta = with lib; {
    description = "Python proxy framework";