diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules')
204 files changed, 2620 insertions, 2297 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index baecca21fd5e..dd5e90ef2e41 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.60.0"; + version = "3.61.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-ZE3rETwAuhv7pHA/zYDKtStWONShFG8tWDeN9K8JdG8="; + hash = "sha256-hA10t/ZtMH2MjyHJJdJeOZLOF5NNTCOgGqxU6CCkZlQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix b/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix index fdded411bee7..78d572744aab 100644 --- a/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-yIkP0eWyEJAZc2tJbwTvlU5b2pDta4SatmsTMPsSDt8="; + hash = "sha256-mliyDKh+7M8GQ0ZJijoYrqKDeAqRHfKGyPJM/5no+fM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix b/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix index 834fc55188c2..43f8f833703a 100644 --- a/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.2.8"; + version = "2024.2.9"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-YdC6459lEvHDnX4L26n28oGzDSsa7/8UGHjnONhn9Yo="; + hash = "sha256-vjg7y+9E4R1Q7h+ao/ttuRbvui4u5hESR8tImWSO04U="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aioboto3/default.nix b/nixpkgs/pkgs/development/python-modules/aioboto3/default.nix index 231e4bbbe8b2..6b0f79655717 100644 --- a/nixpkgs/pkgs/development/python-modules/aioboto3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioboto3/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioboto3"; - version = "12.1.0"; + version = "12.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "terrycain"; repo = "aioboto3"; rev = "refs/tags/v${version}"; - hash = "sha256-CVRDQhymQRi5dyVBLJYTnF3RI4jPBB966dVMT4lOd8g="; + hash = "sha256-GDuxy/V+j0LRJ2lbcRHMEAga+pdCbYIWhEt3ItrHMB4="; }; nativeBuildInputs = [ @@ -37,8 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiobotocore - boto3 - ]; + ] ++ aiobotocore.optional-dependencies.boto3; passthru.optional-dependencies = { chalice = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index 9b8609c435af..15eeb18989cc 100644 --- a/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -7,7 +7,10 @@ , fetchFromGitHub , flask , flask-cors +, awscli , moto +, boto3 +, setuptools , pytest-asyncio , pytestCheckHook , pythonOlder @@ -16,16 +19,16 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.9.1"; - format = "setuptools"; + version = "2.11.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiobotocore"; rev = "refs/tags/${version}"; - hash = "sha256-cODdmP/O24fNIugzl4AYdf3g4Gzwx3JseYKbZKgEPbc="; + hash = "sha256-H9nsLPxjv3H5y6+5piBt6Pb+Wks4vwOitM+WQtyViPs="; }; # Relax version constraints: aiobotocore works with newer botocore versions @@ -34,6 +37,10 @@ buildPythonPackage rec { sed -i "s/'botocore>=.*'/'botocore'/" setup.py ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aioitertools @@ -41,6 +48,15 @@ buildPythonPackage rec { wrapt ]; + passthru.optional-dependencies = { + awscli = [ + awscli + ]; + boto3 = [ + boto3 + ]; + }; + nativeCheckInputs = [ dill flask diff --git a/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix b/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix index 8960dca9a8d7..30511eb81676 100644 --- a/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiocsv"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "MKuranowski"; repo = "aiocsv"; rev = "refs/tags/v${version}"; - hash = "sha256-5jMmT7XY+1VNbDNciZS6B/oQJFj4XmGvhDITKWHCuOQ="; + hash = "sha256-zHU9NfxiRUOAk0kwsKmvxd01UtNXZTnb700Wlm9DUz4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix b/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix index 5d92471c472c..15c71c5cba68 100644 --- a/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.11"; + version = "0.3.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,12 +24,12 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiomysensors"; rev = "refs/tags/v${version}"; - hash = "sha256-uBmFJFmUClTkaAg8jTThygzmZv7UZDPSt0bXo8BLu00="; + hash = "sha256-9M5WuBoezbZr7OwJaM0m2CqibziJVwqANGOhiJrqfxA="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=src --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=src --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index 4e77bc9c6509..2dfef5a251ad 100644 --- a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "8.0.1"; + version = "8.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3W5XfSOaKCCBjDHJh8IP/5I48py3j6i2O3FfhbcQzbY="; + hash = "sha256-i2dlcparDQlwM7Wk/HwlBz0mmI38ZRwxVM6jLY0rI+0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 93010f174c7c..e50bd10281c5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "71"; + version = "72"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "aiounifi"; rev = "refs/tags/v${version}"; - hash = "sha256-KmxwCjmvDByCtsSQ+fQtdLS4ZDxtUaqc5zoOF9dsSq8="; + hash = "sha256-PrFI5ncHW4r2Re1BIqRZlz8ns6d5p6y6PASCleSmyNc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index 497d4a9aa4dd..aba858a05dc4 100644 --- a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "10.4.0"; + version = "11.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-/UsrUzCd4aYEQ4epZggk2O2esJCUG0DxRseK+s6yJd4="; + hash = "sha256-Ep95niYin3urtiMFSVY792zpFAcu6MwQN9DA/IJLSQQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index a2257be2f428..d9cba7737271 100644 --- a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.6.3"; + version = "5.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-aOHnuZdjXiIqd/SeQdVB1qB7v8DfnEFH0zHctA74MPw="; + hash = "sha256-Uq0DXrNQRVhQaPXXGNjbnPhOYoPpa8H3WuDdotCKS8c="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/argilla/default.nix b/nixpkgs/pkgs/development/python-modules/argilla/default.nix index 336b6f6db856..0ccca5417a2e 100644 --- a/nixpkgs/pkgs/development/python-modules/argilla/default.nix +++ b/nixpkgs/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.24.0"; + version = "1.25.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2baSX6b2BFYHXKg37WMHcGel3OTGsCJrulvyxmbdBek="; + hash = "sha256-KU67tu14pX1nCRl9k/Na9EqelO3Uz7It1dpFBU2IjZA="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/arviz/default.nix b/nixpkgs/pkgs/development/python-modules/arviz/default.nix index 63bf85273811..edd555a96b16 100644 --- a/nixpkgs/pkgs/development/python-modules/arviz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/arviz/default.nix @@ -100,6 +100,7 @@ buildPythonPackage rec { "test_plot_ppc_discrete_save_animation" # Assertion error "test_data_zarr" + "test_plot_forest" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index 4cd972d95b8c..f728bbb56209 100644 --- a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -2,11 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder - -# build-system , poetry-core - -# tests , pytest-snapshot , pytestCheckHook }: @@ -14,13 +10,13 @@ buildPythonPackage rec { pname = "awesomeversion"; version = "24.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "awesomeversion"; rev = "refs/tags/${version}"; hash = "sha256-bpLtHhpWc1VweVl5G8mM473Js3bXT11N3Zc0jiVqq5c="; }; @@ -28,7 +24,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace 'version = "0"' 'version = "${version}"' + --replace-fail 'version = "0"' 'version = "${version}"' ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/aws-encryption-sdk/default.nix index b9186ab1779c..7cdcc917c8a8 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-encryption-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -1,54 +1,62 @@ { lib -, buildPythonPackage -, fetchPypi , attrs , boto3 +, buildPythonPackage , cryptography -, setuptools -, wrapt +, fetchPypi , mock -, pytest , pytest-mock , pytestCheckHook +, pythonAtLeast +, pythonOlder +, setuptools +, wrapt }: buildPythonPackage rec { pname = "aws-encryption-sdk"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-jV+/AY/GjWscrL5N0Df9gFKWx3Nqn+RX62hNBT9/lWM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs boto3 cryptography - setuptools wrapt ]; - doCheck = true; - nativeCheckInputs = [ mock - pytest pytest-mock pytestCheckHook ]; disabledTestPaths = [ - # requires networking + # Tests require networking "examples" "test/integration" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # AssertionError: Regex pattern did not match, https://github.com/aws/aws-encryption-sdk-python/issues/644 + "test_abstracts" + ]; + meta = with lib; { + description = "Python implementation of the AWS Encryption SDK"; homepage = "https://aws-encryption-sdk-python.readthedocs.io/"; changelog = "https://github.com/aws/aws-encryption-sdk-python/blob/v${version}/CHANGELOG.rst"; - description = "Fully compliant, native Python implementation of the AWS Encryption SDK."; license = licenses.asl20; maintainers = with maintainers; [ anthonyroussel ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix b/nixpkgs/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix index 7e54c030bf1e..90226ddd99e4 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix @@ -1,34 +1,27 @@ { lib +, botocore , buildPythonPackage -, pythonOlder , fetchPypi +, pytestCheckHook +, pythonAtLeast +, pythonOlder , setuptools , setuptools-scm -, botocore -, pytestCheckHook }: buildPythonPackage rec { - pname = "aws_secretsmanager_caching"; + pname = "aws-secretsmanager-caching"; version = "1.1.1.5"; - format = "setuptools"; + pyprject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "5cee2762bb89b72f3e5123feee8e45fbe44ffe163bfca08b28f27b2e2b7772e1"; + pname = "aws_secretsmanager_caching"; + inherit version; + hash = "sha256-XO4nYruJty8+USP+7o5F++RP/hY7/KCLKPJ7Lit3cuE="; }; - nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - botocore - setuptools # Needs pkg_resources at runtime. - ]; - patches = [ # Remove coverage tests from the pytest invocation in setup.cfg. ./remove-coverage-tests.patch @@ -36,9 +29,18 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'," "" + --replace-fail "'pytest-runner'," "" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + botocore + setuptools # Needs pkg_resources at runtime. + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -48,6 +50,21 @@ buildPythonPackage rec { "test/integ" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # TypeError: 'float' object cannot be interpreted as an integer + "test_calls_hook_binary" + "test_calls_hook_string" + "test_get_secret_binary" + "test_get_secret_string" + "test_invalid_json" + "test_missing_key" + "test_string_with_additional_kwargs" + "test_string" + "test_valid_json_with_mixed_args" + "test_valid_json_with_no_secret_kwarg" + "test_valid_json" + ]; + pythonImportsCheck = [ "aws_secretsmanager_caching" ]; diff --git a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index 31639cb455ff..2e2d6fcf747a 100644 --- a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.20.3"; + version = "0.20.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xB5HHDSUKHYGosbCa4/pesx0uJQarp2aEhpHDBmDh1g="; + hash = "sha256-SwbMIenB8aoZKzxq8xjQ3hmX9PzaccG4+y+fttq8NL8="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 44f3c1b81085..b376126432b5 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -12,15 +12,16 @@ , pytest-trio , pytestCheckHook , requests +, setuptools , six , trio , typing-extensions }: buildPythonPackage rec { - version = "1.28.0"; + version = "1.30.0"; pname = "azure-core"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,10 +29,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-6e78Zvwf3lbatvBNTl0SxgdU1an6Sb3P2FNPyW7ZNr0="; + hash = "sha256-bzp4g+8YRyL2vZlyYu3a+Az+fls+DKqvjbFpVpWJPTU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests six @@ -99,8 +103,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Core Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/CHANGELOG.md"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-core_${version}/sdk/core/azure-core/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix index 07d608dfa56f..a890e435508f 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -1,34 +1,36 @@ { lib +, azure-core , buildPythonPackage , fetchPypi +, isodate , pythonOlder -, azure-common -, azure-core -, msrest -, six +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "azure-keyvault-administration"; - version = "4.3.0"; - format = "setuptools"; + version = "4.4.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY="; + hash = "sha256-ems2y59UTzV1D/L6lMg7l7PvIMH+G0JOpoAY7ucD8d8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - azure-common azure-core - msrest - six + typing-extensions + isodate ]; - # no tests in pypi tarball + # Tests require checkout from mono-repo doCheck = false; pythonNamespaces = [ @@ -42,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Key Vault Administration Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-administration_${version}/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 77d81c87ec31..e45f1b241517 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -3,36 +3,40 @@ , fetchPypi , azure-common , azure-core -, msrest -, msrestazure +, isodate , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.7.0"; - format = "setuptools"; + version = "4.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-nkfZp0gl5QKxPVSByZwYIEDE9Ucj9DNx4AhZQ23888o="; + hash = "sha256-xWEnPkQCwlEUhzSGyYv6GyxHiGIp1BAOh9rxAO4Edyg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-common azure-core - msrest - msrestazure + isodate + typing-extensions ]; pythonNamespaces = [ "azure.keyvault" ]; - # has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -41,7 +45,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Key Vault Certificates Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-certificates_${version}/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index ddb5d440b0b3..56004efa76b6 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -1,41 +1,46 @@ { lib +, azure-core , buildPythonPackage , fetchPypi +, isodate , pythonOlder -, azure-common -, azure-core -, msrest +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.7.0"; - format = "setuptools"; + version = "4.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-d+4lNLplGh8wbIXXtQW8PM7o/qd0UOuvr8Jq7BblRF0="; + hash = "sha256-VjbAodiiDjxXmcs8z/1Ovz8NGst8rpUmhhgzr4sP6BQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - azure-common azure-core - msrest + isodate + typing-extensions ]; pythonNamespaces = [ "azure.keyvault" ]; - # requires checkout from mono-repo + # Tests require checkout from mono-repo doCheck = false; meta = with lib; { description = "Microsoft Azure Key Vault Secrets Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets"; + changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-secrets_${version}/sdk/keyvault/azure-keyvault-secrets"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix b/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix index f3fda2ef3c8b..14e04b17f604 100644 --- a/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.90"; + version = "0.2.91"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = "boschshcpy"; rev = "refs/tags/${version}"; - hash = "sha256-qI8fpQJ7fyZ6CX010cyPuoFj9UQM+jHOJ201GCjIwBU="; + hash = "sha256-lQDYJrla2iDk1MbLHjBGP3ZcZ1djD3bWhz15RaBFMgg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix index 0cd99fd4abbe..371497c895fb 100644 --- a/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.49"; + version = "1.34.52"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-l21X4VqWJUfeTnWo+2BRWYRpK3IQdDBbiK5Nelav4eU="; + hash = "sha256-gjxBBZ+DbWh32qocvSD4E8jxp4uf3ykLwLhTEn4Se6M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 3a48019b2e99..f1ab0c4f28e3 100644 --- a/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -1,27 +1,27 @@ { lib +, botocore , buildPythonPackage -, pythonOlder , fetchFromGitHub -, botocore , jmespath -, s3transfer +, pytestCheckHook +, pythonOlder , pythonRelaxDepsHook +, s3transfer , setuptools -, pytestCheckHook }: buildPythonPackage rec { pname = "boto3"; - version = "1.34.21"; # N.B: if you change this, change botocore and awscli to a matching version - format = "pyproject"; + version = "1.34.49"; # N.B: if you change this, change botocore and awscli to a matching version + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "boto"; - repo = pname; + repo = "boto3"; rev = "refs/tags/${version}"; - hash = "sha256-oOrUVBh1sbaOibU8A+bGZ4z7IEiE4gjHwZ+8889Hv60="; + hash = "sha256-/pgbLSL5RJ5RrKUAfQ1QNJykBdICrpqnuziHOVHt1JI="; }; nativeBuildInputs = [ @@ -54,14 +54,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - crt = [ botocore.optional-dependencies.crt ]; + crt = [ + botocore.optional-dependencies.crt + ]; }; meta = with lib; { + description = "AWS SDK for Python"; homepage = "https://github.com/boto/boto3"; changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - description = "AWS SDK for Python"; longDescription = '' Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for Python, which allows Python developers to write software that makes use of diff --git a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix index 0ee4bac8de62..808deb064ad8 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.49"; + version = "1.34.52"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-St5+p0mKRFMiherfKD7Z3SvW540n/9VjKBj4pUgDs2w="; + hash = "sha256-pRtsofyprNqp6AQS83FTaQ//rX7SJ3Q8xTCAmSDSoAk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/nixpkgs/pkgs/development/python-modules/botocore/default.nix index bc1454b70ff1..89b6dbe07821 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -1,36 +1,47 @@ { lib +, awscrt , buildPythonPackage -, pythonOlder , fetchPypi -, python-dateutil , jmespath -, urllib3 -, pytestCheckHook , jsonschema -, awscrt +, pytestCheckHook +, python-dateutil +, pythonOlder +, pythonRelaxDepsHook +, setuptools +, urllib3 }: buildPythonPackage rec { pname = "botocore"; - version = "1.34.21"; # N.B: if you change this, change boto3 and awscli to a matching version - format = "setuptools"; + version = "1.34.49"; # N.B: if you change this, change boto3 and awscli to a matching version + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IZg7sEc6GRMBksUOxpdNVfDEqkinCUvPQPeILItpuPE="; + hash = "sha256-2JQQvGBnPq/xaZ8/H9yw46Xh96agSMDYjDzlw1SUM+w="; }; + pythonRelaxDeps = [ + "urllib3" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + propagatedBuildInputs = [ - python-dateutil jmespath + python-dateutil urllib3 ]; nativeCheckInputs = [ - pytestCheckHook jsonschema + pytestCheckHook ]; disabledTestPaths = [ @@ -46,14 +57,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - crt = [ awscrt ]; + crt = [ + awscrt + ]; }; meta = with lib; { + description = "A low-level interface to a growing number of Amazon Web Services"; homepage = "https://github.com/boto/botocore"; changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - description = "A low-level interface to a growing number of Amazon Web Services"; maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix b/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix index e327e135c48c..677b4a990362 100644 --- a/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.3.7"; + version = "1.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Bottleneck"; inherit version; - hash = "sha256-4UZ+NzrUado0DtD/KDIU1lMcwIv9yiCDNho6pkcGgfg="; + hash = "sha256-Z4DYlpabp/U8iZW6kMh8VIvrPbQ13JDGC5oQ7Rq02Gg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix index 99a128b0496b..c40d0b8d4ee5 100644 --- a/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix @@ -14,27 +14,20 @@ buildPythonPackage rec { pname = "cachecontrol"; - version = "0.13.1"; - format = "pyproject"; + version = "0.14.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "ionrock"; - repo = pname; + repo = "cachecontrol"; rev = "refs/tags/v${version}"; - hash = "sha256-4N+vk65WxOrT+IJRn+lEnbs5vlWQh9ievVHWWe3BKJ0="; + hash = "sha256-myyqiUGna+5S2GJGnwZTOfLh49NhjfHAvpUB49dQbgY="; }; - postPatch = '' - # https://github.com/ionrock/cachecontrol/issues/297 - substituteInPlace tests/test_etag.py --replace \ - "requests.adapters.HTTPResponse.from_httplib" \ - "urllib3.response.HTTPResponse.from_httplib" - ''; - nativeBuildInputs = [ flit-core ]; @@ -69,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/ionrock/cachecontrol"; changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cachier/default.nix b/nixpkgs/pkgs/development/python-modules/cachier/default.nix index 0cfc20b73397..931279b5a9ac 100644 --- a/nixpkgs/pkgs/development/python-modules/cachier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cachier/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cachier"; - version = "2.3.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-cachier"; repo = "cachier"; - rev = "v${version}"; - hash = "sha256-pgDv0ApFgaNR0amqJNwkTSPlqczOClk9D1uVzZW1B7g="; + rev = "refs/tags/v${version}"; + hash = "sha256-3rKsgcJQ9RQwosVruD7H99msB8iGtAai320okrCZCTI="; }; pythonRemoveDeps = [ "setuptools" ]; diff --git a/nixpkgs/pkgs/development/python-modules/cbor2/default.nix b/nixpkgs/pkgs/development/python-modules/cbor2/default.nix index 5523d4f5e0a2..2db51887e21f 100644 --- a/nixpkgs/pkgs/development/python-modules/cbor2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cbor2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.5.1"; + version = "5.6.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+eGS9GGp+PYILfKMA1sAbRU5BCE9yGQL7Ypy1yu8lHU="; + hash = "sha256-t1E8LeqIaJkfrX74iZiQ68+LGZubRGHDwR160670gg0="; }; postPatch = '' @@ -44,12 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - # https://github.com/agronholm/cbor2/issues/99 - disabledTests = lib.optionals stdenv.is32bit [ - "test_huge_truncated_bytes" - "test_huge_truncated_string" - ]; - meta = with lib; { changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}"; description = "Python CBOR (de)serializer with extensive tag support"; diff --git a/nixpkgs/pkgs/development/python-modules/chainstream/default.nix b/nixpkgs/pkgs/development/python-modules/chainstream/default.nix new file mode 100644 index 000000000000..00c10a22e9ee --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/chainstream/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "chainstream"; + version = "1.0.1"; + + pyproject = true; + + nativeBuildInputs = [ python3Packages.setuptools ]; + + src = fetchPypi { + inherit pname version; + hash = "sha256-302P1BixEmkODm+qTLZwaWLktrlf9cEziQ/TIVfI07c="; + }; + + pythonImportsCheck = [ + "chainstream" + ]; + + meta = with lib; { + description = "Chain I/O streams together into a single stream"; + homepage = "https://github.com/rrthomas/chainstream"; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ cbley ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cheetah3/default.nix b/nixpkgs/pkgs/development/python-modules/cheetah3/default.nix index b85870572a4c..bb1a3da46cf5 100644 --- a/nixpkgs/pkgs/development/python-modules/cheetah3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cheetah3/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "cheetah3"; - version = "3.3.3"; + version = "3.3.3.post1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "CheetahTemplate3"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7L3SBMgNOOLAFvQST8I0gFlrya/6Lwp/umzolfJx3t4="; + hash = "sha256-0NVKie/6Fp8T1O1fvrVorycybLrEXMY1yXZBDyxjpbE="; }; doCheck = false; # Circular dependency diff --git a/nixpkgs/pkgs/development/python-modules/chroma-hnswlib/default.nix b/nixpkgs/pkgs/development/python-modules/chroma-hnswlib/default.nix new file mode 100644 index 000000000000..31f884e53ba8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/chroma-hnswlib/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pybind11 +, setuptools +, wheel +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "chroma-hnswlib"; + version = "0.7.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "chroma-core"; + repo = "hnswlib"; + rev = "refs/tags/${version}"; + hash = "sha256-c4FvymqZy8AZKbh6Y8xZRjKAqYcUyZABRGc1u7vwlsk="; + }; + + nativeBuildInputs = [ + numpy + pybind11 + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hnswlib" + ]; + + meta = with lib; { + description = "Header-only C++/python library for fast approximate nearest neighbors"; + homepage = "https://github.com/chroma-core/hnswlib"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/chromadb/default.nix b/nixpkgs/pkgs/development/python-modules/chromadb/default.nix new file mode 100644 index 000000000000..0cc5484332df --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/chromadb/default.nix @@ -0,0 +1,160 @@ +{ lib +, stdenv +, bcrypt +, build +, buildPythonPackage +, cargo +, chroma-hnswlib +, darwin +, fastapi +, fetchFromGitHub +, grpcio +, hypothesis +, importlib-resources +, kubernetes +, mmh3 +, numpy +, onnxruntime +, openssl +, opentelemetry-api +, opentelemetry-exporter-otlp-proto-grpc +, opentelemetry-instrumentation-fastapi +, opentelemetry-sdk +, orjson +, overrides +, pkg-config +, posthog +, protobuf +, pulsar-client +, pydantic +, pypika +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, pyyaml +, requests +, rustc +, rustPlatform +, setuptools +, setuptools-scm +, tenacity +, tokenizers +, tqdm +, typer +, typing-extensions +, uvicorn +, zstd +}: + +buildPythonPackage rec { + pname = "chromadb"; + version = "0.4.23"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "chroma-core"; + repo = "chroma"; + rev = "refs/tags/${version}"; + hash = "sha256-5gI+FE2jx4G/qahATLcYsONfPZZkk1RFFYK5nrpE0Ug="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-glItbT8gg5SAySnfx3A9TaPyFmd1R46JpAB1JnjBE5M="; + }; + + pythonRelaxDeps = [ + "orjson" + ]; + + nativeBuildInputs = [ + cargo + pkg-config + protobuf + pythonRelaxDepsHook + rustc + rustPlatform.cargoSetupHook + setuptools + setuptools-scm + ]; + + buildInputs = [ + openssl + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + propagatedBuildInputs = [ + bcrypt + build + chroma-hnswlib + fastapi + grpcio + importlib-resources + kubernetes + mmh3 + numpy + onnxruntime + opentelemetry-api + opentelemetry-exporter-otlp-proto-grpc + opentelemetry-instrumentation-fastapi + opentelemetry-sdk + orjson + overrides + posthog + pulsar-client + pydantic + pypika + pyyaml + requests + tenacity + tokenizers + tqdm + typer + typing-extensions + uvicorn + ]; + + nativeCheckInputs = [ + hypothesis + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "chromadb" + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + pytestFlagsArray = [ "-x" ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + # Tests require network access + "chromadb/test/property/test_cross_version_persist.py" + "chromadb/test/auth/test_simple_rbac_authz.py" + "chromadb/test/ef/test_default_ef.py" + "chromadb/test/test_api.py" + "chromadb/test/property/" + "chromadb/test/stress/" + ]; + + meta = with lib; { + description = "The AI-native open-source embedding database"; + homepage = "https://github.com/chroma-core/chroma"; + changelog = "https://github.com/chroma-core/chroma/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/clarabel/Cargo.lock b/nixpkgs/pkgs/development/python-modules/clarabel/Cargo.lock deleted file mode 100644 index ffc1908e7b75..000000000000 --- a/nixpkgs/pkgs/development/python-modules/clarabel/Cargo.lock +++ /dev/null @@ -1,1487 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "accelerate-src" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415ed64958754dbe991900f3940677e6a7eefb4d7367afd70d642677b0c7d19d" - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "amd" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a679e001575697a3bd195813feb57a4718ecc08dc194944015cbc5f6213c2b96" -dependencies = [ - "num-traits", -] - -[[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "blas" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae980f75c3215bfe8203c349b28149b0f4130a262e072913ccb55f877cd239dc" -dependencies = [ - "blas-sys", - "libc", - "num-complex", -] - -[[package]] -name = "blas-src" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa443ee19b4cde6cdbd49043eb8964f9dd367b6d98d67f04395958ebfa28f39d" -dependencies = [ - "accelerate-src", - "intel-mkl-src", - "netlib-src", - "openblas-src", - "r-src", -] - -[[package]] -name = "blas-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b1b279ceb25d7c4faaea95a5f7addbe7d8c34f9462044bd8e630cebcfc2440" -dependencies = [ - "libc", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clarabel" -version = "0.6.0" -dependencies = [ - "amd", - "blas", - "blas-src", - "cfg-if 1.0.0", - "derive_builder", - "enum_dispatch", - "itertools 0.11.0", - "lapack", - "lapack-src", - "lazy_static", - "libc", - "num-derive", - "num-traits", - "pyo3", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.70+curl-8.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.48.0", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.76", - "quote 1.0.35", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" -dependencies = [ - "darling", - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "enum_dispatch" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "windows-sys 0.52.0", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "intel-mkl-src" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7260b33a735eaebcb942800728b38c5760b125ea5e4346290d78397b5422b894" -dependencies = [ - "intel-mkl-tool", -] - -[[package]] -name = "intel-mkl-tool" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ada23f955fb7d06cb5db9424863caa7251f8f9b525f4c4816144465f77cfded7" -dependencies = [ - "curl", - "dirs 2.0.2", - "failure", - "glob", - "log", - "pkg-config", - "tar", - "zstd", -] - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "lapack" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad676a6b4df7e76a9fd80a0c50c619a3948d6105b62a0ab135f064d99c51d207" -dependencies = [ - "lapack-sys", - "libc", - "num-complex", -] - -[[package]] -name = "lapack-src" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c81fcc728418323178fd40407619d0ed26dbbbd1a553693c6290ef5d6698c6" -dependencies = [ - "accelerate-src", - "intel-mkl-src", - "netlib-src", - "openblas-src", - "r-src", -] - -[[package]] -name = "lapack-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447f56c85fb410a7a3d36701b2153c1018b1d2b908c5fbaf01c1b04fac33bcbe" -dependencies = [ - "libc", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall", -] - -[[package]] -name = "libz-sys" -version = "1.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "netlib-src" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f41f36bb4d46906d5a72da5b73a804d9de1a7282eb7c89617201acda7b8212" -dependencies = [ - "cmake", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-derive" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openblas-build" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba42c395477605f400a8d79ee0b756cfb82abe3eb5618e35fa70d3a36010a7f" -dependencies = [ - "anyhow", - "flate2", - "native-tls", - "tar", - "thiserror", - "ureq", - "walkdir", -] - -[[package]] -name = "openblas-src" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e5d8af0b707ac2fe1574daa88b4157da73b0de3dc7c39fe3e2c0bb64070501" -dependencies = [ - "dirs 3.0.2", - "openblas-build", - "vcpkg", -] - -[[package]] -name = "openssl" -version = "0.10.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" -dependencies = [ - "bitflags 2.4.1", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pkg-config" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pyo3" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" -dependencies = [ - "cfg-if 1.0.0", - "indoc", - "libc", - "memoffset", - "parking_lot", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" -dependencies = [ - "proc-macro2 1.0.76", - "pyo3-macros-backend", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2 1.0.76", -] - -[[package]] -name = "r-src" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea397956e1043a8d947ea84b13971d9cb30fce65ca66a921081755ff2e899b6a" - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.38.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "serde" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", - "unicode-xid 0.2.4", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" - -[[package]] -name = "tempfile" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "thiserror" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "unicode-bidi" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "ureq" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" -dependencies = [ - "base64", - "flate2", - "log", - "native-tls", - "once_cell", - "rustls-native-certs", - "url", -] - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "xattr" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "zstd" -version = "0.5.4+zstd.1.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "2.0.6+zstd.1.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "1.4.18+zstd.1.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81" -dependencies = [ - "cc", - "glob", - "itertools 0.9.0", - "libc", -] diff --git a/nixpkgs/pkgs/development/python-modules/clarabel/default.nix b/nixpkgs/pkgs/development/python-modules/clarabel/default.nix index 46cdc7c57611..c3e925323c71 100644 --- a/nixpkgs/pkgs/development/python-modules/clarabel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clarabel/default.nix @@ -1,33 +1,30 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi , rustPlatform , libiconv , numpy , scipy +, nix-update-script }: buildPythonPackage rec { pname = "clarabel"; - version = "0.6.0.post1"; + version = "0.7.0"; pyproject = true; - src = fetchFromGitHub { - owner = "oxfordcontrol"; - repo = "Clarabel.rs"; - rev = "refs/tags/v${version}"; - hash = "sha256-5Mw+3WRMuz3BxLWRdsnXHjetsNrM3EZRZld8lVTNKgo="; + src = fetchPypi { + inherit pname version; + hash = "sha256-udpW9SKAaoR/Ps4I9fIfq3UG7sMUiyJEYZDeUgbdHm8="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-R/o12m2UqKte4H1pvW9DN0YPDhgNIxt0mXrfBDMzcwM="; }; - postPatch = '' - ln -s ${./Cargo.lock} ./Cargo.lock - ''; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook @@ -52,6 +49,8 @@ buildPythonPackage rec { runHook postCheck ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/oxfordcontrol/Clarabel.rs/releases/tag/v${version}/CHANGELOG.md"; description = "Conic Interior Point Solver"; diff --git a/nixpkgs/pkgs/development/python-modules/clarifai/default.nix b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix index 2564b168cfe7..05a86d09ee77 100644 --- a/nixpkgs/pkgs/development/python-modules/clarifai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix @@ -1,23 +1,29 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools , clarifai-grpc +, fetchFromGitHub +, inquirerpy +, llama-index-core , numpy , opencv4 +, pandas , pillow +, pycocotools +, pypdf +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , pyyaml , rich , schema +, setuptools , tqdm , tritonclient -, pytestCheckHook }: buildPythonPackage rec { pname = "clarifai"; - version = "9.11.1"; + version = "10.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,36 +32,59 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-fVari/SnrUnEbrYefV9j2yA/EMJoGiLOV7q/DrS0AQ8="; + hash = "sha256-/2PIsSsYr/R7DuTX/ndBAOX7C3IaFqPw16ZAX8E1Vk8="; }; + pythonRelaxDeps = [ + "clarifai-grpc" + ]; + + pythonRemoveDeps = [ + "opencv-python" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; propagatedBuildInputs = [ clarifai-grpc + inquirerpy + llama-index-core numpy - tqdm opencv4 - tritonclient - rich - schema + pandas pillow + pypdf pyyaml + rich + schema + tqdm + tritonclient ]; + passthru.optional-dependencies = { + all = [ + pycocotools + ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ - # require network access and API key + # Test requires network access and API key "test_export_workflow_general" ]; disabledTestPaths = [ - # require network access and API key + # Tests require network access and API key "tests/test_app.py" "tests/test_data_upload.py" "tests/test_model_predict.py" @@ -63,14 +92,18 @@ buildPythonPackage rec { "tests/test_search.py" "tests/workflow/test_create_delete.py" "tests/workflow/test_predict.py" + "tests/test_rag.py" + "clarifai/models/model_serving/repo_build/static_files/base_test.py" ]; - pythonImportsCheck = [ "clarifai" ]; + pythonImportsCheck = [ + "clarifai" + ]; meta = with lib; { description = "Clarifai Python Utilities"; homepage = "https://github.com/Clarifai/clarifai-python"; - changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${src.rev}"; + changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ natsukium ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix index faf20403e62b..409f2c004c2c 100644 --- a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "cli-helpers"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cli_helpers"; inherit version; - hash = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; + hash = "sha256-uCqJg87uIfGA5v0N23yo2uQ8QOkglR44F/mWqyBNrmo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix b/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix index b44188ffcc71..b51949f73a13 100644 --- a/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-RpuBKdjjSjJJ9UU7VW20gD9Rouj0oxv72sZZaUa/BfY="; + hash = "sha256-Qdv0DcdIjqz8NtyMsVNQxGTxsB3TpXUGDA3oL8QbBDc="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/nixpkgs/pkgs/development/python-modules/cloudpathlib/default.nix b/nixpkgs/pkgs/development/python-modules/cloudpathlib/default.nix index b76de3717bf4..89f5ef6fbf5c 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudpathlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.17.0"; + version = "0.18.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "drivendataorg"; repo = "cloudpathlib"; rev = "refs/tags/v${version}"; - hash = "sha256-rj8v4EUMPdB5zmbP4VQli2H6GjDor3BHaA95GwoKS5E="; + hash = "sha256-RrdRUqQ3QyMUpTi1FEsSXK6WS37r77SdPBH1oVVvSw0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix b/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix index 0bc6b500fbca..efc930341be2 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.9"; + version = "2.0.10"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - hash = "sha256-i/1Z4W/cwrrgo3h85OWfz2X3Y7Odz9mJdRuXokuky/Q="; + hash = "sha256-h193MX8W12dYQnUVG20iWiSnnIFMdUc4amhJ7rGqb/4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/coffea/default.nix b/nixpkgs/pkgs/development/python-modules/coffea/default.nix index 633b2d2c9847..3f5de521b0a8 100644 --- a/nixpkgs/pkgs/development/python-modules/coffea/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coffea/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.2.1"; + version = "2024.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-TQ0aC2iFPWh24ce1WoVRluPvnwvBscLtFl8/wcW/Clg="; + hash = "sha256-GdoVb9YtlUlrSx7TWWrdHOqOJJ4M+kJspOllv6HgFXk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/cohere/default.nix b/nixpkgs/pkgs/development/python-modules/cohere/default.nix index d6140a3f6d2c..86b7e7b1b739 100644 --- a/nixpkgs/pkgs/development/python-modules/cohere/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cohere/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "4.47"; + version = "4.51"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1okhIHnBpUW9SXsUPP96pWMoMfps9Bv3rMk7Sm7/uDk="; + hash = "sha256-AfsJLqkDjdT7Ng77NQb60kUe0jHLZ3TjJLmTyTdKVQo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix b/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix index 3144c5114fc2..02f1de52af7e 100644 --- a/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix @@ -1,34 +1,46 @@ { lib , buildPythonPackage +, editorconfig , fetchPypi -, setuptools , jsbeautifier +, pythonOlder +, setuptools +, six }: buildPythonPackage rec { pname = "cssbeautifier"; - version = "1.14.11"; - format = "pyproject"; + version = "1.15.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QFRMK2K7y2TKpefzegLflWVOXOG8rK2sTKHz3InDFRM="; + hash = "sha256-n3BkNirt1VnFXu7Pa2vtZeBfM0iNy+OQRPBAPCbhwAY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ jsbeautifier ]; + propagatedBuildInputs = [ + editorconfig + jsbeautifier + six + ]; - # has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "cssbeautifier" ]; + pythonImportsCheck = [ + "cssbeautifier" + ]; meta = with lib; { description = "CSS unobfuscator and beautifier"; - homepage = "https://pypi.org/project/cssbeautifier/"; + homepage = "https://github.com/beautifier/js-beautify"; + changelog = "https://github.com/beautifier/js-beautify/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ traxys ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix b/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix index b0bd083085f3..1533055f3c89 100644 --- a/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Uvy5/a9YFdPKpZ3B+Yvrvp7uZCY/My45w1lDqX7zJvI="; + hash = "sha256-pwSDDkBcyaT5+qA/W8v5loi0yXK8R0ugASmbalwYw70="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix index e114d678b145..806444d411b1 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.8"; + version = "1.7.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-EpKZiSDU5fivG3TIarirPgxRGQ3Sf1hwNvCKdQx25c0="; + hash = "sha256-ff+cdY6xy14w30BDn1ct/2Q+4j8cQupJrJHb4vO58J0="; }; sourceRoot = "${src.name}/core"; diff --git a/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix index 1ab2143953b7..41906a936264 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.7.3"; + version = "1.7.4"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-3zj3wA1wxUjKSm1n7QE2g/VUuH3UuWlXCC68mOb2eso="; + hash = "sha256-Ny6Nnb5OhtqSQZ0BMOQrb0ic6i29GVywy3hn3UuVtxE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index f569f24757a2..a51cb07f099c 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; rev = "refs/tags/v${version}"; - hash = "sha256-mYAOAi0Qb89zp4o7vRdR7fw7vrlXt1TFVqGR09QcRSA="; + hash = "sha256-uvwcnOKjwxEmA+/QRGSRofpoE4jZzmE02mGSDLINrJw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix b/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix index 8a96602dcc83..ef114da4ca02 100644 --- a/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "5.2.2"; + version = "6.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-ybZ8f3tqhj0SPbwjtgTB45y4Tx/lIyNZ5vShYsbIrfU="; + hash = "sha256-PjM2bh79o4bBv3zQyFYehhdlvXKFW8Hk0ZKfZDAuiQU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dirtyjson/default.nix b/nixpkgs/pkgs/development/python-modules/dirtyjson/default.nix new file mode 100644 index 000000000000..7cd4fce0e650 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dirtyjson/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "dirtyjson"; + version = "1.0.8"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kMpKGPP/MM6EnRANz0oAOVPHnTojSO8Fbx2cIiMaJf0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dirtyjson" + ]; + + meta = with lib; { + description = "JSON decoder for Python that can extract data from the muck"; + homepage = "https://github.com/codecobblers/dirtyjson"; + license = with licenses; [ afl21 /* and */ mit]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix index d8bb73ccdef8..d1a66ed8f704 100644 --- a/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap4"; - version = "2023.1"; + version = "2024.1"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap4"; rev = "refs/tags/${version}"; - hash = "sha256-4p6dlyQYZGyfBntTuzCjikL8ZG/4xDnTiQ1rCVt0Hbk="; + hash = "sha256-upHrNDhoY+8qD+aeXPcY452xUIyYjW0apf8mVo6pqY4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix b/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix index 5ba20ff94565..81404145e8b8 100644 --- a/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "dnf-plugins-core"; - version = "4.4.4"; + version = "4.5.0"; format = "other"; outputs = [ "out" "man" ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf-plugins-core"; - rev = version; - hash = "sha256-SGgUozOAU6h87SguXh+13CxV4GnVhdN3SpwKfDPh2GY="; + rev = "refs/tags/${version}"; + hash = "sha256-og20X2AUzoOphwF+508EobGEp/VYLtxWY7N4k327o8o="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/docstr-coverage/default.nix b/nixpkgs/pkgs/development/python-modules/docstr-coverage/default.nix index 2c3289c0f393..ba0945ad15af 100644 --- a/nixpkgs/pkgs/development/python-modules/docstr-coverage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docstr-coverage/default.nix @@ -8,7 +8,7 @@ , pytest-mock }: let - version = "2.3.0"; + version = "2.3.1"; in buildPythonPackage { pname = "docstr-coverage"; @@ -17,8 +17,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "HunterMcGushion"; repo = "docstr_coverage"; - rev = "v${version}"; - hash = "sha256-eYHhE5zs3hYzK3aAimF0Gx/Kyk1Ot1F/lKf1poR2er0="; + rev = "refs/tags/v${version}"; + hash = "sha256-QmQE6KZ2NdXKQun+uletxYPktWvfkrj6NPAVl/mmpAY="; }; propagatedBuildInputs = [ click pyyaml tqdm ]; diff --git a/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix b/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix index ab82edb0893b..efdc1d10ace3 100644 --- a/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.9.2"; - format = "pyproject"; + version = "0.11.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-T02nGF+YlughRQPinb0I3NC6xsarh4+qRhG8YfhTvhI="; + hash = "sha256-GMtQtcKEn2mdryl1KMYnYYeGpdbowP3o4dStwuL8AcU="; }; patches = [ ./remote_data.patch ]; diff --git a/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index a7cd1aa36dd4..fd197f9305d6 100644 --- a/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , duckdb , fsspec @@ -13,25 +14,24 @@ }: buildPythonPackage rec { - inherit (duckdb) pname version src; - format = "setuptools"; - - # 1. let nix control build cores - # 2. default to extension autoload & autoinstall disabled - # 3. unconstrain setuptools_scm version - patches = (duckdb.patches or []) ++ [ ./setup.patch ]; + inherit (duckdb) patches pname src version; + pyproject = true; postPatch = (duckdb.postPatch or "") + '' # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library cd tools/pythonpkg - substituteInPlace setup.py --subst-var NIX_BUILD_CORES - - # avoid dependency on mypy - rm tests/stubs/test_stubs.py + # 1. let nix control build cores + # 2. default to extension autoload & autoinstall disabled + substituteInPlace setup.py \ + --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \ + --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "" ''; - BUILD_HTTPFS = 1; + env = { + BUILD_HTTPFS = 1; + DUCKDB_BUILD_UNITY = 1; + }; nativeBuildInputs = [ pybind11 @@ -52,21 +52,35 @@ buildPythonPackage rec { pytestCheckHook ]; + # test flags from .github/workflows/Python.yml + pytestFlagsArray = [ + "--verbose" + ] ++ lib.optionals stdenv.isDarwin [ + "tests/fast" + ]; + + disabledTestPaths = [ + # avoid dependency on mypy + "tests/stubs/test_stubs.py" + ]; + disabledTests = [ # tries to make http request "test_install_non_existent_extension" - # test is racy and interrupt can be delivered before or after target point + + # https://github.com/duckdb/duckdb/issues/10702 + # tests are racy and interrupt can be delivered before or after target point + # causing a later test to fail with a spurious KeyboardInterrupt "test_connection_interrupt" + "test_query_interruption" ]; + # remove duckdb dir to prevent import confusion by pytest preCheck = '' export HOME="$(mktemp -d)" + rm -rf duckdb ''; - setupPyBuildFlags = [ - "--inplace" - ]; - pythonImportsCheck = [ "duckdb" ]; diff --git a/nixpkgs/pkgs/development/python-modules/duckdb/setup.patch b/nixpkgs/pkgs/development/python-modules/duckdb/setup.patch deleted file mode 100644 index 8c8f790a66a1..000000000000 --- a/nixpkgs/pkgs/development/python-modules/duckdb/setup.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py -index 30f1e1ccdd..6784169fcb 100644 ---- a/tools/pythonpkg/setup.py -+++ b/tools/pythonpkg/setup.py -@@ -96,7 +96,7 @@ def parallel_cpp_compile( - return - self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts) - -- list(multiprocessing.pool.ThreadPool(multiprocessing.cpu_count()).imap(_single_compile, objects)) -+ list(multiprocessing.pool.ThreadPool(@NIX_BUILD_CORES@).imap(_single_compile, objects)) - return objects - - -@@ -163,7 +163,6 @@ if 'BUILD_HTTPFS' in os.environ: - for ext in extensions: - toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())]) - --toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1']) - - - class get_pybind_include(object): -@@ -348,7 +347,7 @@ setup( - packages=packages, - include_package_data=True, - python_requires='>=3.7.0', -- setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'], -+ setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'], - use_scm_version=setuptools_scm_conf, - tests_require=['google-cloud-storage', 'mypy', 'pytest'], - classifiers=[ diff --git a/nixpkgs/pkgs/development/python-modules/e3-core/default.nix b/nixpkgs/pkgs/development/python-modules/e3-core/default.nix index 95759b6a096c..ef0b31b177ab 100644 --- a/nixpkgs/pkgs/development/python-modules/e3-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/e3-core/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ autoPatchelfHook +, buildPythonPackage , colorama , coverage , distro @@ -6,12 +7,14 @@ , httpretty , lib , mock +, packaging , psutil , pytest , pytest-socket , python-dateutil , pyyaml , requests +, requests-cache , requests-toolbelt , stdenv , setuptools @@ -24,26 +27,40 @@ buildPythonPackage rec { pname = "e3-core"; - version = "22.3.1"; + version = "22.4.0"; pyproject = true; src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-core"; rev = "v${version}"; - hash = "sha256-4StHOJldfeqApdF6D14Euzg9HvZ2e7G4/OQ0UrEbEIw="; + hash = "sha256-dgEk2/qRfAYwUz+e5TWKUy/aPLpmyWZ32OV1i7QM9Fs="; }; - patches = [ ./0001-use-distro-over-ld.patch ]; + patches = [ + ./0001-use-distro-over-ld.patch + ]; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + autoPatchelfHook + setuptools + ]; propagatedBuildInputs = [ - colorama pyyaml python-dateutil requests requests-toolbelt tqdm stevedore + colorama + packaging + pyyaml + python-dateutil + requests + requests-cache + requests-toolbelt + tqdm + stevedore ] ++ lib.optional stdenv.isLinux [ # See setup.py:24. These are required only on Linux. Darwin has its own set # of requirements. - psutil distro + psutil + distro ]; pythonImportsCheck = [ "e3" ]; diff --git a/nixpkgs/pkgs/development/python-modules/e3-testsuite/default.nix b/nixpkgs/pkgs/development/python-modules/e3-testsuite/default.nix new file mode 100644 index 000000000000..6c13bbb5a08e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/e3-testsuite/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, e3-core +, fetchFromGitHub +, lib +, setuptools +, stdenv +}: + +buildPythonPackage rec { + pname = "e3-testsuite"; + version = "26.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AdaCore"; + repo = "e3-testsuite"; + rev = "v${version}"; + hash = "sha256-V20tX0zi2DRHO42udUcW/CDMyBxh1uSTgac0zZGubsI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + e3-core + ]; + + pythonImportsCheck = [ "e3" ]; + + meta = with lib; { + changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${src.rev}"; + homepage = "https://github.com/AdaCore/e3-testsuite/"; + description = "Generic testsuite framework in Python"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ heijligen ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix b/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix index d3edf6748300..e3ec6adf2f72 100644 --- a/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix @@ -2,27 +2,36 @@ , stdenv , fetchFromGitHub , cmake +, doxygen , boost , eigen , numpy +, scipy }: stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-INOg1oL5APMI2YZDe4yOJadhMsG7b+NfEcSr9FsdqeU="; + hash = "sha256-/k5eltoeUW05FTjvStAOw+tguWLUaUced8TArrk4UDI="; }; + cmakeFlags = [ + "-DINSTALL_DOCUMENTATION=ON" + "-DBUILD_TESTING_SCIPY=ON" + ]; + strictDeps = true; nativeBuildInputs = [ cmake + doxygen + scipy ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index 9105fbd40612..1ceeecafb638 100644 --- a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -20,35 +20,35 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2023.7.0"; - format = "pyproject"; + version = "2024.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dask"; - repo = pname; - rev = version; - hash = "sha256-pJ0zK0upEV7TyuNMIcozugkwBlYpK/Dg6BdB0kBpn9k="; + repo = "fastparquet"; + rev = "refs/tags/${version}"; + hash = "sha256-e0gnC/HMYdrYdEwy6qNOD1J52xgN2x81oCG03YNsYjg="; }; - nativeBuildInputs = [ - cython - oldest-supported-numpy - setuptools - setuptools-scm - wheel - ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace '"pytest-runner"' "" + --replace-fail '"pytest-runner"' "" sed -i \ -e "/pytest-runner/d" \ -e '/"git", "status"/d' setup.py ''; + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ cramjam fsspec @@ -85,7 +85,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A python implementation of the parquet format"; + description = "Implementation of the parquet format"; homepage = "https://github.com/dask/fastparquet"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; diff --git a/nixpkgs/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch b/nixpkgs/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch index c12c85e0de25..2506a10268b2 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch +++ b/nixpkgs/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch @@ -1,17 +1,17 @@ -From 001549503eed364d4baaa5804242f67c6236f6c2 Mon Sep 17 00:00:00 2001 +From d3aed2c18cc3a1c88a8052af1f34d7f81f1be11a Mon Sep 17 00:00:00 2001 From: Flakebi <flakebi@t-online.de> -Date: Sat, 2 Dec 2023 16:55:05 +0100 +Date: Wed, 28 Feb 2024 23:24:14 +0100 Subject: [PATCH] Fix with new dependency versions - cookie_jar is private in werkzeug 2.3, so recreate the client instead - set_cookie does not take a hostname argument anymore, use domain instead - Headers need to specify a content type --- - test_seasurf.py | 63 ++++++++++++++++++++++++------------------------- - 1 file changed, 31 insertions(+), 32 deletions(-) + test_seasurf.py | 71 ++++++++++++++++++++++++------------------------- + 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/test_seasurf.py b/test_seasurf.py -index 517b2d7..501f82d 100644 +index 517b2d7..f940b91 100644 --- a/test_seasurf.py +++ b/test_seasurf.py @@ -71,18 +71,18 @@ class SeaSurfTestCase(BaseTestCase): @@ -37,6 +37,15 @@ index 517b2d7..501f82d 100644 self.assertIn(b('403 Forbidden'), rv.data) def test_json_token_validation_bad(self): +@@ -93,7 +93,7 @@ class SeaSurfTestCase(BaseTestCase): + with self.app.test_client() as client: + with client.session_transaction() as sess: + sess[self.csrf._csrf_name] = tokenA +- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenB) ++ client.set_cookie(self.csrf._csrf_name, tokenB, domain='www.example.com') + + rv = client.post('/bar', data=data) + self.assertEqual(rv.status_code, 403, rv) @@ -107,7 +107,7 @@ class SeaSurfTestCase(BaseTestCase): data = {'_csrf_token': token} with self.app.test_client() as client: @@ -55,7 +64,7 @@ index 517b2d7..501f82d 100644 sess[self.csrf._csrf_name] = token # once this is reached the session was stored -@@ -144,7 +144,7 @@ class SeaSurfTestCase(BaseTestCase): +@@ -144,18 +144,18 @@ class SeaSurfTestCase(BaseTestCase): with client.session_transaction() as sess: token = self.csrf._generate_token() @@ -64,6 +73,19 @@ index 517b2d7..501f82d 100644 sess[self.csrf._csrf_name] = token # once this is reached the session was stored +- rv = client.post('/bar', ++ rv = client.post('/bar', content_type='application/json', + data={self.csrf._csrf_name: token}, + base_url='https://www.example.com', + headers={'Referer': 'https://www.example.com/foobar'}) + + self.assertEqual(rv.status_code, 200) + +- rv = client.post(u'/bar/\xf8', ++ rv = client.post(u'/bar/\xf8', content_type='application/json', + data={self.csrf._csrf_name: token}, + base_url='https://www.example.com', + headers={'Referer': 'https://www.example.com/foobar\xf8'}) @@ -167,7 +167,7 @@ class SeaSurfTestCase(BaseTestCase): with client.session_transaction() as sess: token = self.csrf._generate_token() @@ -252,6 +274,15 @@ index 517b2d7..501f82d 100644 self.assertEqual(res2.status_code, 200) def test_header_set_cookie_samesite(self): +@@ -789,7 +788,7 @@ class SeaSurfTestCaseGenerateNewToken(BaseTestCase): + client.get('/foo') + tokenA = self.csrf._get_token() + +- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenA) ++ client.set_cookie(self.csrf._csrf_name, tokenA, domain='www.example.com') + with client.session_transaction() as sess: + sess[self.csrf._csrf_name] = tokenA + -- -2.42.0 +2.43.0 diff --git a/nixpkgs/pkgs/development/python-modules/flax/default.nix b/nixpkgs/pkgs/development/python-modules/flax/default.nix index fa0f053f86de..b906ba9d4322 100644 --- a/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage +, cloudpickle +, einops , fetchFromGitHub -, jaxlib -, pythonRelaxDepsHook -, setuptools-scm , jax +, jaxlib +, keras +, matplotlib , msgpack , numpy , optax +, orbax-checkpoint +, pytest-xdist +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , pyyaml , rich +, setuptools-scm +, tensorflow , tensorstore , typing-extensions -, matplotlib -, cloudpickle -, einops -, keras -, pytest-xdist -, pytestCheckHook -, tensorflow }: buildPythonPackage rec { @@ -26,6 +28,8 @@ buildPythonPackage rec { version = "0.7.5"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "google"; repo = "flax"; @@ -44,6 +48,7 @@ buildPythonPackage rec { msgpack numpy optax + orbax-checkpoint pyyaml rich tensorstore @@ -75,7 +80,6 @@ buildPythonPackage rec { disabledTestPaths = [ # Docs test, needs extra deps + we're not interested in it. "docs/_ext/codediff_test.py" - # The tests in `examples` are not designed to be executed from a single test # session and thus either have the modules that conflict with each other or # wrong import paths, depending on how they're invoked. Many tests also have @@ -83,12 +87,15 @@ buildPythonPackage rec { # `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them # would be limited anyway. "examples/*" - # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" + # Requires tree + "tests/tensorboard_test.py" + ]; - # Requires orbax which is not packaged as of 2023-07-27. - "tests/checkpoints_test.py" + disabledTests = [ + # ValueError: Checkpoint path should be absolute + "test_overwrite_checkpoints0" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/floret/cstdint.patch b/nixpkgs/pkgs/development/python-modules/floret/cstdint.patch new file mode 100644 index 000000000000..f30f557cb701 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/floret/cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/src/args.cc b/src/args.cc +index a8975e81624c..99854c919341 100644 +--- a/src/args.cc ++++ b/src/args.cc +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + ++#include <cstdint> + #include <iostream> + #include <stdexcept> + #include <string> diff --git a/nixpkgs/pkgs/development/python-modules/floret/default.nix b/nixpkgs/pkgs/development/python-modules/floret/default.nix index 72248cf8dbaa..6ca020ac81df 100644 --- a/nixpkgs/pkgs/development/python-modules/floret/default.nix +++ b/nixpkgs/pkgs/development/python-modules/floret/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ="; }; + patches = [./cstdint.patch ]; + nativeBuildInputs = [ pybind11 setuptools diff --git a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index bb4eb7ca664e..7920c53b8f57 100644 --- a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.14.4"; + version = "0.14.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-zMd/hHobFBPre0bZA1e2S9gPWnIkeImZhSySlIDxYsg="; + hash = "sha256-s3+w6LtewjR725O8ENl7jRer979fRZDqsnbAYJOWcIY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 71075ad7f60d..7bf3e64e7b14 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -1,27 +1,38 @@ { buildPythonPackage , fetchPypi , google-api-core +, google-auth , grpc-google-iam-v1 , lib +, proto-plus +, protobuf , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.11.1"; - format = "setuptools"; + version = "1.11.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EjwBVYq7V39ab/VQEmysfiuwEbMkjCXq5o+jM31NrwI="; + hash = "sha256-5ASS7Lt6F7dWBhc82bW+0FBSDCePax2YF5hr+BAGabs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core + google-auth grpc-google-iam-v1 + proto-plus + protobuf ] ++ google-api-core.optional-dependencies.grpc; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 50346213b253..c256ea54ae49 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.14.1"; + version = "3.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v9gBSb9TYvaqF1/g7dJshSkJ2RlCAWXGdf7yPlne0I4="; + hash = "sha256-/LBhPJorIQvyiInfNy7PJcVyOvH217FErtwiC2XTZvQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix index ffe81f753aa7..535aa86cc8a5 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.16.1"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P/A08nd3ZP4GsySd3Q6TM+kuXRabcnnI1aFd+svMz5E="; + hash = "sha256-dPs7hSe0YcD3luNqHkF6T8fTHC4/u3HMJwsw6THWL44="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index b481bff3f750..cacadba2180b 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.9.1"; + version = "5.9.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qDc6E6d6hIHgRBNDGUHaJ7ROP24xDUXK1rkXTX187g0="; + hash = "sha256-E1LjzE4UbbHwn6QodVkkjIs9nAz+zqVsJcP09j1Y5Pg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 32949b14c332..deab86952e76 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.19.2"; - format = "setuptools"; + version = "2.21.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F6UDRZLoXvADHSW75YlL2y1xlGCFWYC/62iqTo/8Er0="; + hash = "sha256-8GrZ38gBVE+6EYN4i5ZPawF0g6Zgkapoa1Gr0HSAbIQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core @@ -36,9 +41,11 @@ buildPythonPackage rec { pytestCheckHook ]; - # Disable tests that need credentials disabledTests = [ + # Disable tests that need credentials "test_list_global_key_rings" + # Tests require PROJECT_ID + "test_list_ekm_connections" ]; pythonImportsCheck = [ @@ -48,8 +55,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Key Management Service (KMS) API API client library"; - homepage = "https://github.com/googleapis/python-kms"; - changelog = "https://github.com/googleapis/python-kms/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-kms-v${version}/packages/google-cloud-kms/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 8d0d27a77f69..ec901eb34a4f 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.19.6"; + version = "2.19.7"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Tq5LyYRj29rq11l/dmb/4U/GKqvtEOPjIslcsFD6fb4="; + hash = "sha256-2l8eshfAcnvvp8hbm5XmqJsytCLVSMnPmh4ClBAnC4c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 32304fad221f..679d8631aaee 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.18.1"; + version = "2.18.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MQVV88jLl39KRtRFTsosg/7WoJ88SzW4T2+h+P71UCQ="; + hash = "sha256-oA1iEVpwCD6GsdRMp+vK4EGzakTMYupX3kAFcx+NPIg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gradio/client.nix b/nixpkgs/pkgs/development/python-modules/gradio/client.nix index 1d7223e6a248..8ad76a907581 100644 --- a/nixpkgs/pkgs/development/python-modules/gradio/client.nix +++ b/nixpkgs/pkgs/development/python-modules/gradio/client.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "0.7.3"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,10 +36,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; - #rev = "refs/tags/v${gradio.version}"; - rev = "dc131b64f05062447643217819ca630e483a11df"; # v4.9.1 is not tagged... + rev = "refs/tags/gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-Zp1Zl53Va0pyyZEHDUpnldi4dtH2uss7PZQD+Le8+cA="; + hash = "sha256-cRsYqNMmzuybJI823lpUOmNcTdcTO8dJkp3cpjATZQU="; }; prePatch = '' cd client/python diff --git a/nixpkgs/pkgs/development/python-modules/gradio/default.nix b/nixpkgs/pkgs/development/python-modules/gradio/default.nix index bead2da9dfd7..c87c41631291 100644 --- a/nixpkgs/pkgs/development/python-modules/gradio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gradio/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.9.1"; + version = "4.19.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -66,7 +66,7 @@ buildPythonPackage rec { # and upstream has stopped tagging releases since 3.41.0 src = fetchPypi { inherit pname version; - hash = "sha256-KosxlmU5pYvuy5zysscuWM25IGXin7RLGEM9V2xPQrU="; + hash = "sha256-b+WBW7Tfru0fx0Ijv/2R2nChtGMVivjF4D0BuwkGih0="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -81,6 +81,12 @@ buildPythonPackage rec { "tomlkit" ]; + pythonRemoveDeps = [ + # our package is presented as a binary, not a python lib - and + # this isn't a real runtime dependency + "ruff" + ]; + nativeBuildInputs = [ pythonRelaxDepsHook hatchling @@ -164,6 +170,9 @@ buildPythonPackage rec { # shap is too often broken in nixpkgs "test_shapley_text" + + # fails without network + "test_download_if_url_correct_parse" ]; disabledTestPaths = [ # 100% touches network @@ -193,7 +202,6 @@ buildPythonPackage rec { gradio-pdf = null; })).overridePythonAttrs (old: { pname = old.pname + "-sans-client"; - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pythonRelaxDepsHook ]; pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio-client" ]; doInstallCheck = false; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/graphviz/default.nix b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix index 8f145c13e722..8a5286c65609 100644 --- a/nixpkgs/pkgs/development/python-modules/graphviz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , fetchpatch , substituteAll -, graphviz +, graphviz-nox , xdg-utils , makeFontsConf , freefont_ttf @@ -34,7 +34,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./paths.patch; - inherit graphviz; + graphviz = graphviz-nox; xdgutils = xdg-utils; }) # https://github.com/xflr6/graphviz/issues/209 diff --git a/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/nixpkgs/pkgs/development/python-modules/griffe/default.nix index d3e9ca2ae7f4..8f2884a5b6c6 100644 --- a/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.40.1"; - format = "pyproject"; + version = "0.41.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mkdocstrings"; - repo = pname; + repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-DaLxGEwR2Z9IEkKbLkOy7Q3dvvmwTNBNMzYxNoeZMJE="; + hash = "sha256-or0kXc8YJl7+95gM54MaviDdErN0vqBnCtAavZM938k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix b/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix index e37c6a680742..02e336c8bc1f 100644 --- a/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.4.0"; + version = "2.4.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-bZtcvidjUhlb9ML1UIP00yqJ+KnJig5i0j/tAZSK7+Y="; + hash = "sha256-Ka8WqOYsZFvNl7uOsGR6S4entw7GTnF9MZcOB3uJMvg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/nixpkgs/pkgs/development/python-modules/holidays/default.nix index 539caf7083d8..87069dcbbaa0 100644 --- a/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.42"; + version = "0.43"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-oVuzX/H5jj/c4dbPGmXUnZeDbgSd9v9qP2dXe6+PaUQ="; + hash = "sha256-8Qm8hzGVkaYLwqUcqUxcY4iDR1jrhnSoBS8E2Wewb+U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 44fb32e25c2d..6ffdda58a6ce 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2024.1.0"; + version = "2024.2.1"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-4btkqAHbwAsyGV1LjngEoeTT5qyI8dtqFVTp0lIFwmg="; + hash = "sha256-QMsfs9gUWeaz1LfMZF5J2OFVCPnuckZvvF9x5bQ5uZY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix index a983bdd0a2cf..b3d5a232c10a 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -10,7 +10,6 @@ # runtime , glib , libnl -, openssl_1_1 # propagates , aenum @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2024.1.0"; + version = "2024.2.1"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -38,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-UiikZ2DVhTqX6WYfiE8sp2e52BMlyoQnDjLap/efmNc="; + hash = "sha256-gHnTuiyCD9A9Ru8xhniNEpCyn+W9zYnCAoTJeGOW7TI="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-/+gegUMd2n7MpJvdilS5VWefXc0tuRcLrXBBXSH35b0="; + hash = "sha256-gKZKcCXQ8PvZAPV2QRQl+u+r95CVLBDDDgtC0MT7xw4="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); in fetchPypi { @@ -62,7 +61,6 @@ buildPythonPackage rec { buildInputs = [ glib libnl - openssl_1_1 ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index 17ad769329c7..f57aa1a4cbb9 100644 --- a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -1,7 +1,8 @@ { lib -, fetchFromGitHub , buildPythonPackage , pythonOlder +, fetchFromGitHub +, setuptools , filelock , fsspec , packaging @@ -13,8 +14,8 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.20.3"; - format = "setuptools"; + version = "0.21.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,9 +23,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-21Ay8RVS2vtQIh4bBUxE8jFk6F+yeFBJ3XgvRRNtNgI="; + hash = "sha256-0Nr6qs9rzuBQo8SGuQ2Ai2Q+E+Gs4DT/AMrYf7dYM/E="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ filelock fsspec @@ -47,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/huggingface_hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ kira-bruneau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix b/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix index 8c2e49a6e4e5..c6d68d83dbff 100644 --- a/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix @@ -17,7 +17,7 @@ , geopandas , google-cloud-bigquery , google-cloud-bigquery-storage -, graphviz-nox +, graphviz , hypothesis , multipledispatch , numpy @@ -25,15 +25,17 @@ , packaging , pandas , parsy +, pins , poetry-core , poetry-dynamic-versioning , polars -, pooch , psycopg2 , pyarrow +, pyarrow-hotfix , pydata-google-auth , pydruid , pymysql +, pyodbc , pyspark , pytest-benchmark , pytest-httpserver @@ -63,7 +65,7 @@ let name = "ibis-testing-data"; owner = "ibis-project"; repo = "testing-data"; - # https://github.com/ibis-project/ibis/blob/7.1.0/nix/overlay.nix#L20-L26 + # https://github.com/ibis-project/ibis/blob/8.0.0/nix/overlay.nix#L20-L26 rev = "2c6a4bb5d5d525058d8d5b2312a9fee5dafc5476"; hash = "sha256-Lq503bqh9ESZJSk6yVq/uZwkAubzmSmoTBZSsqMm0DY="; }; @@ -71,8 +73,8 @@ in buildPythonPackage rec { pname = "ibis-framework"; - version = "7.1.0"; - format = "pyproject"; + version = "8.0.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -81,7 +83,7 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = "refs/tags/${version}"; - hash = "sha256-E7jryoidw6+CjTIex4wcTXcU+8Kg8LDwg7wJvcwj+7Q="; + hash = "sha256-KcNZslqmSbu8uPYKpkyvd7d8Fsf0nQt80y0auXsI8fs="; }; nativeBuildInputs = [ @@ -94,25 +96,24 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic bidict - filelock multipledispatch numpy pandas parsy - pooch pyarrow + pyarrow-hotfix python-dateutil pytz rich sqlglot toolz typing-extensions - ] - ++ pooch.optional-dependencies.progress - ++ pooch.optional-dependencies.xxhash; + ]; nativeCheckInputs = [ pytestCheckHook + black + filelock hypothesis pytest-benchmark pytest-httpserver @@ -126,35 +127,28 @@ buildPythonPackage rec { "--dist=loadgroup" "-m" "'${lib.concatStringsSep " or " testBackends} or core'" + ]; + + disabledTests = [ # breakage from sqlalchemy2 truediv changes - "--deselect=ibis/tests/sql/test_sqlalchemy.py::test_tpc_h17" + "test_tpc_h17" # tries to download duckdb extensions - "--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite" - "--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite" - + "test_register_sqlite" + "test_read_sqlite" # duckdb does not respect sample_size=2 (reads 3 lines of csv). - "--deselect=ibis/backends/tests/test_register.py::test_csv_reregister_schema" - + "test_csv_reregister_schema" # duckdb fails with: # "This function can not be called with an active transaction!, commit or abort the existing one first" - "--deselect=ibis/backends/tests/test_udf.py::test_vectorized_udf" - "--deselect=ibis/backends/tests/test_udf.py::test_map_merge_udf" - "--deselect=ibis/backends/tests/test_udf.py::test_udf" - "--deselect=ibis/backends/tests/test_udf.py::test_map_udf" - - # pyarrow13 is not supported yet. - "--deselect=ibis/backends/tests/test_temporal.py::test_date_truncate" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_interval_add_cast_column" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_filter_before_window" - "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf" - "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf" - "--deselect=ibis/backends/tests/test_aggregation.py::test_aggregate_grouped" + "test_vectorized_udf" + "test_s3_403_fallback" + "test_map_merge_udf" + "test_udf" + "test_map_udf" + # DataFusion error + "datafusion" + # pluggy.PluggyTeardownRaisedWarning + "test_repr_png_is_not_none_in_not_interactive" + "test_interval_arithmetic" ]; # patch out tests that check formatting with black @@ -162,7 +156,6 @@ buildPythonPackage rec { find ibis/tests -type f -name '*.py' -exec sed -i \ -e '/^ *assert_decompile_roundtrip/d' \ -e 's/^\( *\)code = ibis.decompile(expr, format=True)/\1code = ibis.decompile(expr)/g' {} + - substituteInPlace pyproject.toml --replace 'sqlglot = ">=10.4.3,<12"' 'sqlglot = "*"' ''; preCheck = '' @@ -188,20 +181,22 @@ buildPythonPackage rec { dask = [ dask regex ]; datafusion = [ datafusion ]; druid = [ pydruid sqlalchemy ]; - duckdb = [ duckdb duckdb-engine packaging sqlalchemy sqlalchemy-views ]; + duckdb = [ duckdb duckdb-engine sqlalchemy sqlalchemy-views ]; flink = [ ]; geospatial = [ geoalchemy2 geopandas shapely ]; + mssql = [ sqlalchemy pyodbc sqlalchemy-views ]; mysql = [ sqlalchemy pymysql sqlalchemy-views ]; oracle = [ sqlalchemy oracledb packaging sqlalchemy-views ]; pandas = [ regex ]; - polars = [ polars ]; + polars = [ polars packaging ]; postgres = [ psycopg2 sqlalchemy sqlalchemy-views ]; - pyspark = [ pyspark sqlalchemy ]; - snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views ]; - sqlite = [ regex sqlalchemy sqlite sqlalchemy-views ]; + pyspark = [ pyspark sqlalchemy packaging ]; + snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views packaging ]; + sqlite = [ regex sqlalchemy sqlalchemy-views ]; trino = [ trino-python-client sqlalchemy sqlalchemy-views ]; - visualization = [ graphviz-nox ]; + visualization = [ graphviz ]; decompiler = [ black ]; + examples = [ pins ] ++ pins.optional-dependencies.gcs; }; }; diff --git a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 5d27b9d490e1..46a5eb3e3691 100644 --- a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.19.1"; + version = "3.19.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oPDcQSWNWG9wauSVW7srXN85+UeF6Q0CRlaSyqh2W/Q="; + hash = "sha256-qodN9ALyAfzsrCAiPT3t02JJRCBqFCNVWlsQP+4d3do="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/indexed-bzip2/default.nix b/nixpkgs/pkgs/development/python-modules/indexed-bzip2/default.nix index d6c82e3aec9a..b75a10b98222 100644 --- a/nixpkgs/pkgs/development/python-modules/indexed-bzip2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/indexed-bzip2/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "indexed_bzip2"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tKf9odadfQZQYJz//vWYpeB99Z8VLg+hEPvfEHXgdnM="; + hash = "sha256-3HUiigZR91/nbOAMOuSHGcPtqkkEaj3VepyMhmKOHpI="; }; # has no tests diff --git a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index 991dcb320314..94441890c7aa 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -62,6 +62,8 @@ buildPythonPackage rec { # Pandas API changes cause it to no longer infer datetimes in the expected manner "test_multiquery_into_dataframe" "test_multiquery_into_dataframe_dropna" + # FutureWarning: 'H' is deprecated and will be removed in a future version, please use 'h' instead. + "test_write_points_from_dataframe_with_tag_escaped" ]; pythonImportsCheck = [ "influxdb" ]; diff --git a/nixpkgs/pkgs/development/python-modules/intake-parquet/default.nix b/nixpkgs/pkgs/development/python-modules/intake-parquet/default.nix index 9ef6affb5119..809d9efcc7ca 100644 --- a/nixpkgs/pkgs/development/python-modules/intake-parquet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/intake-parquet/default.nix @@ -5,20 +5,34 @@ , dask , fastparquet , pyarrow +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "intake-parquet"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "intake"; - repo = pname; - rev = version; - sha256 = "sha256-zSwylXBKOM/tG5mwYtc0FmxwcKJ6j+lw1bxJqf57NY8="; + repo = "intake-parquet"; + rev = "refs/tags/${version}"; + hash = "sha256-zSwylXBKOM/tG5mwYtc0FmxwcKJ6j+lw1bxJqf57NY8="; }; + postPatch = '' + # Break circular dependency + substituteInPlace requirements.txt \ + --replace-fail "intake" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandas dask @@ -26,12 +40,6 @@ buildPythonPackage rec { pyarrow ]; - postPatch = '' - # Break circular dependency - substituteInPlace requirements.txt \ - --replace "intake" "" - ''; - doCheck = false; #pythonImportsCheck = [ "intake_parquet" ]; diff --git a/nixpkgs/pkgs/development/python-modules/intake/default.nix b/nixpkgs/pkgs/development/python-modules/intake/default.nix index d4f9c66806ce..b15e90cda27f 100644 --- a/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , appdirs , bokeh , buildPythonPackage @@ -19,14 +20,15 @@ , pythonOlder , pyyaml , requests -, stdenv +, setuptools +, setuptools-scm , tornado }: buildPythonPackage rec { pname = "intake"; - version = "0.7.0"; - format = "setuptools"; + version = "2.0.3"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -34,9 +36,14 @@ buildPythonPackage rec { owner = "intake"; repo = "intake"; rev = "refs/tags/${version}"; - hash = "sha256-LK4abwPViEFJZ10bbRofF2aw2Mj0dliKwX6dFy93RVQ="; + hash = "sha256-Fyv85HkoE9OPOoSHR1sgCG0iAFuSiQMT7cyZcQyLvv0="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ appdirs dask @@ -73,11 +80,6 @@ buildPythonPackage rec { ]; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - ''; - __darwinAllowLocalNetworking = true; preCheck = '' @@ -85,6 +87,20 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; + disabledTestPaths = [ + # Missing plusins + "intake/catalog/tests/test_alias.py" + "intake/catalog/tests/test_gui.py" + "intake/catalog/tests/test_local.py" + "intake/catalog/tests/test_reload_integration.py" + "intake/source/tests/test_csv.py" + "intake/source/tests/test_derived.py" + "intake/source/tests/test_npy.py" + "intake/source/tests/test_text.py" + "intake/tests/test_config.py" + "intake/tests/test_top_level.py" + ]; + disabledTests = [ # Disable tests which touch network "http" @@ -103,23 +119,10 @@ buildPythonPackage rec { "test_remote_cat" "test_remote_env" # ValueError - "test_mlist_parameter" - # ImportError - "test_dataframe" - "test_ndarray" - "test_python" + "test_datasource_python_to_dask" + "test_catalog_passthrough" # Timing-based, flaky on darwin and possibly others "test_idle_timer" - # arrow-cpp-13 related - "test_read" - "test_pickle" - "test_read_dask" - "test_read_list" - "test_read_list_with_glob" - "test_to_dask" - "test_columns" - "test_df_transform" - "test_pipeline_apply" ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # Flaky with older low-res mtime on darwin < 10.13 (#143987) "test_second_load_timestamp" diff --git a/nixpkgs/pkgs/development/python-modules/jax/default.nix b/nixpkgs/pkgs/development/python-modules/jax/default.nix index 0450f73e639b..d41987c9a539 100644 --- a/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -1,6 +1,7 @@ { lib , blas , buildPythonPackage +, callPackage , setuptools , importlib-metadata , fetchFromGitHub @@ -126,6 +127,23 @@ buildPythonPackage rec { pythonImportsCheck = [ "jax" ]; + # Test CUDA-enabled jax and jaxlib. Running CUDA-enabled tests is not + # currently feasible within the nix build environment so we have to maintain + # this script separately. See https://github.com/NixOS/nixpkgs/pull/256230 + # for a possible remedy to this situation. + # + # Run these tests with eg + # + # NIXPKGS_ALLOW_UNFREE=1 nixglhost -- nix run --impure .#python3Packages.jax.passthru.tests.test_cuda_jaxlibBin + passthru.tests = { + test_cuda_jaxlibSource = callPackage ./test-cuda.nix { + jaxlib = jaxlib.override { cudaSupport = true; }; + }; + test_cuda_jaxlibBin = callPackage ./test-cuda.nix { + jaxlib = jaxlib-bin.override { cudaSupport = true; }; + }; + }; + meta = with lib; { description = "Differentiate, compile, and transform Numpy code"; homepage = "https://github.com/google/jax"; diff --git a/nixpkgs/pkgs/development/python-modules/jax/test-cuda.nix b/nixpkgs/pkgs/development/python-modules/jax/test-cuda.nix new file mode 100644 index 000000000000..d156061f3849 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jax/test-cuda.nix @@ -0,0 +1,17 @@ +{ jax +, jaxlib +, pkgs +}: + +pkgs.writers.writePython3Bin "jax-test-cuda" { libraries = [ jax jaxlib ]; } '' + import jax + from jax import random + + assert jax.devices()[0].platform == "gpu" + + rng = random.PRNGKey(0) + x = random.normal(rng, (100, 100)) + x @ x + + print("success!") +'' diff --git a/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index 0bcf055a8766..199b352b2aa2 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -2,16 +2,7 @@ # backend will require some additional work. Those wheels are located here: # https://storage.googleapis.com/jax-releases/libtpu_releases.html. -# For future reference, the easiest way to test the GPU backend is to run -# NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib-bin.override { cudaSupport = true; }" -# export XLA_FLAGS=--xla_gpu_force_compilation_parallelism=1 -# python -c "from jax.lib import xla_bridge; assert xla_bridge.get_backend().platform == 'gpu'" -# python -c "from jax import random; random.PRNGKey(0)" -# python -c "from jax import random; x = random.normal(random.PRNGKey(0), (100, 100)); x @ x" -# There's no convenient way to test the GPU backend in the derivation since the -# nix build environment blocks access to the GPU. See also: -# * https://github.com/google/jax/issues/971#issuecomment-508216439 -# * https://github.com/google/jax/issues/5723#issuecomment-913038780 +# See `python3Packages.jax.passthru` for CUDA tests. { absl-py , autoPatchelfHook @@ -32,12 +23,21 @@ }: let - inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudatoolkit cudnn cudaVersion; + inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaVersion; version = "0.4.24"; inherit (python) pythonVersion; + cudaLibPath = lib.makeLibraryPath (with cudaPackagesGoogle; [ + cuda_cudart.lib # libcudart.so + cuda_cupti.lib # libcupti.so + cudnn.lib # libcudnn.so + libcufft.lib # libcufft.so + libcusolver.lib # libcusolver.so + libcusparse.lib # libcusparse.so + ]); + # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the # official instructions recommend installing CPU-only versions via PyPI. cpuSrcs = @@ -189,18 +189,12 @@ buildPythonPackage { # autoPatchelfHook. That means we need to sneak them into rpath. This step # must be done after autoPatchelfHook and the automatic stripping of # artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the - # patchPhase. Dependencies: - # * libcudart.so.11.0 -> cudatoolkit_11.lib - # * libcublas.so.11 -> cudatoolkit_11 - # * libcuda.so.1 -> opengl driver in /run/opengl-driver/lib + # patchPhase. preInstallCheck = lib.optional cudaSupport '' shopt -s globstar for file in $out/**/*.so; do - rpath=$(patchelf --print-rpath $file) - # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to - # <cudatoolkit_11.lib>/lib which is different from <cudatoolkit_11>/lib. - patchelf --set-rpath "$rpath:${cudatoolkit}/lib:${lib.makeLibraryPath [ cudatoolkit.lib cudnn ]}" $file + patchelf --add-rpath "${cudaLibPath}" "$file" done ''; @@ -211,12 +205,14 @@ buildPythonPackage { scipy ]; - # Note that cudatoolkit is snecessary since jaxlib looks for "ptxas" in $PATH. - # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for - # more info. + # jaxlib looks for ptxas at runtime, eg when running `jax.random.PRNGKey(0)`. + # Linking into $out is the least bad solution. See + # * https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 + # * https://github.com/NixOS/nixpkgs/pull/288829#discussion_r1493852211 + # for more info. postInstall = lib.optional cudaSupport '' - mkdir -p $out/bin - ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas + mkdir -p $out/${python.sitePackages}/jaxlib/cuda/bin + ln -s ${lib.getExe' cudaPackagesGoogle.cuda_nvcc "ptxas"} $out/${python.sitePackages}/jaxlib/cuda/bin/ptxas ''; inherit (jaxlib-build) pythonImportsCheck; @@ -229,8 +225,8 @@ buildPythonPackage { maintainers = with maintainers; [ samuela ]; platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; broken = - !(cudaSupport -> (cudaPackagesGoogle ? cudatoolkit) && lib.versionAtLeast cudatoolkit.version "11.1") - || !(cudaSupport -> (cudaPackagesGoogle ? cudnn) && lib.versionAtLeast cudnn.version "8.2") + !(cudaSupport -> lib.versionAtLeast cudaVersion "11.1") + || !(cudaSupport -> lib.versionAtLeast cudaPackagesGoogle.cudnn.version "8.2") || !(cudaSupport -> stdenv.isLinux) || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")); }; diff --git a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index a934b793c60e..6746fd6eb710 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -3,15 +3,16 @@ , buildPythonPackage , fetchFromGitHub , orjson -, unittestCheckHook , pythonOlder , redis +, setuptools +, unittestCheckHook }: buildPythonPackage rec { pname = "karton-core"; - version = "5.3.2"; - format = "setuptools"; + version = "5.3.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-/MPD83sBo9n/dI1uXbHbjvz6upJSJrssMGmGwfQ+KE8="; + hash = "sha256-RVHhMKoQAqsddziK/vWGynSL9mxMuccNEGzoJTx8KAA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ boto3 orjson diff --git a/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix b/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix index ec41ce9f27f9..2c14e72bcf96 100644 --- a/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix @@ -1,36 +1,38 @@ { lib +, azure-storage-blob +, boto3 , buildPythonPackage , fetchFromGitHub +, python-dotenv , pythonOlder - -# build +, requests +, responses , setuptools , setuptools-git-versioning , setuptools-scm - -# propagates -, azure-storage-blob -, boto3 -, requests - -# tests -, responses , unittestCheckHook +, urllib3 }: + buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.7.1"; - format = "pyproject"; + version = "0.7.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "keboola"; - repo = pname; + repo = "sapi-python-client"; rev = "refs/tags/${version}"; - hash = "sha256-74sChw6eMkBtfHV6hiaaLNOr/J0Sa73LB93Z8muLaiI="; + hash = "sha256-uZo2kEq7zIMGRlhX36kZyihQPZegw5XgVzgVQQOmpc4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "urllib3<2.0.0" "urllib3" + ''; + nativeBuildInputs = [ setuptools setuptools-git-versioning @@ -40,18 +42,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-storage-blob boto3 + python-dotenv requests + responses + urllib3 ]; # Requires API token and an active Keboola bucket # ValueError: Root URL is required. doCheck = false; - nativeCheckInputs = [ - unittestCheckHook - responses - ]; - pythonImportsCheck = [ "kbcstorage" "kbcstorage.buckets" diff --git a/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix b/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix index 9196aef28b5d..ccd74777f32d 100644 --- a/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.26"; + version = "0.1.27"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-YYZ1jWIBVyOqxn7xogVWldA+gsTdQHQheXWwxi+vSxc="; + hash = "sha256-aYQUIjUlwLwTDYWmFOFJOQXViKty/gya07U3sdxiBn8="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/langsmith/default.nix b/nixpkgs/pkgs/development/python-modules/langsmith/default.nix index 919e64a3cf44..b3f4dc1119d7 100644 --- a/nixpkgs/pkgs/development/python-modules/langsmith/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langsmith/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.6"; + version = "0.1.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-IjKlyfYA7HH+fXPsV5lWd8BOXooJFZy0WxkUy2lm4bI="; + hash = "sha256-9My/0DPN6AwAFoAiTdl6jd2GtX4fpFIgpnZe/WzAi9c="; }; sourceRoot = "${src.name}/python"; diff --git a/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix b/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix index f4657dce8458..4b83fb53252e 100644 --- a/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ldfparser"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "c4deszes"; repo = "ldfparser"; rev = "refs/tags/v${version}"; - hash = "sha256-gSjTuMndkzFUDcixJCohuCChhztFXnLpbK/zTOjEBpg="; + hash = "sha256-+7L2WCQEDpWPDBPVt4ddoz0U4YkJ9GqQqp0cKj2fAXM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index c0df7019ed96..fbccd1be7363 100644 --- a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.25.0"; - format = "pyproject"; + version = "0.31.0"; + pyproject = true; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cAogRdhJdXC0lMQRlWwSHQj205mG9uwd1XkFJYsAetA="; + hash = "sha256-MzHS/HzEZ4vDfNRpJ9AU9vFkw7LwloltxyibxEGWRSw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/litellm/default.nix b/nixpkgs/pkgs/development/python-modules/litellm/default.nix index 4f7349ea30f5..0a765a43dfc4 100644 --- a/nixpkgs/pkgs/development/python-modules/litellm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.26.8"; + version = "1.28.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-w2d33mYNgQ+S+000ZswyqXE8RxOUQaH89R7M6PHe020="; + hash = "sha256-rmgKitWY2YFa+L9vpjXCsx5rCS2UrrobyKoleP5taG0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix new file mode 100644 index 000000000000..5663e9f11828 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-llms-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-agent-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/agent/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-llms-openai + ]; + + pythonImportsCheck = [ + "llama_index.agent.openai" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-cli/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-cli/default.nix new file mode 100644 index 000000000000..de4aacdd5adc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-embeddings-openai +, llama-index-llms-openai +, llama-index-vector-stores-chroma +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-cli"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-embeddings-openai + llama-index-llms-openai + llama-index-vector-stores-chroma + ]; + + pythonImportsCheck = [ + "llama_index.cli" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix new file mode 100644 index 000000000000..708230eed628 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix @@ -0,0 +1,115 @@ +{ lib +, aiohttp +, buildPythonPackage +, dataclasses-json +, deprecated +, dirtyjson +, fetchFromGitHub +, fsspec +, llamaindex-py-client +, nest-asyncio +, networkx +, nltk +, numpy +, openai +, pandas +, pillow +, poetry-core +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, tree-sitter +, sqlalchemy +, tenacity +, tiktoken +, typing-inspect +}: + +buildPythonPackage rec { + pname = "llama-index-core"; + version = "0.10.14"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "run-llama"; + repo = "llama_index"; + rev = "refs/tags/v${version}"; + hash = "sha256-9EbhiW2VPaX6Ffrm5a3pJxw2M73x1JOna+OurSJErSM="; + }; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + dataclasses-json + deprecated + dirtyjson + fsspec + llamaindex-py-client + nest-asyncio + networkx + nltk + numpy + openai + pandas + pillow + pyyaml + requests + sqlalchemy + tenacity + tiktoken + typing-inspect + ]; + + nativeCheckInputs = [ + tree-sitter + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/agent/" + "tests/callbacks/" + "tests/chat_engine/" + "tests/evaluation/" + "tests/indices/" + "tests/ingestion/" + "tests/memory/" + "tests/node_parser/" + "tests/objects/" + "tests/playground/" + "tests/postprocessor/" + "tests/query_engine/" + "tests/question_gen/" + "tests/response_synthesizers/" + "tests/retrievers/" + "tests/selectors/" + "tests/test_utils.py" + "tests/text_splitter/" + "tests/token_predictor/" + "tests/tools/" + ]; + + meta = with lib; { + description = "Data framework for your LLM applications"; + homepage = "https://github.com/run-llama/llama_index/"; + changelog = "https://github.com/run-llama/llama_index/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix new file mode 100644 index 000000000000..6b371c816983 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, google-generativeai +, llama-index-core +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-gemini"; + version = "0.1.3"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + google-generativeai + llama-index-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.embeddings.gemini" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-google/default.nix new file mode 100644 index 000000000000..6cf2d1772163 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, google-generativeai +, llama-index-core +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-google"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + google-generativeai + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.embeddings.google" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix new file mode 100644 index 000000000000..41e3843220f5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.embeddings.openai" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix new file mode 100644 index 000000000000..c778fb0e0512 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, llama-index-core +}: + +buildPythonPackage rec { + pname = "llama-index-indices-managed-llama-cloud"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/indices/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.indices.managed.llama_cloud" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-legacy/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-legacy/default.nix new file mode 100644 index 000000000000..e490c3db7e88 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, llama-index-core +}: + +buildPythonPackage rec { + pname = "llama-index-legacy"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix new file mode 100644 index 000000000000..c0b10abd0251 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, llama-index-core +}: + +buildPythonPackage rec { + pname = "llama-index-llms-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/llms/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.llms.openai" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix new file mode 100644 index 000000000000..825b001f5c61 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-llms-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-multi-modal-llms-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/multi_modal_llms/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-llms-openai + ]; + + pythonImportsCheck = [ + "llama_index.multi_modal_llms.openai" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix new file mode 100644 index 000000000000..d30bb7fb709c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-agent-openai +, llama-index-core +, llama-index-llms-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-program-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/program/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-agent-openai + llama-index-core + llama-index-llms-openai + ]; + + pythonImportsCheck = [ + "llama_index.program.openai" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix new file mode 100644 index 000000000000..a1dadcd941f8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-llms-openai +, llama-index-program-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-question-gen-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/question_gen/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-llms-openai + llama-index-program-openai + ]; + + pythonImportsCheck = [ + "llama_index.question_gen.openai" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix new file mode 100644 index 000000000000..05bbdec8f258 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -0,0 +1,46 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +, pymupdf +, pypdf +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "llama-index-readers-file"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + pythonRelaxDeps = [ + "beautifulsoup4" + "pymupdf" + "pypdf" + ]; + + pythonRemoveDeps = [ + "bs4" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + llama-index-core + pymupdf + pypdf + ]; + + pythonImportsCheck = [ + "llama_index.readers.file" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-json/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-json/default.nix new file mode 100644 index 000000000000..c29dcd78c433 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "llama-index-readers-json"; + version = "0.1.2"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.readers.json" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix new file mode 100644 index 000000000000..b9dfde0273e2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-parse +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-readers-llama-parse"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-parse + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.readers.llama_parse" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-weather/default.nix new file mode 100644 index 000000000000..773c737f342d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +, pyowm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "llama-index-readers-weather"; + version = "0.1.4"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + pyowm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.readers.weather" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix new file mode 100644 index 000000000000..62e89093066d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, chromadb +, fetchFromGitHub +, llama-index-core +, onnxruntime +, poetry-core +, pythonRelaxDepsHook +, tokenizers +}: + +buildPythonPackage rec { + pname = "llama-index-vector-stores-chroma"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/vector_stores/${pname}"; + + pythonRelaxDeps = [ + "onnxruntime" + "tokenizers" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + chromadb + llama-index-core + onnxruntime + tokenizers + ]; + + pythonImportsCheck = [ + "llama_index.vector_stores.chroma" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index/default.nix new file mode 100644 index 000000000000..4e269039722f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, llama-index-agent-openai +, llama-index-cli +, llama-index-core +, llama-index-embeddings-openai +, llama-index-indices-managed-llama-cloud +, llama-index-legacy +, llama-index-llms-openai +, llama-index-multi-modal-llms-openai +, llama-index-program-openai +, llama-index-question-gen-openai +, llama-index-readers-file +, llama-index-readers-llama-parse +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-agent-openai + llama-index-cli + llama-index-core + llama-index-embeddings-openai + llama-index-indices-managed-llama-cloud + llama-index-legacy + llama-index-llms-openai + llama-index-multi-modal-llms-openai + llama-index-program-openai + llama-index-question-gen-openai + llama-index-readers-file + llama-index-readers-llama-parse + ]; + + pythonImportsCheck = [ + "llama_index" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix b/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix new file mode 100644 index 000000000000..a38852ff6bfc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-parse"; + version = "0.3.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_parse"; + inherit version; + hash = "sha256-WjBWnDkKuQidrWbPKoyWf4wh13ZB3uwKkiZy304Wz6M="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_parse" + ]; + + meta = with lib; { + description = "Parse files into RAG-Optimized formats"; + homepage = "https://pypi.org/project/llama-parse/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix b/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix new file mode 100644 index 000000000000..d46e070c9517 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httpx +, poetry-core +, pydantic +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llamaindex-py-client"; + version = "0.1.13"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llamaindex_py_client"; + inherit version; + hash = "sha256-O9m0Ne4KeBceukEt6lZ02BPrW/NuV308fH6Q7cVJANk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + httpx + pydantic + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "llama_index_client" + ]; + + meta = with lib; { + description = "Client for LlamaIndex"; + homepage = "https://pypi.org/project/llamaindex-py-client/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/lxml-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/lxml-stubs/default.nix index 8df03f526896..abb0d17f3918 100644 --- a/nixpkgs/pkgs/development/python-modules/lxml-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lxml-stubs/default.nix @@ -1,35 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools -, pytestCheckHook -, pytest-mypy-plugins , lxml +, pytest-mypy-plugins +, pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "lxml-stubs"; - version = "0.4.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml-stubs"; - rev = version; - hash = "sha256-RRH/taLtgaXOl0G/ve2Ad7Xy8WRDUG2/k26EFMv1PRM="; + rev = "refs/tags/${version}"; + hash = "sha256-OwaPnCr0vylhdAvMMUfGV6DjZEh7Q71pgMOt66urg5I="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ lxml ]; + nativeCheckInputs = [ pytestCheckHook pytest-mypy-plugins ]; + disabledTests = [ + # Output difference, https://github.com/lxml/lxml-stubs/issues/101 + "etree_element_iterchildren" + ]; + meta = with lib; { description = "Type stubs for the lxml package"; homepage = "https://github.com/lxml/lxml-stubs"; diff --git a/nixpkgs/pkgs/development/python-modules/meraki/default.nix b/nixpkgs/pkgs/development/python-modules/meraki/default.nix index 53d44ee85d74..cecddbb6eec9 100644 --- a/nixpkgs/pkgs/development/python-modules/meraki/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.42.0"; + version = "1.43.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PZ875cjJUUE92aBoKfgQ3tY8tVN3ksB7nITc8MK0g+w="; + hash = "sha256-llKC5bBVDlSfVDML0a9HEijM+3H5pQVuLxdukJ6sPR0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/monty/default.nix b/nixpkgs/pkgs/development/python-modules/monty/default.nix index 80256a11bfdb..77c7547e0b69 100644 --- a/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2024.2.2"; + version = "2024.2.26"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = "monty"; rev = "refs/tags/v${version}"; - hash = "sha256-tKt0IMUmx1WvnQ27PyeyEEGekOKGY33YX4af1/ipbk4="; + hash = "sha256-+NxgZ8JCoAih4nHq+KP4jym0xnKCjUXJqs+xPpKZPbs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/mplhep/default.nix b/nixpkgs/pkgs/development/python-modules/mplhep/default.nix index 64e58c97e2b8..cb42de13cca7 100644 --- a/nixpkgs/pkgs/development/python-modules/mplhep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.34"; + version = "0.3.35"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-B7pCC3n5b/cDBRDcg+p53RTad8N8iwqsLyxFA4Pm5fM="; + hash = "sha256-0l89Vh/vmi8kHeNer2ExGE1ehn1Kw3AbEUm8C55a92w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/msal/default.nix b/nixpkgs/pkgs/development/python-modules/msal/default.nix index fb6eff799fbf..6b983174f05f 100644 --- a/nixpkgs/pkgs/development/python-modules/msal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msal/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.26.0"; + version = "1.27.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IkdWB5/jOL6DhzdoK0n468IKh8HF7q9ZDarkUyuD3hU="; + hash = "sha256-MQlQPAOLprMHFSsOjTT5gRPy56eJhuKNC69bUwOv2lI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mscerts/default.nix b/nixpkgs/pkgs/development/python-modules/mscerts/default.nix index 400e0c2774e8..9dc16828c869 100644 --- a/nixpkgs/pkgs/development/python-modules/mscerts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mscerts/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "mscerts"; - version = "2023.11.29"; + version = "2024.2.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ralphje"; repo = "mscerts"; rev = "refs/tags/${version}"; - hash = "sha256-TNwpWxknCUcvXFy3UInrEx4iFZi/hLS7exvJBv3DlWo="; + hash = "sha256-ReUDpax4tvw4ZCH8zOipelIPtHi7BdgLHI/r3FNpo1c="; }; # extras_require contains signify -> circular dependency diff --git a/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/nixpkgs/pkgs/development/python-modules/msrest/default.nix index 3463931a1cb6..5f4f9869e304 100644 --- a/nixpkgs/pkgs/development/python-modules/msrest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msrest/default.nix @@ -9,16 +9,18 @@ , isodate , pytest-aiohttp , pytestCheckHook +, pythonAtLeast , pythonOlder , requests , requests-oauthlib +, setuptools , trio }: buildPythonPackage rec { pname = "msrest"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-1EXXXflhDeU+erdI+NsWxSX76ooDTl3+MyQwRzm2xV0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-core aiodns @@ -56,6 +62,12 @@ buildPythonPackage rec { "test_conf_async_requests" "test_conf_async_requests" "test_conf_async_trio_requests" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: 'TestAuthentication' object has no attribute... + "test_apikey_auth" + "test_cs_auth" + "test_eventgrid_auth" + "test_eventgrid_domain_auth" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix b/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix index e564a0fd5959..b997cd9b5065 100644 --- a/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix @@ -1,41 +1,52 @@ -{ pkgs -, lib +{ lib +, adal , buildPythonPackage , fetchFromGitHub -, isPy3k -, adal -, msrest -, mock , httpretty -, pytest +, mock +, msrest , pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { - version = "0.6.4"; - format = "setuptools"; pname = "msrestazure"; + version = "0.6.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # Pypi tarball doesnt include tests - # see https://github.com/Azure/msrestazure-for-python/pull/133 src = fetchFromGitHub { owner = "Azure"; repo = "msrestazure-for-python"; - rev = "v${version}"; - sha256 = "0ik81f0n6r27f02gblgm0vl5zl3wc6ijsscihgvc1fgm9f5mk5b5"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZZVZi0v1ucD2g5FpLaNhfNBf6Ab10fUEcEdkY4ELaEY="; }; - propagatedBuildInputs = [ adal msrest ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + adal + msrest + ]; - nativeCheckInputs = [ httpretty mock pytest ] - ++ lib.optionals isPy3k [ pytest-asyncio ]; + nativeCheckInputs = [ + httpretty + mock + pytest-asyncio + pytestCheckHook + ]; - checkPhase = '' - pytest tests/ - ''; + pythonImportsCheck = [ + "msrest" + ]; - meta = with pkgs.lib; { - description = "The runtime library 'msrestazure' for AutoRest generated Python clients."; + meta = with lib; { + description = "The runtime library 'msrestazure' for AutoRest generated Python clients"; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.mit; maintainers = with maintainers; [ bendlas jonringer ]; diff --git a/nixpkgs/pkgs/development/python-modules/myuplink/default.nix b/nixpkgs/pkgs/development/python-modules/myuplink/default.nix index 7ab0e32e231f..5b4e11a51c6f 100644 --- a/nixpkgs/pkgs/development/python-modules/myuplink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/myuplink/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "myuplink"; - version = "0.4.1"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pajzo"; repo = "myuplink"; rev = "refs/tags/${version}"; - hash = "sha256-zd1ZTLwgPD1m4SR5QVZWUvkjZtlB+VEfCZDsRELuYzE="; + hash = "sha256-UJGRQqgtbYBwfjys2sYiC3dx8Doesu34EBys5Y++qBY="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/nats-py/default.nix b/nixpkgs/pkgs/development/python-modules/nats-py/default.nix index 3c384b8c5784..93cb33f9fd07 100644 --- a/nixpkgs/pkgs/development/python-modules/nats-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nats-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.7.0"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-spKz0rKTI8hWdO6r8VLtP3G8tS9ANsjYRbinXOARCOQ="; + hash = "sha256-5lvdt1JbOmdts0CYU00bSmv0LsMQsOe//yUgyevBULE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index 4db2398c25b5..ba7a84d02ec5 100644 --- a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.17.0"; + version = "5.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-BZo4TzFrH1ATl09zRXy+1AFJSBopmByDHe7oITZy7pA="; + hash = "sha256-rp0N2k23WZ86hqqz4ByW5gdyU2eYLVppyEJEdY/Yk8w="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix index fcd74efe9237..3daac2f31d16 100644 --- a/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix @@ -1,27 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, pythonAtLeast +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { - version = "1.5.6"; - pname = "nest_asyncio"; - disabled = !(pythonAtLeast "3.5"); + pname = "nest-asyncio"; + version = "1.6.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "erdewit"; + repo = "nest_asyncio"; + rev = "refs/tags/v${version}"; + hash = "sha256-5I5WItOl1QpyI4OXZgZf8GiQ7Jlo+SJbDicIbernaU4="; }; - # tests not packaged with source dist as of 1.3.2/1.3.2, and - # can't check tests out of GitHub easily without specific commit IDs (no tagged releases) - doCheck = false; - pythonImportsCheck = [ "nest_asyncio" ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nest_asyncio" + ]; meta = with lib; { description = "Patch asyncio to allow nested event loops"; homepage = "https://github.com/erdewit/nest_asyncio"; + changelog = "https://github.com/erdewit/nest_asyncio/releases/tag/v${version}"; license = licenses.bsdOriginal; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/nibabel/default.nix b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix index 3bccab344741..7d8e021fd0cf 100644 --- a/nixpkgs/pkgs/development/python-modules/nibabel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "nibabel"; - version = "5.2.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Pfjxq5gdG9kvQzHVZVKNEmq5cX/b1M/mj0P80cK/P1I="; + hash = "sha256-tsgLLnKOS8K2XxFC2bjSKHqRAqi/hHfhFe8NgzRVmXU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nibe/default.nix b/nixpkgs/pkgs/development/python-modules/nibe/default.nix index 4dbaa2c94d3d..d065f93ade21 100644 --- a/nixpkgs/pkgs/development/python-modules/nibe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nibe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.8.0"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-baw2uJn2M0tcP897+h88aMkVul6l170Vyz6qwFHZ8+s="; + hash = "sha256-j8P/lhBjlsmnOc4Cv/a2Hdf2EPO8CEpT4IOQHtiBgQA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oci/default.nix b/nixpkgs/pkgs/development/python-modules/oci/default.nix index 15d4ec26e0a3..69eb4f00485f 100644 --- a/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.121.1"; + version = "2.122.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-oOy0gOTekPXv557dl0A0b8TJVGSUYPq38h2Fu8PN03o="; + hash = "sha256-DDUnstgyRgt7sNcGV6gqJoTzmbBCMDTjmvf2zIXpBO8="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix b/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix index daf2a58fc5ed..57750768e4db 100644 --- a/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.2.2"; + version = "3.3.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-pjdPiM23jITqYW5dklJJN5X8C8OmetIDvpN/RCLMWoE="; + hash = "sha256-+u0whEnzA5XZlqgTpQtGH25/krLLvNPycWXzBUedMRc="; }; buildInputs = [ pip ]; diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix index 5b7a0bc0f8f2..3e801b582797 100644 --- a/nixpkgs/pkgs/development/python-modules/openrazer/common.nix +++ b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix @@ -1,14 +1,14 @@ { lib , fetchFromGitHub }: rec { - version = "3.6.1"; + version = "3.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - hash = "sha256-bboTRZqJq5tKeBQuiEQAXxTHYvoldDQlwbfehjDA8EE="; + hash = "sha256-tjVWvJxcZ2maR99VRwMGCa+IK+1CjCc7jxAj4XkDUEw="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix new file mode 100644 index 000000000000..41de5bb8b60f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fastapi +, hatchling +, httpx +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-instrumentation-asgi +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, opentelemetry-util-http +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-fastapi"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-fastapi"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + fastapi + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-asgi + opentelemetry-semantic-conventions + opentelemetry-util-http + ]; + + nativeCheckInputs = [ + httpx + opentelemetry-test-utils + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ + "opentelemetry.instrumentation.fastapi" + ]; + + meta = opentelemetry-instrumentation.meta // { + description = "OpenTelemetry Instrumentation for fastapi"; + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-fastapi"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/opower/default.nix b/nixpkgs/pkgs/development/python-modules/opower/default.nix index 650565f9c11b..306f0431bfae 100644 --- a/nixpkgs/pkgs/development/python-modules/opower/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -5,13 +5,14 @@ , fetchFromGitHub , pyotp , pytestCheckHook +, python-dotenv , pythonOlder , setuptools }: buildPythonPackage rec { pname = "opower"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-aSzy1QLNGfEqHE2IQDdh9YfK+pC6j8X+5KviasSvYI8="; + hash = "sha256-O+yIxEFqD6hel1H9aUnSz/wJoEhVrg6DDZptNcJVkSw="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { aiohttp arrow pyotp + python-dotenv ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix index ef388c34a18f..a42e9950066c 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.3.0"; + version = "6.0.0"; format = "setuptools"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - hash = "sha256-yqaSBw0hVZ73H/WQeAb3USoXgsRby1ChlP4+DNeNfe0="; + hash = "sha256-tS8CtORvXydLkfuOG/xcv5pBjfzUqDvggDRUlePSboo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/overrides/default.nix b/nixpkgs/pkgs/development/python-modules/overrides/default.nix index 8109a428140d..220f7dcbed14 100644 --- a/nixpkgs/pkgs/development/python-modules/overrides/default.nix +++ b/nixpkgs/pkgs/development/python-modules/overrides/default.nix @@ -4,22 +4,27 @@ , pythonAtLeast , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "overrides"; - version = "7.4.0"; - format = "setuptools"; + version = "7.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mkorpela"; - repo = pname; + repo = "overrides"; rev = "refs/tags/${version}"; - hash = "sha256-7fbuBcb47BTVxAoKokZmGdIwHSyfyfSiCAZ4XZjWz60="; + hash = "sha256-UdahbhmRfuxKTxb6Afjny/hMgXX1UuDUrIcLjZ0Jtak="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix b/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix index d3b3e4e66949..86edb6e597cb 100644 --- a/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "3.0.3"; + version = "3.1.0"; pyproject = true; src = fetchPypi { pname = "pinecone_client"; inherit version; - hash = "sha256-KtPvdiftxNnuJI2XgYYcQ0HW0noVvAX2vvU9lYg303Q="; + hash = "sha256-RbggYBP5GpgrmU8fuqOefoyZ0w7zd4qfMZxDuMmS/EI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/nixpkgs/pkgs/development/python-modules/pontos/default.nix index ddff63f6fa7e..b2890f908d90 100644 --- a/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.2.1"; + version = "24.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; rev = "refs/tags/v${version}"; - hash = "sha256-lvmi/aYDGDHbiioFWovDpTCcqgh9hu97Wk2Lcqfd6qk="; + hash = "sha256-xg5/UDAnT6kvDfYnQn/LCHlAgpRrt19pDC8NB5RzCnc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index 4ffe4f45b3e8..73318da35818 100644 --- a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.4.0"; + version = "7.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-XYovKAk2GEMi7GE/DVtLjMbww7guGkZzDOHC7Z6ZpJo="; + hash = "sha256-XaTvLX1YA1lCSMrEEmiD2JsXoMkeQz1x0MgmnF7cjcM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pulsar-client/default.nix b/nixpkgs/pkgs/development/python-modules/pulsar-client/default.nix new file mode 100644 index 000000000000..65ce904eed4b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pulsar-client/default.nix @@ -0,0 +1,119 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, python +}: +let + version = "3.4.0"; + + inherit (python) pythonVersion; + + Srcs = + let + getSrcFromPypi = { platform, dist, hash }: fetchPypi { + inherit version platform dist hash; + pname = "pulsar_client"; + format = "wheel"; + python = dist; + abi = dist; + }; + in + { + "3.9-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp39"; + hash = "sha256-1P5ArMoLZiUkHUoQ/mJccbNj5/7el/op+Qo6cGQ33xE="; + }; + "3.9-aarch64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + dist = "cp39"; + hash = "sha256-11JQZRwMLtt7sK/JlCBqqRyfTVIAVJFN2sL+nAkQgvU="; + }; + "3.9-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp39"; + hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8="; + }; + "3.9-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp39"; + hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8="; + }; + "3.10-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp310"; + hash = "sha256-swp1kuQsdgNOmo1k1C3VurNhQl+GneVi6cytaY4ZzYg="; + }; + "3.10-aarch64-linux" = getSrcFromPypi { + platform = "musllinux_1_1_aarch64"; + dist = "cp310"; + hash = "sha256-1ZYwkKeKVkS6JfQdo6bUnqPwDJcrCVuv82WRbcJGQmo="; + }; + "3.10-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp310"; + hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo="; + }; + "3.10-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp310"; + hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo="; + }; + "3.11-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp311"; + hash = "sha256-M1cd6ZzYmDSfF5eLpi4rg56gJ1+3Bn8xv19uv+rgmH0="; + }; + "3.11-aarch64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + dist = "cp311"; + hash = "sha256-+HQ8MgqpZ5jSDK+pjql6aMQpX8SHLCOs1eAS/TbLBro="; + }; + "3.11-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp311"; + hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M="; + }; + "3.11-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp311"; + hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M="; + }; + "3.12-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp312"; + hash = "sha256-xgbATzVzQQQvpsdUd959IgT3rlCqKcL3SyTlTIX0f5Y="; + }; + "3.12-aarch64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + dist = "cp312"; + hash = "sha256-8gK4Th9oPWRnLdGXERRgCuLlw3NVhyhv+b+0MThfCOg="; + }; + "3.12-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp312"; + hash = "sha256-9/jw/wr1oUD9pOadVAaMRL081iVMUXwVgnUMcG1UNvE="; + }; + "3.12-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp312"; + hash = "sha256-9/jw/wr1oUD9pOadVAaMRL081iVMUXwVgnUMcG1UNvE="; + }; + }; + +in buildPythonPackage { + pname = "pulsar-client"; + inherit version; + + format = "wheel"; + + src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}"; + + meta = with lib; { + description = "Client for pulsar"; + homepage = "https://pypi.org/project/pulsar-client/"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix index 9a322790f865..f64913c32d33 100644 --- a/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "114"; + version = "115"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-XN6di3pxB7lhZ5TQnyHr7nKA0STBi0CVzGnhvRDsbFY="; + hash = "sha256-NjzONVSJ4GEaIeC5ytnTi8JpZY1yIq3LN8vbMy3n0vs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pydiscovergy/default.nix b/nixpkgs/pkgs/development/python-modules/pydiscovergy/default.nix index 3c87b6b6f3a1..dd51f1b964dc 100644 --- a/nixpkgs/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydiscovergy/default.nix @@ -9,6 +9,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pytz , respx }: @@ -29,6 +30,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pytz" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydub/default.nix b/nixpkgs/pkgs/development/python-modules/pydub/default.nix index e1631f74f94e..7ec3da3531cf 100644 --- a/nixpkgs/pkgs/development/python-modules/pydub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydub/default.nix @@ -1,43 +1,59 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub - -# tests +, fetchpatch , ffmpeg-full -, python +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pydub"; version = "0.25.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; - repo = pname; - rev = "v${version}"; - sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m"; + repo = "pydub"; + rev = "refs/tags/v${version}"; + hash = "sha256-FTEMT47wPXK5i4ZGjTVAhI/NjJio3F2dbBZzYzClU3c="; }; + patches = [ + # Fix test assertions, https://github.com/jiaaro/pydub/pull/769 + (fetchpatch { + name = "fix-assertions.patch"; + url = "https://github.com/jiaaro/pydub/commit/66c1bf7813ae8621a71484fdcdf609734c0d8efd.patch"; + hash = "sha256-3OIzvTgGK3r4/s5y7izHvouB4uJEmjO6cgKvegtTf7A="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + ffmpeg-full + pytestCheckHook + ]; + pythonImportsCheck = [ "pydub" "pydub.audio_segment" "pydub.playback" ]; - nativeCheckInputs = [ - ffmpeg-full + pytestFlagsArray = [ + "test/test.py" ]; - checkPhase = '' - ${python.interpreter} test/test.py - ''; - meta = with lib; { description = "Manipulate audio with a simple and easy high level interface"; homepage = "http://pydub.com"; + changelog = "https://github.com/jiaaro/pydub/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix index 4826806c19f1..05514f610ad1 100644 --- a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-Wj2CkOvH5mS+DaIcbrqHjK+0mG3gfyF5M9tFImeJ/ko="; + hash = "sha256-2dKBqGIT4D4QUMixg4ZCxWXjE2zcXoji5i2v+vAPhL4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyexiftool/default.nix b/nixpkgs/pkgs/development/python-modules/pyexiftool/default.nix new file mode 100644 index 000000000000..e7240658ef33 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyexiftool/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, exiftool +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyexiftool"; + version = "0.5.6"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "sylikc"; + repo = "pyexiftool"; + rev = "refs/tags/v${version}"; + hash = "sha256-dgQkbpCbdq2JbupY0DyQbHPR9Bg+bwDo7yN03o3sX+A="; + }; + + postPatch = '' + substituteInPlace exiftool/constants.py \ + --replace-fail 'DEFAULT_EXECUTABLE = "exiftool"' \ + 'DEFAULT_EXECUTABLE = "${lib.getExe exiftool}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ "exiftool" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/sylikc/pyexiftool/blob/${src.rev}/CHANGELOG.md"; + description = "Python wrapper for exiftool"; + homepage = "https://github.com/sylikc/pyexiftool"; + license = with lib.licenses; [ bsd3 /* or */ gpl3Plus ]; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix b/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix index 2f3cde9a51d8..1325a31fe133 100644 --- a/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-LRzyZAusCo4uZlXFWoRPIfPgAGO4sP0KCGYOICNZ6f4="; + hash = "sha256-Uw65+YOnln+IOyT+RgqMEWt5cOZsaeS8Nu8U6ooivWA="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyipp/default.nix b/nixpkgs/pkgs/development/python-modules/pyipp/default.nix index 609e75806678..3046d879ba61 100644 --- a/nixpkgs/pkgs/development/python-modules/pyipp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyipp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.14.4"; + version = "0.14.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ctalkington"; repo = "python-ipp"; - rev = version; - hash = "sha256-xE0fdT+Ffdf4iOHWZzRa7YWtHt92lFdA/sbwjblMR40="; + rev = "refs/tags/${version}"; + hash = "sha256-2YaQZWHrvz1OwD47WUl4UKoYXQBiemCWLM8m/zkipCU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pymc/default.nix b/nixpkgs/pkgs/development/python-modules/pymc/default.nix index 185250bddda5..5afa718726c8 100644 --- a/nixpkgs/pkgs/development/python-modules/pymc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymc/default.nix @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-bOrWgZaSOXXalw251cm5JUDkAARGaxmUk+z3SY6Git8="; + hash = "sha256-tiOXbryY2TmeBVrG5cIMeDJ4alolBQ5LosdfH3tpVOA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail ', "pytest-cov"' "" + ''; + propagatedBuildInputs = [ arviz cachetools @@ -37,11 +42,6 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.py \ - --replace ', "pytest-cov"' "" - ''; - # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix b/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix index 947c065fc32c..22581f493b73 100644 --- a/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pymicrobot"; - version = "0.0.16"; + version = "0.0.22"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMicroBot"; inherit version; - hash = "sha256-W1i1kKDM6DimcerhS5L7yEa32+cB032DrCAfhMCso4A="; + hash = "sha256-8Nkkgznt4JzImJSAbdaX6znhvmgqwOIBjAXVhaMorLk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix b/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix index 2dc7e9f36ebc..8d668d8249e0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.1.2"; + version = "7.1.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-iyLJ3kr0O9wa6ipgMgntH8VbSo1a6btYoQZOaogAfKw="; + hash = "sha256-BnK1ynVbxFFwocxXc6QiYJkBIgEvc1RGpfwUhqe+Gec="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix b/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix index 62b23795d502..77c1e9933261 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.9"; + version = "0.5.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; rev = "refs/tags/v${version}"; - hash = "sha256-qapJcYesOddXFChApFT7hvxLblUigDW40zRe6CYWx+s="; + hash = "sha256-3wa6hayyjWdDVqbLPCqIZ4lgcy1/EdFH4ZVggSRizZU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix b/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix index b3dd6f696006..a2eff3fc4ad8 100644 --- a/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix @@ -3,20 +3,20 @@ , fetchFromGitHub , setuptools , requests -, future +, six }: buildPythonPackage rec { pname = "pysignalclirestapi"; - version = "0.3.22"; + version = "0.3.23"; pyproject = true; src = fetchFromGitHub { owner = "bbernhard"; repo = "pysignalclirestapi"; - rev = version; - hash = "sha256-m8Sihf5vTDntd5Tbaa5o55G/k/rqtmjWreoTab58CHU="; + rev = "refs/tags/${version}"; + hash = "sha256-DI6dPh8TJElDSk2ExMk4w32ROYgc33cwWNmc3pIBADM="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - future + six ]; # upstream has no tests @@ -34,6 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysignalclirestapi" ]; meta = with lib; { + changelog = "https://github.com/bbernhard/pysignalclirestapi/releases/tag/${version}"; description = "Small python library for the Signal Cli REST API"; homepage = "https://github.com/bbernhard/pysignalclirestapi"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix index 3c0b0ec629b4..9bceb430820e 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "2.1.0"; + version = "2.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tarpas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M4636yqzChRI37UdGPOZTjj8POLdrOoJtzmECtZZi4k="; + hash = "sha256-zbMX9r9lftdm9hzXMZRZZ/GEDViGk9QiYYUhO9ZcEAc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-idzip/default.nix b/nixpkgs/pkgs/development/python-modules/python-idzip/default.nix new file mode 100644 index 000000000000..6c64bb6c257e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-idzip/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + +, pythonOlder + +, setuptools + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-idzip"; + version = "0.3.9"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bauman"; + repo = "python-idzip"; + rev = "refs/tags/${version}"; + hash = "sha256-ChzwC/Afn0qeo5anq4anIu2eI9i6XDnSvB7jAwY7rSw="; + }; + + patches = [ + # fix collision + # https://github.com/bauman/python-idzip/pull/23 + (fetchpatch { + name = "fix-bin-folder-collisions.patch"; + url = "https://patch-diff.githubusercontent.com/raw/bauman/python-idzip/pull/23.patch"; + hash = "sha256-4fPhLdY9MaH1aX6tqMT+NNNNDsyv87G0xBh4MC+5yQE="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # need third-party files + # https://github.com/bauman/python-idzip/blob/master/.github/workflows/test.yaml#L2https://github.com/bauman/python-idzip/blob/master/.github/workflows/test.yaml#L288 + "test/test_compressor.py" + "test/test_decompressor.py" + "test/test_lucky_cache.py" + "test/test_readline.py" + "test/test_seek_read_behavior.py" + "test/test_zero_cache.py" + ]; + + disabledTests = [ + # Terminated + # pop_var_context: head of shell_variables not a function context + "test_bufferedio_compat" + ]; + + meta = with lib; { + description = "Seekable, gzip compatible, compression format"; + homepage = "https://github.com/bauman/python-idzip"; + changelog = "https://github.com/bauman/python-idzip/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix index 570ee23fcbf4..588f2042bd9b 100644 --- a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix @@ -5,6 +5,7 @@ # build , setuptools +, pythonRelaxDepsHook # propagates , aiohttp @@ -29,7 +30,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "5.5.3"; + version = "5.7.0b2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -38,16 +39,22 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-8daAABR5l8ZEX+PR4XrxRHlLllgnOVE4Q9yY/7UQXHw="; + hash = "sha256-fMtvVizHeAzLdou0U1tqbmQATIBLK4w9I7EwMlzB8QA="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace '--cov' "" ''; nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "home-assistant-chip-clusters" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index 1346e9b35b7a..810d1ba65994 100644 --- a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.39.1"; + version = "0.39.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-iFLzrjbCwBuV9RQSHoP5LOG0PIPjiTMCpvk3wqGtMgk="; + hash = "sha256-hgd6/3GO1r6Xmgcq3iWVxWzi3VIN8MvV27CxF6tWwgU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix b/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix index 6bd4c17f50ea..11ceaecf895c 100644 --- a/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytraccar"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = "pytraccar"; rev = "refs/tags/${version}"; - hash = "sha256-7QGgI+DDYbordBx4LbtCvPWyEh6ur2RrSKMuDlwRlTo="; + hash = "sha256-VsZ18zVIO5ps0GIoVwXBuVe20n6Cz6buItgKlzYyjt4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ratarmount/default.nix b/nixpkgs/pkgs/development/python-modules/ratarmount/default.nix index f07b28bec4f4..cc235710a689 100644 --- a/nixpkgs/pkgs/development/python-modules/ratarmount/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ratarmount/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ratarmount"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-P+p0h+KuOsunPsXbRwxzAhr1XcEqMjQxHeHmA29+pDQ="; + hash = "sha256-TrOYf9kbcRM8E9vq6sjswK2BQ0eA5zSGAIiNAfIZtnk="; }; propagatedBuildInputs = [ ratarmountcore fusepy ]; diff --git a/nixpkgs/pkgs/development/python-modules/rdkit/default.nix b/nixpkgs/pkgs/development/python-modules/rdkit/default.nix index 8a29bc837cfa..2d5af44a068d 100644 --- a/nixpkgs/pkgs/development/python-modules/rdkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rdkit/default.nix @@ -42,7 +42,7 @@ let in buildPythonPackage rec { pname = "rdkit"; - version = "2023.09.4"; + version = "2023.09.5"; pyproject = false; src = @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - hash = "sha256-yPpt7F3w17tZEe+HECODZ7p27QidNt1sd5f/T2V87NE="; + hash = "sha256-ZYNAHNBHQPx8rBJSvEWFEpdSpYyXcoqJ+nBA7tpHwQs="; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/reptor/default.nix b/nixpkgs/pkgs/development/python-modules/reptor/default.nix index 1f35854766f0..800966352d08 100644 --- a/nixpkgs/pkgs/development/python-modules/reptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reptor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.9"; + version = "0.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-CjTedIl7ZkSFfKKhHmCadTd7zdz3gP7Q4uCscv5An38="; + hash = "sha256-OJcg/e+ZC5Hf4dkP1dhsR9A+5lWvuFeuNLXyW8Hw6ko="; }; pythonRelaxDeps = true; diff --git a/nixpkgs/pkgs/development/python-modules/requests-ratelimiter/default.nix b/nixpkgs/pkgs/development/python-modules/requests-ratelimiter/default.nix index 5cc57d86a57f..dbd142e378bd 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-ratelimiter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "requests-ratelimiter"; - version = "0.4.2"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "JWCook"; repo = "requests-ratelimiter"; - rev = "v${version}"; - hash = "sha256-w4cBQRpk9UTuGA0lPDsqpQ3UEIQdYe38NYXz+V4+Lvc="; + rev = "refs/tags/v${version}"; + hash = "sha256-JdxyBLrxXXb2KJ89qWl7yXP0fIafgnAguPGsN5iit8Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ripser/default.nix b/nixpkgs/pkgs/development/python-modules/ripser/default.nix index 0b65e8c1c487..6e847e483636 100644 --- a/nixpkgs/pkgs/development/python-modules/ripser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ripser/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.6.4"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-eps+lCCGnFDfhemkRskSuK+BYh5iyhr4+UksYzW35ZQ="; + hash = "sha256-UuxI1bA6H8s2D9xWVwCecXEHkCV0rhkxuoooaer/a8A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/roombapy/default.nix b/nixpkgs/pkgs/development/python-modules/roombapy/default.nix index 02fdef0c54b0..bef8114aa3cf 100644 --- a/nixpkgs/pkgs/development/python-modules/roombapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/roombapy/default.nix @@ -5,41 +5,40 @@ , orjson , paho-mqtt , poetry-core +, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "roombapy"; - version = "1.6.10"; - format = "pyproject"; + version = "1.6.13"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-aGNSySSKCx/8GYUdDWMSAhMBex738UACqnqj/Qx1m38="; + hash = "sha256-5TFuOk3fj4kg5MyWz7HQ/zWdvceFa3mWnFx+Yuq2III="; }; - postPatch = '' - # hbmqtt was replaced by amqtt - substituteInPlace tests/test_roomba_integration.py \ - --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" - - substituteInPlace pyproject.toml \ - --replace 'orjson = ">=3.8.7"' 'orjson = "*"' - ''; - nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "orjson" ]; propagatedBuildInputs = [ orjson paho-mqtt + pydantic ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rope/default.nix b/nixpkgs/pkgs/development/python-modules/rope/default.nix index c014314685b9..ad5cad2dd8cb 100644 --- a/nixpkgs/pkgs/development/python-modules/rope/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rope/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "rope"; - version = "1.9.0"; - format = "pyproject"; + version = "1.12.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-rope"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j65C3x3anhH23D4kic5j++r/Ft0RqgZ/jFrNrNHVcXA="; + hash = "sha256-j/9q2S2B3DzmEqMOBLG9iHwnLqZipcPxLaKppysJffA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix index 91758650bba8..124b44f097cc 100644 --- a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix @@ -1,29 +1,38 @@ { lib +, stdenv , botocore , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder -, stdenv +, setuptools }: buildPythonPackage rec { pname = "s3transfer"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "boto"; - repo = pname; + repo = "s3transfer"; rev = "refs/tags/${version}"; hash = "sha256-21xycx1+84uY4gFr7N+ra98dpsEwxy9zeSl4QA66nUc="; }; - propagatedBuildInputs = [ botocore ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + botocore + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ # Requires network access @@ -32,12 +41,18 @@ buildPythonPackage rec { # There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS # See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603. # I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork - lib.optionals stdenv.isDarwin [ "tests/unit/test_compat.py" ]; + lib.optionals stdenv.isDarwin [ + "tests/unit/test_compat.py" + ]; - pythonImportsCheck = [ "s3transfer" ]; + pythonImportsCheck = [ + "s3transfer" + ]; passthru.optional-dependencies = { - crt = [ botocore.optional-dependencies.crt ]; + crt = [ + botocore.optional-dependencies.crt + ]; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/sdds/default.nix b/nixpkgs/pkgs/development/python-modules/sdds/default.nix index 9ae9c01b39e0..805121544080 100644 --- a/nixpkgs/pkgs/development/python-modules/sdds/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sdds/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sdds"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pylhc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8tnJAptTUsC0atxM9Dpn90drcprdWrs8fYoX8RDkLyQ="; + hash = "sha256-4phANoYohuCaLbzO4TgRkSS+UHE8CnzonpEd46xzD0M="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/shazamio/default.nix b/nixpkgs/pkgs/development/python-modules/shazamio/default.nix index 05c9784b367f..7190c1e2c0ae 100644 --- a/nixpkgs/pkgs/development/python-modules/shazamio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shazamio/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + # https://github.com/shazamio/ShazamIO/issues/80 broken = versionAtLeast pydantic.version "2"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/simpful/default.nix b/nixpkgs/pkgs/development/python-modules/simpful/default.nix index 2060210a3bd8..37f2ae860c0e 100644 --- a/nixpkgs/pkgs/development/python-modules/simpful/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simpful/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "simpful"; - version = "2.11.1"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aresio"; repo = "simpful"; rev = "refs/tags/${version}"; - hash = "sha256-54WkKnPB3xA2CaOpmasqxgDoga3uAqoC1nOivytXmGY="; + hash = "sha256-NtTw7sF1WfVebUk1wHrM8FHAe3/FXDcMApPkDbw0WXo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index af3dca512c62..2782b5eea5db 100644 --- a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.27.0"; + version = "3.27.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-MA3pn6NQxzXYu/BBpOgfZWnS51dl7oXrAi43jenHhxI="; + hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix index 3a66c42111b9..9769f22727a3 100644 --- a/nixpkgs/pkgs/development/python-modules/slackclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.27.0"; + version = "3.27.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-MA3pn6NQxzXYu/BBpOgfZWnS51dl7oXrAi43jenHhxI="; + hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix index 9917e4d3f759..300aec741473 100644 --- a/nixpkgs/pkgs/development/python-modules/snapcast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snapcast/default.nix @@ -5,12 +5,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "snapcast"; - version = "2.3.3"; - format = "setuptools"; + version = "2.3.4"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "happyleavesaoc"; repo = "python-snapcast"; rev = "refs/tags/${version}"; - hash = "sha256-IFgSO0PjlFb4XJarx50Xnx6dF4tBKk3sLcoLWVdpnk8="; + hash = "sha256-qADcLrE5QwoYBDEmh7hrDJZIND2k3F0OTCEHdHDu3Y0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ construct packaging diff --git a/nixpkgs/pkgs/development/python-modules/snorkel/default.nix b/nixpkgs/pkgs/development/python-modules/snorkel/default.nix index 6e918c2f9145..8da4fd87d736 100644 --- a/nixpkgs/pkgs/development/python-modules/snorkel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snorkel/default.nix @@ -20,7 +20,7 @@ }: let pname = "snorkel"; - version = "0.9.9"; + version = "0.10.0"; in buildPythonPackage { inherit pname version; @@ -31,8 +31,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "snorkel-team"; repo = pname; - rev = "v${version}"; - hash = "sha256-IDWYvblS0Q8ubuHzgIc7fU/gwpJ43Dd7VMWycMfAJxc="; + rev = "refs/tags/v${version}"; + hash = "sha256-1DgkMHYToiI3266yCND1bXiui80x8AaBttxM83kJImw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/speechbrain/default.nix b/nixpkgs/pkgs/development/python-modules/speechbrain/default.nix index ddb1ab53c9c3..2a91b2b0b100 100644 --- a/nixpkgs/pkgs/development/python-modules/speechbrain/default.nix +++ b/nixpkgs/pkgs/development/python-modules/speechbrain/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "speechbrain"; - version = "0.5.16"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "speechbrain"; repo = "speechbrain"; rev = "refs/tags/v${version}"; - hash = "sha256-Mve6wr3klXMe7sCiJjPuzUPKGHRyI/LzTe6Ea39zNHw="; + hash = "sha256-s23RHxqr+ZCWPYNchFpyYa01mY+Bum3thgNbJP8rAmA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix b/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix index f02a32d0f64f..7eb9ee70eca9 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlglot"; - version = "20.9.0"; + version = "21.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "refs/tags/v${version}"; - hash = "sha256-4czhmAJUDRj0x8dCmIXg5BQ1Uvie5vx+UtWdSSY5mnM="; + hash = "sha256-xMKDkhotVBkLzn+f9RMGCPfWTF4Rz9a193nSJv5z+iA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/systembridgeconnector/default.nix b/nixpkgs/pkgs/development/python-modules/systembridgeconnector/default.nix index c1b734bcbda9..bb3a714d68a9 100644 --- a/nixpkgs/pkgs/development/python-modules/systembridgeconnector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/systembridgeconnector/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "systembridgeconnector"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = "system-bridge-connector"; rev = "refs/tags/${version}"; - hash = "sha256-dMOhw7e2sCmGItsgGcGxYVCIJM2FBm6IyxIQXPtY+Pg="; + hash = "sha256-CbLm2CHofgtaTHuGDexVEKmy8+ovvvGJOO3iiAimLTg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tensordict/default.nix b/nixpkgs/pkgs/development/python-modules/tensordict/default.nix index 1c5bad17e8a0..6c64ca00c5ee 100644 --- a/nixpkgs/pkgs/development/python-modules/tensordict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensordict/default.nix @@ -10,11 +10,12 @@ , numpy , h5py , pytestCheckHook +, stdenv }: buildPythonPackage rec { pname = "tensordict"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = "tensordict"; rev = "refs/tags/v${version}"; - hash = "sha256-XTFUzPs/fqX3DPtu/qSE1hY+7r/HToPVPaTyVRzDT/E="; + hash = "sha256-eCx1r7goqOdGX/0mSGCiLhdGQTh4Swa5aFiLSsL56p0="; }; nativeBuildInputs = [ @@ -53,6 +54,18 @@ buildPythonPackage rec { pytestCheckHook ]; + # RuntimeError: internal error + disabledTests = lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + "test_add_scale_sequence" + "test_modules" + "test_setattr" + ]; + + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "test/test_distributed.py" + ]; + meta = with lib; { description = "A pytorch dedicated tensor container"; changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/python-modules/termcolor/default.nix b/nixpkgs/pkgs/development/python-modules/termcolor/default.nix index 9a0af4e558e2..474af852d39f 100644 --- a/nixpkgs/pkgs/development/python-modules/termcolor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/termcolor/default.nix @@ -30,9 +30,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Termcolor"; - homepage = "https://pypi.python.org/pypi/termcolor"; + description = "ANSI color formatting for output in terminal"; + homepage = "https://github.com/termcolor/termcolor"; license = licenses.mit; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix b/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix index 598c68884d3b..faed23aa2d14 100644 --- a/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.4.4"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-80VjSg94gCXzqy6Z/yuDblYgo4TlJdxR+jsOiY/Zhng="; + hash = "sha256-4IXLtQyEi4R7aakaLCl9jpm3D/Es3wLIwigSTYK12kg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix b/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix index 6d8c9c9f83d2..092a3d03b602 100644 --- a/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.4.16"; + version = "0.4.19"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o+h38NREnh14M23gyF2X2UdW7/spmHFo0rqvkKnmSRQ="; + hash = "sha256-u5k9dP6llfTjM745fRHvKC2vM7jd9D8lvPUsDcYx0EI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/torch/default.nix b/nixpkgs/pkgs/development/python-modules/torch/default.nix index 388f66f40a49..d6c51904bd9d 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -8,7 +8,7 @@ magma-hip, magma-cuda-static, # Use the system NCCL as long as we're targeting CUDA on a supported platform. - useSystemNccl ? (cudaSupport && !cudaPackages.nccl.meta.unsupported), + useSystemNccl ? (cudaSupport && !cudaPackages.nccl.meta.unsupported || rocmSupport), MPISupport ? false, mpi, buildDocs ? false, diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 4ba34211571c..de16dec6240b 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.1.5"; + version = "4.1.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m7Qhx8vdQAtvBtJS+4nQQSh0qnp/TRXoch/WJgk/7EI="; + hash = "sha256-ps99+3JDyKuB25G1hho6MClDFp48N/dBarHZUpcZK30="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 2deb71addc84..b730c0951194 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.13.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-HlHT7fJbDz8+7pTWHortK2xKDzoIQElJPbUTxmIdGCs="; + hash = "sha256-5PhINmG1y+oAEpfxaB8ZFHfWlo0jRZnUKO5oUPcnFuM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix b/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix index e69d9ab8e5df..ce64a0833e04 100644 --- a/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,12 +364,12 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.11.2"; + version = "2.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bnYg/u2BvG3/iBJ5xKQwiMG/n8vREpnOGHYaSlwlnRs="; + hash = "sha256-ma/pyfhqWpWFZ+V4O+mNr4SfoOC4/vn9+Hy+rYGAaG8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 923d2e581f97..687dadc3eb65 100644 --- a/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240106"; + version = "4.12.0.20240229"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-mNYomFtxsUC9O8IqjLCrYDwvLQjyDTeSWWXrSiFzm+g="; + hash = "sha256-435M+hGwOwF3VzLlbSwBDLJO4Qd4Yne65rwPo+MFtoY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix b/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix index 13cd4f61f93c..69cbd695f910 100644 --- a/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.20240201"; + version = "0.20.0.20240227"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ukv9T/bdGWQLp6tdk5ADk6ZYl4gPNlCZeWSpQ/Tnmms="; + hash = "sha256-fy27AjVgJLXbPv2d8msjbaBQrS6tqJhy5ShLSjlLd2E="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix b/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix index 7e5fbfe90251..996f8b4e5c3d 100644 --- a/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-html5lib"; - version = "1.1.11.20240222"; + version = "1.1.11.20240228"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-2VF+xrovofYxE+KTClm2ByKpdsyYO5TX/XcvFIZeEVI="; + hash = "sha256-InNrcpnmBexLpTnUhpHpBf0MYcPqYQrMWZIiMtyEzt4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-lxml/default.nix b/nixpkgs/pkgs/development/python-modules/types-lxml/default.nix new file mode 100644 index 000000000000..21a8dc882161 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-lxml/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, pyright +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +, typeguard +, types-beautifulsoup4 +, typing-extensions +}: + +buildPythonPackage rec { + pname = "types-lxml"; + version = "2024.02.09"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "abelcheung"; + repo = "types-lxml"; + rev = "refs/tags/${version}"; + hash = "sha256-vmRbzfwlGGxd64KX8j4B3O9c7kg7hXSsCEYq3WAFdmk="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + types-beautifulsoup4 + typing-extensions + ]; + + nativeCheckInputs = [ + lxml + pyright + pytestCheckHook + typeguard + ]; + + pythonImportsCheck = [ + "lxml-stubs" + ]; + + disabledTests = [ + # AttributeError: 'bytes' object has no attribute 'find_class' + # https://github.com/abelcheung/types-lxml/issues/34 + "test_bad_methodfunc" + "test_find_class" + "test_find_rel_links" + "test_iterlinks" + "test_make_links_absolute" + "test_resolve_base_href" + "test_rewrite_links" + ]; + + meta = with lib; { + description = "Complete lxml external type annotation"; + homepage = "https://github.com/abelcheung/types-lxml"; + changelog = "https://github.com/abelcheung/types-lxml/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 938856691b7a..e9b8e0294d80 100644 --- a/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.18"; + version = "0.0.19"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; - rev = "v${version}"; - hash = "sha256-XUMpWzDqouhbsP+s0b13f6N0YGdXJK6qhbWQLqMzNHM="; + rev = "refs/tags/v${version}"; + hash = "sha256-VoO9B27CNY2Cnt/Q2HsU6DVYkukQMgbIHc6xqfN0P7w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index ac1f937a44b4..388cd89371ed 100644 --- a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.12.4"; + version = "0.12.5"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-lfsCmEhF6CTrEIa4y98NgDw6EgfLk39BVsTmYZD6MkU="; + hash = "sha256-69GukU2R38tM43vAk+l9vjypgjTS/Bcmcdcj1HXnzv4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 288758dfb34a..9e8436bd662c 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonOlder , awkward +, cramjam , hatch-vcs , hatchling , numpy @@ -10,17 +11,15 @@ , packaging , pandas , pytestCheckHook -, lz4 , pytest-timeout , rangehttpserver , scikit-hep-testdata , xxhash -, zstandard }: buildPythonPackage rec { pname = "uproot"; - version = "5.2.2"; + version = "5.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-7X8oIMvOSC1JXQrZTPXLiqsUnfSc2Rx3KCvxKbhvPzM="; + hash = "sha256-cZVdsemaA3ni6xFfrkyLJA+12B7vyURj9OYVuOhqTXU="; }; nativeBuildInputs = [ @@ -39,6 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward + cramjam numpy fsspec packaging @@ -47,12 +47,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pandas pytestCheckHook - lz4 pytest-timeout rangehttpserver scikit-hep-testdata xxhash - zstandard ]; preCheck = '' @@ -79,6 +77,8 @@ buildPythonPackage rec { "test_open_fsspec_http" "test_open_fsspec_github" "test_pickle_roundtrip_http" + # Cyclic dependency with dask-awkward + "test_decompression_executor_for_dask" ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix b/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix index 7d24067fd110..3e47f886cdb7 100644 --- a/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix @@ -1,26 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , urwid -, glibcLocales , pytestCheckHook }: buildPythonPackage rec { - pname = "urwid_readline"; - version = "0.13"; + pname = "urwid-readline"; + version = "0.14"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-AYAgy8hku17Ye+F9wmsGnq4nVcsp86nFaarDve0e+vQ="; + src = fetchFromGitHub { + owner = "rr-"; + repo = "urwid_readline"; + rev = "refs/tags/${version}"; + hash = "sha256-ZTg+GZnu7R6Jf2+SIwVo57yHnjwuY92DElTJs8oRErE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ urwid ]; + pythonImportsCheck = [ "urwid_readline" ]; + nativeCheckInputs = [ - glibcLocales pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/userpath/default.nix b/nixpkgs/pkgs/development/python-modules/userpath/default.nix index 5f4a31d39b19..014de3cfeb1e 100644 --- a/nixpkgs/pkgs/development/python-modules/userpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/userpath/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.9.1"; - format = "pyproject"; + version = "1.9.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zoF2co2YyRS2QBeBvzsj/M2WjRZHU5yHiMcBA3XgJ5Y="; + hash = "sha256-bFIojasGklfMgxhG0V1IEzUiRV1Gd+5pqXgfEdvv2BU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/vllm/default.nix b/nixpkgs/pkgs/development/python-modules/vllm/default.nix index e8127c4caf8b..4977a829d4c7 100644 --- a/nixpkgs/pkgs/development/python-modules/vllm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vllm/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "vllm"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; src = fetchFromGitHub { owner = "vllm-project"; repo = pname; rev = "v${version}"; - hash = "sha256-hfd4ScU0mkZ7z4+w08BUA1K9bPXSiFThfiO+Ll2MTtg="; + hash = "sha256-ZFwlR8Xnen7FFblwzPJm0k+3iEo2p27QhfRaDfzwbOM="; }; # Otherwise it tries to enumerate host supported ROCM gfx archs, and that is not possible due to sandboxing. @@ -62,11 +62,11 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace "cupy-cuda12x == 12.1.0" "cupy == 12.3.0" substituteInPlace requirements-build.txt \ - --replace "torch==2.1.2" "torch == 2.2.0" + --replace "torch==2.1.2" "torch == 2.2.1" substituteInPlace pyproject.toml \ - --replace "torch == 2.1.2" "torch == 2.2.0" + --replace "torch == 2.1.2" "torch == 2.2.1" substituteInPlace requirements.txt \ - --replace "torch == 2.1.2" "torch == 2.2.0" + --replace "torch == 2.1.2" "torch == 2.2.1" '' + lib.optionalString rocmSupport '' substituteInPlace setup.py \ --replace "'hipcc', '--version'" "'${writeShellScript "hipcc-version-stub" "echo HIP version: 0.0"}'" diff --git a/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix b/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix index 14b6a094912a..aa64499fd37a 100644 --- a/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.8"; - format = "pyproject"; + version = "1.8.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - repo = pname; + repo = "wagtail-localize"; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-K4TOW4q8vD9vaNJzSEtmQBgO/dOxcWKKUp2FE3JLIbE="; + hash = "sha256-WOkixwcGvsH4vgL7KAQeeGtoh3+Usr9drXb3Uho1AS0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index 3f85f8064899..5e00ef399e61 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -6,12 +6,13 @@ , paho-mqtt , python-dateutil , weconnect +, setuptools }: buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.48.3"; - format = "setuptools"; + version = "0.48.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,19 +20,23 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-Pja9BP0gbWXTgOokEngNS364tJp1oWJYNKcTxyYJHGw="; + hash = "sha256-Yv6CAGTDi4P9pImLxVk2QkZ014iqQ8UMBUeiyZWnYiQ="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "weconnect[Images]~=" "weconnect>=" substituteInPlace weconnect_mqtt/__version.py \ - --replace "develop" "${version}" + --replace-fail "0.0.0dev" "${version}" + substituteInPlace requirements.txt \ + --replace-fail "weconnect[Images]~=" "weconnect>=" substituteInPlace pytest.ini \ - --replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ - --replace "pytest-cov" "" + --replace-fail "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ + --replace-fail "pytest-cov" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ paho-mqtt python-dateutil diff --git a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index e9f4877110ef..df6a1529e929 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -2,18 +2,18 @@ , ascii-magic , buildPythonPackage , fetchFromGitHub +, oauthlib , pillow -, pytest-httpserver , pytestCheckHook , pythonOlder , requests -, oauthlib +, setuptools }: buildPythonPackage rec { pname = "weconnect"; - version = "0.59.5"; - format = "setuptools"; + version = "0.60.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -21,9 +21,24 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ujIA98QD8ds2/iLLeJqn88nY9tZuuOSnOwGvRznA8PQ="; + hash = "sha256-hvV4pbCyzAbi3bKXClzpiyhp+4qnuIj5pViUe7pEq64="; }; + postPatch = '' + substituteInPlace weconnect/__version.py \ + --replace-fail "0.0.0dev" "${version}" + substituteInPlace setup.py \ + --replace-fail "setup_requires=SETUP_REQUIRED" "setup_requires=[]" \ + --replace-fail "tests_require=TEST_REQUIRED" "tests_require=[]" + substituteInPlace pytest.ini \ + --replace-fail "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ + --replace-fail "required_plugins = pytest-cov" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ oauthlib requests @@ -37,24 +52,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytest-httpserver pytestCheckHook ]; - postPatch = '' - substituteInPlace weconnect/__version.py \ - --replace "develop" "${version}" - substituteInPlace setup.py \ - --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ - --replace "tests_require=TEST_REQUIRED," "tests_require=[]," - substituteInPlace image_extra_requirements.txt \ - --replace "pillow~=" "pillow>=" \ - --replace "ascii_magic~=" "ascii_magic>=" - substituteInPlace pytest.ini \ - --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ - --replace "required_plugins = pytest-httpserver pytest-cov" "" - ''; - pythonImportsCheck = [ "weconnect" ]; diff --git a/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 91721fdd169a..237c7827f1e2 100644 --- a/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -4,16 +4,15 @@ , fetchFromGitHub , cryptography , ifaddr -, pytest-asyncio +, pytest-asyncio_0_21 , pytestCheckHook , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "xknx"; - version = "2.12.0"; + version = "2.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,12 +21,11 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknx"; rev = "refs/tags/${version}"; - hash = "sha256-Fwo76tvkLLx8QJeokuGohhnt83eGBMyWIUSHJGuQWJ4="; + hash = "sha256-O8xhih/EVULTq4jdmxInzXRO4m6PJA9pyzsHjR+58dQ="; }; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ @@ -37,7 +35,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0_21 pytestCheckHook ]; @@ -50,6 +48,15 @@ buildPythonPackage rec { "test_scan_timeout" "test_start_secure_routing_knx_keys" "test_start_secure_routing_manual" + # RuntimeError: Event loop is closed + "test_has_group_address_localtime" + "test_invalid_authentication" + "test_invalid_frames" + "test_no_authentication" + "test_process_read_localtime" + "test_sync_date" + "test_sync_datetime" + "test_sync_time_local" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix b/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix index f5e47f196dca..1b0098629a92 100644 --- a/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-7WK4TgrTuUwR33d1N8+VmgZ6iylyfIJbFCyxh49luL0="; + hash = "sha256-tw/hHiiW4ZGlrbQmuIihJmhyIL++Rjpg6q8AdKNsn14="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix index b32403a6a97d..93a16ea29f9b 100644 --- a/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.4.1"; + version = "2.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u6Mhqt6DcPiini8EvtqKoVAYUwb31hvWfCNb/sbqvWQ="; + hash = "sha256-A/4N3vmFuzg9vaPISs0P3KxRQZSquPpR1zYcYEePkTA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yalexs/default.nix b/nixpkgs/pkgs/development/python-modules/yalexs/default.nix index 02e72f9244fc..159232118605 100644 --- a/nixpkgs/pkgs/development/python-modules/yalexs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yalexs/default.nix @@ -13,22 +13,33 @@ , pythonOlder , requests , requests-mock +, setuptools }: buildPythonPackage rec { pname = "yalexs"; - version = "1.11.2"; - format = "setuptools"; + version = "1.11.4"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-FHaHXbRtgbBrveHPbrPsP+vGIvscot3ilpPFucISces="; + hash = "sha256-LzjkR60zelxV8N4i68M31yJJLEThUgz6+hYd6d+EHx4="; }; + postPatch = '' + # Not used requirement + substituteInPlace setup.py \ + --replace-fail '"vol",' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp @@ -46,12 +57,6 @@ buildPythonPackage rec { requests-mock ]; - postPatch = '' - # Not used requirement - substituteInPlace setup.py \ - --replace '"vol",' "" - ''; - pythonImportsCheck = [ "yalexs" ]; diff --git a/nixpkgs/pkgs/development/python-modules/yaspin/default.nix b/nixpkgs/pkgs/development/python-modules/yaspin/default.nix index c90da30a746b..0235c06ab149 100644 --- a/nixpkgs/pkgs/development/python-modules/yaspin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yaspin/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pytest-xdist , pytestCheckHook , pythonOlder , termcolor @@ -30,13 +31,13 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-xdist pytestCheckHook ]; - postPatch = '' - # https://github.com/pavdmyt/yaspin/pull/212 - substituteInPlace pyproject.toml \ - --replace 'termcolor-whl = "1.1.2"' 'termcolor = "*"' + # tests assert for \033 which gets turned off in termcolor when TERM dumb is used which is used by nix + preCheck = '' + export FORCE_COLOR=1 ''; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix b/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix index 5c155094cf64..e1e43b34a7ae 100644 --- a/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.3.7"; - format = "pyproject"; + version = "0.3.9"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "YoSmart-Inc"; - repo = pname; + repo = "yolink-api"; rev = "refs/tags/v${version}"; - hash = "sha256-P9Hu3JhoFDwKylTAZmXYX2AI2CPf/GbYhJCU4wX/aWY="; + hash = "sha256-RXO++8Dh0hLkjXev/WDhPixLHKXlqRabbrPW6Hs/xoM="; }; nativeBuildInputs = [ |