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

Merge pull request #300094 from fabaff/meshtastic-bump 

python312Packages.meshtastic: 2.3.0 -> 2.3.3
parents 48c499ef 5559282b

pkgs/development/python-modules/meshtastic/default.nix

+12 −48
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


buildPythonPackage rec {

  pname = "meshtastic";

  version = "2.3.0";

  version = "2.3.3";

  pyproject = true;



  disabled = pythonOlder "3.7";
@@ -30,14 +30,14 @@ buildPythonPackage rec { 
    owner = "meshtastic";

    repo = "Meshtastic-python";

    rev = "refs/tags/${version}";

    hash = "sha256-HiksPxV5VTIOV71J0zlC8iiXmF85a0dTYjjnWthhdGY=";

    hash = "sha256-kydZgOiQHDovQ5RwyLru2nyHoCEVZClq8wJit/mnbvU=";

  };



  nativeBuildInputs = [

  build-system = [

    setuptools

  ];



  propagatedBuildInputs = [

  dependencies = [

    bleak

    dotmap

    pexpect
@@ -73,50 +73,14 @@ buildPythonPackage rec { 
  ];



  disabledTests = [

    # AttributeError: 'HardwareMessage'...

    "test_handleFromRadio_with_my_info"

    "test_handleFromRadio_with_node_info"

    "test_main_ch_longsfast_on_non_primary_channel"

    "test_main_ch_set_name_with_ch_index"

    "test_main_configure_with_camel_case_keys"

    "test_main_configure_with_snake_case"

    "test_main_export_config_called_from_main"

    "test_main_export_config_use_camel"

    "test_main_export_config"

    "test_main_get_with_invalid"

    "test_main_get_with_valid_values_camel"

    "test_main_getPref_invalid_field_camel"

    "test_main_getPref_invalid_field"

    "test_main_getPref_valid_field_bool_camel"

    "test_main_getPref_valid_field_bool"

    "test_main_getPref_valid_field_camel"

    "test_main_getPref_valid_field_string_camel"

    "test_main_getPref_valid_field_string"

    "test_main_getPref_valid_field"

    "test_main_set_invalid_wifi_passwd"

    "test_main_set_valid_camel_case"

    "test_main_set_valid_wifi_passwd"

    "test_main_set_valid"

    "test_main_set_with_invalid"

    "test_main_setPref_ignore_incoming_0"

    "test_main_setPref_ignore_incoming_123"

    "test_main_setPref_invalid_field_camel"

    "test_main_setPref_invalid_field"

    "test_main_setPref_valid_field_int_as_string"

    "test_readGPIOs"

    "test_onGPIOreceive"

    "test_setURL_empty_url"

    "test_watchGPIOs"

    "test_writeConfig_with_no_radioConfig"

    "test_writeGPIOs"

    "test_reboot"

    "test_shutdown"

    "test_main_sendtext"

    "test_main_sendtext_with_channel"

    "test_MeshInterface"

    "test_getNode_not_local"

    "test_getNode_not_local_timeout"

    "test_main_onConnected_exception"

    # TypeError

    "test_main_info"

    "test_main_support"

    "test_main_info_with_tcp_interfa"

    "test_main_no_proto"

    "test_main_info_with_seriallog_stdout"

    "test_main_info_with_seriallog_output_txt"

    "test_support_info"

  ];



  meta = with lib; {

pkgs/development/python-modules/pygatt/default.nix

+28 −15
Original line number Diff line number Diff line
@@ -2,27 +2,43 @@ 
, buildPythonPackage

, fetchFromGitHub

, mock

, nose

, pynose

, pexpect

, pyserial

, pytestCheckHook

, pythonOlder

, setuptools

}:



buildPythonPackage rec {

  pname = "pygatt";

  version = "4.0.5";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.5";



  src = fetchFromGitHub {

    owner = "peplin";

    repo = pname;

    rev = "v${version}";

    sha256 = "1zdfxidiw0l8n498sy0l33n90lz49n25x889cx6jamjr7frlcihd";

    repo = "pygatt";

    rev = "refs/tags/v${version}";

    hash = "sha256-DUZGsztZViVNZwmhXoRN5FOQ7BgUeI0SsYgCHlvsrv0=";

  };



  propagatedBuildInputs = [

  postPatch = ''

    # Not support for Python < 3.4

    substituteInPlace setup.py \

      --replace-fail "'enum-compat'" "" \

      --replace-fail "'coverage >= 3.7.1'," "" \

      --replace-fail "'nose >= 1.3.7'" ""

    substituteInPlace tests/bgapi/test_bgapi.py \

       --replace-fail "assertEquals" "assertEqual"

  '';



  build-system = [

    setuptools

  ];



  dependencies = [

    pyserial

  ];
@@ -34,25 +50,22 @@ buildPythonPackage rec { 
    # For cross compilation the doCheck is false and therefor the

    # nativeCheckInputs not included. We have to include nose here, since

    # setup.py requires nose unconditionally.

    nose

    pynose

  ];



  nativeCheckInputs = [

    mock

    pytestCheckHook

  ]

  ++ passthru.optional-dependencies.GATTTOOL;



  postPatch = ''

    # Not support for Python < 3.4

    substituteInPlace setup.py --replace "'enum-compat'" ""

  '';

  ] ++ passthru.optional-dependencies.GATTTOOL;



  pythonImportsCheck = [ "pygatt" ];

  pythonImportsCheck = [

    "pygatt"

  ];



  meta = with lib; {

    description = "Python wrapper the BGAPI for accessing Bluetooth LE Devices";

    homepage = "https://github.com/peplin/pygatt";

    changelog = "https://github.com/peplin/pygatt/blob/v${version}/CHANGELOG.rst";

    license = with licenses; [ asl20 mit ];

    maintainers = with maintainers; [ fab ];

  };