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

Merge pull request #217943 from fabaff/ascii-magic-bump 

python310Packages.ascii-magic: 2.1.1 -> 2.3.0
parents ab6a7ee4 8695787b

pkgs/development/python-modules/ascii-magic/default.nix

+19 −5
Original line number Diff line number Diff line
@@ -3,12 +3,13 @@ 
, colorama

, fetchPypi

, pillow

, pytestCheckHook

, pythonOlder

}:



buildPythonPackage rec {

  pname = "ascii-magic";

  version = "2.1.1";

  version = "2.3.0";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -16,7 +17,7 @@ buildPythonPackage rec { 
  src = fetchPypi {

    pname = "ascii_magic";

    inherit version;

    hash = "sha256-YfGa+3nuqAAo69TydxO6uKNMcqZAkOEi/PMP8Frasfw=";

    hash = "sha256-PtQaHLFn3u1cz8YotmnzWjoD9nvdctzBi+X/2KJkPYU=";

  };



  propagatedBuildInputs = [
@@ -24,14 +25,27 @@ buildPythonPackage rec { 
    pillow

  ];



  # Project is not tagging releases and tests are not shipped with PyPI source

  # https://github.com/LeandroBarone/python-ascii_magic/issues/10

  doCheck = false;

  nativeCheckInputs = [

    pytestCheckHook

  ];



  pythonImportsCheck = [

    "ascii_magic"

  ];



  preCheck = ''

    cd tests

  '';



  disabledTests = [

    # Test requires network access

    "test_from_url"

    "test_quick_test"

    "test_wrong_url"

    # No clipboard in the sandbox

    "test_from_clipboard"

  ];



  meta = with lib; {

    description = "Python module to converts pictures into ASCII art";

    homepage = "https://github.com/LeandroBarone/python-ascii_magic";

pkgs/development/python-modules/weconnect-mqtt/default.nix

+8 −8
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


buildPythonPackage rec {

  pname = "weconnect-mqtt";

  version = "0.42.1";

  version = "0.42.2";

  format = "setuptools";



  disabled = pythonOlder "3.8";
@@ -19,15 +19,9 @@ buildPythonPackage rec { 
    owner = "tillsteinbach";

    repo = "WeConnect-mqtt";

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

    hash = "sha256-/YCrnDOJdKc687pRKj1gVTOTj7dEpplN49VuFJOlQIE=";

    hash = "sha256-dPG714a/GPNPs7h/ubLA+KI2hB5gFf5UDNwhhMyqJlc=";

  };



  propagatedBuildInputs = [

    paho-mqtt

    python-dateutil

    weconnect

  ] ++ weconnect.optional-dependencies.Images;



  postPatch = ''

    substituteInPlace weconnect_mqtt/__version.py \

      --replace "develop" "${version}"
@@ -36,6 +30,12 @@ buildPythonPackage rec { 
      --replace "pytest-cov" ""

  '';



  propagatedBuildInputs = [

    paho-mqtt

    python-dateutil

    weconnect

  ] ++ weconnect.optional-dependencies.Images;



  nativeCheckInputs = [

    pytestCheckHook

  ];

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

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ buildPythonPackage rec { 
      --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \

      --replace "tests_require=TEST_REQUIRED," "tests_require=[],"

    substituteInPlace image_extra_requirements.txt \

      --replace "pillow~=9.4.0" "pillow"

      --replace "pillow~=" "pillow>=" \

      --replace "ascii_magic~=" "ascii_magic>="

    substituteInPlace pytest.ini \

      --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \

      --replace "pytest-cov" ""