Merge pull request #203390 from SuperSandro2000/changedetection-io

python310Packages.apprise: 1.1.0 -> 1.2.0; changedetection-io: 0.39.21.1 -> 0.39.22.1

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

@@ -7,30 +7,29 @@
 , gntp
 , installShellFiles
 , markdown
-, mock
 , paho-mqtt
+, pytest-mock
+, pytest-xdist
 , pytestCheckHook
 , pythonOlder
 , pyyaml
 , requests
 , requests-oauthlib
-, slixmpp
 }:
 
 buildPythonPackage rec {
   pname = "apprise";
-  version = "1.1.0";
+  version = "1.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-92eoBwp3fcKb9zCBeeC2ndLeZeZpM+2JsZmef/5yO2A=";
+    hash = "sha256-bjGvoY9HRS6szVb7fug9kkUsU00V85JAftGg48RlJEs=";
   };
 
   nativeBuildInputs = [
-    babel
     installShellFiles
   ];
 
@@ -44,11 +43,12 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    babel
     gntp
-    mock
     paho-mqtt
+    pytest-mock
+    pytest-xdist
     pytestCheckHook
-    slixmpp
   ];
 
   disabledTests = [

pkgs/servers/web-apps/changedetection-io/default.nix

@@ -31,14 +31,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "changedetection-io";
-  version = "0.39.21.1";
+  version = "0.39.22.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "dgtlmoon";
     repo = "changedetection.io";
     rev = version;
-    sha256 = "sha256-cX2HwlsWOJ34msEnPP38jq+kzSxOM/spe0Ja2lZ/Q7w=";
+    sha256 = "sha256-qK44m64/skmeoBgHToTyOpeWUF2kgks10OHoAoLim+k=";
   };
 
   postPatch = ''
@@ -49,33 +49,35 @@ py.pkgs.buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = with py.pkgs; [
-    flask
-    flask-wtf
+    apprise
+    beautifulsoup4
+    brotli
+    chardet
+    cryptography
     eventlet
-    validators
-    timeago
-    inscriptis
     feedgen
+    flask
     flask-login
     flask-restful
+    flask-wtf
+    inscriptis
     jinja2
     jinja2-time
-    pytz
-    brotli
-    requests
-    urllib3
-    chardet
-    wtforms
     jsonpath-ng
     jq
-    apprise
-    paho-mqtt
-    cryptography
-    beautifulsoup4
     lxml
-    selenium
-    werkzeug
+    paho-mqtt
+    pillow
     playwright
+    pytz
+    requests
+    selenium
+    setuptools
+    timeago
+    urllib3
+    validators
+    werkzeug
+    wtforms
   ] ++ requests.optional-dependencies.socks;
 
   # tests can currently not be run in one pytest invocation and without docker