Merge staging-next into staging

7 files changed, 97 insertions, 11 deletions

diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix
index 646e6fe16267..544ba040f042 100644
--- a/pkgs/development/python-modules/asf-search/default.nix
+++ b/pkgs/development/python-modules/asf-search/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "asf-search";
-  version = "9.0.7";
+  version = "9.0.9";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "asfadmin";
     repo = "Discovery-asf_search";
     tag = "v${version}";
-    hash = "sha256-qfP02OQ3RQx8EZsrbrSvlFkz16MZsTT7phemrKo8vEI=";
+    hash = "sha256-1ZJsVcbqvB0DpcVyCWaEdYEnDXDDIupiprcIZlRCWDo=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];
diff --git a/pkgs/development/python-modules/hko/default.nix b/pkgs/development/python-modules/hko/default.nix
new file mode 100644
index 000000000000..8c683da8edb2
--- /dev/null
+++ b/pkgs/development/python-modules/hko/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  poetry-core,
+  aiohttp,
+}:
+
+buildPythonPackage rec {
+  pname = "hko";
+  version = "0.3.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-6FzdaSaw7sX52wM8HbHFGtKdR2JBg3B2cMZnP7RfQzs=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [ aiohttp ];
+
+  # Tests require network access
+  doCheck = false;
+
+  pythonImportsCheck = [ "hko" ];
+
+  meta = {
+    description = "Unofficial Python wrapper for the Hong Kong Observatory public API";
+    homepage = "https://github.com/MisterCommand/python-hko";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix
index 2a0e06c9ec02..eba53b1b7e9c 100644
--- a/pkgs/development/python-modules/ipycanvas/default.nix
+++ b/pkgs/development/python-modules/ipycanvas/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "ipycanvas";
-  version = "0.13.3";
+  version = "0.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ToZ8UJsB9cTPwAn32SHjLloSoCmshW54wE/xW2VpLEo=";
+    hash = "sha256-kh8UgiWLWSm1mTF7XBKZMdgOFr41+jgwCjLnqkz+n4k=";
   };
 
   # We relax dependencies here instead of pulling in a patch because upstream
diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix
index c27991b8ca09..e568b82024b0 100644
--- a/pkgs/development/python-modules/pysoma/default.nix
+++ b/pkgs/development/python-modules/pysoma/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pysoma";
-  version = "0.0.13";
+  version = "0.0.14";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1bS9zafuqxwcuqpM/AA3ZjNbFpxBNXtoHYFsQOWmLXQ=";
+    hash = "sha256-DlyOQmhseCIeaYlzTmkQBSlDjJlPZn7FRExil5gQjdY=";
   };
 
   # Project has no test
diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix
index e220f5caff29..65bca92865c5 100644
--- a/pkgs/development/python-modules/readabilipy/default.nix
+++ b/pkgs/development/python-modules/readabilipy/default.nix
@@ -44,9 +44,9 @@ buildPythonPackage rec {
     dontNpmBuild = true;
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     beautifulsoup4
     html5lib
     lxml
@@ -75,6 +75,18 @@ buildPythonPackage rec {
     "tests/test_benchmarking.py"
   ];
 
+  disabledTests = [
+    # IndexError: list index out of range
+    "test_html_blacklist"
+    "test_prune_div_with_one_empty_span"
+    "test_prune_div_with_one_whitespace_paragraph"
+    "test_empty_page"
+    "test_contentless_page"
+    "test_extract_title"
+    "test_iframe_containing_tags"
+    "test_iframe_with_source"
+  ];
+
   passthru = {
     tests.version = testers.testVersion {
       package = readabilipy;
@@ -85,10 +97,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "HTML content extractor";
-    mainProgram = "readabilipy";
     homepage = "https://github.com/alan-turing-institute/ReadabiliPy";
     changelog = "https://github.com/alan-turing-institute/ReadabiliPy/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "readabilipy";
   };
 }
diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix
index 4f07633db51f..821a6c29438b 100644
--- a/pkgs/development/python-modules/sabctools/default.nix
+++ b/pkgs/development/python-modules/sabctools/default.nix
@@ -7,12 +7,12 @@
 }:
 buildPythonPackage rec {
   pname = "sabctools";
-  version = "8.2.5";
+  version = "8.2.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZEC813/JpGPEFL+nXKFAXFfUrrhECCIqONe27LwS00g=";
+    hash = "sha256-olZSIjfP2E1tkCG8WzEZfrBJuDEp3PZyFFE5LJODEZE=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/triggercmd/default.nix b/pkgs/development/python-modules/triggercmd/default.nix
new file mode 100644
index 000000000000..760a72323be1
--- /dev/null
+++ b/pkgs/development/python-modules/triggercmd/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  requests,
+  websocket-client,
+  pyjwt,
+}:
+
+buildPythonPackage rec {
+  pname = "triggercmd";
+  version = "0.0.27";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-4MTRtDo4kD/1Bifw8wx++TZ3K2M4TMVRyvwqGL5cHC8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    requests
+    websocket-client
+    pyjwt
+  ];
+
+  # Tests require network access and authentication tokens
+  doCheck = false;
+
+  pythonImportsCheck = [ "triggercmd" ];
+
+  meta = {
+    description = "Python agent for TRIGGERcmd cloud service";
+    homepage = "https://github.com/rvmey/triggercmd-python-agent";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}