diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules')
235 files changed, 2348 insertions, 1154 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index d9fe80fcba4f..0bb566508b34 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.49.0"; + version = "3.51.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-bLwPnKLOdk8scKF4hQgkBXRoz0Ph6/pcRLlJdN+cDoA="; + hash = "sha256-/a0IKOFWnXC6BJItpJDqiA9aCB1PNhglNlB/4KvyQdg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix b/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix index 64e3cfa7b032..90f28265c090 100644 --- a/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix @@ -1,26 +1,36 @@ { lib +, aiohttp , buildPythonPackage -, pythonOlder , fetchFromGitHub , geopy +, pythonOlder , requests +, setuptools , urllib3 +, wheel }: buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.2.2"; + version = "0.4.4"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-3f3hvui00oItu6t9rKecoCquqsD1Eeqz+SEsLBqGt48="; + hash = "sha256-Jm7fv1fNavp2GkfKPhZXYGnGuCBy6BdN9iTNYTBIyew="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ + aiohttp geopy requests urllib3 @@ -29,11 +39,14 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "aemet_opendata.interface" ]; + pythonImportsCheck = [ + "aemet_opendata.interface" + ]; meta = with lib; { description = "Python client for AEMET OpenData Rest API"; homepage = "https://github.com/Noltari/AEMET-OpenData"; + changelog = "https://github.com/Noltari/AEMET-OpenData/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix b/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix index 2ea2137f0405..ac094571d087 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.6.7"; + version = "0.6.8"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/LUTHeApktB4okt9bVkZe7G1dApVaYUdwty4sbK7IKQ="; + hash = "sha256-aCf0IO70t/QMmDmIwBKN3Um1HgHjHn1r6Dze/pWaQ5M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix b/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix new file mode 100644 index 000000000000..dd572da52210 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiocomelit"; + version = "0.0.6"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "chemelli74"; + repo = "aiocomelit"; + rev = "refs/tags/v${version}"; + hash = "sha256-u6CyqDFLgnIVak0UqN4JmL8ll/li3k9EhFs7iC5oZ9U="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiocomelit" + ]; + + meta = with lib; { + description = "Library to control Comelit Simplehome"; + homepage = "https://github.com/chemelli74/aiocomelit"; + changelog = "https://github.com/chemelli74/aiocomelit/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index cc34f91fde9d..f0a310b7a14c 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "16.0.3"; + version = "16.0.5"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x4kH8riHZbVibgwR2DmWB4tsswpub4m2LwnypVVUgqM="; + hash = "sha256-SueK59CZTKkQPsHThs7k9eCEmc1GwaRIrw3oSK4E80E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index ed3823af9bef..e083abc1d7ea 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TyVmvricfaS+i96DGwh0IKhMm56U1DyebAmRb+OFCh4="; + hash = "sha256-EE8+VoZ755wd8s3Gm0lziu+1r4rAFgdjEtqI0apoZ7E="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix index ec91f0bd0c55..9b157264a7e9 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - hash = "sha256-knsdOzR0SPhv9SRcnKGeQPOX65OQZoK+WSeQZ4yYLzc="; + hash = "sha256-duWEJDS5Ts3EWNRZ8MJcD7buMh3FRKA+bJiO3P7QWz0="; }; propagatedBuildInputs = [ aiohttp attrs python-socks ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix index ba0b17a5eb58..b6346a511aa5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.10"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; + hash = "sha256-LDLpNuwkoPacI/a2NSlqUABRgwy+jAjGwOxmShLskso="; }; propagatedBuildInputs = [ @@ -29,8 +29,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # AssertionError, https://github.com/timmo001/aiolyric/issues/5 - "test_location" + # AssertionError, https://github.com/timmo001/aiolyric/issues/61 + "test_priority" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix b/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix index c5fdc3f8f36f..352f7eb9603d 100644 --- a/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix @@ -13,33 +13,18 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "2023.08.0"; + version = "2023.09.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - hash = "sha256-oTkWirq3w0DgQWWe0ziK+ry4pg6j6SQbBESLG4xgDE4="; + rev = "refs/tags/${version}"; + hash = "sha256-45LgfCA8037GqP4WfEjE4hj2YdKUGu2hGrQ/f0r1PAI="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aiorecollect/pull/207 - # - (fetchpatch { - name = "clean-up-dependencies.patch"; - url = "https://github.com/bachya/aiorecollect/commit/0bfddead1c1b176be4d599b8e12ed608eac97b8b.patch"; - hash = "sha256-w/LAtyuyYsAAukDeIy8XLlp9QrydC1Wmi2zxEj1Zdm8="; - includes = [ "pyproject.toml" ]; - }) - ]; - postPatch = '' # this is not used directly by the project sed -i '/certifi =/d' pyproject.toml @@ -80,6 +65,7 @@ buildPythonPackage rec { and more. ''; homepage = "https://github.com/bachya/aiorecollect"; + changelog = "https://github.com/bachya/aiorecollect/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioruckus/default.nix b/nixpkgs/pkgs/development/python-modules/aioruckus/default.nix new file mode 100644 index 000000000000..a3d77994f432 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aioruckus/default.nix @@ -0,0 +1,67 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +, xmltodict +}: + +buildPythonPackage rec { + pname = "aioruckus"; + version = "0.34"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "ms264556"; + repo = "aioruckus"; + rev = "refs/tags/v${version}"; + hash = "sha256-SPj1w1jAJFBsWj1+N8srAbvlh+yB3ZTT7aDcZTnmUto="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools>=68.1" "setuptools" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + pythonImportsCheck = [ + "aioruckus" + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # these require a local ruckus device + "test_ap_info" + "test_authentication_error" + "test_connect_success" + "test_current_active_clients" + "test_mesh_info" + "test_system_info" + ]; + + meta = with lib; { + description = "Python client for Ruckus Unleashed and Ruckus ZoneDirector"; + homepage = "https://github.com/ms264556/aioruckus"; + license = licenses.bsd0; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index d00469ecb099..b47936c926d3 100644 --- a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.4.0"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cbgDuJXvZmbhIgxpuySGbJqz7DeI65DHwk1UPdNUs1Q="; + hash = "sha256-mB9BEVqbHcoUaygIgrtqk20wMJkL+dWpbeyG5VP4+sg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix b/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix index a39130c383a3..5891fa703a90 100644 --- a/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "0.5.5"; + version = "0.5.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; rev = "v${version}"; - hash = "sha256-VCwIAeSAN4tMwB8TXN/ukrws0qYv/jHHeEu++m56AHA="; + hash = "sha256-jJw1L1++Z/r+E12tA6zoyyy4MmTpaaVVzKwfI6xcDBQ="; }; propagatedBuildInputs = [ @@ -29,6 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiotractive" ]; meta = with lib; { + changelog = "https://github.com/zhulik/aiotractive/releases/tag/v${version}"; description = "Python client for the Tractive REST API"; homepage = "https://github.com/zhulik/aiotractive"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 09b177a61bf7..45591837df44 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aioresponses -, async-timeout , buildPythonPackage , fetchFromGitHub , orjson @@ -10,25 +9,39 @@ , pytestCheckHook , pythonOlder , segno +, setuptools +, wheel }: buildPythonPackage rec { pname = "aiounifi"; - version = "55"; - format = "setuptools"; + version = "61"; + format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JvuP1Rhq01Y9KbfAJpawUQNWfxvlf9LY82RvXok4tgw="; + hash = "sha256-tzP20KDPCq1/fJY+OfEpo3LMbP662ROh2aPI4nmDp0Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools==" "setuptools>=" \ + --replace "wheel==" "wheel>=" + + sed -i '/--cov=/d' pyproject.toml + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp - async-timeout orjson segno ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix b/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix new file mode 100644 index 000000000000..f0ad237f9208 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix @@ -0,0 +1,54 @@ +{ lib +, aiohttp +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiovodafone"; + version = "0.0.8"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "chemelli74"; + repo = "aiovodafone"; + rev = "refs/tags/v${version}"; + hash = "sha256-o21zaK3dJfURFAt8fPaOd95H7tuqLnFPC01RGHBIz4M="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiovodafone --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + beautifulsoup4 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiovodafone" + ]; + + meta = with lib; { + description = "Library to control Vodafon Station"; + homepage = "https://github.com/chemelli74/aiovodafone"; + changelog = "https://github.com/chemelli74/aiovodafone/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix b/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix new file mode 100644 index 000000000000..ba2d16c7e3e9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix @@ -0,0 +1,60 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, syrupy +, yarl +}: + +buildPythonPackage rec { + pname = "aiowaqi"; + version = "1.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-waqi"; + rev = "refs/tags/v${version}"; + hash = "sha256-CQCF59Tp0VE7PNHPdVzzZegLUNDkslzKapELDjZn1k4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ + "aiowaqi" + ]; + + meta = with lib; { + description = "Module to interact with the WAQI API"; + homepage = "https://github.com/joostlek/python-waqi"; + changelog = "https://github.com/joostlek/python-waqi/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix index 565bcf750ac8..5801e6a5ee14 100644 --- a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-config"; - version = "2.2.11"; + version = "2.2.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nkCNzOg6JYQkIlmcFm3VIjHvoHDK7hfw4PhrUwnNp28="; + hash = "sha256-blrT/yCQ2vxaociSqKvRX3fUyKLsAFT3UyFGB/AzZHI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index 09cb189f40cd..4a9ff67c3cba 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.3"; + version = "2.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OP9jXkuUeR3ilWyB4mWDbsSWWzDp7jXXL88ycdxGuYs="; + hash = "sha256-eaG9E02BPI6jdAWZxv2WGhFCXOd1fy/XJc9W1qGnI2w="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 17bfb4203720..be0a887cd8a8 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.15.2"; + version = "2.15.3"; src = fetchPypi { inherit pname version; - hash = "sha256-hCUbAB8vnAkUvu3/zxlSnnRaExCBWdH+J96eOmpjrFo="; + hash = "sha256-JhvAGhUnT8WmlQ1bkrmqG318bo91Q8kUUF5b/ZdEeTo="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix index 911361f82b8a..8344af439070 100644 --- a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.10"; + version = "0.3.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-OmT8a588eprCTUnnhLF5+XSOtetiUMouaWz1hrTl1ao="; + hash = "sha256-bjagT0I0/N76CGf1b8EBNyOTzPBWybr2I2yO5NWO3po="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 39fef995bf98..20daf71c8cda 100644 --- a/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -1,17 +1,27 @@ { lib , buildPythonPackage -, isPy3k +, setuptools , python -, antlr4 }: +, antlr4 +}: buildPythonPackage rec { pname = "antlr4-python3-runtime"; inherit (antlr4.runtime.cpp) version src; + + format = "pyproject"; + disabled = python.pythonOlder "3.6"; sourceRoot = "${src.name}/runtime/Python3"; - # in 4.9, test was renamed to tests + nativeBuildInputs = [ + setuptools + ]; + + # We use an asterisk because this expression is used also for old antlr + # versions, where there the tests directory is `test` and not `tests`. + # See e.g in package `baserow`. checkPhase = '' cd test* ${python.interpreter} run.py diff --git a/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/nixpkgs/pkgs/development/python-modules/anyio/default.nix index 82874b9a3132..3508554d308d 100644 --- a/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.7.0"; + version = "3.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - hash = "sha256-uXPp2ycYl3T/ybZihDchImC/Yi4qgHI37ZeA+I6dg4c="; + hash = "sha256-9/pAcVTzw9v57E5l4d8zNyBJM+QNGEuLKrQ0WUBW5xw="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 92c58450cee4..793591627837 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.2.5"; + version = "5.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-h1xpP3fFr8+twa5jXQrZfKFjNAlCvXv7sFvhgJZ88H0="; + hash = "sha256-sfhcAEJn+9uTPZLjgurfpuWNEdefzQZSXZdw7IeuqZw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix b/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix index 35871bff21c8..64fe911661ff 100644 --- a/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "0.7"; + version = "1.0.0"; src = fetchPypi { inherit version; pname = lib.replaceStrings ["-"] ["_"] pname; - hash = "sha256-iMOE60MimXpY3ok46RrJ/5D2orbLKuI+IWnHQFrdOtg="; + hash = "sha256-9ILvYqEOaGMD84xm8I3xe53e5a2CIZwjVx7oDXar7qM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index 2ce8a31193a1..fd389308c931 100755 --- a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.0"; + version = "3.41.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-f1i4kX9lZ8ozv/jLzvu1XbCn+BheMn8SQE1mtivaEG8="; + hash = "sha256-DSIJOp5c/bqOOIZylhUGyIwIco5isA3ytCRR51WfTyI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index c716a56dfb24..85a668a2c22e 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.36.0"; + version = "1.37.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-cHpeNY0WY4yai/yWw2Oy1QLLjlj8PFNdB3BMbkP31Ds="; + hash = "sha256-ukHDrxx+Jxlp/Ypg1ltz7WN07X16spNdC7YygJhTBJo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 2a2915afcd75..f5af4ac77973 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -59,7 +59,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; - homepage = "https://github.com/aws/serverless-application-model"; + homepage = "https://github.com/awslabs/serverless-application-model"; + changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index dc9ddfeceb70..807cd8a02942 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.19.0"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q5DA+lraOebUYgjFDj11XUPZY1X8qD/1dwgeMoL2SZ0="; + hash = "sha256-kXf/TKw0YkWuSWNc1rQqbb3q4XWCRRkBAiDUisX/8UI="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 4dac7ecf5b83..c577a7888a94 100644 --- a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -1,7 +1,8 @@ { lib -, arrow +, stdenv , buildPythonPackage , fetchPypi +, glibcLocales , importlib-metadata , logfury , pyfakefs @@ -12,18 +13,19 @@ , requests , setuptools-scm , tqdm +, typing-extensions }: buildPythonPackage rec { pname = "b2sdk"; - version = "1.19.0"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aJpSt+dXjw4S33dBiMkaR6wxzwLru+jseuPKFj2R36Y="; + hash = "sha256-6zSjCt+J6530f1GMc/omP1zXKQKU1SDLLvslMWoqMcU="; }; nativeBuildInputs = [ @@ -31,12 +33,13 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - arrow logfury requests tqdm ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata + ] ++ lib.optionals (pythonOlder "3.12") [ + typing-extensions ]; nativeCheckInputs = [ @@ -44,13 +47,13 @@ buildPythonPackage rec { pytest-lazy-fixture pytest-mock pyfakefs + ] ++ lib.optionals stdenv.isLinux [ + glibcLocales ]; postPatch = '' substituteInPlace setup.py \ --replace 'setuptools_scm<6.0' 'setuptools_scm' - substituteInPlace requirements.txt \ - --replace 'arrow>=0.8.0,<1.0.0' 'arrow' ''; disabledTestPaths = [ @@ -73,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; + changelog = "https://github.com/Backblaze/b2-sdk-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix b/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix new file mode 100644 index 000000000000..5b114655bcbb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-dateutil +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "beautiful-date"; + version = "2.2.0"; + format = "setuptools"; + + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "kuzmoyev"; + repo = "beautiful-date"; + rev = "v${version}"; + hash = "sha256-5xRmHaAPf1ps75cOINHkHT1aYb5UGLZGl0OHVQaMES0="; + }; + + propagatedBuildInputs = [ + python-dateutil + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "beautiful_date" ]; + + meta = with lib; { + description = "Simple and beautiful way to create date and datetime objects in Python"; + homepage = "https://github.com/kuzmoyev/beautiful-date"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 096fb2289888..effdf9d010f8 100644 --- a/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.35.9"; + version = "0.36.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-68t6l7/30euGo0dX5HTnGMl65j6UVF2f9fYZH6EhlzI="; + hash = "sha256-5s2I24gvHRXHm7ZTNZxc6ge9Kbe6UObcY29SvbIUWJg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index baa4ddacfec5..57eb2dc26845 100644 --- a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -7,9 +7,12 @@ , httpx , pycryptodome , pyjwt +, pytest-asyncio , pytestCheckHook +, python , respx , time-machine +, tzdata }: buildPythonPackage rec { @@ -39,12 +42,21 @@ buildPythonPackage rec { pyjwt ]; + postInstall = '' + cp -R bimmer_connected/tests/responses $out/${python.sitePackages}/bimmer_connected/tests/ + ''; + nativeCheckInputs = [ + pytest-asyncio pytestCheckHook respx time-machine ]; + preCheck = '' + export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo + ''; + pythonImportsCheck = [ "bimmer_connected" ]; diff --git a/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix index 846684551480..401037eb3dd7 100644 --- a/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.1.1"; + version = "3.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fw1Eo4f9MdCjICkZiCUX3wa947s1kv9qqYmYjd0zqF4="; + hash = "sha256-q+J4PUBm42jBcLbiywWwDZxUI0Gsl8GjnLPwniWp+Kw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/nixpkgs/pkgs/development/python-modules/bleak/default.nix index dbe2364a9863..13b335d02617 100644 --- a/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.20.2"; + version = "0.21.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hiQSsQHq1hoCQhoWU50i2NXYR/LaTHAize9cfr1uZsY="; + hash = "sha256-hnXBXm0BFNNzw563Ybr76KHiqt2sFqo0dtiRHGWsu3A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 3a4f1f567e90..920bb1cecc48 100644 --- a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, cryptography , cython_3 , poetry-core , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.9.1"; + version = "1.11.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DLB2mBjHPVT2Fg2Kr0WUDuu5nqBCbdu525wAD3ERKV8="; + hash = "sha256-iyfk0OOJezNCNyqRCbR2cTTTdgdYQM6hExTngd/3CtA="; }; # The project can build both an optimized cython version and an unoptimized @@ -32,6 +33,10 @@ buildPythonPackage rec { setuptools ]; + propagatedBuildInputs = [ + cryptography + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix index be8514f08acd..2bd7f8e6d90e 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.31.39"; + version = "1.31.40"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-pqpGnPXZT5lDnTpXBfsJk0/tBtUovgazAWZf/TZJfNg="; + hash = "sha256-IAGiU9r0ri4XHmE3uZgqAKf7/HpTRJoWhW3ASefNUhQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bracex/default.nix b/nixpkgs/pkgs/development/python-modules/bracex/default.nix index b519021295b1..d2b8bb06ff9b 100644 --- a/nixpkgs/pkgs/development/python-modules/bracex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bracex/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "bracex"; - version = "2.3.post1"; + version = "2.4"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-57I/yLLNBtPewGkrqr7LJJ3alOBqYXkB/wOmxW/XFpM="; + hash = "sha256-on6vHfQs9WH+1Yt6jz/fEp0eoWqB4frdHReYm8Y4S+s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bytecode/default.nix b/nixpkgs/pkgs/development/python-modules/bytecode/default.nix index d8521ddf0f15..95b28f4190fd 100644 --- a/nixpkgs/pkgs/development/python-modules/bytecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bytecode/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bytecode"; - version = "0.14.2"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "vstinner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HBXtpUl8Lcx3yCVnk9kVU0+AUVdgy1HQBV4rHEndiek="; + hash = "sha256-A8S3U07P4Olq9f7/q20aHOPAQsQp3OuGHtIAs8B8VEQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 9507cad79502..1b6a7d72e415 100644 --- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.26.0"; + version = "1.27.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-wM27HW5w8fDjHoGV+OGDTaO5SKJrq8fGKh1EPQt+wlo="; + hash = "sha256-gZgaWgkvMuD7IfIy85rX3i6lZqj5WkStF0dHe+AQSJY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index 9a198ab21fc6..750e3908cd3f 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.3.3"; + version = "5.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-uskO+ZtwubW11M/Ov28atRaLhsYSC8fFgUzYI039k4E="; + hash = "sha256-kCPfaoli2nnrMMDITV9IY9l5OkZjVMyTHX9yQjmW3ig="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix b/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix index 37a1c750b319..175a454ab1ea 100644 --- a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "certipy-ad"; - version = "4.7.0"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ly4k"; repo = "Certipy"; rev = "refs/tags/${version}"; - hash = "sha256-CkIxk+Aps9TRA2wEE/zZKl9t4CyjxEsgLntbn9kWY6o="; + hash = "sha256-CyTwaCYhxUqvycZBKSzTWLKmKvebCNyE4vqTUnaX1V0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix index 9c44a4f4b6b6..ed5377d9783a 100644 --- a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix @@ -1,38 +1,37 @@ { lib +, aws-sam-translator , buildPythonPackage , fetchFromGitHub -, pythonOlder -, aws-sam-translator , jschema-to-python , jsonpatch , jsonschema , junit-xml +, mock , networkx +, pydot +, pytestCheckHook +, pythonOlder , pyyaml +, regex , sarif-om , setuptools -, six -, mock -, pydot -, pytestCheckHook +, sympy }: buildPythonPackage rec { pname = "cfn-lint"; - version = "0.73.2"; + version = "0.79.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-CNB5LrXllGxy99NjCrbjkUXUpJ72U3pUnWqrqkOiCG8="; + hash = "sha256-5Lb8dA8HqDdEO/Ehv5y/JlP+te46mzrTw/kNHBb9l38="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "jsonschema~=3.0" "jsonschema>=3.0" - ''; - propagatedBuildInputs = [ aws-sam-translator jschema-to-python @@ -40,9 +39,11 @@ buildPythonPackage rec { jsonschema junit-xml networkx + networkx pyyaml + regex sarif-om - six + sympy ]; nativeCheckInputs = [ @@ -62,34 +63,28 @@ buildPythonPackage rec { # https://github.com/aws-cloudformation/cfn-python-lint/issues/1705 # See also: https://github.com/NixOS/nixpkgs/issues/108076 "TestQuickStartTemplates" - # requires git directory + # Requires git directory "test_update_docs" # Tests depend on network access (fails in getaddrinfo) "test_update_resource_specs_python_2" "test_update_resource_specs_python_3" "test_sarif_formatter" + # Some CLI tests fails + "test_bad_config" + "test_override_parameters" + "test_positional_template_parameters" + "test_template_config" ]; pythonImportsCheck = [ "cfnlint" - "cfnlint.conditions" - "cfnlint.core" - "cfnlint.decode.node" - "cfnlint.decode.cfn_yaml" - "cfnlint.decode.cfn_json" - "cfnlint.decorators.refactored" - "cfnlint.graph" - "cfnlint.helpers" - "cfnlint.rules" - "cfnlint.runner" - "cfnlint.template" - "cfnlint.transform" ]; meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; homepage = "https://github.com/aws-cloudformation/cfn-python-lint"; - changelog = "https://github.com/aws-cloudformation/cfn-python-lint/blob/master/CHANGELOG.md"; + changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix b/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix index 7bcb98a4efea..13434cc86d05 100644 --- a/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "chat-downloader"; - version = "0.2.7"; + version = "0.2.8"; format = "setuptools"; src = fetchPypi { inherit version pname; - hash = "sha256-FKdeuw4MEy1ZNeOCYllYxxFBUj2/fy0r/pxJv8FpOso="; + hash = "sha256-WBasBhefgRkOdMdz2K/agvS+cY6m3/33wiu+Jl4d1Cg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cmaes/default.nix b/nixpkgs/pkgs/development/python-modules/cmaes/default.nix index fdb2a1d0fcc0..88085cd2fdf9 100644 --- a/nixpkgs/pkgs/development/python-modules/cmaes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmaes/default.nix @@ -10,15 +10,16 @@ buildPythonPackage rec { pname = "cmaes"; - version = "0.9.1"; - disabled = pythonOlder "3.7"; + version = "0.10.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "CyberAgentAILab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dd5vLT4Q0cI5ts0WgBpjPtOA81exGNjWSNHEiPggYbg="; + hash = "sha256-1mXulG/yqNwKQKDFGBh8uxIYOPSsm8+PNp++CSswc50="; }; nativeBuildInputs = [ setuptools ]; @@ -31,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for CMA evolution strategy"; homepage = "https://github.com/CyberAgentAILab/cmaes"; + changelog = "https://github.com/CyberAgentAILab/cmaes/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix index b426de499aa0..b113175941cc 100644 --- a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -11,13 +11,14 @@ , pythonOlder , pythonRelaxDepsHook , requests +, tqdm , typer , websocket-client }: buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.8.24.13"; + version = "2023.8.30.20"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-Ju8QczI/vyX4//WMy92H66DafTGJefsOqIjifCfQXGU="; + hash = "sha256-zi9hFpmRILfWXA9eLGbzt/+v3l1wykZz10GUuH20hzE="; }; pythonRelaxDeps = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { python-dateutil requests typer + tqdm websocket-client ]; diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 076e045d7272..aa762e315c13 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -1,10 +1,10 @@ { lib , stdenv -, callPackage , buildPythonPackage -, fetchPypi +, callPackage , cargo , cffi +, fetchPypi , hypothesis , iso8601 , isPyPy @@ -14,8 +14,8 @@ , pkg-config , pretend , py -, pytestCheckHook , pytest-subtests +, pytestCheckHook , pythonOlder , pytz , rustc @@ -29,20 +29,20 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "41.0.2"; # Also update the hash in vectors.nix + version = "41.0.3"; # Also update the hash in vectors.nix format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fSML+FYWTeFk7LYVzMFMf8beaQbd1bSR86+Q01FMklw="; + hash = "sha256-bRknQRE+9eMNidy1uVbvThV48wRwhwG4tz044+FGHzQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-hkuoICa/suMXlr4u95JbMlFzi27lJqJRmWnX3nZfzKU="; + hash = "sha256-LQu7waympGUs+CZun2yDQd2gUUAgyisKBG5mddrfSo0="; }; postPatch = '' @@ -62,9 +62,14 @@ buildPythonPackage rec { cffi ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv ] - ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + libiconv + ] ++ lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; propagatedBuildInputs = lib.optionals (!isPyPy) [ cffi diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix index 554873de89e1..ff8bfa05ed51 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix @@ -1,4 +1,9 @@ -{ buildPythonPackage, fetchPypi, lib, cryptography, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, setuptools +}: buildPythonPackage rec { pname = "cryptography-vectors"; @@ -9,15 +14,19 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-Ao3/lKhSLKgYsRKV/xLfVfNI8zoZPAWX3f6COeU9FYI="; + hash = "sha256-gN4EUsSzT1b1UY6B69dba5BfVyiq7VIdQuQfTryKQ/s="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + ]; # No tests included doCheck = false; - pythonImportsCheck = [ "cryptography_vectors" ]; + pythonImportsCheck = [ + "cryptography_vectors" + ]; meta = with lib; { description = "Test vectors for the cryptography package"; diff --git a/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix b/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix new file mode 100644 index 000000000000..390c459242ae --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, jsbeautifier +}: + +buildPythonPackage rec { + pname = "cssbeautifier"; + version = "1.14.9"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LaQyRy9oFw64VK/5exaiRyH1CQ7javLjEZlZConn9x8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ jsbeautifier ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "cssbeautifier" ]; + + meta = with lib; { + description = "CSS unobfuscator and beautifier"; + homepage = "https://pypi.org/project/cssbeautifier/"; + license = licenses.mit; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix b/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix index 21a9e359c413..97f2ff499c3e 100644 --- a/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "cwl-upgrader"; - version = "1.2.8"; + version = "1.2.9"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DwXwzhsv92t6PU4emmG7xlIU7uj3rcHh4+o9NqBMA+A="; + hash = "sha256-yvgGMGo4QK+PRDzqlOH4rP49fnJUlbYB9B5AnlX+LF8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix b/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix index 3c80a158b4e2..77f81963eefc 100644 --- a/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "cwl-utils"; - version = "0.28"; + version = "0.29"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hplpsig+phIX6WCbUV0ILcA62f5DE/yTyKfoaeumgyY="; + hash = "sha256-XxfeBikJcRcUCIVDAmPTtcrrgvZYrRKpjs5bmMokeeI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index 70cd89afdcad..4cdd8f31a5fd 100644 --- a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # (https://trac.sagemath.org/ticket/27267). depends on Cython patch. (fetchpatch { name = "use-trashcan-for-gen.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555"; + url = "https://raw.githubusercontent.com/sagemath/sage/b6ea17ef8e4d652de0a85047bac8d41e90b25555/build/pkgs/cypari/patches/trashcan.patch"; hash = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8="; }) ]; diff --git a/nixpkgs/pkgs/development/python-modules/daqp/default.nix b/nixpkgs/pkgs/development/python-modules/daqp/default.nix new file mode 100644 index 000000000000..9ef1d3eee877 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/daqp/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildPythonPackage +, unittestCheckHook +, cython +, setuptools +, wheel +, numpy +}: +buildPythonPackage { + pname = "daqp"; + version = "0.5.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "darnstrom"; + repo = "daqp"; + rev = "5a15a3d16731d3d50f867218c1b281567db556fd"; + hash = "sha256-in7Ci/wM7i0csJ4XVfo1lboWOyfuuU+8E+TzGmMV3x0="; + }; + + sourceRoot = "source/interfaces/daqp-python"; + + postPatch = '' + sed -i 's|../../../daqp|../..|' setup.py + sed -i 's|if src_path and os.path.exists(src_path):|if False:|' setup.py + ''; + + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ "-s" "test" "-p" "'*.py'" "-v" ]; + + nativeBuildInputs = [ + cython + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "daqp" ]; + + meta = with lib; { + description = "A dual active-set algorithm for convex quadratic programming"; + homepage = "https://github.com/darnstrom/daqp"; + license = licenses.mit; + maintainers = with maintainers; [ renesat ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dataclass-factory/default.nix b/nixpkgs/pkgs/development/python-modules/dataclass-factory/default.nix new file mode 100644 index 000000000000..28caa864d456 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dataclass-factory/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose2 +, typing-extensions +}: + +buildPythonPackage rec { + pname = "dataclass-factory"; + version = "2.13"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "reagento"; + repo = "dataclass-factory"; + rev = version; + hash = "sha256-hNPuqs3TvDleIxflCW5rutbXjDotFRLCNJlcTBFxFAw="; + }; + + nativeCheckInputs = [ + nose2 + ]; + + checkInputs = [ + typing-extensions + ]; + + pythonImportsCheck = [ "dataclass_factory" ]; + + checkPhase = '' + runHook preCheck + + nose2 -v tests + + runHook postCheck + ''; + + meta = with lib; { + description = "Modern way to convert python dataclasses or other objects to and from more common types like dicts or json-like structures"; + homepage = "https://github.com/reagento/dataclass-factory"; + changelog = "https://github.com/reagento/dataclass-factory/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index 8b8ca7a7208b..32328178fa4e 100644 --- a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.15"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ADWNB2Eu4TwlAvchyzBwGiw9YT9McPr9lsNfo1lR1WI="; + hash = "sha256-jv00WqSC/KCM+6+LtsCAQcqZTBbV1pavEqsCP/F84VU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/nixpkgs/pkgs/development/python-modules/datadog/default.nix index fb3271af586f..2ec4ca43032b 100644 --- a/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.46.0"; + version = "0.47.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5PvJKoXisJGaImiWrkX8Xks1bAxX8cJlllnfvgeJxnQ="; + hash = "sha256-R747LD1wmn9bcJ6xJu1P5sx5d9YY/lwVjdicKp99mRY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index 28c4df0a62a2..bec651629d7f 100644 --- a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.94.1"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ttz6AX/NH6/NNLgU2cMSb5e1jV/cq0LGW3ENARRP7H4="; + hash = "sha256-Dzr7CSoJhO/F75Ro686lKXCOzP2AxtR6wJOp70IOvUk="; }; # The project can build both an optimized cython version and an unoptimized @@ -66,11 +66,13 @@ buildPythonPackage rec { "test_export_alias" "test_export_introspection" "test_export_unexport" + "test_fast_disconnect" "test_glib_big_message" "test_high_level_service_fd_passing" "test_interface_add_remove_signal" "test_introspectable_interface" "test_methods" + "test_multiple_flags_in_message" "test_name_requests" "test_object_manager" "test_peer_interface" diff --git a/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix b/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix index a7195fcee166..5d0c94686926 100644 --- a/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dirty-equals"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-j+EqsKVRG2DDka1G3Px8ExYZt8QkqHkhojRnAHObdR4="; + hash = "sha256-ShbkPGj1whOQ11bFLUSTfvVEVlvc3JUzRDICbBohgMM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix index 8216ca4ff872..77d50b65ce6f 100644 --- a/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix @@ -9,17 +9,17 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.10.2"; + version = "2.11.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; format = "setuptools"; src = fetchFromGitHub { owner = "niwinz"; repo = "django-jinja"; - rev = version; - hash = "sha256-IZ4HjBQt6K8xbaYfO5DVlGKUVCQ3UciAUpfnqCjzyCE="; + rev = "refs/tags/${version}"; + hash = "sha256-0gkv9xinHux8TRiNBLl/JgcimXU3CzysxzGR2jn7OZ4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix b/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix index 8056aca7100e..004773037e88 100644 --- a/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "django-tastypie"; - version = "0.14.5"; + version = "0.14.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "django-tastypie"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RgYinpo8eVzRaSkcnFkSq+IqpcFt6LCCHkpHyB/7u5M="; + hash = "sha256-emZVcycGLa8Z2yMv/NWZi1b5fPk50u841cFfFF3Ke/s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-stubs/default.nix new file mode 100644 index 000000000000..1d1d76ed3b68 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, django-stubs +, fetchFromGitHub +, mypy +, py +, pytest-mypy-plugins +, pytestCheckHook +, pythonOlder +, requests +, types-pyyaml +, types-requests +, typing-extensions +}: + +buildPythonPackage rec { + pname = "djangorestframework-stubs"; + version = "3.14.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "typeddjango"; + repo = "djangorestframework-stubs"; + rev = version; + hash = "sha256-T357ocJvDC+vt0I4VyAu0Q9YzY9cSK7shgp9fQ1qHyY="; + }; + + propagatedBuildInputs = [ + django-stubs + mypy + requests + types-pyyaml + types-requests + typing-extensions + ]; + + nativeCheckInputs = [ + mypy + py + pytest-mypy-plugins + pytestCheckHook + ]; + + meta = with lib; { + description = "PEP-484 stubs for Django REST Framework"; + homepage = "https://github.com/typeddjango/djangorestframework-stubs"; + changelog = "https://github.com/typeddjango/djangorestframework-stubs/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ elohmeier ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/dnspython/default.nix b/nixpkgs/pkgs/development/python-modules/dnspython/default.nix index 402272fb54b8..5bf9981170b1 100644 --- a/nixpkgs/pkgs/development/python-modules/dnspython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dnspython/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dnspython"; - version = "2.4.1"; + version = "2.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wzlxx5r1vpaLuJfpXCRI4RpkXuhNk7Jlzgt6q+Xf3Kg="; + hash = "sha256-jc+ujHRgovhLQHLibxyfQQHKIMBxZJy3w06LapPViYQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dunamai/default.nix b/nixpkgs/pkgs/development/python-modules/dunamai/default.nix index 87ff45fb468e..46e2361d9db9 100644 --- a/nixpkgs/pkgs/development/python-modules/dunamai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dunamai/default.nix @@ -6,13 +6,12 @@ , importlib-metadata , packaging , pytestCheckHook -, setuptools , git }: buildPythonPackage rec { pname = "dunamai"; - version = "1.16.0"; + version = "1.18.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - hash = "sha256-pPUn+1rv76N/7WVDyWJLPVMweJ1Qbx6/P4zIKU06hSs="; + hash = "sha256-QKXEFwOAa5nIQZA6DHNqnWyshnN+/6qovdqjCd9WF4k="; }; nativeBuildInputs = [ @@ -46,7 +45,11 @@ buildPythonPackage rec { nativeCheckInputs = [ git pytestCheckHook - setuptools + ]; + + disabledTests = [ + # clones from github.com + "test__version__from_git__shallow" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index e5ee78a02350..09ae0a82d634 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.15.4"; + version = "2.16.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8lwEf1+deLojhJDjRjII8sHRCGCM6l+igigIvNJidxQ="; + hash = "sha256-pLagCMHxlN26x/zP6tDRchxTwqvRyARKO5EzmuWncUo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dvc/default.nix b/nixpkgs/pkgs/development/python-modules/dvc/default.nix index 60f7c588eaa3..5700bec74686 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.17.0"; + version = "3.18.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MFwmER2BmSKqisgLvnLY3aFoRuzeObE7lr5JOesJdXE="; + hash = "sha256-wTKQmFvI4kaXGivRiGDoI4lM/xHxYUDBqplscvjVQRs="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix b/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix index 8054757dd0ab..66fb7964e53e 100644 --- a/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "epson-projector"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { pname = "epson_projector"; inherit version; - hash = "sha256-a9pRncC22DCKX+7ObC8PORpR+RGbOBor2lbwzfrU8tk="; + hash = "sha256-LwsdMuwvLifIP1PRNhfLi4TTZRp/cw9Bcf57vrsNrbI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ete3/default.nix b/nixpkgs/pkgs/development/python-modules/ete3/default.nix index b3c598ad396b..48ec3ca62386 100644 --- a/nixpkgs/pkgs/development/python-modules/ete3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ete3/default.nix @@ -7,7 +7,6 @@ , withTreeVisualization ? false , lxml , withXmlSupport ? false -, pyqt4 , pyqt5 }: @@ -25,7 +24,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ete3" ]; propagatedBuildInputs = [ six numpy ] - ++ lib.optional withTreeVisualization (if isPy3k then pyqt5 else pyqt4) + ++ lib.optional withTreeVisualization pyqt5 ++ lib.optional withXmlSupport lxml; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index bdee002b5aad..784b13c3549a 100644 --- a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.13.0"; + version = "1.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-t1C9fS0LU46J7y+rp2pTCVma09aFqzuBtslrlU+MS1E="; + hash = "sha256-ZoxIuUeDkhACWGi+njZuMhO8P6nlErcBkub5VCMNm8Q="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix index 98a36d2953d4..26da544933d0 100644 --- a/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastrlock"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "scoder"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KYJd1wGJo+z34cY0YfsRbpC9IsQY/VJqycGpMmLmaVk="; + hash = "sha256-2h+rhP/EVMG3IkJVkE74p4GeBTwV3BS7fUkKpwedr2k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix b/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix index ad979dbaf6ab..6ee8b07137ee 100644 --- a/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "faust-cchardet"; - version = "2.1.18"; + version = "2.1.19"; format = "pyproject"; src = fetchFromGitHub { @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "cChardet"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-jTOqxBss/FAb8nMkU62H6O4ysmirD2FTA9mtvxXh43k="; + hash = "sha256-yY6YEhXC4S47rxnkKAta4m16IVGn7gkHSt056bYOYJ4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix index b32fc7b25afc..1305234e43f7 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-YDVZ/dD+TRJEnJRTRmGEB6EIkK5eQ5MdXh8FideoVDQ="; + hash = "sha256-UtmMd180bwFm426YevARq6r7DL182dI7dGAUPFKLWuM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/gcsa/default.nix b/nixpkgs/pkgs/development/python-modules/gcsa/default.nix new file mode 100644 index 000000000000..9dd8b51fd31d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gcsa/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pyfakefs +, tzlocal +, google-api-python-client +, google-auth-httplib2 +, google-auth-oauthlib +, python-dateutil +, beautiful-date +}: + +buildPythonPackage rec { + pname = "gcsa"; + version = "2.1.0"; + format = "setuptools"; + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "kuzmoyev"; + repo = "google-calendar-simple-api"; + rev = "v${version}"; + hash = "sha256-Ye8mQSzgaEZx0vUpt5xiMrJTFh2AmSB7ZZlKaEj/YpM="; + }; + + propagatedBuildInputs = [ + tzlocal + google-api-python-client + google-auth-httplib2 + google-auth-oauthlib + python-dateutil + beautiful-date + ]; + + nativeCheckInputs = [ pytestCheckHook pyfakefs ]; + pythonImportsCheck = [ "gcsa" ]; + + meta = with lib; { + description = "Pythonic wrapper for the Google Calendar API"; + homepage = "https://github.com/kuzmoyev/google-calendar-simple-api"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gitpython/default.nix b/nixpkgs/pkgs/development/python-modules/gitpython/default.nix index 79cefa48656c..8721df4bf36a 100644 --- a/nixpkgs/pkgs/development/python-modules/gitpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.32"; + version = "3.1.33"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; rev = "refs/tags/${version}"; - hash = "sha256-Bhgu57w5QYfq5hlTh5gCJhbdwUMU+u0nrova/2V2ed0="; + hash = "sha256-SqpoI8QnynHRHUdenMrOAGib/SDpix4rSXfEes4xt/Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index e96d6dff8e42..76bd9c572fa4 100644 --- a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.27.0"; + version = "3.28.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-ZgRYwx/vICs1ombD8LGvCr0Wf9TpQurDGBoC2mtbxRs="; + hash = "sha256-mKtqfEpnWftpGReaUrmXf3LftZnMtEizPi4RbIwgnUM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix b/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix index 7a44e6488643..17c7ba91f28b 100644 --- a/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.3.0"; + version = "6.4.0"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-wBtotr7nH7KL5ISaJFs4i8CCv4OCZnVOREUon8jhQdY="; + hash = "sha256-vbyI5pSoQWFHG8aqZC4FExKzzIo6yxwl9DgGSgDz8xU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 267ba36b91db..9732cfe2a6a1 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.4.3"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2cd8Uqpd31KuZXc22/tTEkApM/crq4SA/C0q/phpdAI="; + hash = "sha256-XYjEmBMCkCUxKvAF2KNXwG72C6TMszLikFvLtnjJf14="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 361323ee17b1..e94498a5c6d9 100644 --- a/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.35.2"; + version = "0.36.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Sskz14aAPqUXhQjetPfhjVm8gjG4yrck3sHpgD37DPU="; + hash = "sha256-miv7CDpBJ5hUyPzQWLqSndmUYR9Lmaonrilod6uhBo8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 9d05bf5e0930..fd01e1b1d815 100644 --- a/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.10.0"; + version = "5.11.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-GAlQYQVuwsnkXqZOvG66f9kig+m392CVlrgUTqrTKyA="; + hash = "sha256-a8A47il9NrMdHkSX4YmQj4VIAYDXK5V+FUdwv+LGIfQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index b80f9a2e4d06..4b5498396dd7 100644 --- a/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "23.4.0"; + version = "23.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L7GR50nlcm2EQ6YxLAfieQJ+vPUrCrj72KNSY73LFko="; + hash = "sha256-W49jmFwLrCu8NhQ65ll3iu+QbnHBA5sCeUgSLYLrui0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 9aa76821650b..c1bcfbc33899 100644 --- a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.8.14"; + version = "2023.9.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-msN3S7rBYZnCAh2IGBVzHjqiTapzH2kMV5CBFHmtcNE="; + hash = "sha256-FM07+ORPFne+9gtruuKqp2EwPLF9py7zi9a6vehN2Yk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix index 1491587ade27..3fa3546eb976 100644 --- a/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.6.5"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DqXGvn7vYC3SXOM/u+nMUshgBUe0O6Dcffaxh9vFohk="; + hash = "sha256-f8bRVo9365w5gMpkb31thGXCRWZuKfkFEow9Wv4/+bM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix index 2928be6ede9a..514d4e2477b6 100644 --- a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix @@ -1,31 +1,45 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, pytestCheckHook , datalad -, git , dcm2niix -, nibabel -, pydicom -, nipype , dcmstack , etelemetry +, fetchPypi , filelock +, git +, nibabel +, nipype +, pydicom +, pytestCheckHook +, pythonOlder +, setuptools +, versioningit +, wheel }: buildPythonPackage rec { - version = "0.13.1"; pname = "heudiconv"; + version = "0.13.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UUBRC6RToj4XVbJnxG+EKdue4NVpTAW31RNm9ieF1lU="; + hash = "sha256-UUBRC6RToj4XVbJnxG+EKdue4NVpTAW31RNm9ieF1lU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "versioningit ~=" "versioningit >=" + ''; + + nativeBuildInputs = [ + setuptools + versioningit + wheel + ]; + propagatedBuildInputs = [ nibabel pydicom @@ -42,7 +56,13 @@ buildPythonPackage rec { git ]; - preCheck = ''export HOME=$(mktemp -d)''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "heudiconv" + ]; meta = with lib; { homepage = "https://heudiconv.readthedocs.io"; diff --git a/nixpkgs/pkgs/development/python-modules/html-tag-names/default.nix b/nixpkgs/pkgs/development/python-modules/html-tag-names/default.nix new file mode 100644 index 000000000000..543ef8686dc9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/html-tag-names/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +}: + +buildPythonPackage rec { + pname = "html-tag-names"; + version = "0.1.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Riverside-Healthcare"; + repo = "html-tag-names"; + rev = version; + hash = "sha256-2YywP4/0yocejuJwanC5g9BR7mcy5C+zMhCjNZ9FRH4="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "HtmlTagNames" ]; + + meta = with lib; { + description = "List of known HTML tags"; + homepage = "https://github.com/Riverside-Healthcare/html-tag-names"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/html-void-elements/default.nix b/nixpkgs/pkgs/development/python-modules/html-void-elements/default.nix new file mode 100644 index 000000000000..bef3d9208026 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/html-void-elements/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +}: + +buildPythonPackage rec { + pname = "html-void-elements"; + version = "0.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Riverside-Healthcare"; + repo = "html-void-elements"; + rev = version; + hash = "sha256-Q5OEczTdgCCyoOsKv3MKRE3w4t/qyPG4YKbF19jlC88="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "HtmlVoidElements" ]; + + meta = with lib; { + description = "List of HTML void tag names"; + homepage = "https://github.com/Riverside-Healthcare/html-void-elements"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index 2f0374644d40..9fc7e657468d 100644 --- a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -4,7 +4,6 @@ , pythonOlder , filelock , fsspec -, importlib-metadata , packaging , pyyaml , requests @@ -14,16 +13,16 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.15.1"; + version = "0.16.4"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-q30/oNP1NjyxiJuSfxyjFgciydImMUgPdGJ/tqVtwZk="; + hash = "sha256-fWvEvYiaLiVGmDdfibIHJAsu7nUX+eaE0QGolS3LHO8="; }; propagatedBuildInputs = [ @@ -34,8 +33,6 @@ buildPythonPackage rec { requests tqdm typing-extensions - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; # Tests require network access. @@ -45,7 +42,7 @@ buildPythonPackage rec { "huggingface_hub" ]; - meta = with lib; { + meta = with lib; { description = "Download and publish models and other files on the huggingface.co hub"; homepage = "https://github.com/huggingface/huggingface_hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/nixpkgs/pkgs/development/python-modules/hvac/default.nix index 732496cdee88..7f8c9c5bea8a 100644 --- a/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+dvMRrmLJQx4XrEFCqEe40oMi2YWt1IYzxNGqYF5kvk="; + hash = "sha256-b1qg1rgTi1hdRlbR/gG12HYWMQyASEuQnMhMLLjwZP0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/idasen/default.nix b/nixpkgs/pkgs/development/python-modules/idasen/default.nix index 8ce6928b9057..8fb0b0c4d008 100644 --- a/nixpkgs/pkgs/development/python-modules/idasen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.10.0"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-aCVKnKWJlrlKD+74KL9JKlNpMGOzg/iWmB+1IMn0V/E="; + hash = "sha256-aCAtZsHH1tkti2A7OWw9rV4vij1n6T+R8nMa/MRZuF8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ilua/default.nix b/nixpkgs/pkgs/development/python-modules/ilua/default.nix index 143f1ed035f9..9c6a7f6cb337 100644 --- a/nixpkgs/pkgs/development/python-modules/ilua/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ilua/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, jupyter_console +, jupyter-console , jupyter-core , pygments , termcolor @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - jupyter_console + jupyter-console jupyter-core pygments termcolor diff --git a/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix b/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix index e71c3e845424..aba6a22ea168 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.9.2"; + version = "1.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-2j8qYRXR8nmV5++g4OJn65dq3lypgqo9oxBscNb4eNs="; + hash = "sha256-XPmrGg0SCTiZKMeTCeJywuKaa5ByY9FQTBy+THSJSiQ="; }; propagatedBuildInputs = [ ipywidgets ]; @@ -23,8 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipyvue" ]; meta = with lib; { - description = "Jupyter widgets base for Vue libraries."; - homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; + description = "Jupyter widgets base for Vue libraries"; + homepage = "https://github.com/mariobuikhuizen/ipyvue"; license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix index e6cd8e253dd8..5e5e60b39624 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , setuptools , setuptools-scm , tempora -, six }: buildPythonPackage rec { pname = "jaraco-logging"; - version = "3.1.2"; + version = "3.2.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "jaraco.logging"; inherit version; - hash = "sha256-k6cLizdnd5rWx7Vu6YV5ztd7afFqu8rnSfYsLFnmeTE="; + hash = "sha256-X8ssPxI1HU1QN1trYPOJnFg3sjLxotj/y6/17NK3M+c="; }; - pythonNamespaces = [ "jaraco" ]; + pythonNamespaces = [ + "jaraco" + ]; nativeBuildInputs = [ setuptools @@ -27,17 +31,19 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora - six ]; # test no longer packaged with pypi doCheck = false; - pythonImportsCheck = [ "jaraco.logging" ]; + pythonImportsCheck = [ + "jaraco.logging" + ]; meta = with lib; { description = "Support for Python logging facility"; homepage = "https://github.com/jaraco/jaraco.logging"; + changelog = "https://github.com/jaraco/jaraco.logging/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/json-logging/default.nix b/nixpkgs/pkgs/development/python-modules/json-logging/default.nix index 5a56ea4fbc02..a3ac3ff7f005 100644 --- a/nixpkgs/pkgs/development/python-modules/json-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-logging/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { "quart" ]; + disabledTestPaths = [ + # Smoke tests don't always work + "tests/smoketests/test_run_smoketest.py" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix index 91e21f91019e..e847c341f4d8 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix @@ -18,15 +18,16 @@ }: buildPythonPackage rec { - pname = "jupyter_console"; - version = "6.6.1"; + pname = "jupyter-console"; + version = "6.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-WTEhLVy8H5Vvb9YVdVteFfOJqOqmlyiNu+Q3cBdhXsw="; + pname = "jupyter_console"; + inherit version; + hash = "sha256-VmpL8xyHrb+t8izfhG4wabWace1dpx1rpNiqrRSlNTk="; }; nativeBuildInputs = [ @@ -71,5 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/jupyter_console"; changelog = "https://github.com/jupyter/jupyter_console/releases/tag/v${version}"; license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix index b8a9a97e230a..0c3d704711d1 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.7.0"; + version = "2.7.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-NtoKJm0xpBrDNaNmyIkzwX36W7gXpI9cAsFtMDvJR38="; + hash = "sha256-1JFshYHE67xTTOvaqOyiR42fO/3Yjq4p/KsBIOrFdkk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix index 818623c2513b..b795dc9c9101 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix @@ -3,7 +3,7 @@ , fetchPypi , notebook , qtconsole -, jupyter_console +, jupyter-console , nbconvert , ipykernel , ipywidgets @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f"; }; - propagatedBuildInputs = [ notebook qtconsole jupyter_console nbconvert ipykernel ipywidgets ]; + propagatedBuildInputs = [ notebook qtconsole jupyter-console nbconvert ipykernel ipywidgets ]; # Meta-package, no tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix b/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix index bce1025301e3..8d8b51bc842f 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "karton-config-extractor"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA="; + hash = "sha256-X2g/wgWLIY2ZIwH1l83EApyoeYQU5/MWq5S0qmYz+CA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index ac07b77bf2b4..aab31436fb2b 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.23.0post0"; + version = "0.23.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qk9QYfLVJVtkNgAZ19UziU7metluz10gDs9HbMoqZjo="; + hash = "sha256-uMsQFDPLsphS6T55sDMKFawYgAycp8u9NizF5ZHnMqQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/localstack/default.nix b/nixpkgs/pkgs/development/python-modules/localstack/default.nix index 2b722c92919f..e984554a843e 100644 --- a/nixpkgs/pkgs/development/python-modules/localstack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/localstack/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "localstack"; - version = "1.4.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-mfPlpB1CvYuhnfucDfJjZtNS+1Kz0/l3+3uUXxxGiF4="; + hash = "sha256-hlK3pltajFRAtiwLOJQNmxRfoRAX5Jccygglbhb45O8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/logilab/common.nix b/nixpkgs/pkgs/development/python-modules/logilab/common.nix index eef74d0695ec..9467f003c703 100644 --- a/nixpkgs/pkgs/development/python-modules/logilab/common.nix +++ b/nixpkgs/pkgs/development/python-modules/logilab/common.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.9.7"; + version = "1.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/JlN9RlIRLbi9TL9V6SgO6ddPeKqLzK402DqkLBRuxM="; + hash = "sha256-MoXt3tta5OimJUjOkWSMDCmXV0aS8N0W5bcANwAelYY="; }; nativeBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + setuptools mypy-extensions typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ diff --git a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix index e609558d4c92..f97cb9593b6f 100644 --- a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix +++ b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix @@ -1,22 +1,57 @@ -{ lib, buildPythonPackage, fetchPypi, logilab-common, six }: +{ lib +, buildPythonPackage +, fetchPypi +, importlib-metadata +, logilab-common +, pip +, six +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { pname = "logilab-constraint"; version = "0.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-Jk6wvvcDEeHfy7dUcjbnzFIeGBYm5tXzCI26yy+t2qs="; }; + nativeBuildInputs = [ + importlib-metadata + pip + ]; + propagatedBuildInputs = [ - logilab-common six + logilab-common + setuptools + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # avoid ModuleNotFoundError: No module named 'logilab.common' due to namespace + rm -r logilab + ''; + + disabledTests = [ + # these tests are abstract test classes intended to be inherited + "Abstract" ]; + pythonImportsCheck = [ "logilab.constraint" ]; meta = with lib; { description = "logilab-database provides some classes to make unified access to different"; - homepage = "https://www.logilab.org/project/logilab-database"; + homepage = "https://forge.extranet.logilab.fr/open-source/logilab-constraint"; + changelog = "https://forge.extranet.logilab.fr/open-source/logilab-constraint/-/blob/${version}/CHANGELOG.md"; + license = licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix b/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix index 8a3a0fff574d..bf85abee73c8 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "magic-filter"; - version = "1.0.10"; + version = "1.0.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aiogram"; repo = "magic-filter"; - rev = "v${version}"; - hash = "sha256-mHqq/ci8uMACNutwmxKX1nrl3nTSnSyU2x1VxzWxqzM="; + rev = "refs/tags/v${version}"; + hash = "sha256-mfSq47UWOLyEDkAsdHsJuVl/rJ4KgiGPpDL7qSKEfws="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index e47f27d806cb..fc9636c351a0 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -48,6 +49,12 @@ buildPythonPackage rec { twisted ]; + # Fails in Darwin's sandbox + postPatch = lib.optionalString stdenv.isDarwin '' + echo 'LogRequests.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py + echo 'WebSocketAPI.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py + ''; + checkPhase = '' trial -j$NIX_BUILD_CORES wormhole_mailbox_server ''; diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix index f462793266b9..95635b94d505 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix @@ -56,6 +56,31 @@ buildPythonPackage rec { disabledTests = [ # Expected: (<class 'wormhole.errors.WrongPasswordError'>,) Got: Failure instance: Traceback (failure with no frames): <class 'wormhole.errors.LonelyError'>: "test_welcome" + ] ++ lib.optionals stdenv.isDarwin [ + # These tests doesn't work within Darwin's sandbox + "test_version" + "test_text" + "test_receiver" + "test_sender" + "test_sender_allocation" + "test_text_wrong_password" + "test_override" + "test_allocate_port" + "test_allocate_port_no_reuseaddr" + "test_ignore_localhost_hint" + "test_ignore_localhost_hint_orig" + "test_keep_only_localhost_hint" + "test_get_direct_hints" + "test_listener" + "test_success_direct" + "test_direct" + "test_relay" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # These tests doesn't work within Darwin's sandbox + "src/wormhole/test/test_xfer_util.py" + "src/wormhole/test/test_wormhole.py" ]; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix index b2510bd0a8fe..34a1a4767e72 100644 --- a/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix @@ -5,15 +5,19 @@ , pytestCheckHook , hypothesis , readme_renderer +, pythonOlder }: buildPythonPackage rec { pname = "marisa-trie"; - version = "0.8.0"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PQGdF7DX9i1ubXvQUjbYJSYk6hwUC+uL+cbu/zizxwc="; + hash = "sha256-2KaDAfAjpyTrN5qqGxD4ip4aRYzIpBtSfGJQeFm0pNI="; }; nativeBuildInputs = [ @@ -60,6 +64,7 @@ buildPythonPackage rec { This package provides alternative Cython-based pip-installable Python bindings. ''; homepage = "https://github.com/kmike/marisa-trie"; + changelog = "https://github.com/pytries/marisa-trie/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 4b83afc5d31a..5a92323dcd1c 100644 --- a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.20.0"; + version = "0.20.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; + hash = "sha256-Byvwg6WW4b8kRWJkl6DG2Ioz4HYDaJyVEV98tS/ybXQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mercadopago/default.nix b/nixpkgs/pkgs/development/python-modules/mercadopago/default.nix index aebb28c185a5..dc71fc326667 100644 --- a/nixpkgs/pkgs/development/python-modules/mercadopago/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mercadopago/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "mercadopago"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mercadopago"; repo = "sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-HtPyIwip/cjvnBDZ0qGpLKJOkwETGSqXvTkH2pcd6cc="; + hash = "sha256-ABxYGYUBOzeOSE0yK8jym+ldinDUCTpqO165OWhszgs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix index 6d5f85acb481..3f270fee8fce 100644 --- a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.29.5"; + version = "0.30.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tGp8CHQ1Ekn/2KiGZGd/8V6NdWMseDSETZ/Z3T3P91U="; + hash = "sha256-O5BAfb+6fCbETaJmWsVSayTId/57VjA7U3FGCeNe28Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/nixpkgs/pkgs/development/python-modules/millheater/default.nix index 6edd37f14dbc..b5153d7c4028 100644 --- a/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.11.1"; + version = "0.11.2"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = "refs/tags/${version}"; - hash = "sha256-RlnZUI7F1u1rjmuPc2guqVomR25Izf5jejN6LlMZYS8="; + hash = "sha256-PsNT/mZ4Dun4s9QpGRyEuVxYcM5AXaUS28UsSOowOb4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index df8b47a3e983..b7afeffe9d86 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.6.0"; + version = "1.6.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-r9zboUvF1IH32d6jQ+nRbzXejlZADt5+YNZ/LdFyULk="; + hash = "sha256-zbF+fqgXb8BAN+Nf2pRV/SeOXnJXLXJBIWZyZ6a9zP4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix index 453ff24ef7bf..effa1e42ad36 100644 --- a/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "mwparserfromhell"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w="; + hash = "sha256-K60L/2FFdjmeRHDWQAuinFLVlWgqS43mQq+7W+v0o0Y="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch b/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch index 4356052d8715..4b8e40d6588b 100644 --- a/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch +++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch @@ -1,36 +1,22 @@ -From c5d32ef5d656b0aa4b2c1fc61c901d40bf2fb96a Mon Sep 17 00:00:00 2001 -From: Alexander Ben Nasrallah <me@abn.sh> -Date: Mon, 19 Jul 2021 17:24:41 +0200 -Subject: [PATCH] Revert "Fix MacOS wheels platform tag" - -This reverts commit d1e89fd3d7391084cdf35b0806cb5d2a4b413654. ---- - cpydist/__init__.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - diff --git a/cpydist/__init__.py b/cpydist/__init__.py -index 0e7f341..2619d7a 100644 +index 7fdbaf2..3c427da 100644 --- a/cpydist/__init__.py +++ b/cpydist/__init__.py -@@ -41,7 +41,7 @@ from distutils.command.install import install - from distutils.command.install_lib import install_lib - from distutils.core import Command - from distutils.dir_util import mkpath, remove_tree --from distutils.sysconfig import get_config_vars, get_python_version -+from distutils.sysconfig import get_python_version - from distutils.version import LooseVersion - from subprocess import check_call, Popen, PIPE - -@@ -57,9 +57,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py") +@@ -38,7 +38,7 @@ import tempfile + from glob import glob + from pathlib import Path + from subprocess import PIPE, Popen, check_call +-from sysconfig import get_config_vars, get_python_version ++from sysconfig import get_python_version + + from setuptools import Command + from setuptools.command.build_ext import build_ext +@@ -68,8 +68,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py") with open(version_py, "rb") as fp: exec(compile(fp.read(), version_py, "exec")) - + -if "MACOSX_DEPLOYMENT_TARGET" in get_config_vars(): - get_config_vars()["MACOSX_DEPLOYMENT_TARGET"] = "11.0" -- - COMMON_USER_OPTIONS = [ - ("byte-code-only", None, - "remove Python .py files; leave byte code .pyc only"), --- -2.31.1 + COMMON_USER_OPTIONS = [ + ( \ No newline at end of file diff --git a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index a96bd21cc0ec..ba963ff0d5dd 100644 --- a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -6,21 +6,30 @@ , fetchFromGitHub , protobuf , pythonOlder -, fetchpatch +, mysql80 +, openssl +, pkgs }: buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.29"; + version = "8.0.33"; format = "setuptools"; disabled = pythonOlder "3.7"; + setupPyBuildFlags = [ + "--with-mysql-capi=\"${mysql80}\"" + "--with-openssl-include-dir=\"${openssl.dev}/include\"" + "--with-openssl-lib-dir=\"${lib.getLib openssl}/lib\"" + "-L \"${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql80}/lib\"" + ]; + src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - hash = "sha256-X0qiXNYkNoR00ESUdByPj4dPnEnjLyopm25lm1JvkAk="; + hash = "sha256-GtMq7E2qBqFu54hjUotzPyxScTKXNdEQcmgHnS7lBhc="; }; patches = [ @@ -30,17 +39,19 @@ buildPythonPackage rec { # 10.12. The patch reverts # https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654 ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch + ]; - # Allow for clang to be used to build native extensions - (fetchpatch { - url = "https://github.com/mysql/mysql-connector-python/commit/fd24ce9dc8c60cc446a8e69458f7851d047c7831.patch"; - hash = "sha256-WvU1iB53MavCsksKCjGvUl7R3Ww/38alxxMVzjpr5Xg="; - }) + nativeBuildInputs = [ + mysql80 ]; + propagatedBuildInputs = [ dnspython protobuf + mysql80 + openssl + pkgs.zstd ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index 9eb5faa6064e..ca2272ac1bd5 100644 --- a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , vmprof -, pyqt4 , isPyPy , pkgs , scons @@ -21,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-8eWOcxATVS866nlN39b2VU1CuXAfcn0yQsDweHS2yDU="; }; - nativeCheckInputs = [ vmprof pyqt4 ]; + nativeCheckInputs = [ vmprof ]; nativeBuildInputs = [ scons ]; propagatedBuildInputs = [ chrpath ]; diff --git a/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix b/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix index 8894de41d561..caf4028df577 100644 --- a/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "12.535.77"; + version = "12.535.108"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-jYHl7Zk8hABkVBAq+ExL/99yulxRIStsASHGVoiYPhQ="; + hash = "sha256-FB/oGHcaFl+5P3Xb5/Afdnw7r6fBP2h29TWDURsHjuE="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/openai/default.nix b/nixpkgs/pkgs/development/python-modules/openai/default.nix index 87e16ac90ac0..172ddb5970a9 100644 --- a/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.27.9"; + version = "0.28.0"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vp85M9VZvbY4saG88WcR3Qw8z+A9nU1Oi3sf9yitsV4="; + hash = "sha256-NDIHOX0W1nERvOWxnGBD42v+EjrND/9u90SS7KJzOW8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix b/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix new file mode 100644 index 000000000000..5fd2e6316bb0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, pythonOlder +, bentoml +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling +, httpx +, openllm-core +, soundfile +, transformers +}: + +buildPythonPackage rec { + inherit (openllm-core) src version; + pname = "openllm-client"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + sourceRoot = "source/openllm-client"; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + httpx + openllm-core + ]; + + passthru.optional-dependencies = { + grpc = [ + bentoml + ] ++ bentoml.optional-dependencies.grpc; + agents = [ + transformers + # diffusers + soundfile + ] ++ transformers.agents; + full = passthru.optional-dependencies.grpc ++ passthru.optional-dependencies.agents; + }; + + # there is no tests + doCheck = false; + + pythonImportsCheck = [ "openllm_client" ]; + + meta = with lib; { + description = "Interacting with OpenLLM HTTP/gRPC server, or any BentoML server"; + homepage = "https://github.com/bentoml/OpenLLM/tree/main/openllm-client"; + changelog = "https://github.com/bentoml/OpenLLM/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix b/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix new file mode 100644 index 000000000000..3f2c80cf0a57 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix @@ -0,0 +1,84 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, accelerate +, attrs +, bentoml +, bitsandbytes +, cattrs +, datasets +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling +, inflection +, mypy-extensions +, orjson +, peft +, ray +, transformers +, typing-extensions +}: + +buildPythonPackage rec { + pname = "openllm-core"; + version = "0.2.27"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bentoml"; + repo = "OpenLLM"; + rev = "refs/tags/v${version}"; + hash = "sha256-R69Qsx9360pJx+7oyhHdeAXUjTAdevPmaBl9gj+AA8U="; + }; + + sourceRoot = "source/openllm-core"; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + attrs + bentoml + cattrs + inflection + mypy-extensions + orjson + typing-extensions + ]; + + passthru.optional-dependencies = { + vllm = [ + ray + # vllm + ]; + fine-tune = [ + accelerate + bitsandbytes + datasets + peft + transformers + # trl + ] ++ transformers.optional-dependencies.torch + ++ transformers.optional-dependencies.tokenizers + ++ transformers.optional-dependencies.accelerate; + }; + + # there is no tests + doCheck = false; + + pythonImportsCheck = [ "openllm_core" ]; + + meta = with lib; { + description = "Core components for OpenLLM"; + homepage = "https://github.com/bentoml/OpenLLM/tree/main/openllm-core"; + changelog = "https://github.com/bentoml/OpenLLM/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openllm/default.nix b/nixpkgs/pkgs/development/python-modules/openllm/default.nix new file mode 100644 index 000000000000..63974fa8be7b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openllm/default.nix @@ -0,0 +1,198 @@ +{ lib +, buildPythonPackage +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, accelerate +, bentoml +, bitsandbytes +, click +, datasets +, docker +, einops +, fairscale +, flax +, hypothesis +, ipython +, jax +, jaxlib +, jupyter +, jupytext +, keras +, nbformat +, notebook +, openai +, openllm-client +, openllm-core +, optimum +, peft +, pytest-mock +, pytest-randomly +, pytest-rerunfailures +, pytest-xdist +, ray +, safetensors +, sentencepiece +, soundfile +, syrupy +, tabulate +, tensorflow +, tiktoken +, transformers +, openai-triton +, xformers +}: + +buildPythonPackage rec { + inherit (openllm-core) src version; + pname = "openllm"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + sourceRoot = "source/openllm-python"; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + # remove cuda-python as it has an unfree license + "cuda-python" + ]; + + propagatedBuildInputs = [ + bentoml + bitsandbytes + click + openllm-client + optimum + safetensors + tabulate + transformers + ] ++ bentoml.optional-dependencies.io + ++ tabulate.optional-dependencies.widechars + # ++ transformers.optional-dependencies.accelerate + ++ transformers.optional-dependencies.tokenizers + ++ transformers.optional-dependencies.torch; + + passthru.optional-dependencies = { + agents = [ + # diffusers + soundfile + transformers + ] ++ transformers.optional-dependencies.agents; + baichuan = [ + # cpm-kernels + sentencepiece + ]; + chatglm = [ + # cpm-kernels + sentencepiece + ]; + falcon = [ + einops + xformers + ]; + fine-tune = [ + accelerate + bitsandbytes + datasets + peft + # trl + ]; + flan-t5 = [ + flax + jax + jaxlib + keras + tensorflow + ]; + ggml = [ + # ctransformers + ]; + gptq = [ + # auto-gptq + ]; # ++ autogptq.optional-dependencies.triton; + grpc = [ + openllm-client + ] ++ openllm-client.optional-dependencies.grpc; + llama = [ + fairscale + sentencepiece + ]; + mpt = [ + einops + openai-triton + ]; + openai = [ + openai + tiktoken + ]; + opt = [ + flax + jax + jaxlib + keras + tensorflow + ]; + playground = [ + ipython + jupyter + jupytext + nbformat + notebook + ]; + starcoder = [ + bitsandbytes + ]; + vllm = [ + ray + # vllm + ]; + all = with passthru.optional-dependencies; ( + agents ++ baichuan ++ chatglm ++ falcon ++ fine-tune ++ flan-t5 ++ ggml ++ gptq ++ llama ++ mpt ++ openai ++ opt ++ playground ++ starcoder ++ vllm + ); + }; + + nativeCheckInputs = [ + docker + hypothesis + pytest-mock + pytest-randomly + pytest-rerunfailures + pytest-xdist + pytestCheckHook + syrupy + ]; + + preCheck = '' + export HOME=$TMPDIR + # skip GPUs test on CI + export GITHUB_ACTIONS=1 + ''; + + disabledTests = [ + # these tests access to huggingface.co + "test_opt_125m" + "test_opt_125m" + "test_flan_t5" + "test_flan_t5" + ]; + + pythonImportsCheck = [ "openllm" ]; + + meta = with lib; { + description = "Operating LLMs in production"; + homepage = "https://github.com/bentoml/OpenLLM/tree/main/openllm-python"; + changelog = "https://github.com/bentoml/OpenLLM/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix index b405a3b8fca9..748149ae1f44 100644 --- a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-NhUSnttnyCr70aFwbpFf+mjg7r/JnJA8NDqsZRfdWFg="; + hash = "sha256-FBtR+ijGsc3rmOvcOMHO5qTnVL1ryEq3qqDQwrzlRD4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/orange3/default.nix b/nixpkgs/pkgs/development/python-modules/orange3/default.nix index 6c857cc07acd..cff4a603c846 100644 --- a/nixpkgs/pkgs/development/python-modules/orange3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orange3/default.nix @@ -1,21 +1,21 @@ { lib -, buildPythonPackage -, copyDesktopItems -, fetchurl -, makeDesktopItem -, fetchFromGitHub -, nix-update-script -, python , baycomp , bottleneck +, buildPythonPackage , chardet +, copyDesktopItems , cython +, fetchFromGitHub +, fetchurl , httpx , joblib , keyring , keyrings-alt +, makeDesktopItem , matplotlib +, nix-update-script , numpy +, oldest-supported-numpy , openpyxl , opentsne , orange-canvas-core @@ -23,25 +23,32 @@ , pandas , pyqtgraph , pyqtwebengine +, python , python-louvain +, pythonOlder , pyyaml , qt5 , qtconsole +, recommonmark , requests , scikit-learn , scipy -, sphinx , serverfiles +, setuptools +, sphinx +, wheel , xlrd , xlsxwriter }: let -self = buildPythonPackage rec { + self = buildPythonPackage rec { pname = "orange3"; version = "3.35.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "biolab"; repo = "orange3"; @@ -50,6 +57,8 @@ self = buildPythonPackage rec { }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools>=41.0.0,<50.0" "setuptools" sed -i 's;\(scikit-learn\)[^$]*;\1;g' requirements-core.txt sed -i 's;pyqtgraph[^$]*;;g' requirements-gui.txt # TODO: remove after bump with a version greater than 0.13.1 ''; @@ -57,8 +66,12 @@ self = buildPythonPackage rec { nativeBuildInputs = [ copyDesktopItems cython + oldest-supported-numpy qt5.wrapQtAppsHook + recommonmark + setuptools sphinx + wheel ]; enableParallelBuilding = true; @@ -153,12 +166,14 @@ self = buildPythonPackage rec { }); }; - meta = { - mainProgram = "orange-canvas"; + meta = with lib; { description = "Data mining and visualization toolbox for novice and expert alike"; homepage = "https://orangedatamining.com/"; - license = [ lib.licenses.gpl3Plus ]; - maintainers = [ lib.maintainers.lucasew ]; + changelog = "https://github.com/biolab/orange3/blob/${version}/CHANGELOG.md"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ lucasew ]; + mainProgram = "orange-canvas"; }; }; -in self +in +self diff --git a/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix index 3531f409f0ef..e6b7d7b05f3a 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.1.1"; + version = "5.2.0"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - hash = "sha256-EQ+2Adgi3UsI7qJ5d9cNAfnxzR6vbezQQqIfQ78/KyU="; + hash = "sha256-ihnsV07QV+k9UWdDJgX/h0xLkBelIV/QIaIDTGzVKpI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix index 09b76eb27cb6..85f92e478354 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-YiYzbVtu4YhfBXtl2+3oTEqcXk5K51oOjn84PBY+xIA="; + hash = "sha256-zJSqvbUOHiVxxsvEs5lpSgVBV2c1kIqYSgIjqeH72z4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/osqp/default.nix b/nixpkgs/pkgs/development/python-modules/osqp/default.nix index 7f15cc189832..ac933f65e1c2 100644 --- a/nixpkgs/pkgs/development/python-modules/osqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osqp/default.nix @@ -14,20 +14,16 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.2.post8"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-I9a65KNhL2DV9lLQ5fpLLq1QfKv/9dkw2CIFeubtZnc="; + hash = "sha256-A+Rg5oPsLOD4OTU936PEyP+lCauM9qKyr7tYb6RT4YA="; }; - postPatch = '' - sed -i 's/sp.random/np.random/g' src/osqp/tests/*.py - ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; dontUseCmakeConfigure = true; @@ -54,29 +50,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # Test are failing due to scipy update (removal of scipy.random in 1.9.0) - # Is fixed upstream but requires a new release - "test_feasibility_problem" + # Need an unfree license package - mkl "test_issue14" - "test_polish_random" - "test_polish_unconstrained" - "test_primal_and_dual_infeasible_problem" - "test_primal_infeasible_problem" - "test_solve" - "test_unconstrained_problem" - "test_update_A_allind" - "test_update_A" - "test_update_bounds" - "test_update_l" - "test_update_P_A_allind" - "test_update_P_A_indA" - "test_update_P_A_indP_indA" - "test_update_P_A_indP" - "test_update_P_allind" - "test_update_P" - "test_update_q" - "test_update_u" - "test_warm_start" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index d79b9eea4bce..e64f61e0ddec 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -206,6 +206,8 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1} "test_binops" + # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921. + "test_rolling" ]; # Tests have relative paths, and need to reference compiled C extensions diff --git a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index e92022ecd68a..6a2cb70d4179 100644 --- a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.2.0"; + version = "19.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1j1QQo8hTUM7CzDUiRvOUWImb+rGIQgPWl69hTvlZUo="; + hash = "sha256-hVI3syst8F5BNrHcu21OxszPMWuv0wY65yFdfoXLMWM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/peft/default.nix b/nixpkgs/pkgs/development/python-modules/peft/default.nix index 8bd8b1a924f6..d6a4531312fa 100644 --- a/nixpkgs/pkgs/development/python-modules/peft/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peft/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-riOCe43/2xUpE6TTCEpMndeFTbaBN4JFDlv90tqVO4Y="; + hash = "sha256-FaD873ksim7ewOI6Wqcv+GuPmH45+yAvbJC1H/DSfI8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix b/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix index fa6c63378625..0cb84c332a88 100644 --- a/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.16.1"; + version = "0.17.0"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-4VOJ7l6tBhMBZ2x+T5Bl5WdnMg4JEBkwaGDA/9XUmc8="; + hash = "sha256-sq/xWPLLAz4w6JdUfnB5E52hmj8gmrbg1oeBedyjCEE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 66d7cf680bfd..01884677f26d 100644 --- a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.2.1"; + version = "8.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-8uPPEoLxoMRq/tkpThatwjPHZIMYQ8lNL6fLcG+nsnw="; + hash = "sha256-d76s4iJFwhzWSySXTS53PQQuWfWIboIRecEyjzobsME="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix index 4573e25a22b2..ca0d947d37b1 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k , olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2 , libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml -, pytestCheckHook +, pytestCheckHook, setuptools }@args: import ../pillow/generic.nix (rec { diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index bb669f421177..bf3b1991c39a 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -6,7 +6,7 @@ , fetchpatch , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 -, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools # for passthru.tests , imageio, matplotlib, pilkit, pydicom, reportlab }@args: diff --git a/nixpkgs/pkgs/development/python-modules/pillow/generic.nix b/nixpkgs/pkgs/development/python-modules/pillow/generic.nix index 95ecce0522c3..5186e8a476bb 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/generic.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/generic.nix @@ -39,6 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyroma numpy ]; + nativeBuildInputs = [ setuptools ]; + buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ] ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] ++ lib.optionals (isPyPy) [ tk libX11 ]; diff --git a/nixpkgs/pkgs/development/python-modules/pip/default.nix b/nixpkgs/pkgs/development/python-modules/pip/default.nix index bc06cb39e247..484a15e85876 100644 --- a/nixpkgs/pkgs/development/python-modules/pip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip/default.nix @@ -10,6 +10,9 @@ , pretend , pytest +# docs +, sphinx + # coupled downsteam dependencies , pip-tools }: @@ -36,18 +39,50 @@ buildPythonPackage rec { installShellFiles setuptools wheel + + # docs + sphinx ]; + outputs = [ + "out" + "man" + ]; + + # pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting + # to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148 + postBuild = '' + cd docs + + # remove references to sphinx extentions only required for html doc generation + # sphinx.ext.intersphinx requires network connection or packaged object.inv files for python and pypug + # sphinxcontrib.towncrier is not currently packaged + for ext in sphinx.ext.intersphinx sphinx_copybutton sphinx_inline_tabs sphinxcontrib.towncrier myst_parser; do + substituteInPlace html/conf.py --replace '"'$ext'",' "" + done + + PYTHONPATH=$src/src:$PYTHONPATH sphinx-build -v \ + -d build/doctrees/man \ + -c html \ + -d build/doctrees/man \ + -b man \ + man \ + build/man + cd .. + ''; + nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; postInstall = '' + installManPage docs/build/man/* + installShellCompletion --cmd pip \ - --bash <($out/bin/pip completion --bash) \ - --fish <($out/bin/pip completion --fish) \ - --zsh <($out/bin/pip completion --zsh) + --bash <($out/bin/pip completion --bash --no-cache-dir) \ + --fish <($out/bin/pip completion --fish --no-cache-dir) \ + --zsh <($out/bin/pip completion --zsh --no-cache-dir) ''; passthru.tests = { inherit pip-tools; }; diff --git a/nixpkgs/pkgs/development/python-modules/pkutils/default.nix b/nixpkgs/pkgs/development/python-modules/pkutils/default.nix index e626c9bd587c..e3957533ea99 100644 --- a/nixpkgs/pkgs/development/python-modules/pkutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkutils/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose +, nose3 , pythonOlder , pythonRelaxDepsHook , semver @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + nose3 ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 625cd6ab9148..9c6440cd4c32 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -3,7 +3,6 @@ , dunamai , fetchFromGitHub , jinja2 -, markupsafe , poetry-core , poetry , pytestCheckHook @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.21.5"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YFbIQLIbedErdKiPlZf0+6qtZexuJ6Q6pzhy54vSK5Y="; + hash = "sha256-BGAo3c0TzyhIiDtZjoEP+Eeu51WJB3Wg71poFMWJ+VM="; }; nativeBuildInputs = [ @@ -32,7 +31,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ dunamai jinja2 - markupsafe tomlkit ]; diff --git a/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix b/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix index 5915459f8ec9..e358143afea3 100644 --- a/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.8"; + version = "0.12.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "policy_sentry"; rev = "refs/tags/${version}"; - hash = "sha256-I56xWBbE1TqP+I8Op5X4TqHNB+gRlEPi7YQldIsjv4Q="; + hash = "sha256-mVB7qqADjf4XnDaQyL5C4/Z6hOxAMQbmr6fGnaXD+O0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix index 149556c125e5..b0efbcb373d4 100644 --- a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix @@ -1,27 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , hatch-vcs , hatchling -, wcwidth -, importlib-metadata , pytest-lazy-fixture , pytestCheckHook +, pythonOlder +, wcwidth }: buildPythonPackage rec { pname = "prettytable"; - version = "3.5.0"; + version = "3.8.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jazzband"; repo = "prettytable"; rev = "refs/tags/${version}"; - hash= "sha256-J6oWNug2MEkUZSi67mM5H/Nf4tdSTB/ku34plp1XWCM="; + hash= "sha256-JnxUjUosQJgprIbA9szSfw1Fi21Qc4WljoRAQv4x5YM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -33,8 +32,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; nativeCheckInputs = [ @@ -47,9 +44,9 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}"; description = "Display tabular data in a visually appealing ASCII table format"; homepage = "https://github.com/jazzband/prettytable"; + changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index cad2f1366e18..552c0fb42b37 100644 --- a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.0.3"; + version = "6.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-AnyKDoD7hh3iYheUK8RXFfXEi5yChkZNAyWobC2ghmQ="; + hash = "sha256-YukXw7/KDfw6iYoN6UpF5XGb5D6oaaXTOpsduqZZz2Y="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/nixpkgs/pkgs/development/python-modules/pyaml/default.nix b/nixpkgs/pkgs/development/python-modules/pyaml/default.nix index 96ae8df32df0..a38cd3093e72 100644 --- a/nixpkgs/pkgs/development/python-modules/pyaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "23.7.0"; + version = "23.9.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DFELu4k4MJQA4LHkesFv2Q5W1lKAWpNBcSh4ZxjzNUY="; + sha256 = "sha256-s/mzgzUyfTIUyIg0kwA3OGwP5EV+GuGXGcVvqiOSIr0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyasn/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn/default.nix index 0fc2121f1430..026b5fdff683 100644 --- a/nixpkgs/pkgs/development/python-modules/pyasn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyasn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyasn"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - hash = "sha256-6UK1SRY2Pse4tw6urs0OtOQe8bz0ojl7KabXFfzN+SU="; + hash = "sha256-otVfs+5HlHYJ9QIRylsLrEEahvPJNfuSyksLirfGaP8="; }; datasrc = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix new file mode 100644 index 000000000000..b2513a37ab49 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix @@ -0,0 +1,70 @@ +{ lib +, awesomeversion +, buildPythonPackage +, envoy-utils +, fetchFromGitHub +, httpx +, lxml +, orjson +, poetry-core +, pyjwt +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +, syrupy +, tenacity +}: + +buildPythonPackage rec { + pname = "pyenphase"; + version = "1.9.3"; + format = "pyproject"; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "pyenphase"; + repo = "pyenphase"; + rev = "refs/tags/v${version}"; + hash = "sha256-Wcv5E0Oj8wkVOPGz9viXMNpaqK00xti+pF5Jt6mCWi4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=pyenphase --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + awesomeversion + envoy-utils + httpx + lxml + orjson + pyjwt + tenacity + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + syrupy + ]; + + pythonImportsCheck = [ + "pyenphase" + ]; + + meta = with lib; { + description = "Library to control enphase envoy"; + homepage = "https://github.com/pyenphase/pyenphase"; + changelog = "https://github.com/pyenphase/pyenphase/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix b/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix index 9dfe3b82cb55..4cc60efbc637 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix @@ -2,19 +2,30 @@ , lib , buildPythonPackage , fetchFromGitHub +, pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "pyinstrument"; - version = "4.5.0"; + version = "4.5.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "joerick"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HvPapa3b9/Wc4ClaMOmCAIeHS7H4V9aCR9JCDol2ElE="; + hash = "sha256-VL/JzgMxn5zABfmol+5oofR1RjyxTdzvUi6JnwsSFao="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + # Module import recursion doCheck = false; @@ -25,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Call stack profiler for Python"; homepage = "https://github.com/joerick/pyinstrument"; + changelog = "https://github.com/joerick/pyinstrument/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix index a27f49c8613a..b1605fac01b5 100644 --- a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.2.15"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "milvus-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wwhgO2iCzPXobyZI0narHPn2WCAB9sS1+AoLrP1Ih6Q="; + hash = "sha256-hp00iUT1atyTQk532z7VAajpfvtnKE8W2la9MW7NxoE="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix index c1b1b75d284c..d4715c131cea 100644 --- a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix @@ -7,54 +7,57 @@ , prompt-toolkit , pygments , pyserial -, pyserial-asyncio , pytest-asyncio -, pytest-rerunfailures , pytest-xdist , pytestCheckHook , redis , sqlalchemy -, tornado , twisted +, typer }: buildPythonPackage rec { pname = "pymodbus"; - version = "3.3.2"; + version = "3.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EGJyb0AVLKN7FEoeWF4rVqmJBNbXHent9P+cxc13rQs="; + hash = "sha256-ZoGpMhJng46nW7v/QgjGCsFZV6xV4PSh9/DH1d2dzdg="; }; - # Twisted asynchronous version is not supported due to a missing dependency - propagatedBuildInputs = [ - aiohttp - click - prompt-toolkit - pygments - pyserial - pyserial-asyncio - tornado - ]; + passthru.optional-dependencies = { + repl = [ + aiohttp + typer + prompt-toolkit + pygments + click + ] ++ typer.optional-dependencies.all; + serial = [ + pyserial + ]; + }; nativeCheckInputs = [ mock pytest-asyncio - pytest-rerunfailures pytest-xdist pytestCheckHook redis sqlalchemy twisted - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + preCheck = '' + pushd test + ''; - pytestFlagsArray = [ - "--reruns" "3" # Racy socket tests - ]; + postCheck = '' + popd + ''; pythonImportsCheck = [ "pymodbus" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix deleted file mode 100644 index a0bf3f03f600..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip_4, qt4, pkg-config, lndir, dbus, makeWrapper }: - -buildPythonPackage rec { - pname = "PyQt-x11-gpl"; - version = "4.12.3"; - format = "other"; - - src = fetchurl { - url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz"; - sha256 = "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0"; - }; - - postPatch = '' - mkdir -p $out - lndir ${dbus-python} $out - rm -rf "$out/nix-support" - - export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages - ${lib.optionalString stdenv.isDarwin '' - export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \ - ''} - - substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ - ${lib.optionalString stdenv.isDarwin '' - --replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \ - ''} - - chmod +x configure.py - sed -i '1i#!${python.pythonForBuild.interpreter}' configure.py - ''; - - configureScript = "./configure.py"; - dontAddPrefix = true; - configureFlags = [ - "--confirm-license" - "--bindir=${placeholder "out"}/bin" - "--destdir=${placeholder "out"}/${python.sitePackages}" - "--plugin-destdir=${placeholder "out"}/lib/qt4/plugins" - "--sipdir=${placeholder "out"}/share/sip/PyQt4" - "--dbus=${lib.getDev dbus-python}/include/dbus-1.0" - "--verbose" - ]; - - nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ]; - buildInputs = [ qt4 dbus ]; - - propagatedBuildInputs = [ sip_4 ]; - - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; - - enableParallelBuilding = true; - - passthru = { - qt = qt4; - }; - - meta = with lib; { - description = "Python bindings for Qt"; - license = "GPL"; - homepage = "http://www.riverbankcomputing.co.uk"; - maintainers = [ maintainers.sander ]; - platforms = platforms.mesaPlatforms; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index a5dbfd521d62..a2b24faf10db 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pyramid"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+r/XRQOeJq1bCRX8OW6HJcD4o9F7lB+WEezR7XbP59o="; + hash = "sha256-NyE4pzjkIWU1zHbczm7d1aGqypUTDyNU+4NCZMBvGN4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix b/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix deleted file mode 100644 index d2b896605f7f..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pexpect -, python-slugify -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pyruckus"; - version = "0.16"; - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "gabe565"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-SVE5BrCCQgCrhOC0CSGgbZ9TEY3iZ9Rp/xMUShPAxxM="; - }; - - propagatedBuildInputs = [ - pexpect - python-slugify - ]; - - # Tests requires network features - doCheck = false; - pythonImportsCheck = [ "pyruckus" ]; - - meta = with lib; { - description = "Python client for Ruckus Unleashed"; - homepage = "https://github.com/gabe565/pyruckus"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix b/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix index ff0d39fa7e32..45ba38aed42b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.8.1"; + version = "2023.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-PTkuVGUdqRcvgcIL7yoVWNLQcWyDpXXHLxb7CoD8J1s="; + hash = "sha256-4uYUEx6OcUMG8nS/PqZK5hHFQd/7pTGIix2it8pleuY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix b/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix deleted file mode 100644 index 1ad2d0123828..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libxml2, libxslt, python3, qt4 }: - -# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. -let - pythonEnv = python3.withPackages (ps: with ps; [ sphinx ]); -in -stdenv.mkDerivation rec { - pname = "pyside-apiextractor"; - version = "0.10.10"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "Apiextractor"; - rev = version; - hash = "sha256-YH8aYyzv59xiIglZbdNgOPnmEQwNE2GmotAFFfFdMlg="; - }; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - ''; - - nativeBuildInputs = [ cmake pythonEnv ]; - buildInputs = [ qt4 libxml2 libxslt ]; - - meta = with lib; { - description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; - license = licenses.gpl2; - homepage = "http://www.pyside.org/docs/apiextractor/"; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside/default.nix b/nixpkgs/pkgs/development/python-modules/pyside/default.nix deleted file mode 100644 index 82cc62f2c708..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, fetchFromGitHub, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa, libGL }: - -buildPythonPackage rec { - pname = "pyside"; - version = "1.2.4"; - format = "other"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "PySide"; - rev = version; - hash = "sha256-14XbihJRMk9WaeK6NUBV/4OMFZF8EBIJgEJEaCU8Ecg="; - }; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - ''; - - nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; - - buildInputs = [ mesa libGL ]; - - makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ]; - - dontWrapQtApps = true; - - meta = { - description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; - license = lib.licenses.lgpl21; - homepage = "http://www.pyside.org"; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch b/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch deleted file mode 100644 index 440e94508c57..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Shiboken-1.2.4.org/tests/libsample/simplefile.cpp 2017-08-26 09:06:27.216859143 +0100 -+++ Shiboken-1.2.4/tests/libsample/simplefile.cpp 2017-08-26 09:05:40.037029652 +0100 -@@ -90,13 +90,13 @@ - SimpleFile::exists() const - { - std::ifstream ifile(p->m_filename); -- return ifile; -+ return (bool)ifile; - } - - bool - SimpleFile::exists(const char* filename) - { - std::ifstream ifile(filename); -- return ifile; -+ return (bool)ifile; - } - diff --git a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix b/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix deleted file mode 100644 index 3d47ccd58f2b..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pysideApiextractor, python3, qt4 }: - -# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. -let - pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]); -in stdenv.mkDerivation rec { - pname = "pyside-generatorrunner"; - version = "0.6.16"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "Generatorrunner"; - rev = version; - hash = "sha256-JAghKY033RTD5b2elitzVQbbN3PMmT3BHwpqx8N5EYg="; - }; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - ''; - - nativeBuildInputs = [ cmake pythonEnv ]; - buildInputs = [ pysideApiextractor qt4 ]; - - meta = with lib; { - description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; - license = licenses.gpl2; - homepage = "http://www.pyside.org/docs/generatorrunner/"; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix b/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix deleted file mode 100644 index 9bad569806a6..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, fetchFromGitHub, buildPythonPackage -, cmake -, fetchurl -, isPy3k -, libxml2 -, libxslt -, pkg-config -, pysideApiextractor -, pysideGeneratorrunner -, python -, pythonAtLeast -, qt4 -, sphinx -}: - -buildPythonPackage rec { - pname = "pyside-shiboken"; - version = "1.2.4"; - format = "other"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "Shiboken"; - rev = version; - sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v"; - }; - - nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ]; - - buildInputs = [ python libxml2 libxslt ]; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - echo "preConfigure: Fixing shiboken_generator install target." - substituteInPlace generator/CMakeLists.txt --replace \ - \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ - ''; - - patches = [ - # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 - ./gcc6.patch - (lib.optional (pythonAtLeast "3.5") ./shiboken_py35.patch) - (fetchurl { - # https://github.com/pyside/Shiboken/pull/90 - name = "fix-build-with-python-3.9.patch"; - url = "https://github.com/pyside/Shiboken/commit/d1c901d4c0af581003553865360ba964cda041e8.patch"; - sha256 = "1f7slz8n8rps5r67hz3hi4rr82igc3l166shfy6647ivsb2fnxwy"; - }) - ]; - - cmakeFlags = lib.optionals isPy3k [ - "-DUSE_PYTHON3=TRUE" - "-DPYTHON3_INCLUDE_DIR=${lib.getDev python}/include/${python.libPrefix}" - "-DPYTHON3_LIBRARY=${lib.getLib python}/lib" - ]; - - meta = with lib; { - description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; - license = licenses.gpl2; - homepage = "http://www.pyside.org/"; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch b/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch deleted file mode 100644 index fb095cf991cf..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake ---- a/cmake/Modules/FindPython3Libs.cmake -+++ b/cmake/Modules/FindPython3Libs.cmake -@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks) - # Search for the python framework on Apple. - # CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0) -+FOREACH(_CURRENT_VERSION 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - IF(_CURRENT_VERSION GREATER 3.1) - SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "") - ELSE() diff --git a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix b/nixpkgs/pkgs/development/python-modules/pyside/tools.nix deleted file mode 100644 index cc52a0502f28..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cmake, qt4, pyside, pysideShiboken }: - -buildPythonPackage rec { - pname = "pyside-tools"; - version = "0.2.15"; - format = "other"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "Tools"; - rev = version; - sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll"; - }; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qt4 ]; - - propagatedBuildInputs = [ pyside pysideShiboken ]; - - meta = with lib; { - description = "Development tools (pyside-uic/rcc/lupdate) for PySide, the LGPL-licensed Python bindings for the Qt framework"; - license = licenses.gpl2; - homepage = "https://wiki.qt.io/PySide"; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside6/default.nix b/nixpkgs/pkgs/development/python-modules/pyside6/default.nix index 0cf06e885c13..be99c0a086fb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyside6/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyside6/default.nix @@ -2,7 +2,6 @@ , stdenv , cmake , ninja -, qt6 , python , moveBuildTree , shiboken6 @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { inherit (shiboken6) version src; - sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. @@ -34,9 +33,12 @@ stdenv.mkDerivation rec { moveBuildTree ]; - buildInputs = with qt6; [ + buildInputs = with python.pkgs.qt6; [ # required qtbase + python.pkgs.ninja + python.pkgs.packaging + python.pkgs.setuptools ] ++ lib.optionals stdenv.isLinux [ # optional qt3d @@ -69,6 +71,12 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postInstall = '' + cd ../../.. + ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=pyside6 + cp -r PySide6.egg-info $out/${python.sitePackages}/ + ''; + meta = with lib; { description = "Python bindings for Qt"; license = with licenses; [ lgpl3Only gpl2Only gpl3Only ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 1bff99c95820..6d6f4c3baa4f 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.5"; + version = "1.0.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-a+2RW+S0Tpf1odfLi0JEdbxfJehF+HI/sHc4QX7lQ+4="; + hash = "sha256-bP64JMDhSYusLzRq0Mv89x1c9DflmYFTih9RP+dY4/c="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index 6ea53e7dadd8..a4309ea0fe56 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.10.4"; + version = "0.10.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-pEw0CmQYwZmfpN1mAv04eeOBTVX6JfW3aKhfofZaKYo="; + hash = "sha256-iiE6XHj5632sBlivUHz7HiNRjNpEh+OMqcJ65o2km6I="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/pystache/default.nix b/nixpkgs/pkgs/development/python-modules/pystache/default.nix index 19d9b2cdf490..5cb51640b51d 100644 --- a/nixpkgs/pkgs/development/python-modules/pystache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pystache/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pystache"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c="; + hash = "sha256-nyONWgbxiEPg1JHY5OKS3AP+1qVMsKXDS+N6P6qXMXQ="; }; LC_ALL = "en_US.UTF-8"; diff --git a/nixpkgs/pkgs/development/python-modules/pytapo/default.nix b/nixpkgs/pkgs/development/python-modules/pytapo/default.nix index 7d026e0625ba..f27757b4784e 100644 --- a/nixpkgs/pkgs/development/python-modules/pytapo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.1.18"; + version = "3.2.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pYzp/iQHTXS+ovtWIwOoUfYg/h/46ZLNZyevK2vQHEA="; + hash = "sha256-V/D+eE6y1kCMZmp9rIcvS/wdcSyW3mYWEJqpCb74NtY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix b/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix index b7c25bbf17c8..c1bfd320119b 100644 --- a/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.10"; + version = "0.3.11"; format = "pyproject"; src = fetchFromGitHub { owner = "madmaze"; repo = pname; - rev = "v${version}"; - hash = "sha256-CyKXtaIE/8iPLqi0GHVUgTeJDYZyWBjkRvOKJJKCxZo="; + rev = "refs/tags/v${version}"; + hash = "sha256-8obU1QFlboQnFjb3JUkVG+tt0wDlRffVH/PBmN1r3dk="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix index 16f85581cabf..a5e11c66a71a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -2,30 +2,33 @@ , buildPythonPackage , fetchPypi , pytest +, pytestCheckHook , pytest-flakes -, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-UFF8ldnaImXU6al4kGjf720mbwXE6Nut9VlvNVrMVoY="; }; - buildInputs = [ pytest ]; + propagatedBuildInputs = [ + pytest + ]; - propagatedBuildInputs = [ pytest-flakes tox ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-flakes + ]; meta = with lib; { license = licenses.asl20; homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; maintainers = with maintainers; [ onny ]; - # Pytest support > 6.0 missing - # https://github.com/t2y/pytest-quickcheck/issues/17 - broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix b/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix index 10db66e4bb22..2ffc8ed0b7f2 100644 --- a/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.15"; + version = "0.5.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PNgv3QXl3iyDX0KOn1egQrt6D64i3eCUyCPtXe94y0U="; + hash = "sha256-m80lnNd1ANddV0d/w3S7+QWzIPRklDZsWMO2g1hgEoQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix index d4ef03912005..6473cb660086 100644 --- a/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "9.3.0"; + version = "9.4.0"; src = fetchPypi { inherit pname version; - hash = "sha256-mmqjD+/0jAwP0Yjm1RUNvdkeP9WxDS2514uYEqsUr4g="; + hash = "sha256-pT5kcKUWYntZ0iUFIioMhXlL4afyd06HeWEFvUfulpU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix index 07044b9499bb..af0671279ab1 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix @@ -12,15 +12,17 @@ , requests , requests-mock , stestr +, multiprocess +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "python-jenkins"; - version = "1.7.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy"; + hash = "sha256-/18dklOdkD+GmwLq8rExREfm1tePdn7c/dkpZ9UyucY="; }; # test uses timeout mechanism unsafe for use with the "spawn" @@ -30,18 +32,25 @@ buildPythonPackage rec { --replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout ''; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "setuptools" + ]; + buildInputs = [ mock ]; propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ stestr testscenarios requests-mock ]; - checkPhase = '' - # Skip tests that fail due to setuptools>=66.0.0 rejecting PEP 440 - # non-conforming versions. See - # https://github.com/pypa/setuptools/issues/2497 for details. - stestr run -E "tests.test_plugins.(PluginsTestScenarios.test_plugin_version_comparison|PluginsTestScenarios.test_plugin_version_object_comparison|PluginsTest.test_plugin_equal|PluginsTest.test_plugin_not_equal)" - ''; + nativeCheckInputs = [ stestr testscenarios requests-mock multiprocess ]; + checkPhase = '' + # Skip tests that fail due to setuptools>=66.0.0 rejecting PEP 440 + # non-conforming versions. See + # https://github.com/pypa/setuptools/issues/2497 for details. + stestr run -E "tests.test_plugins.(PluginsTestScenarios.test_plugin_version_comparison|PluginsTestScenarios.test_plugin_version_object_comparison|PluginsTest.test_plugin_equal|PluginsTest.test_plugin_not_equal)" + ''; meta = with lib; { description = "Python bindings for the remote Jenkins API"; diff --git a/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix index f3d8d46bbe84..60be5e80c8c7 100644 --- a/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.5.1"; + version = "4.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-jtcY0yPD6eBcTFNVgANY4brQkrAscADeY8hbfw6M/tI="; + hash = "sha256-JFdpPX2lVSGN/jVsKMOOKrPm51fwpD476TnQo/0AYWQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix index 8cdc62e8c0f5..1bad0f4e6930 100644 --- a/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "18.3.0"; + version = "18.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UPdYfHorJSj3NQWBf5Q3rFwdBNV26b4mTS3u/9t0WnY="; + hash = "sha256-a2tq4sEescEI469V6qchGw/JGZk1oimmuj4N5RTBK1A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix b/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix index eb498ea05adf..d783efa71425 100644 --- a/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "python-pptx"; - version = "0.6.21"; + version = "0.6.22"; src = fetchPypi { inherit pname version; - hash = "sha256-d5iiqviVY1ZbPHEgwKz+mv93XbDbNYBUTjv0hAwuN48="; + hash = "sha256-OPjukt3jHSS0ViVg5hsDV+XZfs91xDUq5mFtWjKXhlQ="; }; # postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix index bb8320846862..e34bad425b3c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-swiftclient"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Hj3fmYzL6n3CWqbfjrPffTi/S8lrBl8vhEMeglmBezM="; + hash = "sha256-p32Xqw5AEsZ4cy5XW9/u0oKzSJuRdegsRqR6yEke7oQ="; }; # remove duplicate script that will be created by setuptools from the diff --git a/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix b/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix index 4e7f9ff84884..1e3776b906a5 100644 --- a/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "python_docs_theme"; - version = "2023.3.1"; + version = "2023.7"; format = "flit"; src = fetchFromGitHub { owner = "python"; repo = "python-docs-theme"; - rev = version; - sha256 = "sha256-WyO5Xc67k5ExB4eCFd17sZCBMaV5djle9BAM0tn5CPc="; + rev = "refs/tags/${version}"; + sha256 = "sha256-43/TlgYm7Q4ZtY25MiLU9fd1atDmiDUeUK6AYfDfmag="; }; propagatedBuildInputs = [ sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix index 91dc505a3d83..3ec700149bed 100644 --- a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix @@ -12,11 +12,11 @@ let pname = "pythonnet"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { pname = "pythonnet"; inherit version; - sha256 = "sha256-7U9/f5VRVAQRLds9oWOOGhATy1bmTEjE+mAwPwKwo90="; + sha256 = "sha256-LN0cztxkp8m9cRvj0P0MSniTJHQTncVKppe+3edBx0Y="; }; # This buildDotnetModule is used only to get nuget sources, the actual diff --git a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index 2701f7e64f1d..f18402db6bb0 100644 --- a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.28.1"; + version = "0.28.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-ZEdBV+X9Ib1JvE8nzey+er7GrQMAV79zqn8ssC+kKdU="; + hash = "sha256-vi5f4V0nPb9K3nwdmwMDoNE85Or6haOWjMY4d/2Fj2s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytimeparse2/default.nix b/nixpkgs/pkgs/development/python-modules/pytimeparse2/default.nix new file mode 100644 index 000000000000..becbbb267e48 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytimeparse2/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, buildPythonPackage, dateutils }: + +buildPythonPackage rec { + pname = "pytimeparse2"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "onegreyonewhite"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-zWRbSohTvbVd3GcRRoxH/UReVGYHC0YmbNgbt8N0X48="; + }; + + propagatedBuildInputs = [ dateutils ]; + + # custom checks, see + # https://github.com/onegreyonewhite/pytimeparse2/blob/e00df7506b6925f2c6a5783e89e9f239d128271a/tox.ini#L36C20-L36C78 + checkPhase = '' + runHook preCheck + python tests.py -vv --failfast + runHook postCheck + ''; + + pythonImportsCheck = [ "pytimeparse2" ]; + + meta = with lib; { + description = "A pytimeparse based project with the aim of optimizing functionality and providing stable support"; + homepage = "https://github.com/onegreyonewhite/pytimeparse2"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index c76b97c2374a..5d46e647dc8a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.7"; + version = "2.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-R1uX5kPRnLWqqpEYbzJp7aOSK6e5mfyQ14CkbBCDszw="; + hash = "sha256-Z/5d7aUO9UO7c9PoekxP8PMajKlh//hk/YIp+BJMcho="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix b/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix index 2d4e7217fff2..62ea4229079e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.1.9"; + version = "2.1.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-88aCnPzC4RfmEsL05pgFoOCfz42R1eqaJGTmXoWu0gA="; + hash = "sha256-ddtTtTAUpvS8DN1vKVN+CjnmYp20xyxHydwOaDRjWzo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix b/nixpkgs/pkgs/development/python-modules/pyvista/default.nix index e63038b54c0b..4d40a650506c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvista/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.41.1"; + version = "0.42.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-vFxEMKEkiFOBrkvmaJPwoo+lOe6V9AmPxl32Tocy9p8="; + hash = "sha256-Bk2bw6WCLzMb3nLMCS9rRugNocA9eYju/aoE68TYu5c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywaze/default.nix b/nixpkgs/pkgs/development/python-modules/pywaze/default.nix new file mode 100644 index 000000000000..fbaa0e94ea87 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pywaze/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, httpx +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +}: + +buildPythonPackage rec { + pname = "pywaze"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "eifinger"; + repo = "pywaze"; + rev = "refs/tags/v${version}"; + hash = "sha256-z/6eSgERHKV/5vjbRWcyrxAMNDIHvM3GUoo3xf+AhNY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov --cov-report term-missing --cov=src/pywaze " "" + ''; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + httpx + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ + "pywaze" + ]; + + meta = with lib; { + description = "Module for calculating WAZE routes and travel times"; + homepage = "https://github.com/eifinger/pywaze"; + changelog = "https://github.com/eifinger/pywaze/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix b/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix index 2785ad3a32d9..a31438335ef8 100644 --- a/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2023.7.52"; + version = "2023.9.53"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-RHOupNo0jteUpxcxAojOfnBGGBt293j0OCHeKEritpQ="; + hash = "sha256-/q0bL1WxIn6giOp9kLUCLZRpS/2d2Rdr61rRwZXQRP8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix b/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix new file mode 100644 index 000000000000..18141543c98c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildPythonPackage +, unittestCheckHook +, daqp +, ecos +, numpy +, osqp +, scipy +, scs +, quadprog +}: +buildPythonPackage rec { + pname = "qpsolvers"; + version = "3.4.0"; + format = "flit"; + + src = fetchFromGitHub { + owner = "qpsolvers"; + repo = "qpsolvers"; + rev = "v${version}"; + hash = "sha256-GrYAhTWABBvU6rGoHi00jBa7ryjCNgzO/hQBTdSW9cg="; + }; + + pythonImportsCheck = [ "qpsolvers" ]; + + propagatedBuildInputs = [ + daqp + ecos + numpy + osqp + scipy + scs + ]; + + nativeCheckInputs = [ + quadprog + unittestCheckHook + ]; + + meta = with lib; { + description = "Quadratic programming solvers in Python with a unified API"; + homepage = "https://github.com/qpsolvers/qpsolvers"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ renesat ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix b/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix deleted file mode 100644 index a356bfddb934..000000000000 --- a/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, isPy3k -, isPyPy -, pkgs -, python -, pyqt4 -}: - -buildPythonPackage { - pname = "qscintilla-qt4"; - version = pkgs.qscintilla-qt4.version; - format = "other"; - - disabled = isPyPy; - - src = pkgs.qscintilla-qt4.src; - - nativeBuildInputs = [ pkgs.xorg.lndir ]; - - buildInputs = [ pyqt4.qt pyqt4 ]; - - preConfigure = '' - mkdir -p $out - lndir ${pyqt4} $out - rm -rf "$out/nix-support" - cd Python - ${python.executable} ./configure-old.py \ - --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ - --apidir $out/api/${python.libPrefix} \ - -n ${pkgs.qscintilla-qt4}/include \ - -o ${pkgs.qscintilla-qt4}/lib \ - --sipdir $out/share/sip - ''; - - meta = with lib; { - description = "A Python binding to QScintilla, Qt based text editing control"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ danbst ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index 57b16e254fcf..b963798f6560 100644 --- a/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.4.0"; + version = "5.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V3SOov0mMgoLd626IBMc+7E4GMfJbYP6/LEQ/1X1izU="; + hash = "sha256-t/+1PXTyPO4p9M21Xdb6vI7DEtlPPEa6OOHd5FhpPfs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix index 35f8e56a280f..e534704a7c4a 100644 --- a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U="; + hash = "sha256-2y1QgWeqYQZ4FWXI2lxvFIfeusujNRnO3DX6iZfUJNQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/quaternion/default.nix b/nixpkgs/pkgs/development/python-modules/quaternion/default.nix new file mode 100644 index 000000000000..ad53a085d327 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/quaternion/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, oldest-supported-numpy +, scipy +, numba +}: + +buildPythonPackage rec { + pname = "quaternion"; + version = "2022.4.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "moble"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-iLjVQ6eGwpLQXi8Sr5ShJdXMqYNclGEuq/oxR4ExDLA="; + }; + + propagatedBuildInputs = [ + oldest-supported-numpy + numba + scipy + ]; + + meta = with lib; { + description = "A package add built-in support for quaternions to numpy"; + homepage = "https://github.com/moble/quaternion"; + license = licenses.mit; + maintainers = [ maintainers.ocfox ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rchitect/default.nix b/nixpkgs/pkgs/development/python-modules/rchitect/default.nix index ad1484dfc254..2ac13e9a47f1 100644 --- a/nixpkgs/pkgs/development/python-modules/rchitect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rchitect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rchitect"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0="; + hash = "sha256-e0xCUp5WBP4UKPkwPfrouNNYTBEnhlHHlkBQmghQfdk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix b/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix index 8c911b282605..4d8ab8e8a8c9 100644 --- a/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix @@ -10,9 +10,11 @@ , pandas , pyarrow , pytest +, pythonOlder , scikit-learn , scipy -, pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { @@ -21,11 +23,17 @@ buildPythonPackage rec { format = "pyproject"; disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; hash = "sha256-7NoMEN/xOLFwaBXeMysShfZwrn6MzpJZYhNQHVieaqQ="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ pyarrow jellyfish @@ -41,14 +49,19 @@ buildPythonPackage rec { # pytestCheckHook does not work # Reusing their CI setup which involves 'rm -rf recordlinkage' in preCheck phase do not work too. - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ + pytest + ]; - pythonImportsCheck = [ "recordlinkage" ]; + pythonImportsCheck = [ + "recordlinkage" + ]; meta = with lib; { description = "Library to link records in or between data sources"; homepage = "https://recordlinkage.readthedocs.io/"; + changelog = "https://github.com/J535D165/recordlinkage/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = [ maintainers.raitobezarius ]; + maintainers = with maintainers; [ raitobezarius ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/regex/default.nix b/nixpkgs/pkgs/development/python-modules/regex/default.nix index d41bed6136ed..2df8bf922ea7 100644 --- a/nixpkgs/pkgs/development/python-modules/regex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.10.31"; + version = "2023.8.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-o6mJIdqaG/hFeu7mpVGUioNgFonl7N1zaJTqm77HfoM="; + hash = "sha256-/L3F8rDxzQ9qVs20b+QdLM4eZE47aIMvPu68X7D3cS4="; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index b74665e2c342..758c957823a6 100644 --- a/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -2,15 +2,14 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, ffmpeg-python , orjson , pythonOlder -, requests +, typing-extensions }: buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.8"; + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,29 +18,22 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-vbSt1rD25Bt3Qac0uO0Z63JhbU5HU0p2ox046W6xyJU="; + hash = "sha256-+1FZzgVaj2hphSTFlOtaYH3o++kC/aaahU8i8urdme0="; }; - postPatch = '' - # Packages in nixpkgs is different than the module name - substituteInPlace setup.py \ - --replace "ffmpeg" "ffmpeg-python" - ''; - propagatedBuildInputs = [ aiohttp - ffmpeg-python orjson - requests + typing-extensions ]; - # All tests require a network device - doCheck = false; - pythonImportsCheck = [ "reolink_aio" ]; + # All tests require a network device + doCheck = false; + meta = with lib; { description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/starkillerOG/reolink_aio"; diff --git a/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix b/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix index c86ed090919d..5acc7ae6ae26 100644 --- a/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "requirements-detector"; - version = "1.1.0"; + version = "1.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "landscapeio"; repo = pname; - rev = version; - hash = "sha256-H+h/PN1TrlpDRgI7tMWUhXlxj4CChwcxIR/BvyO261c="; + rev = "refs/tags/${version}"; + hash = "sha256-qmrHFQRypBJOI1N6W/Dtc5ss9JGqoPhFlbqrLHcb6vc="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool to find and list requirements of a Python project"; homepage = "https://github.com/landscapeio/requirements-detector"; + changelog = "https://github.com/landscapeio/requirements-detector/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/returns/default.nix b/nixpkgs/pkgs/development/python-modules/returns/default.nix index 0b54d62ba569..2e0275bd8040 100644 --- a/nixpkgs/pkgs/development/python-modules/returns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/returns/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "returns"; - version = "0.21.0"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dry-python"; repo = "returns"; rev = "refs/tags/${version}"; - hash = "sha256-oYOCoh/pF2g4KGWC2mEnFD+zm2CKL+3x5JjzuZ3QHVQ="; + hash = "sha256-0eFirhBsj8SWfoAPWEMuFa+EvBgHKpNeKVj3qJ4L6hE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix b/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix index 5578acbe5b69..0fde4435543d 100644 --- a/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.1.0"; + version = "1.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hamdanal"; repo = "rich-argparse"; rev = "v${version}"; - hash = "sha256-Rnv4A9pZ5VHpNjrWnsKyxQ4ISCLjIUu3tbbOzP4uFuw="; + hash = "sha256-WAqFhH9gUwDZuORJ++fKjCmaCurdYpep3WPq68tWJ4U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix index 409c3a0d7ed1..7ded790ec53e 100644 --- a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -1,38 +1,44 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage +, cerberus , fetchFromGitHub , fetchpatch -, lib -, cerberus +, pythonOlder , pyyaml , ruamel-yaml }: buildPythonPackage rec { pname = "riscv-config"; - version = "3.5.2"; + version = "3.13.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "riscv-software-src"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K7W6yyqy/2c4WHyOojuvw2P/v7bND5K6WFfTujkofBw="; + hash = "sha256-SnUt6bsTEC7abdQr0nWyNOAJbW64B1K3yy1McfkdxAc="; }; - patches = [ - # Remove when updating to v3.8.0+ - (fetchpatch { - name = "remove-dangling-pip-import.patch"; - url = "https://github.com/riscv-software-src/riscv-config/commit/f75e7e13fe600b71254b0391be015ec533d3c3ef.patch"; - hash = "sha256-oVRynBIJevq3UzlMDRh2rVuBJZoEwEYhDma3Bb/QV2E="; - }) + propagatedBuildInputs = [ + cerberus + pyyaml + ruamel-yaml ]; - propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ]; + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "riscv_config" + ]; meta = with lib; { - homepage = "https://github.com/riscv/riscv-config"; description = "RISC-V configuration validator"; + homepage = "https://github.com/riscv/riscv-config"; + changelog = "https://github.com/riscv-software-src/riscv-config/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix index 26b94d0fd917..675ae527b311 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ruamel.base" ]; + pythonNamespaces = [ "ruamel" ]; + meta = with lib; { description = "Common routines for ruamel packages"; homepage = "https://sourceforge.net/projects/ruamel-base/"; diff --git a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix index 80721c039a21..c66df5ec520f 100644 --- a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.6.0"; + version = "2023.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y/2N3wXrci3nhLe1AxlhB/KlGAYSmM8AWopHFbTUkRc="; + hash = "sha256-NQV9TVlyLKuf6RyaMBR+Plvd/FXsFP3od2xRIXnII90="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index 16d6c6120da1..b61a5e2e7bce 100644 --- a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -1,29 +1,30 @@ { lib , black , buildPythonPackage -, fetchPypi -, setuptools-scm , cachecontrol +, fetchPypi +, importlib-resources , lockfile , mistune , mypy +, pytestCheckHook +, pythonOlder , rdflib , ruamel-yaml , setuptools -, pytestCheckHook -, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "schema-salad"; - version = "8.4.20230606143604"; + version = "8.4.20230808163024"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8Zo9ZhS0r+zsk7nHEh0x7gHYwaoWmyctQYRMph09mvY="; + hash = "sha256-ai4vv6EFX4yTR8sgRspiG+M8a8oa83LIlJPGX7q+Kd0="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cachecontrol + importlib-resources lockfile mistune mypy diff --git a/nixpkgs/pkgs/development/python-modules/scs/default.nix b/nixpkgs/pkgs/development/python-modules/scs/default.nix index 973e54644bea..0a242e231373 100644 --- a/nixpkgs/pkgs/development/python-modules/scs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scs/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , blas @@ -11,13 +12,13 @@ buildPythonPackage rec { pname = "scs"; - version = "3.0.0"; + version = "3.2.3"; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; rev = version; - hash = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw="; + hash = "sha256-/5yGvZy3luGQkbYcsb/6TZLYou91lpA3UKONviMVpuM="; fetchSubmodules = true; }; @@ -33,6 +34,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; + disabledTests = lib.lists.optional (stdenv.system == "x86_64-linux") [ + # `test/test_scs_rand.py` hang on "x86_64-linux" (https://github.com/NixOS/nixpkgs/pull/244532#pullrequestreview-1598095858) + "test_feasible" + "test_infeasibl" + "test_unbounded" + ]; meta = with lib; { description = "Python interface for SCS: Splitting Conic Solver"; diff --git a/nixpkgs/pkgs/development/python-modules/sdds/default.nix b/nixpkgs/pkgs/development/python-modules/sdds/default.nix index c36d066a7517..9ae9c01b39e0 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.3.1"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pylhc"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-lb4awMQ7GE7m2N2yiCpJ976I2j8hE98/93zCX7Rp4qU="; + rev = "refs/tags/v${version}"; + hash = "sha256-8tnJAptTUsC0atxM9Dpn90drcprdWrs8fYoX8RDkLyQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix b/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix index 7f5fb4718ff9..782a1d43ec5a 100644 --- a/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "seatconnect"; - version = "1.1.7"; + version = "1.1.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "farfar"; repo = pname; - rev = version; - hash = "sha256-8QZtivHG+tf7S2hVlFaQ7yCeCCI7ft/EIr0D73mcURw="; + rev = "refs/tags/${version}"; + hash = "sha256-HITVrI0o94a61gy/TYSGFtLBYX4Rw/dK1o2/KsvHLTQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/send2trash/default.nix b/nixpkgs/pkgs/development/python-modules/send2trash/default.nix index 890a38e63e9d..0fab032f93a1 100644 --- a/nixpkgs/pkgs/development/python-modules/send2trash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/send2trash/default.nix @@ -7,25 +7,16 @@ buildPythonPackage rec { pname = "Send2Trash"; - version = "1.8.1b0"; + version = "1.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "hsoft"; repo = "send2trash"; rev = "refs/tags/${version}"; - hash = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q="; + hash = "sha256-p0Pd9g+nLoT+oruthwjBn2E9rznvcx35VmzOAce2iTY="; }; - postPatch = '' - # Confuses setuptools validation - # setuptools.extern.packaging.requirements.InvalidRequirement: One of the parsed requirements in `extras_require[win32]` looks like a valid environment marker: 'sys_platform == "win32"' - sed -i '/win32 =/d' setup.cfg - - # setuptools.extern.packaging.requirements.InvalidRequirement: One of the parsed requirements in `extras_require[objc]` looks like a valid environment marker: 'sys_platform == "darwin"' - sed -i '/objc =/d' setup.cfg - ''; - nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix index 43836e882303..36317a10bfb3 100644 --- a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.12.0"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-LVpTB7Q78N/cRbneJJ1aT+lFE790ssdMHo8VRirtDHY="; + hash = "sha256-6zhbchCRHyltJ/EP9Hnj4LoRn7/0PDJCmWNjF+IsQdM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix index 882eb6d4599b..725c71eeafdc 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "setuptools-gettext"; - version = "0.1.3"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = "setuptools-gettext"; rev = "refs/tags/v${version}"; - hash = "sha256-pTjYdezNBFeLCh6cbC+YtHxQB4zrZAFTCjjNQffbHhc="; + hash = "sha256-16kzKB0xq3ApQlGQYp12oB7K99QCQMUwqpP54QiI3gg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/shazamio/default.nix b/nixpkgs/pkgs/development/python-modules/shazamio/default.nix new file mode 100644 index 000000000000..ee1616f7b775 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/shazamio/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, wheel +, aiofiles +, aiohttp +, dataclass-factory +, numpy +, pydantic +, pydub +, ffmpeg +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "shazamio"; + version = "0.4.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dotX12"; + repo = "ShazamIO"; + rev = version; + hash = "sha256-dfrdfbGkLYNjlS6Qv9Rnywv6nqiKrNXCICLSuAXpQBU="; + }; + + patches = [ + # remove poetry and virtualenv from build dependencies as they are not used + # https://github.com/dotX12/ShazamIO/pull/71 + (fetchpatch { + name = "remove-unused-build-dependencies.patch"; + url = "https://github.com/dotX12/ShazamIO/commit/5c61e1efe51c2826852da5b6aa6ad8ce3d4012a9.patch"; + hash = "sha256-KiU5RVBPnSs5qrReFeTe9ePg1fR7y0NchIIHcQwlPaI="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + wheel + ]; + + propagatedBuildInputs = [ + aiofiles + aiohttp + dataclass-factory + numpy + pydantic + pydub + ]; + + nativeCheckInputs = [ + ffmpeg + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # requires internet access + "test_about_artist" + "test_recognize_song_file" + "test_recognize_song_bytes" + ]; + + pythonImportsCheck = [ "shazamio" ]; + + meta = with lib; { + description = "A free asynchronous library from reverse engineered Shazam API"; + homepage = "https://github.com/dotX12/ShazamIO"; + changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix b/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix index 9bf4f0d6482e..ca227a625b73 100644 --- a/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix @@ -2,24 +2,26 @@ , fetchurl , llvmPackages , python -, qt6 , cmake , autoPatchelfHook , stdenv , libxcrypt }: -llvmPackages.stdenv.mkDerivation rec { +let + stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv; +in +stdenv'.mkDerivation rec { pname = "shiboken6"; - version = "6.5.0"; + version = "6.5.2"; src = fetchurl { # https://download.qt.io/official_releases/QtForPython/shiboken6/ url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; - sha256 = "sha256-bvU7KRJyZ+OBkX5vk5nOdg7cBkTNWDGYix3nLJ1YOrQ="; + sha256 = "sha256-kNvx0U/NQcmKfL6kS4pJUeENC3mOFUdJdW5JRmVNG6g"; }; - sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; patches = [ ./fix-include-qt-headers.patch @@ -35,7 +37,10 @@ llvmPackages.stdenv.mkDerivation rec { buildInputs = [ llvmPackages.llvm llvmPackages.libclang - qt6.qtbase + python.pkgs.qt6.qtbase + python.pkgs.ninja + python.pkgs.packaging + python.pkgs.setuptools ]; cmakeFlags = [ @@ -54,6 +59,12 @@ llvmPackages.stdenv.mkDerivation rec { patchelf $out/${python.sitePackages}/shiboken6/Shiboken.abi3.so --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir} ''; + postInstall = '' + cd ../../.. + ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=shiboken6 + cp -r shiboken6.egg-info $out/${python.sitePackages}/ + ''; + dontWrapQtApps = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/simplepush/default.nix b/nixpkgs/pkgs/development/python-modules/simplepush/default.nix new file mode 100644 index 000000000000..e7461a850b30 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/simplepush/default.nix @@ -0,0 +1,48 @@ +{ lib +, aiohttp +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "simplepush"; + version = "2.2.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "simplepush"; + repo = "simplepush-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-DvDPihhx1rzJN6iQP5rHluplJ1AaN0b/glcd+tZCues="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + cryptography + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "simplepush" + ]; + + meta = with lib; { + description = "Module to send push notifications via Simplepush"; + homepage = "https://github.com/simplepush/simplepush-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix index 2530b9652032..7e8f8e159eca 100644 --- a/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,38 +1,52 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikit-learn, python }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, deap +, numpy +, scikit-learn +, scipy +, unittestCheckHook +}: buildPythonPackage rec { pname = "sklearn-deap"; - version = "0.2.3"; + version = "0.3.0"; + format = "setuptools"; # No tests in Pypi src = fetchFromGitHub { owner = "rsteca"; - repo = pname; + repo = "sklearn-deap"; rev = version; - sha256 = "1yqnmy8h08i2y6bb2s0a5nx9cwvyg45293whqh420c195gpzg1x3"; + hash = "sha256-bXBHlv1pIOyDLKCBeffyHaTZ7gNiZNl0soa73e8E4/M="; }; patches = [ - # Fix for scikit-learn v0.21.1. See: https://github.com/rsteca/sklearn-deap/pull/62 + # Fix for scikit-learn v1.1. See: https://github.com/rsteca/sklearn-deap/pull/80 (fetchpatch { - url = "https://github.com/rsteca/sklearn-deap/commit/3ae62990fc87f36b59382e7c4db3c74cf99ec3bf.patch"; - sha256 = "1na6wf4v0dcmyz3pz8aiqkmv76d1iz3hi4iyfq9kfnycgzpv1kxk"; + url = "https://github.com/rsteca/sklearn-deap/commit/3b84bd905796378dd845f99e083da17284c9ff6f.patch"; + hash = "sha256-YYLw0uzecyIbdNAy/CxxWDV67zJbZZhUMypnDm/zNGs="; + }) + (fetchpatch { + url = "https://github.com/rsteca/sklearn-deap/commit/2f60e215c834f60966b4e51df25e91939a72b952.patch"; + hash = "sha256-vn5nLPwwkjsQrp3q7C7Z230lkgRiyJN0TQxO8Apizg8="; }) ]; propagatedBuildInputs = [ numpy scipy deap scikit-learn ]; - checkPhase = '' - ${python.interpreter} test.py - ''; + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "evolutionary_search" ]; meta = with lib; { description = "Use evolutionary algorithms instead of gridsearch in scikit-learn"; homepage = "https://github.com/rsteca/sklearn-deap"; - license = licenses.lgpl3; + license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; - # broken by scikit-learn 0.24.1 - broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix b/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix index 30cf185c1aa7..f732da1d5d3f 100644 --- a/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ aiohttp +, bottle +, buildPythonPackage , chalice , cherrypy , django @@ -7,17 +9,23 @@ , fetchFromGitHub , flask , flask-sockets +, gunicorn , lib , moto , numpy , pyramid , pytest-asyncio , pytestCheckHook +, pythonOlder , sanic , sanic-testing , slack-sdk , starlette , tornado +, uvicorn +, websocket-client +, websockets +, werkzeug }: buildPythonPackage rec { @@ -25,6 +33,8 @@ buildPythonPackage rec { version = "1.18.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "slackapi"; repo = "bolt-python"; @@ -40,23 +50,37 @@ buildPythonPackage rec { propagatedBuildInputs = [ slack-sdk ]; + passthru.optional-dependencies = { + async = [ + aiohttp + websockets + ]; + adapter = [ + bottle + chalice + cherrypy + django + falcon + fastapi + flask + flask-sockets + gunicorn + moto + pyramid + sanic + sanic-testing + starlette + tornado + uvicorn + websocket-client + werkzeug + ]; + }; + nativeCheckInputs = [ - chalice - cherrypy - django - falcon - fastapi - flask - flask-sockets - moto - pyramid pytest-asyncio pytestCheckHook - sanic - sanic-testing - starlette - tornado - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Work around "Read-only file system: '/homeless-shelter'" errors preCheck = '' @@ -66,6 +90,9 @@ buildPythonPackage rec { disabledTestPaths = [ # boddle is not packaged as of 2023-07-15 "tests/adapter_tests/bottle/" + # Tests are blocking at some point. Blocking could be performance-related. + "tests/scenario_tests_async/" + "tests/slack_bolt_async/" ]; disabledTests = [ @@ -82,6 +109,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework to build Slack apps using Python"; homepage = "https://github.com/slackapi/bolt-python"; + changelog = "https://github.com/slackapi/bolt-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index a85fc4029fea..741ef59f26da 100644 --- a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+sUfxc72+dV5iqRg9ObePlPhoPx7kT0r2Yta6Aa8yDs="; + hash = "sha256-Z2oNyhbefBIJAKoaX85kQIM7CmD3ZoK3zPFmeWcoLKM="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in diff --git a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix index 5d87fb52b2ab..cb07518e95d7 100644 --- a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.6.0.20230303"; + version = "0.7.0.20230622"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "JustAnotherArchivist"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FY8byS+0yAhNSRxWsrsQMR5kdZmnHutru5Z6SWVfpiE="; + hash = "sha256-9xAUMr1SWFePEvIz6DFEexk9Txex3u8wPNfMAdxEUCA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index b5d58792477d..cfdfd6de623b 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.25"; + version = "0.26"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-j95THZLRz8KBf+Nkez8tB+dmgsSoSInASlPoMffFRDI="; + hash = "sha256-rbM5fVywYTYyzT2teJQ4FCK6wkRkw5PLBQQE3WcSsac="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix index 5ad7575c247c..e68f9db10193 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.3"; + version = "2.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0aNkq4nacW2RZxup2J748ZZgaLug5HB5ekiWU4KcqvM="; + hash = "sha256-NjuwoOFZTLaRY3RkGS9PGZaQlUaSUiQrQ8CSvzBaJd0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/nixpkgs/pkgs/development/python-modules/spyder/default.nix index c1de80fc5161..9722222905a0 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -7,19 +7,16 @@ , cloudpickle , cookiecutter , diff-match-patch -, flake8 , intervaltree , jedi , jellyfish , keyring , matplotlib -, mccabe , nbconvert , numpy , numpydoc , psutil , pygments -, pylint , pylint-venv , pyls-spyder , pyopengl @@ -28,7 +25,6 @@ , python-lsp-server , pyxdg , pyzmq -, pycodestyle , qdarkstyle , qstylizer , qtawesome @@ -45,14 +41,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.4.2"; + version = "5.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-L8zgT7M7N+P5/9FQgf6ab7afUQXC1afzwUjAp6yKxC8="; + hash = "sha256-/9p/8avjy1c3Dwos9Byx03kfVrRofVQus+Ae5beFnmo="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch b/nixpkgs/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch index cb2a37930715..abb021e39554 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch +++ b/nixpkgs/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch @@ -1,24 +1,25 @@ -Don't remove sys.path entries that come from PYTHONPATH, or else the app cannot -be used in Nixpkgs. - -Author: Bjørn Forsman <bjorn.forsman@gmail.com> -diff -uNr spyder-5.4.0.orig/spyder/app/start.py spyder-5.4.0/spyder/app/start.py ---- spyder-5.4.0.orig/spyder/app/start.py 2022-08-30 02:02:28.000000000 +0200 -+++ spyder-5.4.0/spyder/app/start.py 2023-01-02 11:38:28.138744879 +0100 -@@ -6,16 +6,8 @@ +diff --git a/spyder/app/start.py b/spyder/app/start.py +index 97b08a600..66486e510 100644 +--- a/spyder/app/start.py ++++ b/spyder/app/start.py +@@ -6,20 +6,8 @@ # (see spyder/__init__.py for details) # ----------------------------------------------------------------------------- - + -# Remove PYTHONPATH paths from sys.path before other imports to protect against -# shadowed standard libraries. import os import sys -if os.environ.get('PYTHONPATH'): - for path in os.environ['PYTHONPATH'].split(os.pathsep): -- try: -- sys.path.remove(path.rstrip(os.sep)) -- except ValueError: -- pass - +- if os.name == 'nt' and 'pkgs' in path: +- # Don't remove pynsist installer entry for 'pkgs' directory +- continue +- else: +- try: +- sys.path.remove(path.rstrip(os.sep)) +- except ValueError: +- pass + # Standard library imports import ctypes diff --git a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 1b5016a1ad0d..4dda36262dde 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.7.8"; + version = "1.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ky/XmXhzmoF3UKNHu7xKcVWZf8epHp0ymqqQ9WHHObs="; + hash = "sha256-k07Dpkpa1MO9ICMl4a2YI2ONgcUG0vLOzC+wsoHxI3s="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/steamship/default.nix b/nixpkgs/pkgs/development/python-modules/steamship/default.nix index 9e0284d11819..e79b9993b883 100644 --- a/nixpkgs/pkgs/development/python-modules/steamship/default.nix +++ b/nixpkgs/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.22"; + version = "2.17.27"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-PQI6r2DoarswjTc8jp+nrJqkmckQ6+eGuI0MU8kvnM8="; + hash = "sha256-Wgz0jkMaMUTM7ubb/TsGaQm8UbdPtEvzapl0h4xrqq0="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix b/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix deleted file mode 100644 index 2b536fa0e628..000000000000 --- a/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -, mmpython -, pyqt4 -}: - -buildPythonPackage rec { - version = "2.0.18"; - pname = "subdownloader"; - - src = fetchurl { - url = "https://launchpad.net/subdownloader/trunk/2.0.18/+download/subdownloader_2.0.18.orig.tar.gz"; - sha256 = "0manlfdpb585niw23ibb8n21mindd1bazp0pnxvmdjrp2mnw97ig"; - }; - - propagatedBuildInputs = [ mmpython pyqt4 ]; - - setup = '' - import os - import sys - - try: - if os.environ.get("NO_SETUPTOOLS"): - raise ImportError() - from setuptools import setup, Extension - SETUPTOOLS = True - except ImportError: - SETUPTOOLS = False - # Use distutils.core as a fallback. - # We won t be able to build the Wheel file on Windows. - from distutils.core import setup, Extension - - with open("README") as fp: - long_description = fp.read() - - requirements = [ ] - - install_options = { - "name": "subdownloader", - "version": "2.0.18", - "description": "Tool for automatic download/upload subtitles for videofiles using fast hashing", - "long_description": long_description, - "url": "http://www.subdownloader.net", - - "scripts": ["run.py"], - "packages": ["cli", "FileManagement", "gui", "languages", "modules"], - - } - if SETUPTOOLS: - install_options["install_requires"] = requirements - - setup(**install_options) - ''; - - postUnpack = '' - echo '${setup}' > $sourceRoot/setup.py - ''; - - meta = with lib; { - description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; - homepage = "https://www.subdownloader.net"; - license = licenses.gpl3; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/swift/default.nix b/nixpkgs/pkgs/development/python-modules/swift/default.nix index 4e7b496b7a54..95dd8e55d4a4 100644 --- a/nixpkgs/pkgs/development/python-modules/swift/default.nix +++ b/nixpkgs/pkgs/development/python-modules/swift/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "swift"; - version = "2.31.1"; + version = "2.32.0"; src = fetchPypi { inherit pname version; - hash = "sha256-6CRSIv2m2pqZdzRAEJ/6Qo90PZ7LRNg1zQg50Ecq2RQ="; + hash = "sha256-JeDmZx667rG1ARfRBUDTcOWe7u3ZiytZzGQSRp8bpes="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/nixpkgs/pkgs/development/python-modules/tempora/default.nix index 128af5bc0687..591cf9e3555f 100644 --- a/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -1,31 +1,25 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder - -# build time -, setuptools-scm - -# runtime -, pytz -, jaraco-functools - -# tests , freezegun +, jaraco-functools , pytest-freezegun , pytestCheckHook +, pythonOlder +, pytz +, setuptools-scm }: buildPythonPackage rec { pname = "tempora"; - version = "5.2.1"; + version = "5.5.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-txdkhsWUinUgHo0LIe8sI8qAhHQGDfRyGMkilb3OUnY="; + hash = "sha256-E+T8yZfQUJwzBtaEHwPpOBt+Xkayvr+ukVGvkAhfDCY="; }; nativeBuildInputs = [ @@ -53,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Objects and routines pertaining to date and time"; homepage = "https://github.com/jaraco/tempora"; + changelog = "https://github.com/jaraco/tempora/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix b/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix index 87e84a43b916..bf21e0ee59d3 100644 --- a/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Unofficial Python API for TIDAL music streaming service"; homepage = "https://github.com/tamland/python-tidal"; license = licenses.gpl3; - maintainers = [ maintainers.rodrgz ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/timetagger/default.nix b/nixpkgs/pkgs/development/python-modules/timetagger/default.nix index de652099767d..e41158d8c167 100644 --- a/nixpkgs/pkgs/development/python-modules/timetagger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "23.8.1"; + version = "23.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VHvCvXmNwxuk4Le2VqsU1CFcHfAr40WbhELzu5wfB1U="; + hash = "sha256-pg4lKRsgi4SZrKYnVmMfU5hzJriRqVa3InYW9emFLy8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/nixpkgs/pkgs/development/python-modules/tldextract/default.nix index a3d159000ab9..1b2c1a7e6ba0 100644 --- a/nixpkgs/pkgs/development/python-modules/tldextract/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tldextract/default.nix @@ -9,22 +9,24 @@ , requests , requests-file , responses +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "tldextract"; - version = "3.4.4"; - format = "setuptools"; + version = "3.5.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X+MhDFd0Y1RRkdRa1SLT1eeNVSGM6XIV6CAE3K4eEjQ="; + hash = "sha256-TfHGW5W+YdWUKOhhHpVeVObx1Eg9Po1XM9OpBiFV6RA="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/tlds/default.nix b/nixpkgs/pkgs/development/python-modules/tlds/default.nix index e9e71fcd5e59..1b001cd53659 100644 --- a/nixpkgs/pkgs/development/python-modules/tlds/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tlds/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "tlds"; - version = "2023050900"; + version = "2023080900"; format = "setuptools"; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; rev = "refs/tags/${version}"; - hash = "sha256-Fm2cRhUb1Gsr7mrcym/JjYAeG8f3RDhUnxzYIvpxmQE="; + hash = "sha256-n6SGOBkwGrjnH01yFd9giODUDkPGVMwB1H/fozzwQwU="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix index b468e499f52a..4b0f9adba51b 100644 --- a/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -63,6 +63,14 @@ buildPythonPackage rec { sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py ''; + # Hardening has to be disabled + # due to pycparsing handling it poorly. + # See https://github.com/NixOS/nixpkgs/issues/252023 + # for more details. + hardeningDisable = [ + "fortify" + ]; + nativeBuildInputs = [ cffi pkgconfig # this is the Python module diff --git a/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix new file mode 100644 index 000000000000..348fa01ffbe1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, setuptools-git-versioning +, wheel + +# dependencies +, async-timeout +, bellows +, click +, coloredlogs +, crc +, libgpiod +, typing-extensions +, zigpy + +# tests +, pytestCheckHook +, pytest-asyncio +, pytest-mock +, pytest-timeout +}: + +buildPythonPackage rec { + pname = "universal-silabs-flasher"; + version = "0.0.13"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "NabuCasa"; + repo = "universal-silabs-flasher"; + rev = "v${version}"; + hash = "sha256-qiaDPCnVb6JQ2fZRFK+QF4o8K2UbIWGNKl5oo6MQUW0="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-git-versioning + wheel + ]; + + propagatedBuildInputs = [ + async-timeout + bellows + click + coloredlogs + crc + typing-extensions + zigpy + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ + libgpiod + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-mock + pytest-timeout + ]; + + pythonImportsCheck = [ "universal_silabs_flasher" ]; + + meta = with lib; { + description = "Flashes Silicon Labs radios running EmberZNet or CPC multi-pan firmware"; + homepage = "https://github.com/NabuCasa/universal-silabs-flasher"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix index e03d2a6f4544..eb34584736d3 100644 --- a/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix @@ -9,6 +9,7 @@ , onnxruntime , transformers , detectron2 +, paddleocr # check inputs , pytestCheckHook , coverage @@ -21,14 +22,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.5.7"; + version = "0.5.22"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; rev = "refs/tags/${version}"; - hash = "sha256-xlsihi1ZTNgdnSk3H8rMBRi4AAxPKNFqygcIMtM/jE0="; + hash = "sha256-YMPChP8/KB/UioavIa0pdj0wH9bTkN8frFmkQZ3bUPc="; }; postPatch = '' @@ -44,7 +45,7 @@ buildPythonPackage rec { onnxruntime transformers detectron2 - # paddleocr + paddleocr # yolox ] ++ layoutparser.optional-dependencies.layoutmodels @@ -71,8 +72,6 @@ buildPythonPackage rec { "test_get_path_oob_move_nested[False]" # requires yolox "test_yolox" - # requires paddleocr - "test_table_prediction" ]; disabledTestPaths = [ @@ -90,10 +89,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "unstructured_inference" ]; meta = with lib; { - description = ""; + description = "hosted model inference code for layout parsing models"; homepage = "https://github.com/Unstructured-IO/unstructured-inference"; changelog = "https://github.com/Unstructured-IO/unstructured-inference/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index 951aec2cd879..2754f192d506 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.9.1"; + version = "0.10.12"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-9O/rZ07vZC0XN5XgevFvWuG8gwyTM+gfn+OqgaIHld8="; + hash = "sha256-v5hNl93dUEo90Hgm5u2N7tB1W5fnu+Pmnv+iw7QyQKM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix b/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix index 330be3286742..2912c44fcf06 100644 --- a/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "uptime-kuma-api"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "uptime_kuma_api"; inherit version; - hash = "sha256-3Y7PGidtmBjrIXGAElzRAv//kvX0ZcK3OX0xnfeuLWE="; + hash = "sha256-owRLc6823jJbEEzdJ3ORCkQfaEvxxs0uwYLzzCa17zI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/uritools/default.nix b/nixpkgs/pkgs/development/python-modules/uritools/default.nix index 76678539bd9c..7975e0f74231 100644 --- a/nixpkgs/pkgs/development/python-modules/uritools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uritools/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "uritools"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-78XDpt4FQEhQaFqNPzTahHa1aqNRb7+O/1yHBMeigm8="; + hash = "sha256-BN8reH0Ot2IA6DGTgqA1Yvv+R0H9ZsFVBrCNO4IR1XM="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix b/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix index 1787063f2aea..436ab5fa1ba4 100644 --- a/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.3.4"; + version = "1.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2TyJs0GdYTZWJR66IV6XuBR4b3aRi9KhFy/4ji1c6NU="; + hash = "sha256-KzvJcBR6Bc+z6IAmJ0KR88aSQMjRx1UilS28oBv9nTE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix index ef33a46cc34c..b6d12a67185c 100644 --- a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix @@ -6,6 +6,7 @@ , nose , ptyprocess }: + buildPythonPackage rec { pname = "vncdo"; version = "0.12.0"; @@ -32,7 +33,7 @@ buildPythonPackage rec { description = "A command line VNC client and python library"; license = licenses.mit; maintainers = with maintainers; [ elitak ]; + mainProgram = pname; platforms = with platforms; linux ++ darwin; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/nixpkgs/pkgs/development/python-modules/vsure/default.nix index f8242d34f4c2..441969da6137 100644 --- a/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.6"; + version = "2.6.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ecrBvKOhW3znVoXHQeKKW4o/hbA4fLhxJrWZObwtki8="; + hash = "sha256-/eVFa1BTFbvFTAt48Bv+bjsV7f2eVSuKARJQVxDqU9s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/nixpkgs/pkgs/development/python-modules/webauthn/default.nix index 39795ac6ce7f..2ef7d52e2a35 100644 --- a/nixpkgs/pkgs/development/python-modules/webauthn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webauthn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.8.1"; + version = "1.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-ivPLS+kh/H8qLojgc5qh1ndPzSZbzbnm9E+LQGq8+Xs="; + hash = "sha256-ZfHFyjdZeKuKX/aokhB6L93HbBFnlrvuJZ2V4uRmNck="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index 0111a43b06ce..baffe37de0c9 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.45.1"; + version = "0.46.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-lZa8HIGLSDd/avNuoYSUHJ0b3rSx8uHLuUz8lABQHO4="; + hash = "sha256-7TR6+woAV8f80t4epCnZj4jYYpTPKDkzwzNNsgofiwg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index a70e833da9fc..a1d1522bb9a0 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.57.0"; + version = "0.58.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-EqKjDPSjhI03ZwkHyNG4ZbIdrzn7wrjpGfze1Qkk0lk="; + hash = "sha256-2+RvDAKIUsQwmVrqcgt0RXOF+Z+lZ6oSyZyI+HTcZBs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/whodap/default.nix b/nixpkgs/pkgs/development/python-modules/whodap/default.nix index c4b207962987..a666d0a156b5 100644 --- a/nixpkgs/pkgs/development/python-modules/whodap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whodap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.8"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hAU9143R/LDqDBgX3Y+gBG+dt4dpIIPDdO6HgH0ZTfg="; + hash = "sha256-0Wxx33AO9g4ACAUwkFkLo2AemK7PxXvZXWgHpu+E96c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xcffib/default.nix b/nixpkgs/pkgs/development/python-modules/xcffib/default.nix index b4def14ff47c..b0b00da0dc32 100644 --- a/nixpkgs/pkgs/development/python-modules/xcffib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xcffib/default.nix @@ -1,37 +1,36 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch -, xorg , cffi +, fetchPypi , pytestCheckHook +, pythonOlder +, xorg }: buildPythonPackage rec { - version = "1.2.0"; pname = "xcffib"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8yMCFEf55zB40hu5KMSPTavq6z87N+gDxta5hzXoFIM="; + hash = "sha256-qVyUZfL5e0/O3mBr0eCEB6Mt9xy3YP1Xv+U2d9tpGsw="; }; - patches = [ - (fetchpatch { - name = "remove-leftover-six-import.patch"; - url = "https://github.com/tych0/xcffib/commit/8a488867d30464913706376ca3a9f4c98ca6c5cf.patch"; - hash = "sha256-wEms0gC7tVqtmKMjjpH/34kdQ6HUV0h67bUGbgijlqw="; - }) - ]; - postPatch = '' # Hardcode cairo library path sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; - propagatedBuildInputs = [ cffi ]; + propagatedNativeBuildInputs = [ + cffi + ]; - propagatedNativeBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + ]; nativeCheckInputs = [ pytestCheckHook @@ -44,11 +43,14 @@ buildPythonPackage rec { rm -r xcffib ''; - pythonImportsCheck = [ "xcffib" ]; + pythonImportsCheck = [ + "xcffib" + ]; meta = with lib; { description = "A drop in replacement for xpyb, an XCB python binding"; homepage = "https://github.com/tych0/xcffib"; + changelog = "https://github.com/tych0/xcffib/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ kamilchm ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix index 796118abc25c..fb7a18c325bc 100644 --- a/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ypy-websocket"; - version = "0.12.1"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "y-crdt"; repo = "ypy-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-JsSOh7CSHUnGJmNAP87fMMsRgdj6nNna1XVe15MYqoA="; + hash = "sha256-3ANuIwRxUoFo5SSdTvBhTHExrYR7timu7XkE0t+UyWk="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/zamg/default.nix b/nixpkgs/pkgs/development/python-modules/zamg/default.nix index 6e3d7908bac2..af5b6053389d 100644 --- a/nixpkgs/pkgs/development/python-modules/zamg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.2.4"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-o1FMhwAHdkcfArT9QRgVi0ieRw4aVdBoqwdlV0sxpQ0="; + hash = "sha256-dt0y423Xw/IFi83DFvGdsN1uzJBMbm13pBYtMgMntuU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 0fb2134276e4..a0d3cd2517b0 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.88.0"; + version = "0.102.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-PE/KK2MFSVinaCLztdu7LS+gSemlq4UzVVwSjK+9yiM="; + hash = "sha256-Z4RswQDA05wXXyg8CeIiuh9I1EXTyXh6Z88r7soGFTo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 77fb2ac72c42..4828ff4264c5 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.57.0"; + version = "0.57.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-79TOt3PRvkhuF6wf+acYhhzFFkYX0l3yLpxv8dNRk1U="; + hash = "sha256-aVrLiWPjc4xn2GvKmZCrRJGGbxP545PKqAH9rPq8IPo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 7c9de5a6fbef..3669f6c70f1f 100644 --- a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.49.0"; + version = "0.51.1"; format = "setuptools"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6CN2Smwm693RUuRUdqrNKa7j2I3pjmR+QoPfpjti+h8="; + hash = "sha256-2U0mRlNUCZD05lgGB3dz2WaUxG2dv/C7nxD2sI3R8B8="; }; propagatedBuildInputs = [ @@ -27,8 +27,6 @@ buildPythonPackage rec { pydantic ]; - doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook |