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

Merge pull request #223891 from fabaff/aiomysensors-bump

python310Packages.aiomysensors: 0.3.6 -> 0.3.9, python310Packages.aiofiles: 22.1.0 -> 23.1.0 
parents 6d195109 540441db
Loading
Loading
Loading
Loading
+11 −7
Original line number Diff line number Diff line
@@ -17,16 +17,20 @@ python3.pkgs.buildPythonApplication {
  src = fetchFromGitHub {
    owner = "GNS3";
    repo = "gns3-server";
    rev = "v${version}";
    rev = "refs/tags/v${version}";
    sha256 = sha256Hash;
  };

  postPatch = ''
    substituteInPlace requirements.txt \
      --replace "psutil==" "psutil>=" \
      --replace "jsonschema>=4.17.0,<4.18" "jsonschema" \
      --replace "sentry-sdk==1.10.1,<1.11" "sentry-sdk"
  '';
  pythonRelaxDeps = [
    "aiofiles"
    "jsonschema"
    "psutil"
    "sentry-sdk"
  ];

  nativeBuildInputs = with python3.pkgs; [
    pythonRelaxDepsHook
  ];

  propagatedBuildInputs = with python3.pkgs; [
    aiofiles
+7 −7
Original line number Diff line number Diff line
@@ -10,16 +10,16 @@

buildPythonPackage rec {
  pname = "aiofiles";
  version = "22.1.0";
  version = "23.1.0";
  format = "pyproject";

  disabled = pythonOlder "3.6";
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "Tinche";
    repo = pname;
    rev = "v${version}";
    hash = "sha256-2itjGYusJT6sbCAgvKsI9IXeAOP7VQV0bpifFBZmnAo=";
    rev = "refs/tags/v${version}";
    hash = "sha256-ouBqqt0CJYxxQqbG9jn4p8zO+nKjqZgPjZpiZic67ss=";
  };

  nativeBuildInputs = [
@@ -45,10 +45,10 @@ buildPythonPackage rec {
    "aiofiles"
  ];

  meta = {
  meta = with lib; {
    description = "File support for asyncio";
    homepage = "https://github.com/Tinche/aiofiles";
    license = with lib.licenses; [ asl20 ];
    maintainers = with lib.maintainers; [ fridh ];
    license = with licenses; [ asl20 ];
    maintainers = with maintainers; [ fridh ];
  };
}
+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@

buildPythonPackage rec {
  pname = "aiomysensors";
  version = "0.3.6";
  version = "0.3.9";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "MartinHjelmare";
    repo = pname;
    rev = "refs/tags/v${version}";
    hash = "sha256-oYYr7LuTvw7e99930vF7odl2dWA/QPOTEW02l8cqXlc=";
    hash = "sha256-hLUITEPUoUKGqN3AnacahnKwoKdfGN3mp34df74gsbE=";
  };

  nativeBuildInputs = [
@@ -58,6 +58,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Library to connect to MySensors gateways";
    homepage = "https://github.com/MartinHjelmare/aiomysensors";
    changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}";
    license = with licenses; [ asl20 ];
    maintainers = with maintainers; [ fab ];
  };
+11 −6
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@
, pytestCheckHook
, pythonAtLeast
, pythonOlder
, pythonRelaxDepsHook
, redis
, starlette
}:
@@ -27,8 +28,18 @@ buildPythonPackage rec {
    hash = "sha256-IAB7JW8iVb5M610GVK0POXlSiya22KzNgr26BNvPC4Q=";
  };

  pythonRelaxDeps = [
    "limits"
  ];

  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace '["redis^3.4.1"]' '["redis"]'
  '';

  nativeBuildInputs = [
    poetry-core
    pythonRelaxDepsHook
  ];

  propagatedBuildInputs = [
@@ -44,12 +55,6 @@ buildPythonPackage rec {
    starlette
  ];

  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace 'limits = "^1.5"' 'limits = "*"' \
      --replace 'redis = "^3.4.1"' 'redis = "*"'
  '';

  disabledTests = [
    # AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'.
    "test_endpoint_request_param_invalid"
+11 −4
Original line number Diff line number Diff line
@@ -8,17 +8,17 @@
, y-py
, pytest-asyncio
, pytestCheckHook
, pythonRelaxDepsHook
, websockets
}:

buildPythonPackage rec {
  pname = "ypy-websocket";
  version = "0.8.4";
  format = "pyproject";

  disabled = pythonOlder "3.7";

  format = "pyproject";

  src = fetchFromGitHub {
    owner = "y-crdt";
    repo = "ypy-websocket";
@@ -26,8 +26,13 @@ buildPythonPackage rec {
    hash = "sha256-jl2ciIA3enJRfPgcu96MZN+BmNL+bBet54AFDBy3seY=";
  };

  pythonRelaxDeps = [
    "aiofiles"
  ];

  nativeBuildInputs = [
    hatchling
    pythonRelaxDepsHook
  ];

  propagatedBuildInputs = [
@@ -36,7 +41,9 @@ buildPythonPackage rec {
    y-py
  ];

  pythonImportsCheck = [ "ypy_websocket" ];
  pythonImportsCheck = [
    "ypy_websocket"
  ];

  nativeCheckInputs = [
    pytest-asyncio
@@ -50,7 +57,7 @@ buildPythonPackage rec {
  ];

  meta = {
    changelog = "https://github.com/y-crdt/ypy-websocket/blob/${src.rev}/CHANGELOG.md";
    changelog = "https://github.com/y-crdt/ypy-websocket/blob/${version}/CHANGELOG.md";
    description = "WebSocket Connector for Ypy";
    homepage = "https://github.com/y-crdt/ypy-websocket";
    license = lib.licenses.mit;
Loading