Unverified Commit 0101dac2 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #224520 from fabaff/aiofile-bump

python310Packages.aiofile: 3.8.0 -> 3.8.5, python310Packages.aiomisc: 16.3.15 -> 17.0.8
parents 9a605de4 eda3223b
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
{ lib
, aiomisc
, aiomisc-pytest
, aiormq
, buildPythonPackage
, fetchFromGitHub
, pamqp
, poetry-core
, pytestCheckHook
, pythonOlder
@@ -39,11 +40,9 @@ buildPythonPackage rec {
  ];

  nativeCheckInputs = [
    aiomisc-pytest
    pamqp
    pytestCheckHook
  ];

  checkInputs = [
    aiomisc
    shortuuid
  ];

+5 −11
Original line number Diff line number Diff line
{ lib
, aiomisc
, aiomisc-pytest
, caio
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
, pythonOlder
}:

buildPythonPackage rec {
  pname = "aiofile";
  version = "3.8.0";
  version = "3.8.5";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@@ -19,23 +19,16 @@ buildPythonPackage rec {
    owner = "mosquito";
    repo = pname;
    rev = "refs/tags/${version}";
    hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w=";
    hash = "sha256-jQ97jtYhkqQgQjtHhtlk5JlvkzbFQw3kY6uXuV81ZkQ=";
  };

  patches = [
    (fetchpatch {
      name = "remove-asynctest.patch";
      url = "https://github.com/mosquito/aiofile/commit/9253ca42022f17f630ccfb6811f67876910f8b13.patch";
      hash = "sha256-yMRfqEbdxApFypEj27v1zTgF/4kuLf5aS/+clo3mfZo=";
    })
  ];

  propagatedBuildInputs = [
    caio
  ];

  nativeCheckInputs = [
    aiomisc
    aiomisc-pytest
    pytestCheckHook
  ];

@@ -63,6 +56,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "File operations with asyncio support";
    homepage = "https://github.com/mosquito/aiofile";
    changelog = "https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md";
    license = licenses.asl20;
    maintainers = with maintainers; [ fab ];
  };
+48 −0
Original line number Diff line number Diff line
{ lib
, aiomisc
, buildPythonPackage
, fetchPypi
, poetry-core
, pytest
, pythonOlder
}:

buildPythonPackage rec {
  pname = "aiomisc-pytest";
  version = "1.1.1";
  format = "pyproject";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    pname = "aiomisc_pytest";
    inherit version;
    hash = "sha256-LDeMQbB4wFdgJ95r9/vFN6fmkoXSPq9NRXONXQ3lbdM=";
  };

  nativeBuildInputs = [
    poetry-core
  ];

  buildInputs = [
    pytest
  ];

  propagatedBuildInputs = [
    aiomisc
  ];

  pythonImportsCheck = [
    "aiomisc_pytest"
  ];

  # Module has no tests
  doCheck = false;

  meta = with lib; {
    description = "Pytest integration for aiomisc";
    homepage = "https://github.com/aiokitchen/aiomisc";
    license = licenses.asl20;
    maintainers = with maintainers; [ fab ];
  };
}
+11 −3
Original line number Diff line number Diff line
@@ -10,29 +10,36 @@
, fastapi
, fetchPypi
, logging-journald
, poetry-core
, pytestCheckHook
, pythonOlder
, raven
  #, raven-aiohttp
, setproctitle
, setuptools
, uvloop
}:

buildPythonPackage rec {
  pname = "aiomisc";
  version = "16.3.15";
  format = "setuptools";
  version = "17.0.8";
  format = "pyproject";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-lHDjsK8ds1ftovY2IAbJwk3jnn4FoDo6f/Nu/MSAhqM=";
    hash = "sha256-URN9ACnHbQnq7UqfKwhofOdpE/Bjz7WrbdWQikxpVOU=";
  };

  nativeBuildInputs = [
    poetry-core
  ];

  propagatedBuildInputs = [
    colorlog
    logging-journald
    setuptools
  ];

  nativeCheckInputs = [
@@ -83,6 +90,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Miscellaneous utils for asyncio";
    homepage = "https://github.com/aiokitchen/aiomisc";
    changelog = "https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md";
    license = licenses.asl20;
    maintainers = with maintainers; [ fab ];
  };
+4 −3
Original line number Diff line number Diff line
{ lib
, aiomisc-pytest
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
@@ -12,7 +13,7 @@

buildPythonPackage rec {
  pname = "aiormq";
  version = "6.7.2";
  version = "6.7.4";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@@ -21,7 +22,7 @@ buildPythonPackage rec {
    owner = "mosquito";
    repo = pname;
    rev = "refs/tags/${version}";
    hash = "sha256-ujRw+trXOZaCRsZdkE3WoomOSdYoQkHmtlyFg1mp3Sg=";
    hash = "sha256-vORo5Kqy+Rg8WCyFU5lyQHS4EALYkycY4XxYhABV/4A=";
  };

  nativeBuildInputs = [
@@ -39,7 +40,7 @@ buildPythonPackage rec {
  ];

  checkInputs = [
    aiomisc
    aiomisc-pytest
  ];

  # Tests attempt to connect to a RabbitMQ server
Loading