python312Packages.prettytable: 3.11.0 -> 3.12.0; python312Packages.jupysql: 0.10.13 -> 0.10.16 (#359274)

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

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -36,15 +37,15 @@
 
 buildPythonPackage rec {
   pname = "jupysql";
-  version = "0.10.13";
+  version = "0.10.16";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ploomber";
     repo = "jupysql";
-    rev = "refs/tags/${version}";
+    tag = version;
-    hash = "sha256-vNuMGHFkatJS5KjxaOBwZ7JolIDAdYqGq3JNKSV2fKE=";
+    hash = "sha256-TIISiGvspRG0d/4nEyi8Tiu0y80D1Rf8puDEkGIeA08=";
   };
 
   pythonRelaxDeps = [ "sqlalchemy" ];
@@ -81,33 +82,35 @@ buildPythonPackage rec {
     psutil
   ] ++ optional-dependencies.dev;
 
-  disabledTests = [
+  disabledTests =
-    # AttributeError: 'DataFrame' object has no attribute 'frame_equal'
+    [
-    "test_resultset_polars_dataframe"
+      # AttributeError: 'DataFrame' object has no attribute 'frame_equal'
-    # all of these are broken with later versions of duckdb; see
+      "test_resultset_polars_dataframe"
-    # https://github.com/ploomber/jupysql/issues/1030
+      # all of these are broken with later versions of duckdb; see
-    "test_resultset_getitem"
+      # https://github.com/ploomber/jupysql/issues/1030
-    "test_resultset_dict"
+      "test_resultset_getitem"
-    "test_resultset_len"
+      "test_resultset_dict"
-    "test_resultset_dicts"
+      "test_resultset_len"
-    "test_resultset_dataframe"
+      "test_resultset_dicts"
-    "test_resultset_csv"
+      "test_resultset_dataframe"
-    "test_resultset_str"
+      "test_resultset_csv"
-    "test_resultset_repr_html_when_feedback_is_2"
+      "test_resultset_str"
-    "test_resultset_repr_html_with_reduced_feedback"
+      "test_resultset_repr_html_when_feedback_is_2"
-    "test_invalid_operation_error"
+      "test_resultset_repr_html_with_reduced_feedback"
-    "test_resultset_config_autolimit_dict"
+      "test_invalid_operation_error"
-    # fails due to strict warnings
+      "test_resultset_config_autolimit_dict"
-    "test_calling_legacy_plotting_functions_displays_warning"
+      # fails due to strict warnings
-  ];
+      "test_calling_legacy_plotting_functions_displays_warning"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Fatal Python error: Aborted (in matplotlib)
+      "test_no_errors_with_stored_query"
+    ];
 
   disabledTestPaths = [
     # require docker
     "src/tests/integration"
 
-    # require network access
-    "src/tests/test_telemetry.py"
-
     # want to download test data from the network
     "src/tests/test_parse.py"
     "src/tests/test_ggplot.py"

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

@@ -6,8 +6,8 @@
   setuptools,
   setuptools-scm,
   autoPatchelfHook,
-  pytestCheckHook,
   udev,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    description = "Python wraper for libuuu";
+    description = "Python wrapper for libuuu";
     homepage = "https://github.com/nxp-imx/mfgtools/tree/master/wrapper";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ GaetanLepage ];

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

@@ -2,26 +2,31 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   hatch-vcs,
   hatchling,
+
+  # dependencies
+  wcwidth,
+
+  # tests
+  coverage,
+  pytest-cov-stub,
   pytest-lazy-fixtures,
   pytestCheckHook,
-  pythonOlder,
-  wcwidth,
 }:
 
 buildPythonPackage rec {
   pname = "prettytable";
-  version = "3.11.0";
+  version = "3.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "prettytable";
-    rev = "refs/tags/${version}";
+    tag = version;
-    hash = "sha256-LtphoD5gCMgWgDcFghinq9zjUD69XudEeGIToqqmVPs=";
+    hash = "sha256-RoBPmnuAOtTET898Gdm1zzPIst26GdCY5nU1PyJ+Nro=";
   };
 
   build-system = [
@@ -32,17 +37,19 @@ buildPythonPackage rec {
   dependencies = [ wcwidth ];
 
   nativeCheckInputs = [
+    coverage
+    pytest-cov-stub
     pytest-lazy-fixtures
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "prettytable" ];
 
-  meta = with lib; {
+  meta = {
     description = "Display tabular data in a visually appealing ASCII table format";
     homepage = "https://github.com/jazzband/prettytable";
     changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

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

@@ -1,44 +1,52 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
-  mock,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  click,
   prettytable,
   prompt-toolkit,
   ptable,
   pygments,
-  pytestCheckHook,
-  pythonOlder,
   requests,
   rich,
+  urllib3,
+
+  # tests
+  mock,
+  pytestCheckHook,
   sphinx,
   testtools,
   tkinter,
-  urllib3,
   zeep,
 }:
 
 buildPythonPackage rec {
   pname = "softlayer";
   version = "6.2.5";
-  format = "setuptools";
+  pyproject = true;
-
-  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = pname;
+    owner = "softlayer";
     repo = "softlayer-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wDLMVonPUexoaZ60kRBILmr5l46yajzACozCp6uETGY=";
   };
 
-  postPatch = ''
+  build-system = [
-    substituteInPlace setup.py \
+    setuptools
-        --replace "rich ==" "rich >="
+  ];
-  '';
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "rich"
+  ];
+
+  dependencies = [
     click
     prettytable
     prompt-toolkit
@@ -66,6 +74,11 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
+  pytestFlagsArray = lib.optionals stdenv.hostPlatform.isDarwin [
+    # SoftLayer.exceptions.TransportError: TransportError(0): ('Connection aborted.', ConnectionResetError(54, 'Connection reset by peer'))
+    "--deselect=tests/CLI/modules/hardware/hardware_basic_tests.py::HardwareCLITests"
+  ];
+
   disabledTestPaths = [
     # Test fails with ConnectionError trying to connect to api.softlayer.com
     "tests/transports/soap_tests.py.unstable"
@@ -73,11 +86,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "SoftLayer" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python libraries that assist in calling the SoftLayer API";
     homepage = "https://github.com/softlayer/softlayer-python";
     changelog = "https://github.com/softlayer/softlayer-python/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
-    maintainers = with maintainers; [ onny ];
+    maintainers = with lib.maintainers; [ onny ];
   };
 }