python313Packages.netapp-ontap: fix build, python313Packages.marshmallow: 3.21.1 -> 3.26.1 (#380908)

pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
-, zlib, boost, openssl, python311, libiconv, ncurses, darwin
+, zlib, boost186, openssl, python311, libiconv, ncurses, darwin
 , boost-build
 }:
 
@@ -8,7 +8,7 @@ let
 
   # Make sure we override python, so the correct version is chosen
   # for the bindings, if overridden
-  boostPython = boost.override (_: {
+  boostPython = boost186.override (_: {
     enablePython = true;
     python = python311;
     enableStatic = true;

pkgs/development/python-modules/aiohttp-apispec/default.nix

@@ -9,24 +9,33 @@
   pytest-aiohttp,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
   webargs,
 }:
 
 buildPythonPackage rec {
   pname = "aiohttp-apispec";
   version = "3.0.0b2";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "maximdanilchenko";
-    repo = pname;
-    rev = "v${version}";
+    repo = "aiohttp-apispec";
+    tag = "v${version}";
     hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU=";
   };
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace tests/conftest.py \
+      --replace-fail 'aiohttp_app(loop,' 'aiohttp_app(event_loop,' \
+      --replace-fail 'return loop.run_until_complete' 'return event_loop.run_until_complete'
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     apispec
     jinja2

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

@@ -2,12 +2,14 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  pythonAtLeast,
 }:
 
 buildPythonPackage rec {
   pname = "htmlmin";
   version = "0.1.12";
   format = "setuptools";
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178";
@@ -22,5 +24,6 @@ buildPythonPackage rec {
     homepage = "https://pypi.python.org/pypi/htmlmin";
     license = licenses.bsd3;
     maintainers = [ ];
+    broken = pythonAtLeast "3.13"; # requires removed cgi module
   };
 }

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

@@ -5,23 +5,19 @@
   flit-core,
   packaging,
   pytestCheckHook,
-  pythonOlder,
-  pytz,
   simplejson,
 }:
 
 buildPythonPackage rec {
   pname = "marshmallow";
-  version = "3.21.1";
+  version = "3.26.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "marshmallow-code";
     repo = "marshmallow";
     tag = version;
-    hash = "sha256-KhXasYKooZRokRoFlWKOaQzSUe6tXDtUlrf65eGGUi8=";
+    hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38=";
   };
 
   nativeBuildInputs = [ flit-core ];
@@ -30,7 +26,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytz
     simplejson
   ];
 

pkgs/development/python-modules/netapp-ontap/default.nix

@@ -1,11 +1,9 @@
 {
   lib,
   buildPythonPackage,
-  cliche,
   fetchPypi,
   marshmallow,
   pythonOlder,
-  recline,
   requests,
   requests-toolbelt,
   setuptools,
@@ -32,9 +30,6 @@ buildPythonPackage rec {
     requests
     requests-toolbelt
     urllib3
-    # required for cli
-    cliche
-    recline
   ];
 
   # No tests in sdist and no other download available
@@ -44,7 +39,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Library for working with ONTAP's REST APIs simply in Python";
-    homepage = "https://devnet.netapp.com/restapi.php";
+    homepage = "https://library.netapp.com/ecmdocs/ECMLP3331665/html/index.html";
     license = licenses.bsd3;
     maintainers = with maintainers; [ SuperSandro2000 ];
     mainProgram = "ontap-cli";

pkgs/development/python-modules/private-gpt/default.nix

@@ -8,6 +8,7 @@
   poetry-core,
 
   # dependencies
+  cryptography,
   docx2txt,
   fastapi,
   injector,
@@ -16,7 +17,6 @@
   python-multipart,
   pyyaml,
   transformers,
-  uvicorn,
   watchdog,
 
   # optional-dependencies
@@ -48,9 +48,11 @@ buildPythonPackage rec {
     "llama-index-core"
     "llama-index-readers-file"
     "python-multipart"
+    "watchdog"
   ];
 
   dependencies = [
+    cryptography
     docx2txt
     fastapi
     injector
@@ -59,7 +61,6 @@ buildPythonPackage rec {
     python-multipart
     pyyaml
     transformers
-    uvicorn
     watchdog
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 

pkgs/development/python-modules/type-infer/default.nix

@@ -87,5 +87,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/mindsdb/type_infer";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ mbalatsko ];
+    # ModuleNotFoundError: No module named 'imghdr', unrelated
+    broken = true;
   };
 }

pkgs/development/python-modules/webtest-aiohttp/default.nix

@@ -6,21 +6,19 @@
   fetchpatch,
   pytest-aiohttp,
   pytestCheckHook,
-  pythonOlder,
+  setuptools,
   webtest,
 }:
 
 buildPythonPackage rec {
   pname = "webtest-aiohttp";
   version = "2.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sloria";
-    repo = pname;
-    rev = version;
+    repo = "webtest-aiohttp";
+    tag = version;
     hash = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao=";
   };
 
@@ -32,7 +30,15 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [ webtest ];
+  postPatch = ''
+    substituteInPlace test_webtest_aiohttp.py \
+      --replace-fail '(app, loop)' '(app, event_loop)' \
+      --replace-fail 'WebTestApp(app, loop=loop)' 'WebTestApp(app, loop=event_loop)'
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [ webtest ];
 
   nativeCheckInputs = [
     aiohttp

pkgs/tools/admin/ansible/doctor.nix

@@ -46,10 +46,6 @@ python3.pkgs.buildPythonApplication rec {
     ruamel-yaml
   ];
 
-  postInstall = ''
-    rm $out/lib/python*/site-packages/LICENSE
-  '';
-
   # Module has no tests
   doCheck = false;