diff options
Diffstat (limited to 'pkgs/development/python-modules')
1913 files changed, 9238 insertions, 3480 deletions
diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix index 18e93a1ff77a..b86e16ae0d4d 100644 --- a/pkgs/development/python-modules/3to2/default.nix +++ b/pkgs/development/python-modules/3to2/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = { homepage = "https://bitbucket.org/amentajo/lib3to2"; description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible"; + mainProgram = "3to2"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mt-caret ]; }; diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix index dc19f1506958..b2b5a03beac4 100644 --- a/pkgs/development/python-modules/a2wsgi/default.nix +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "a2wsgi"; - version = "1.10.2"; + version = "1.10.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RrLKQnz5rVOMFF4y6zaFfhy/R3ty/h7Q49NemMBgYbk="; + hash = "sha256-UOgaxVqmCfosZm5CuswlxCTIiEzmBy8afpAhFLfuXWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index 460a4a90ee8e..b2a04d8ac599 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "ASCII art to image converter"; + mainProgram = "aafigure"; homepage = "https://launchpad.net/aafigure/"; license = licenses.bsd2; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index add8b364591f..934133d0d705 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -78,6 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous RDP protocol implementation"; + mainProgram = "ardpscan"; homepage = "https://github.com/skelsec/aardwolf"; changelog = "https://github.com/skelsec/aardwolf/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index a2f22062d3bf..eb412275a882 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "absl-py"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-2WkCEcX8/vzdGkVHCsK1xazUUkHDr3Hu2WvFRBdGwNU="; + hash = "sha256-eCB5DvuzFnOc3otOGTVyQ/w2CKFSAkKIUT3ZaNfZWf8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index f4b17bbd5df2..1c31b8292809 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, pytest_7 , setuptools , numpy , packaging @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.26.1"; + version = "0.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-l0RSBVAa2u3bGDLbg/e/1UP5WO8z2+YBqzwdviAcMA0="; + hash = "sha256-7rnI8UXyAql8fLMKoSRrWzVw5CnyYVE2o6dJOzSgWxw="; }; nativeBuildInputs = [ setuptools ]; @@ -46,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ evaluate parameterized - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) transformers ]; preCheck = '' diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 9de8f1e06752..f0e1d699a8ef 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; + mainProgram = "acme-tiny"; homepage = "https://github.com/diafygi/acme-tiny"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 0f1e20041adf..6d04df9d9671 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; + mainProgram = "actdiag"; homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index 785c011c6d66..1bf592b99517 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool (and pre-commit hook) to automatically add trailing commas to calls and literals"; + mainProgram = "add-trailing-comma"; homepage = "https://github.com/asottile/add-trailing-comma"; license = licenses.mit; maintainers = with maintainers; [ gador ]; diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index a97353baa987..6f4ca01a7ac0 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "1.0.4"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Phlya"; repo = "adjusttext"; rev = "refs/tags/v${version}"; - hash = "sha256-Lhl6ykx5ynf+pBub5tBUaALm1w/88jbuSXPigE216NY="; + hash = "sha256-o/TA/br7sJAcvfIR4uA7a6XRf/enJ/x7N4ys6Of0j3g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix index 7e293f953c07..c425495221b3 100644 --- a/pkgs/development/python-modules/adlfs/default.nix +++ b/pkgs/development/python-modules/adlfs/default.nix @@ -8,12 +8,14 @@ , fetchFromGitHub , fsspec , pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "adlfs"; - version = "2023.10.0"; - format = "setuptools"; + version = "2024.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,10 +23,15 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pmKqMNVSW+Jzz4MZaiUbzXFcLzTKj52RJH7WvFMj6NM="; + hash = "sha256-/Qakr7ISlzDqunoshUf8mpWCvFXOH3haUx/C79j4RZA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ aiohttp azure-core azure-datalake-store diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix index 62f9b0dd5b94..fda6d316162a 100644 --- a/pkgs/development/python-modules/aesedb/default.nix +++ b/pkgs/development/python-modules/aesedb/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parser for JET databases"; + mainProgram = "antdsparse"; homepage = "https://github.com/skelsec/aesedb"; changelog = "https://github.com/skelsec/aesedb/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index f1bee9f07ea1..5617eec6b534 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -1,4 +1,5 @@ { lib +, aioboto3 , aiohttp , buildPythonPackage , fetchPypi @@ -7,7 +8,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.58"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,10 +16,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-ymynaOKvnqqHIEuQc+5CagsaH5cHnQit8ileoUO6G+I="; + hash = "sha256-5vfw8SU3lWlPoMAR+byf8jpZrGmXTPoeO+DvPByjZnw="; }; propagatedBuildInputs = [ + aioboto3 aiohttp ]; diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix index 4b6c4faa123a..fe6b4192014a 100644 --- a/pkgs/development/python-modules/aioapns/default.nix +++ b/pkgs/development/python-modules/aioapns/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aioapns"; - version = "3.1"; + version = "3.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BUSRIDAxeVKlZteYgGZZkMcUn6hAo1fWCbuZcHZXUhU="; + hash = "sha256-QPayQogW97saMmaPUP5x0CiXd6Qptg/OROigi5ASNQg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 486781c4c97d..f6a02d393e5f 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.2.10"; + version = "2024.3.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-NRcLyuU5FFIKJALUrx5iVSihzgO6ljqaqlhbs+y2E4Q="; + hash = "sha256-ZJRc5nzp1P3X93PxGVB55VgN1HZ2kvn43LT2wYEPxSo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix index 5c4e3ed03786..377c96798629 100644 --- a/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Get data from the Azure DevOps API"; + mainProgram = "aioazuredevops"; homepage = "https://github.com/timmo001/aioazuredevops"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/aiobafi6/default.nix b/pkgs/development/python-modules/aiobafi6/default.nix index 9bdd4f9eb420..7856437baeea 100644 --- a/pkgs/development/python-modules/aiobafi6/default.nix +++ b/pkgs/development/python-modules/aiobafi6/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for communication with the Big Ass Fans i6 firmware"; + mainProgram = "aiobafi6"; homepage = "https://github.com/jfroy/aiobafi6"; changelog = "https://github.com/jfroy/aiobafi6/releases/tag/0.8.2"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/aioblescan/default.nix b/pkgs/development/python-modules/aioblescan/default.nix index 312dcd20ee90..768b2f972201 100644 --- a/pkgs/development/python-modules/aioblescan/default.nix +++ b/pkgs/development/python-modules/aioblescan/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to listen for BLE advertized packets"; + mainProgram = "aioblescan"; homepage = "https://github.com/frawau/aioblescan"; changelog = "https://github.com/frawau/aioblescan/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix index 6b0f79655717..ea7921fc283b 100644 --- a/pkgs/development/python-modules/aioboto3/default.nix +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -1,7 +1,6 @@ { lib , aiobotocore , aiofiles -, boto3 , buildPythonPackage , chalice , cryptography @@ -13,6 +12,7 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests }: @@ -33,6 +33,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core poetry-dynamic-versioning + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "aiobotocore" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 21883ceab8aa..525e482a42f7 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.11.2"; + version = "2.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiobotocore"; rev = "refs/tags/${version}"; - hash = "sha256-H9nsLPxjv3H5y6+5piBt6Pb+Wks4vwOitM+WQtyViPs="; + hash = "sha256-+CXKDk6crCPTVpVfcDWy+1UzS05oTu1RtIvDcVrEmFU="; }; # Relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/aiobroadlink/default.nix b/pkgs/development/python-modules/aiobroadlink/default.nix index 4be53769784b..db73273a3679 100644 --- a/pkgs/development/python-modules/aiobroadlink/default.nix +++ b/pkgs/development/python-modules/aiobroadlink/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to control various Broadlink devices"; + mainProgram = "aiobroadlink"; homepage = "https://github.com/frawau/aiobroadlink"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index aa9e05a982b5..8cb67f32a920 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; description = "Asynchronous console and interfaces for asyncio"; + mainProgram = "apython"; homepage = "https://github.com/vxgmichel/aioconsole"; license = licenses.gpl3Only; maintainers = with maintainers; [ catern ]; diff --git a/pkgs/development/python-modules/aiocurrencylayer/default.nix b/pkgs/development/python-modules/aiocurrencylayer/default.nix index 39fb1deeb9b3..427992c58823 100644 --- a/pkgs/development/python-modules/aiocurrencylayer/default.nix +++ b/pkgs/development/python-modules/aiocurrencylayer/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "aiocurrencylayer"; - version = "1.0.5"; - format = "pyproject"; + version = "1.0.6"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; - repo = pname; + repo = "aiocurrencylayer"; rev = "refs/tags/${version}"; - hash = "sha256-468OBQV7ISnPRUfi/CM3dCh1ez0jwSVnM6DduPvAgPI="; + hash = "sha256-VOzgWN+dDPaGEcahFPSWjBR989b9eNkx4zcnI9o2Xiw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix index 9a860cfb832c..b96e7eb29fbc 100644 --- a/pkgs/development/python-modules/aiodhcpwatcher/default.nix +++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aiodhcpwatcher"; - version = "0.8.0"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiodhcpwatcher"; rev = "v${version}"; - hash = "sha256-zZigXYUDSbXjlH810CgLa56xWYKcStBeKUbgsZ5WjOw="; + hash = "sha256-yvmCp8luR26yFYun/YY/tt+peaAL4nOR9cC6lpMiJhk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index ee041198e8d9..3330acf8d5a2 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -1,4 +1,5 @@ { lib +, aiodns , async-timeout , buildPythonPackage , cached-ipaddress @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.6.1"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiodiscover"; rev = "refs/tags/v${version}"; - hash = "sha256-M3tus0r58YVJyi/S7UWq+OvaKke3hqkHGuYkUxEpVxg="; + hash = "sha256-7oeyuwirQ2mm0UQEOwTkAz126UnxkoMjg+DDu5DWY3E="; }; nativeBuildInputs = [ @@ -33,11 +34,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout + aiodns cached-ipaddress dnspython + ifaddr netifaces pyroute2 - ifaddr ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix index b93333c2adb0..414f35aaf4d0 100644 --- a/pkgs/development/python-modules/aioecowitt/default.nix +++ b/pkgs/development/python-modules/aioecowitt/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Wrapper for the EcoWitt protocol"; + mainProgram = "ecowitt-testserver"; homepage = "https://github.com/home-assistant-libs/aioecowitt"; changelog = "https://github.com/home-assistant-libs/aioecowitt/releases/tag/${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix index fe16afab2258..e0f6a236b6cb 100644 --- a/pkgs/development/python-modules/aioelectricitymaps/default.nix +++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -1,6 +1,6 @@ { lib , aiohttp -, aresponses +, aioresponses , buildPythonPackage , fetchFromGitHub , mashumaro @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioelectricitymaps"; - version = "0.4.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "aioelectricitymaps"; rev = "refs/tags/v${version}"; - hash = "sha256-q06B40c0uvSuzH/3YCoxg4p9aNIOPrphsoESktF+B14="; + hash = "sha256-l6D5Cr2d89n+Ac5V5geBUY0sOiEO3sci9244K0MI+dc="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - aresponses + aioresponses pytest-asyncio pytestCheckHook syrupy diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix index 505af218349c..feddda5832f2 100644 --- a/pkgs/development/python-modules/aioemonitor/default.nix +++ b/pkgs/development/python-modules/aioemonitor/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for SiteSage Emonitor"; + mainProgram = "my_example"; homepage = "https://github.com/bdraco/aioemonitor"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index ad3ac4f4e573..c17f2df97fa2 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "23.0.0"; + version = "23.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iYaRA1Jj9Ew/s/LyS6U+NZ3TsAlXdDq0DAaudgFV5/o="; + hash = "sha256-1Y2hcgvn0Msx17t1sH5N8cg2wmYo6YqFWPUqUNTNN5M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index c125e2869df9..ed60684b9fa3 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pythonRelaxDepsHook , pytestCheckHook , aiohttp , aiohttp-socks @@ -37,6 +38,11 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pydantic" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index 29d06a8e406e..8976c3d30707 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/ehendrix23/aioharmony"; description = "Python library for interacting the Logitech Harmony devices"; + mainProgram = "aioharmony"; license = licenses.asl20; maintainers = with maintainers; [ oro ]; }; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 2e6a1957779e..546fd9c4f404 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -79,6 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module that implements the HomeKit protocol"; + mainProgram = "aiohomekitctl"; longDescription = '' This Python library implements the HomeKit protocol for controlling Homekit accessories. diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index f58d6eff074f..d048cb41e320 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "WSGI adapter for aiohttp"; + mainProgram = "aiohttp-wsgi-serve"; homepage = "https://github.com/etianen/aiohttp-wsgi"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 11eb19010fdd..823a0f9e14b7 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -22,6 +22,7 @@ , gunicorn , pytest-mock , pytestCheckHook +, pytest_7 , python-on-whales , re-assert , trustme @@ -82,7 +83,7 @@ buildPythonPackage rec { freezegun gunicorn pytest-mock - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) python-on-whales re-assert ] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 852f50fa93a3..a9362a9dac3d 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for local communication with LIFX devices over a LAN"; + mainProgram = "aiolifx"; homepage = "https://github.com/frawau/aiolifx"; changelog = "https://github.com/frawau/aiolifx/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/aiomisc-pytest/default.nix b/pkgs/development/python-modules/aiomisc-pytest/default.nix index 96c77b1d96ba..674aef1d02ef 100644 --- a/pkgs/development/python-modules/aiomisc-pytest/default.nix +++ b/pkgs/development/python-modules/aiomisc-pytest/default.nix @@ -5,6 +5,7 @@ , poetry-core , pytest , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -22,6 +23,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pytest" ]; buildInputs = [ diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 63038d99f3cc..92e016c786b8 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.4.1"; + version = "17.5.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SJyCxKncHRdWZUdsosOCLLRYG+ym8utXwAJjn3BRRHU="; + hash = "sha256-bpR9HsR/7qVaDcTsHXJypGDyS7/BE/CzFk6eNaQ/C8k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix index 634c031cbd74..16450a8758b9 100644 --- a/pkgs/development/python-modules/aiomqtt/default.nix +++ b/pkgs/development/python-modules/aiomqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiomqtt"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = "aiomqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-Ww4NdCtT04b4tRmarJjB4xmfRBNIQekP8iARAdpmBH0="; + hash = "sha256-bV1elEO1518LVLwNDN5pzjxRgcG34K1XUsK7fTw8h+8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index 9ba8dae31c8a..006f108da390 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to connect to MySensors gateways"; + mainProgram = "aiomysensors"; homepage = "https://github.com/MartinHjelmare/aiomysensors"; changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/aiooncue/default.nix b/pkgs/development/python-modules/aiooncue/default.nix index 1c19c02222c8..4003ebd5de40 100644 --- a/pkgs/development/python-modules/aiooncue/default.nix +++ b/pkgs/development/python-modules/aiooncue/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aiooncue"; - version = "0.3.5"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = version; - hash = "sha256-i3b/W2EeH/rNmMcNW+BA9w2BRzeV6EACSJI3zffVQS4="; + rev = "refs/tags/${version}"; + hash = "sha256-TKOpx+twnG9zj7RcwOn53ebT7eyLOFKyxChp9lCdoU8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix index 2d30e0422ef3..0c1abce558a8 100644 --- a/pkgs/development/python-modules/aiooss2/default.nix +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.9"; - format = "pyproject"; + version = "0.2.10"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-LdH04pRioxpHY1amRO90l9l5540IsDxmQcrEUVSq8dk="; + hash = "sha256-xlbOLqillSpN6DHYn7bqTL7qMlicYCXGxO30Z/tiKJY="; }; pythonRelaxDeps = [ @@ -32,13 +32,13 @@ buildPythonPackage rec { "oss2" ]; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp oss2 ]; diff --git a/pkgs/development/python-modules/aiopinboard/default.nix b/pkgs/development/python-modules/aiopinboard/default.nix new file mode 100644 index 000000000000..33d4d82ea218 --- /dev/null +++ b/pkgs/development/python-modules/aiopinboard/default.nix @@ -0,0 +1,60 @@ +{ lib +, aiohttp +, aresponses +, arrow +, buildPythonPackage +, certifi +, fetchFromGitHub +, frozenlist +, poetry-core +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "aiopinboard"; + version = "2024.01.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = "aiopinboard"; + rev = "refs/tags/${version}"; + hash = "sha256-/N9r17e0ZvPmcqW/XtRyAENKCGRzWqeOSKPpWHHYomg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + arrow + certifi + frozenlist + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-aiohttp + pytestCheckHook + ]; + + + pythonImportsCheck = [ + "aiopinboard" + ]; + + meta = with lib; { + description = "Library to interact with the Pinboard API"; + homepage = "https://github.com/bachya/aiopinboard"; + changelog = "https://github.com/bachya/aiopinboard/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index d759a4db6a28..c39e5303c917 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiopvapi"; - version = "3.0.2"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "sander76"; repo = "aio-powerview-api"; rev = "refs/tags/v${version}"; - hash = "sha256-NfSGu4M0NWfCDc37zRwUjYtZz5jOtw3pYgF6fIsB/Yo="; + hash = "sha256-nJjYGPxpnbq/8XFmLKbMU71buFdaNUj7PQES5FnlN3o="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix index 447975225cad..b7034d385835 100644 --- a/pkgs/development/python-modules/aiopylgtv/default.nix +++ b/pkgs/development/python-modules/aiopylgtv/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to control webOS based LG TV units"; + mainProgram = "aiopylgtvcommand"; homepage = "https://github.com/bendavid/aiopylgtv"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/aioraven/default.nix b/pkgs/development/python-modules/aioraven/default.nix new file mode 100644 index 000000000000..227e0b62becf --- /dev/null +++ b/pkgs/development/python-modules/aioraven/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +, iso4217 +, pyserial +, pyserial-asyncio +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "aioraven"; + version = "0.5.2"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "cottsay"; + repo = "aioraven"; + rev = "refs/tags/${version}"; + hash = "sha256-ysmIxWy+gufX5oUfQ7Zw5xv0t/yxihFB+eAdYAWAmXs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + iso4217 + pyserial + pyserial-asyncio + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aioraven" + ]; + + meta = with lib; { + description = "Module for communication with RAVEn devices"; + homepage = "https://github.com/cottsay/aioraven"; + changelog = "https://github.com/cottsay/aioraven/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index e1e4f7fabaf7..89ffdf6827cb 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the Remember the Milk API"; + mainProgram = "aiortm"; homepage = "https://github.com/MartinHjelmare/aiortm"; changelog = "https://github.com/MartinHjelmare/aiortm/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 2dfef5a251ad..55c60d8e921a 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-i2dlcparDQlwM7Wk/HwlBz0mmI38ZRwxVM6jLY0rI+0="; + hash = "sha256-ZJ6lb3pd8DhNagaVq1uFwadtviuHCg44YZkh29ipu5U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 2294960ce59a..0a92b10bfd29 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -1,53 +1,44 @@ { lib +, aiohttp , async-timeout , buildPythonPackage , fetchFromGitHub -, fetchpatch , pillow -, pytest-asyncio -, pytestCheckHook , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "aioslimproto"; - version = "2.3.3"; - format = "pyproject"; + version = "3.0.1"; + pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "aioslimproto"; rev = "refs/tags/${version}"; - hash = "sha256-d+PEzCF1Cw/7NmumxIRRlr3hojpNsZM/JMQ0KWdosXk="; + hash = "sha256-K7z34fT0PQ5qcV+66VbhYTUhCjqW/OjPnrygBFKIW1k="; }; - patches = [ - # https://github.com/home-assistant-libs/aioslimproto/pull/189 - (fetchpatch { - name = "unpin-setuptools-version.patch"; - url = "https://github.com/home-assistant-libs/aioslimproto/commit/06fd56987be8903ff147bad38af84b21bc31bc18.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov" "" + ''; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ + aiohttp async-timeout pillow ]; - nativeCheckInputs = [ - pytest-asyncio - pytestCheckHook - ]; + # Module has no tests + doCheck = false; pythonImportsCheck = [ "aioslimproto" diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index fa66e0ca53cb..2f3c5e3b836c 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiosmtpd"; - version = "1.4.4.post2"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-iWKOxXtOBmszDBgeSHNY4a74D00p/9Pf7h/n+ohpTqs="; + rev = "refs/tags/v${version}"; + hash = "sha256-8nQ4BVSLYgZHRGkbujy/olV/+GABlkDhe5wef3hyQpQ="; }; propagatedBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio based SMTP server"; + mainProgram = "aiosmtpd"; homepage = "https://aiosmtpd.readthedocs.io/"; longDescription = '' This is a server for SMTP and related protocols, similar in utility to the diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 165342fec1d9..ac2ff4a650a8 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "9.3"; + version = "10.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; rev = "refs/tags/${version}"; - hash = "sha256-7bCJykE+7/eA1h4L5MyH/zVPZVMt7cNLXZSWq+8mPtY="; + hash = "sha256-KlDwvoU0GYCN+ZCp4pp557qf9ChceS4NeA0Yiq+g3YQ="; }; sphinxRoot = "docs/source"; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index e50bd10281c5..01879192a82d 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for communicating with Unifi Controller API"; + mainProgram = "aiounifi"; homepage = "https://github.com/Kane610/aiounifi"; changelog = "https://github.com/Kane610/aiounifi/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index 19959b7accd4..a24384e3c51e 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to parse the registry hive"; + mainProgram = "awinreg"; homepage = "https://github.com/skelsec/aiowinreg"; changelog = "https://github.com/skelsec/aiowinreg/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix index 6bd40233d761..bfe406b05364 100644 --- a/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "A pure python implementation of multicast DNS service discovery"; + mainProgram = "aiozeroconf"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/development/python-modules/airium/default.nix b/pkgs/development/python-modules/airium/default.nix index 4d84454a339c..b61cd573fb4b 100644 --- a/pkgs/development/python-modules/airium/default.nix +++ b/pkgs/development/python-modules/airium/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bidirectional HTML-python translator"; + mainProgram = "airium"; homepage = "https://gitlab.com/kamichal/airium"; license = licenses.mit; maintainers = with maintainers; [ hulr ]; diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 91ceae7ea288..1f9458541065 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = "airthings-ble"; rev = "refs/tags/${version}"; - hash = "sha256-A7Nrg0O+WVoHP+m8pz6idnNcxulwPYmMt9DfhKTHG24="; + hash = "sha256-BeOrGRVxvfQR1xqIpOp4tOTvlqTKCZHUjVKDqVjVnYM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ajsonrpc/default.nix b/pkgs/development/python-modules/ajsonrpc/default.nix index 0b974e368045..47643f6e94b4 100644 --- a/pkgs/development/python-modules/ajsonrpc/default.nix +++ b/pkgs/development/python-modules/ajsonrpc/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async JSON-RPC 2.0 protocol + asyncio server"; + mainProgram = "async-json-rpc-server"; homepage = "https://github.com/pavlov99/ajsonrpc"; license = licenses.mit; maintainers = with maintainers; [ oxzi ]; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index 949bfdcac95d..b2b77a34c881 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -1,16 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi -, pygments }: +{ lib +, buildPythonPackage +, fetchPypi +, flit-core +, pygments +}: buildPythonPackage rec { pname = "alabaster"; - version = "0.7.13"; - format = "setuptools"; + version = "0.7.16"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-onpKCE1eaQ4W4B4DrSsuVSxhplRpQZuQckMZPeGoSuI="; + hash = "sha256-dai5nCil2tUN1/jM3UR6Eh3bOJLanlPRylzKMQbVjWU="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ pygments ]; # No tests included diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index 6c13bebebdfe..17e9c7fc7974 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -12,18 +12,20 @@ , pytestCheckHook , pythonOlder , pythonRelaxDepsHook +, torch +, torchvision }: buildPythonPackage rec { pname = "albumentations"; - version = "1.4.0"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ZJ+KFIlveIs1bsxwCDxPuRvtq0/04rOa0heoJOGJ3tA="; + hash = "sha256-lznWLJocXdfwnhAZ33V5ZdlFCAsNa0u/rjfkjmHBQOg="; }; nativeBuildInputs = [ @@ -50,6 +52,8 @@ buildPythonPackage rec { nativeCheckInputs = [ deepdiff pytestCheckHook + torch + torchvision ]; disabledTests = [ diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 9cc5f6105cf5..9ff15479551e 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -89,6 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "a simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games"; + mainProgram = "ale-import-roms"; homepage = "https://github.com/mgbellemare/Arcade-Learning-Environment"; license = licenses.gpl2; maintainers = with maintainers; [ billhuang ]; diff --git a/pkgs/development/python-modules/alectryon/default.nix b/pkgs/development/python-modules/alectryon/default.nix index 136768950dfd..423aedb94237 100644 --- a/pkgs/development/python-modules/alectryon/default.nix +++ b/pkgs/development/python-modules/alectryon/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/cpitclaudel/alectryon"; description = "A collection of tools for writing technical documents that mix Coq code and prose"; + mainProgram = "alectryon"; license = licenses.mit; maintainers = with maintainers; [ Zimmi48 ]; }; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 1b5dc8514414..9f4131778818 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.13.0"; + version = "1.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-q0s7lNLh5fgeNL6Km3t1dfyd1TmPzLC+81HsmxSHJiM="; + hash = "sha256-STLIVYv2jy7pK5u8uCGGccYnBk1bCJOUN69td9wF5ZU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix index f023cbb3a429..52a38b647a69 100644 --- a/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "allure-python-commons-test"; - version = "2.13.2"; + version = "2.13.3"; format = "setuptools"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-Xh6NtqiuTg7UxKqJ7/p45rCUQGWiGDEaNAslzeYtgfg="; + hash = "sha256-DGPxOoUGecpqKugrVR9iAa1VCBoInzUGTEY4GQB13SE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index e441daefcd43..9636c6d94e20 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.4.3"; + version = "0.4.4"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; rev = "refs/tags/v${version}"; - hash = "sha256-03uAaD4aEMxu/T1D8Hb7XcWvZZuaCK5HmdOD9bx+ZIc="; + hash = "sha256-XL5S7/Utfg83DLIBGBDWYoQnRZaFE11Wy+XXbimu3Q8="; }; nativeBuildInputs = [ @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "A modern hardware definition language and toolchain based on Python"; + mainProgram = "amaranth-rpc"; homepage = "https://amaranth-lang.org/docs/amaranth"; license = licenses.bsd2; maintainers = with maintainers; [ emily thoughtpolice pbsds ]; diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix index 778a585a69f1..d9587d11ee48 100644 --- a/pkgs/development/python-modules/amarna/default.nix +++ b/pkgs/development/python-modules/amarna/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static-analyzer and linter for the Cairo programming language"; + mainProgram = "amarna"; homepage = "https://github.com/crytic/amarna"; license = licenses.agpl3Only; maintainers = with maintainers; [ raitobezarius ]; diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 6e28c5da9978..939c554d339d 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, cbor2 , docopt , fetchFromGitHub , jsonconversion @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.11.3"; + version = "0.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { rev = "refs/tags/v${version}"; # Test vectors require git submodule fetchSubmodules = true; - hash = "sha256-wA24ASd6+rTAqHNQ9ZGMnCK9ykJjogCtEWfrXY1B87o="; + hash = "sha256-L21FYl4Q+nhB3CU1maOxBHSLU+ox1POHtMio8SSZ/r0="; }; postPatch = '' @@ -41,6 +42,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + cbor2 docopt pytestCheckHook tabulate diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index 264acc781393..5f6cc373e560 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to anonymize IP addresses in log files"; + mainProgram = "anonip"; homepage = "https://github.com/DigitaleGesellschaft/Anonip"; license = licenses.bsd3; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 192ecaf2eab4..5f87f8ff3e51 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , pytestCheckHook , setuptools @@ -10,22 +9,14 @@ buildPythonPackage rec { pname = "ansi2html"; - version = "1.8.0"; + version = "1.9.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-OLgqKYSCofomE/D5yb6z23Ko+DLurFjrLke/Ms039tU="; + hash = "sha256-XGg3oT7MGQOqt6VFNTMSBJ3+3+UQU2KtOo2dIHhx7HE="; }; - patches = [ - (fetchpatch { - name = "update-build-requirements.patch"; - url = "https://github.com/pycontribs/ansi2html/commit/be9c47dd39e500b2e34e95efde90d0a3b44daaee.patch"; - hash = "sha256-nvOclsgysg+4sK694ppls0BLfq5MCJJQW3V/Ru30D/k="; - }) - ]; - nativeBuildInputs = [ setuptools setuptools-scm @@ -42,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert text with ANSI color codes to HTML"; + mainProgram = "ansi2html"; homepage = "https://github.com/ralphbean/ansi2html"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ davidtwco ]; diff --git a/pkgs/development/python-modules/ansi2image/default.nix b/pkgs/development/python-modules/ansi2image/default.nix index 1d66f846bacd..eadb1ca188a4 100644 --- a/pkgs/development/python-modules/ansi2image/default.nix +++ b/pkgs/development/python-modules/ansi2image/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to convert ANSI text to an image"; + mainProgram = "ansi2image"; homepage = "https://github.com/helviojunior/ansi2image"; changelog = "https://github.com/helviojunior/ansi2image/blob/${version}/CHANGELOG"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 685fdd59f969..e4cb4c205d25 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -103,6 +103,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helps when interfacing with Ansible"; + mainProgram = "ansible-runner"; homepage = "https://github.com/ansible/ansible-runner"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index af123b9df777..1269714c5824 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -80,6 +80,7 @@ buildPythonPackage { meta = with lib; { description = "Radically simple IT automation"; + mainProgram = "ansible-community"; homepage = "https://www.ansible.com"; changelog = "https://github.com/ansible-community/ansible-build-data/blob/${version}/${lib.versions.major version}/CHANGELOG-v${lib.versions.major version}.rst"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/anthemav/default.nix b/pkgs/development/python-modules/anthemav/default.nix index 965d399d573c..00642f8cb157 100644 --- a/pkgs/development/python-modules/anthemav/default.nix +++ b/pkgs/development/python-modules/anthemav/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python asyncio module to interface with Anthem AVM and MRX receivers"; + mainProgram = "anthemav_monitor"; homepage = "https://github.com/nugget/python-anthemav"; changelog = "https://github.com/nugget/python-anthemav/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 0b15d85e2e36..76b852c71f6d 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.15.0"; + version = "0.19.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-cI+CbQir2QpHAb+72clLGG7ZBsrYT3fY14HzxjtKOsk="; + hash = "sha256-D9asbwZ9puOuIK6w7cWJ2HmC3JYjamUZPOxVKWq+Va4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 3b8ed13b1ad8..70fa4e6da2fa 100644 --- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Runtime for ANTLR"; + mainProgram = "pygrun"; homepage = "https://www.antlr.org/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/anyconfig/default.nix b/pkgs/development/python-modules/anyconfig/default.nix index 87792781f640..b0e673969a5b 100644 --- a/pkgs/development/python-modules/anyconfig/default.nix +++ b/pkgs/development/python-modules/anyconfig/default.nix @@ -7,17 +7,16 @@ buildPythonPackage rec { pname = "anyconfig"; - version = "0.13.0"; + version = "0.14.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-A/8uF2KvOI+7vtHBq3+fHsAGqR2n2zpouWPabneV0qw="; + hash = "sha256-LN9Ur12ujpF0Pe2CxU7Z2Krvo6lyL11F6bX3S2A+AU0="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=src -vv" "" + sed -i '/addopts =/d' setup.cfg ''; propagatedBuildInputs = [ @@ -36,12 +35,14 @@ buildPythonPackage rec { disabledTestPaths = [ # NameError: name 'TT' is not defined "tests/schema/test_jsonschema.py" + "tests/backend/loaders/pickle/test_pickle_stdlib.py" ]; pythonImportsCheck = [ "anyconfig" ]; meta = with lib; { description = "Python library provides common APIs to load and dump configuration files in various formats"; + mainProgram = "anyconfig_cli"; homepage = "https://github.com/ssato/python-anyconfig"; license = licenses.mit; maintainers = with maintainers; [ tboerger ]; diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index f8d992bed39b..c5e6d20acb6b 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9BxzdeQ5Yh4FDXGNVx9kiy7/fBmn8esvZkrK4wW4oGA="; + hash = "sha256-y58DQiTD0ZKaBNf0cA3MFE+7F68Svrl+Idz6BZY7HWQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 8e55337e4100..f18fa10557f3 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -44,6 +44,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + # Tests print “Fontconfig error: Cannot load default config file” preCheck = lib.optionalString withGraphviz '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 2e267e2ef191..fead79054b36 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -49,14 +49,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.52.0"; + version = "2.54.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - hash = "sha256-s/DgTMsJc3c3dqR5Ak9p+xmLm72uNL3AofGzR26B3nI="; + hash = "sha256-DcqYBPAS+yUqTJLUem8+2OqRUzb6DoBOeRkMjmvuvws="; }; patches = [ diff --git a/pkgs/development/python-modules/apcaccess/default.nix b/pkgs/development/python-modules/apcaccess/default.nix index e6d6d32eb353..b93a91c3090b 100644 --- a/pkgs/development/python-modules/apcaccess/default.nix +++ b/pkgs/development/python-modules/apcaccess/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library offers programmatic access to the status information provided by apcupsd over its Network Information Server"; + mainProgram = "apcaccess"; homepage = "https://github.com/flyte/apcaccess"; license = licenses.mit; maintainers = with maintainers; [ uvnikita ]; diff --git a/pkgs/development/python-modules/apispec-webframeworks/default.nix b/pkgs/development/python-modules/apispec-webframeworks/default.nix index 171deeebda8c..66e45f0a15f9 100644 --- a/pkgs/development/python-modules/apispec-webframeworks/default.nix +++ b/pkgs/development/python-modules/apispec-webframeworks/default.nix @@ -1,4 +1,5 @@ { lib +, aiohttp , apispec , bottle , buildPythonPackage @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "apispec-webframeworks"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = "apispec-webframeworks"; rev = "refs/tags/${version}"; - hash = "sha256-zrsqIZ5ZogZsK1ZOL2uy8igS4T8a+19IwL5dMhKw7OA="; + hash = "sha256-qepiaRW36quIgxBtEHMF3HN0wO6jp2uGAHgg5fJoMUY="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { ] ++ apispec.optional-dependencies.yaml; nativeCheckInputs = [ + aiohttp bottle flask mock diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index 6daf9868a4a4..9bc15aafb82a 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apkinspector"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bB/WeCRnYOdfg4bm9Nloa2QMxr2IJW8IZd+svUno4N0="; + hash = "sha256-6n5WCQ6V63kbWT6b7t9PEFbrJpxEg1WOE9XV70tHnGA="; }; nativeBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module designed to provide detailed insights into the zip structure of APK files"; + mainProgram = "apkInspector"; homepage = "https://github.com/erev0s/apkInspector"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index 014fa13d6e2d..a3af5ba33b86 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "app-model"; rev = "refs/tags/v${version}"; - hash = "sha256-idie99ditHJG/6rv97LDaF71iTjjgJyhLiTrbkQmbts="; + hash = "sha256-lnsaplJJk+c0hdHyQPH98ssppxBXqj/O0K6xlRfk+Oc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 32ec4869cae5..16b7c1d29dcb 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "11.1.1"; + version = "11.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-kVGCAht3ZP6ENhFJG3LoYs6PTH7OSNoj/h5QACwjKG8="; + hash = "sha256-VM4TP98bS9NmhxZz+YHMJrHKr5g6E6aYidxjKQyXp7k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index d9cba7737271..a62c3dc8251d 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -75,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; + mainProgram = "vdb"; homepage = "https://github.com/appthreat/vulnerability-db"; changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index aafdf6ac72b2..153b8b3b05dd 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.44.2.0"; + version = "3.45.1.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-H7aqZHU4SXNrfbv6iwHckkNm5MeGkro42+njSoFJgS4="; + hash = "sha256-NkpkciLR2TgfK/7UQHEzvQu8qRj4UJyOlGQbiV23qrc="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/aranet4/default.nix b/pkgs/development/python-modules/aranet4/default.nix index 49000324ac27..338e53fcb788 100644 --- a/pkgs/development/python-modules/aranet4/default.nix +++ b/pkgs/development/python-modules/aranet4/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Aranet4 devices"; + mainProgram = "aranetctl"; homepage = "https://github.com/Anrijs/Aranet4-Python"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index 7e2d9aa7b92a..b78a7bfac161 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for speaking to Arcam receivers"; + mainProgram = "arcam-fmj"; homepage = "https://github.com/elupus/arcam_fmj"; changelog = "https://github.com/elupus/arcam_fmj/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/archspec/default.nix b/pkgs/development/python-modules/archspec/default.nix index a68c7554303e..1ae73f71f325 100644 --- a/pkgs/development/python-modules/archspec/default.nix +++ b/pkgs/development/python-modules/archspec/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archspec"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "archspec"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-6+1TiXCBqW8YH/ggZhRcZV/Tyh8Ku3ocwxf9z9KrCZY="; + hash = "sha256-Ek+rmgvG6DbtxljAEHVac/JzNI1MaLpPu4G8nhaxzg8="; }; nativeBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for detecting, labeling, and reasoning about microarchitectures"; + mainProgram = "archspec"; homepage = "https://archspec.readthedocs.io/"; changelog = "https://github.com/archspec/archspec/releases/tag/v${version}"; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 0c76a89d7a5c..fbbda611ba50 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -64,6 +64,7 @@ buildPythonPackage rec { An open source facility for XBRL, the eXtensible Business Reporting Language supporting various standards, exposed through a Python or REST API'' + lib.optionalString gui " and a graphical user interface"; + mainProgram = "arelle"; homepage = "http://arelle.org/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 2496934d571b..5b4a4e45ce4c 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.2.1"; + version = "3.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kislyuk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gOKuFv04Qv9ry7LEKC9zIe7kJvHNFhTBDUrL+zu8AYk="; + hash = "sha256-xHUK57Adp3pnzHtFzvjFYb3t1cywRrEeKKXgJJqg10s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 2a0ba451d28a..3097db541754 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "argh"; - version = "0.30.4"; + version = "0.31.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-n8qOacTa1PjSp7373YCwdURitTUQoD4bXPK0Oofm6WA="; + hash = "sha256-2xw0iFgE99RkbDhdwvsZtFKYVhMi9MFerhsTOZP54yM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 0ccca5417a2e..f4886e311f85 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.25.0"; + version = "1.26.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KU67tu14pX1nCRl9k/Na9EqelO3Uz7It1dpFBU2IjZA="; + hash = "sha256-+8oN3afbpBQU2tRb2Oq12IlmoCg4O1LUHtt4hl2FOEI="; }; pythonRelaxDeps = [ @@ -179,6 +179,7 @@ buildPythonPackage { meta = with lib; { description = "Argilla: the open-source data curation platform for LLMs"; + mainProgram = "argilla"; homepage = "https://github.com/argilla-io/argilla"; changelog = "https://github.com/argilla-io/argilla/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/argostranslate/default.nix b/pkgs/development/python-modules/argostranslate/default.nix index 9d958c2e1e9e..57ea8db15a3d 100644 --- a/pkgs/development/python-modules/argostranslate/default.nix +++ b/pkgs/development/python-modules/argostranslate/default.nix @@ -18,13 +18,13 @@ let in buildPythonPackage rec { pname = "argostranslate"; - version = "1.9.1"; + version = "1.9.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OlVrRfBhbJpIFjWdLQsn7zEteRP6UfkIpGT4Y933QKk="; + sha256 = "sha256-N1Dh8238cDKpIMeQT645lDvYMbOWjVqGuWxt37+TQmQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index e505ac015bca..01f81b316952 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pdm-pep517 +, pdm-backend , appdirs , loguru , requests @@ -13,6 +13,7 @@ , pyperclip , aria2 , fastapi +, psutil , pytest-xdist , pytestCheckHook , responses @@ -21,19 +22,19 @@ buildPythonPackage rec { pname = "aria2p"; - version = "0.11.2"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pawamoy"; repo = pname; - rev = version; - hash = "sha256-z74ej6J6Yh1aVsXR5fE+XhoCzCS+zfDxQL8gKFd7tBA="; + rev = "refs/tags/${version}"; + hash = "sha256-WlbZP2+qUSyfmeFFiuarXI3VaNZvD9cnOef/WM+J0OE="; }; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -59,6 +60,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook responses + psutil uvicorn ] ++ passthru.optional-dependencies.tui; @@ -67,6 +69,7 @@ buildPythonPackage rec { "test_add_downloads_torrents_and_metalinks" "test_add_downloads_uris" # require a running aria2 server + "test_cli_autoclear_commands" "test_get_files_method" "test_pause_subcommand" "test_resume_method" @@ -78,6 +81,7 @@ buildPythonPackage rec { homepage = "https://github.com/pawamoy/aria2p"; changelog = "https://github.com/pawamoy/aria2p/blob/${src.rev}/CHANGELOG.md"; description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC"; + mainProgram = "aria2p"; license = licenses.isc; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index 65b65c8643ec..14740b2136c1 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ariadne"; - version = "0.22.0"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = "ariadne"; rev = "refs/tags/${version}"; - hash = "sha256-GMBtW2gZbF1m0BrKhYEkSaZYt5tIGmP/ipy6WC1H1pg="; + hash = "sha256-zdM6LKtrD6m3hWn90yAgsinCvaa86BaTdhgf/VzGDLA="; }; patches = [ diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index 2bf6f51cd163..c1fbd475bc07 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "ASCII art library for Python"; + mainProgram = "art"; homepage = "https://github.com/sepandhaghighi/art"; changelog = "https://github.com/sepandhaghighi/art/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index edd555a96b16..56298852a377 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.17.0"; + version = "0.17.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-DqVwbiNJHdRxK3Ppfa6sqPJzDqMaj1mtlAJHFq09u2Y="; + hash = "sha256-V0/yboKpK/4QuCOzKDiyFpu/J2JLu0aQxRZ+rpMS9eY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix index a7a6b83c5667..a60642a11489 100644 --- a/pkgs/development/python-modules/arxiv2bib/default.nix +++ b/pkgs/development/python-modules/arxiv2bib/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Get a BibTeX entry from an arXiv id number, using the arxiv.org API"; + mainProgram = "arxiv2bib"; homepage = "http://nathangrigg.github.io/arxiv2bib/"; license = licenses.bsd3; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/development/python-modules/asdf-standard/default.nix b/pkgs/development/python-modules/asdf-standard/default.nix index 170cefa42e86..63586454746b 100644 --- a/pkgs/development/python-modules/asdf-standard/default.nix +++ b/pkgs/development/python-modules/asdf-standard/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asdf-standard"; - version = "1.0.3"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "asdf_standard"; inherit version; - hash = "sha256-r9j/mnDnsX9rzGTrkqVEhn1dT+HwB2cZFC/fYrls/UQ="; + hash = "sha256-AVNbwrFb/AnsimLUmZ+c8y3EnccWYMhCVkAij9h3YQI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asdf-transform-schemas/default.nix b/pkgs/development/python-modules/asdf-transform-schemas/default.nix index d00e43e756a3..7adc1705569e 100644 --- a/pkgs/development/python-modules/asdf-transform-schemas/default.nix +++ b/pkgs/development/python-modules/asdf-transform-schemas/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asdf-transform-schemas"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,14 +17,14 @@ buildPythonPackage rec { src = fetchPypi { pname = "asdf_transform_schemas"; inherit version; - hash = "sha256-3n/cP+41+5V/wylXh3oOnX3U0uhRvWMaclnxHCvSlMo="; + hash = "sha256-gs9MeCV1c0qJUyfyX/WDzpSZ1+K4Nv6IgLLXlhxrRis="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asdf-standard ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 8ce547ee08d8..e454101b2512 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "7.0.6"; + version = "7.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-mumnr3jeiinSLagBfYuMVcdUcM5HkUPD8iwvu9YychA="; + hash = "sha256-4DqZGDg9VZsBWaVb3WpAegZVW1lk/5f9AR5Gxgik1gQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asks/default.nix b/pkgs/development/python-modules/asks/default.nix index 8be9a9b21160..86c024f0e12d 100644 --- a/pkgs/development/python-modules/asks/default.nix +++ b/pkgs/development/python-modules/asks/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchFromGitHub , anyio @@ -39,6 +40,12 @@ buildPythonPackage rec { trio ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # stuck in threading waiter.acquire() + "test_https_get" + "test_https_get_checks_cert" + ]; + pythonImportsCheck = [ "asks" ]; meta = { diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 90ccd0c6f1a2..fbad415431dc 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for translating ASN.1 into other forms"; + mainProgram = "asn1ate"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index 5083b20f3b33..b339739afcab 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "ASN.1 parsing, encoding and decoding"; + mainProgram = "asn1tools"; homepage = "https://github.com/eerimoq/asn1tools"; changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index fd0812139e3c..d0b3fe60160a 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "3.0.2"; # Check whether the version is compatible with pylint + version = "3.1.0"; # Check whether the version is compatible with pylint pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "astroid"; rev = "refs/tags/v${version}"; - hash = "sha256-KTmFJKlymI1ACWk3UhbkZF/dB9W8/h6kaAfKLL3yiCA="; + hash = "sha256-+cTQHbqoucaNi7rPoyH6Cu07vZMS8KWn5C/A3NXRSwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index 4089c6bc6cce..4eab03562468 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "astropy-iers-data"; - version = "0.2023.12.04.00.30.20"; + version = "0.2024.03.04.00.30.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "astropy-iers-data"; rev = "refs/tags/v${version}"; - hash = "sha256-r4YCBeAyqzwQghLK56d+nJ/TkoSIHmtiW5Gi5xXM2QM="; + hash = "sha256-BG5hQHvPqpuV2TUsD/kZv3DKx+wjods/XgZw1Z5hygg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 0dee4e9ed97d..d770eb196a28 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -72,6 +72,13 @@ buildPythonPackage rec { # May fail due to parallelism, see: # https://github.com/astropy/astropy/issues/15441 "TestUnifiedOutputRegistry" + + # fail due to pytest>=8 + # https://github.com/astropy/astropy/issues/15960#issuecomment-1913654471 + "test_distortion_header" + + # flaky + "test_timedelta_conversion" # More flaky tests, see: https://github.com/NixOS/nixpkgs/issues/294392 "test_sidereal_lon_independent" "test_timedelta_full_precision_arithmetic" diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 0e2da16189be..3421902ff830 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.18"; + version = "0.0.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t2AolP0GZ88b0+FqHXHIP1V6TIV61Bvd8wVXpZZltK0="; + hash = "sha256-QQVgIPdonPXwpVl1nH8Cps4nGb2oTfeDvRBY1XgeUUs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index fc4ee957d278..4cb8e0bbbbb9 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio UPnP Client library for Python"; + mainProgram = "upnp-client"; homepage = "https://github.com/StevenLooman/async_upnp_client"; changelog = "https://github.com/StevenLooman/async_upnp_client/blob/${version}/CHANGES.rst"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 88591af61bbd..dce3a9ba0642 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, async-timeout , uvloop , postgresql , pythonOlder @@ -13,7 +14,7 @@ buildPythonPackage rec { version = "0.29.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -23,6 +24,12 @@ buildPythonPackage rec { # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495 doCheck = postgresql.doCheck; + # required for compatibility with Python versions older than 3.11 + # see https://github.com/MagicStack/asyncpg/blob/v0.29.0/asyncpg/_asyncio_compat.py#L13 + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ + async-timeout + ]; + nativeCheckInputs = [ uvloop postgresql diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index b28315a44e8c..cad72c813aec 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.11"; + version = "0.2.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Fwm898mU7wvH5OkYVUrw3rL4VT5yyvoHxVtfcuL+4bQ="; + hash = "sha256-uilvJjuZrvdC2m4zhXCkbzLjwtbC1liWEZ20Ya7FYJ0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index f29936d3174a..25c114debd40 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -2,28 +2,33 @@ , buildPythonPackage , fetchPypi , async-timeout -, pysnmplib +, pysnmp-lextudio , pythonOlder +, poetry-core }: buildPythonPackage rec { pname = "atenpdu"; - version = "0.6.1"; - format = "setuptools"; + version = "0.6.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3."; src = fetchPypi { inherit pname version; - hash = "sha256-Of7tQJNqaLDgO8nie6rSd1saMbauXJBp8vWfXYAziEE="; + hash = "sha256-KzRoE4tE/tQkKYroq5PbWKREmEl8AwbIOg3IHRZZtsQ="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ async-timeout - pysnmplib + pysnmp-lextudio ]; - # Project has no test + # Module has no test doCheck = false; pythonImportsCheck = [ @@ -32,7 +37,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to control ATEN PE PDUs"; + mainProgram = "pductl"; homepage = "https://github.com/mtdcr/pductl"; + changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 45f61e63c10c..c4c9f85cf3f2 100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -1,9 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, beautifulsoup4 , deprecated +, jmespath +, lxml , oauthlib , requests +, requests-kerberos , requests-oauthlib , six , pytestCheckHook @@ -12,7 +16,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.3"; + version = "3.41.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,13 +25,17 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MIzBuIeQfAVlllaU02htx1eufRlpe+V9Kzo+EFF45ME="; + hash = "sha256-yQqy+pFl5TK4CEUM+vpwl+pkUjBuc0xvqC9o1ZC5m7c="; }; propagatedBuildInputs = [ + beautifulsoup4 deprecated + jmespath + lxml oauthlib requests + requests-kerberos requests-oauthlib six ]; diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 20fc37d45999..41cbe28b8a26 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { sybil ]; + pytestFlagsArray = [ + # TypeError: FixtureManager.getfixtureclosure() missing 1 required positional argument: 'ignore_args' + "--ignore=docs/using.rst" + ]; + postPatch = '' sed -i '/cov=public/d' pyproject.toml ''; diff --git a/pkgs/development/python-modules/atsim-potentials/default.nix b/pkgs/development/python-modules/atsim-potentials/default.nix index 4a3c75966dc3..b06ef867c21f 100644 --- a/pkgs/development/python-modules/atsim-potentials/default.nix +++ b/pkgs/development/python-modules/atsim-potentials/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/mjdrushton/atsim-potentials"; description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS"; + mainProgram = "potable"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index a298dc36f507..8e46432b810f 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "attrs"; - version = "23.1.0"; + version = "23.2.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-YnmDbVgVE6JvG/I1+azTM7yRFWg/FPfo+uRsmPxQ4BU="; + hash = "sha256-k13DtSnCYvbPduUId9NaS9PB3hlP1B9HoreujxmXHzA="; }; patches = [ diff --git a/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch b/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch index 7d7b83a366e0..cf743ba9ee05 100644 --- a/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch +++ b/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch @@ -1,18 +1,18 @@ diff --git a/pyproject.toml b/pyproject.toml -index fb8fae3..998211f 100644 +index 1c72fc2..ae45740 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT [build-system] --requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme"] +-requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme>=23.2.0"] +requires = ["hatchling"] build-backend = "hatchling.build" @@ -26,7 +26,8 @@ classifiers = [ - "Typing :: Typed", + "Typing :: Typed", ] dependencies = ["importlib_metadata;python_version<'3.8'"] -dynamic = ["version", "readme"] @@ -20,12 +20,11 @@ index fb8fae3..998211f 100644 +version = "@version@" [project.optional-dependencies] - tests-no-zope = [ -@@ -67,50 +68,9 @@ Changelog = "https://www.attrs.org/en/stable/changelog.html" - Funding = "https://github.com/sponsors/hynek" + tests-mypy = [ +@@ -70,54 +71,9 @@ Funding = "https://github.com/sponsors/hynek" Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi" -- + -[tool.hatch.version] -source = "vcs" -raw-options = { local_scheme = "no-local-version" } @@ -68,7 +67,12 @@ index fb8fae3..998211f 100644 -[Full changelog](https://www.attrs.org/en/stable/changelog.html) -""" - +-# Point sponsor image URLs to versions. +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]] +-pattern = '\/latest\/_static/sponsors' +-replacement = '/$HFPR_VERSION/_static/sponsors' +- - - # Make coverage play nicely with pytest-xdist. - [tool.hatch.build.targets.wheel.hooks.autorun] - dependencies = ["hatch-autorun"] + [tool.pytest.ini_options] + addopts = ["-ra", "--strict-markers", "--strict-config"] + xfail_strict = true diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix index bd82dabbc83f..63b8e605086e 100644 --- a/pkgs/development/python-modules/audible/default.nix +++ b/pkgs/development/python-modules/audible/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "A(Sync) Interface for internal Audible API written in pure Python"; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://github.com/mkb79/Audible"; maintainers = with maintainers; [ jvanbruegge ]; }; diff --git a/pkgs/development/python-modules/auditok/default.nix b/pkgs/development/python-modules/auditok/default.nix index 459662df15d5..2ec68b11157b 100644 --- a/pkgs/development/python-modules/auditok/default.nix +++ b/pkgs/development/python-modules/auditok/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Audio Activity Detection tool that can process online data as well as audio files"; + mainProgram = "auditok"; homepage = "https://github.com/amsehili/auditok/"; changelog = "https://github.com/amsehili/auditok/blob/v${version}/CHANGELOG"; license = licenses.mit; diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 7f0540b6d096..217f76a1f49c 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.7.0"; + version = "4.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "auth0"; repo = "auth0-python"; rev = "refs/tags/${version}"; - hash = "sha256-Z89T0HXB66MZTYNKSK8fHunUBFuI1wT5jcy+P3+9tIk="; + hash = "sha256-udtrvAr8wfg1DbNbBEjA/tlrYhIiXtTFqi4bZCuKI0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 3b65404bde72..7f0159f96bca 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/alandtse/auth_capture_proxy/releases/tag/v${version}"; description = "A proxy to capture authentication information from a webpage"; + mainProgram = "auth_capture_proxy"; homepage = "https://github.com/alandtse/auth_capture_proxy"; license = licenses.asl20; maintainers = with maintainers; [ graham33 hexa ]; diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index 6762e4b3ad7a..3f73af498036 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the generation of email authentication headers"; + mainProgram = "dmarc-policy-find"; homepage = "https://github.com/ValiMail/authentication-headers"; changelog = "https://github.com/ValiMail/authentication-headers/blob${version}/CHANGES"; license = licenses.mit; diff --git a/pkgs/development/python-modules/autofaiss/default.nix b/pkgs/development/python-modules/autofaiss/default.nix index 0f6ab7dda159..af5bbbebbb7d 100644 --- a/pkgs/development/python-modules/autofaiss/default.nix +++ b/pkgs/development/python-modules/autofaiss/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically create Faiss knn indices with the most optimal similarity search parameters"; + mainProgram = "autofaiss"; homepage = "https://github.com/criteo/autofaiss"; changelog = "https://github.com/criteo/autofaiss/blob/${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix index 64d429629276..1fc68b92f94b 100644 --- a/pkgs/development/python-modules/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { pname = "autoflake"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-jCAR+jRwG519zwW5hzvEhZ1Pzk5i3+qQ3/79FXb18B0="; + hash = "sha256-yYt13FsKhkWcTwGh0yrH60M47EMXpEaVFf8eaH7NkJ4="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to remove unused imports and unused variables"; + mainProgram = "autoflake"; homepage = "https://github.com/myint/autoflake"; license = licenses.mit; maintainers = with maintainers; [ yuriaisaka ]; diff --git a/pkgs/development/python-modules/autoit-ripper/default.nix b/pkgs/development/python-modules/autoit-ripper/default.nix index 5b926c18c3c2..3a4f3f059fc9 100644 --- a/pkgs/development/python-modules/autoit-ripper/default.nix +++ b/pkgs/development/python-modules/autoit-ripper/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract AutoIt scripts embedded in PE binaries"; + mainProgram = "autoit-ripper"; homepage = "https://github.com/nazywam/AutoIt-Ripper"; changelog = "https://github.com/nazywam/AutoIt-Ripper/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index 1b3a7d652185..46adfc6195ac 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "Autologging"; + pname = "autologging"; version = "1.3.2"; src = fetchPypi { - inherit pname version; + pname = "Autologging"; + inherit version; sha256 = "117659584d8aab8cf62046f682f8e57b54d958b8571c737fa8bf15c32937fbb6"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 6979c01b5960..e69a30257f1c 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -43,6 +43,7 @@ let automat = buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/glyph/Automat"; description = "Self-service finite-state machines for the programmer on the go"; + mainProgram = "automat-visualize"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 605fb0c66df3..b57472867005 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -131,6 +131,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic bindings for FFmpeg/Libav"; + mainProgram = "pyav"; homepage = "https://github.com/mikeboers/PyAV/"; changelog = "https://github.com/PyAV-Org/PyAV/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index 7c65fd4fc0f6..114ff98326f8 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "A serialization and RPC framework"; + mainProgram = "avro"; homepage = "https://pypi.python.org/pypi/avro-python3/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 4158600e182f..b023936e4314 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python serialization and RPC framework"; + mainProgram = "avro"; homepage = "https://github.com/apache/avro"; changelog = "https://github.com/apache/avro/releases/tag/release-${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index a9a60652b195..43a61d6d0220 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A serialization and RPC framework"; + mainProgram = "avro"; homepage = "https://pypi.python.org/pypi/avro3k/"; }; } diff --git a/pkgs/development/python-modules/aw-client/default.nix b/pkgs/development/python-modules/aw-client/default.nix index c856d384d8f1..c08ea790059c 100644 --- a/pkgs/development/python-modules/aw-client/default.nix +++ b/pkgs/development/python-modules/aw-client/default.nix @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library for ActivityWatch"; + mainProgram = "aw-client"; homepage = "https://github.com/ActivityWatch/aw-client"; maintainers = with maintainers; [ huantian ]; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix index 61ea5bbfaf09..290c2650a015 100644 --- a/pkgs/development/python-modules/aw-core/default.nix +++ b/pkgs/development/python-modules/aw-core/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Core library for ActivityWatch"; + mainProgram = "aw-cli"; homepage = "https://github.com/ActivityWatch/aw-core"; maintainers = with maintainers; [ huantian ]; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 2397b2462579..0c67f2ce4bce 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command line tool to ease AWS CLI authentication against ADFS"; + mainProgram = "aws-adfs"; homepage = "https://github.com/venth/aws-adfs"; changelog = "https://github.com/venth/aws-adfs/releases/tag/v${version}"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix index 7cdcc917c8a8..c525d79e4b6d 100644 --- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -7,7 +7,6 @@ , mock , pytest-mock , pytestCheckHook -, pythonAtLeast , pythonOlder , setuptools , wrapt @@ -15,14 +14,14 @@ buildPythonPackage rec { pname = "aws-encryption-sdk"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jV+/AY/GjWscrL5N0Df9gFKWx3Nqn+RX62hNBT9/lWM="; + hash = "sha256-QwT8+M4qo/qYsaz/ejvzzQUowynAxDe1Xg9Fa79iNH4="; }; nativeBuildInputs = [ @@ -42,15 +41,18 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTestPaths = [ # Tests require networking "examples" "test/integration" ]; - disabledTests = lib.optionals (pythonAtLeast "3.12") [ - # AssertionError: Regex pattern did not match, https://github.com/aws/aws-encryption-sdk-python/issues/644 - "test_abstracts" + pythonImportsCheck = [ + "aws_encryption_sdk" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index e944cccb5be0..1119435b48c2 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -7,29 +7,34 @@ , pyelftools , pytestCheckHook , pythonOlder +, setuptools , six }: buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.45.0"; - format = "setuptools"; + version = "1.47.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-TmU7neEnHaRuGNzK9VuXUiEayBLZaPqjrnPLvBOQj5g="; + hash = "sha256-hfvqK27yxk/y67gz0N6VuFj8OR3cQMD4iYQtx1XJSgw="; }; postPatch = '' substituteInPlace setup.py \ - --replace "version=read_version()," 'version="${version}",' + --replace-fail "version=read_version()," 'version="${version}",' ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ six ]; @@ -57,17 +62,24 @@ buildPythonPackage rec { "TestPythonPipWorkflow" "TestRubyWorkflow" "TestRustCargo" + "test_with_mocks" # Tests which are passing locally but not on Hydra "test_copy_dependencies_action_1_multiple_files" "test_move_dependencies_action_1_multiple_files" ]; + disabledTestPaths = [ + # Dotnet binary needed + "tests/integration/workflows/dotnet_clipackage/test_dotnet.py" + ]; + pythonImportsCheck = [ "aws_lambda_builders" ]; meta = with lib; { description = "Tool to compile, build and package AWS Lambda functions"; + mainProgram = "lambda-builders"; homepage = "https://github.com/awslabs/aws-lambda-builders"; changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/v${version}"; longDescription = '' diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 9fad12faaac4..872adf822768 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.82.0"; + version = "1.86.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-xAbFF4bKHFv5YAOlMA28lW1Xc37xV83X4r19MdubvFs="; + hash = "sha256-elirU6u6smuYIj8oO6s2ybQB8Tu0pJPkBdjd0W0CfFE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 53e69baa9182..43d59437330b 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.12.1"; + version = "2.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-xray-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-NLFNst4Yqsz2u5IXwe8OdJPW77irLRO5tWWn1uV3tMg="; + hash = "sha256-KhYYzeOteQxS1ltEUbjsDriHXO0Kom9YiCvVhSNvXVQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 788148d5e441..75e8897a7144 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "2.0.8"; + version = "2.0.10"; pyproject = true; disabled = isPy27; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = "refs/tags/${version}"; - sha256 = "sha256-0ej+Gy9nF96SaGhohHF9EJObSpHdxIe9QXHNHejVwbQ="; + sha256 = "sha256-tvTN6gV73Qnbe4OBHtfxt4jXV32fMTPE4H79WIkgkxE="; }; patches = [ diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 274b88a9811b..7cd356214d56 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.5.2"; + version = "3.7.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-lIEitS/pyOq4RjyUqPzfKOcNtAIWp14sQcLfQ1FwEoE="; + hash = "sha256-6HocnnPG/Id+49NN3WqnSYEnsijA2r13WM2NJIxVwFs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax/default.nix index a0315a561fba..f0bba36c3c2f 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "ax"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchFromGitHub { owner = "facebook"; repo = pname; - rev = version; - hash = "sha256-5f2VpOFDRz6YzxvxFYWMu8hljkMVbBsyULYVreUxYRU="; + rev = "refs/tags/${version}"; + hash = "sha256-UOX8Q7F5c9J1KSfQUy8aoL5CNb9YmEI4X7Fd5B16UqQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index 1d77c3409c94..4f9e456de6aa 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "axis"; - version = "53"; + version = "58"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-M5uaRiZP66RApSztvgzzpAUBKCcSCqC6fxzmB52mibY="; + hash = "sha256-6Mxthf37PtJSWsi+Ok0zBezTJLPwVoc8S1ZdQE57BEI="; }; postPatch = '' @@ -31,11 +31,11 @@ buildPythonPackage rec { --replace-fail "wheel==0.40.0" "wheel" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout attrs httpx @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for communicating with devices from Axis Communications"; + mainProgram = "axis"; homepage = "https://github.com/Kane610/axis"; changelog = "https://github.com/Kane610/axis/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix index 7c87679a9a06..510b87474d9a 100644 --- a/pkgs/development/python-modules/axisregistry/default.nix +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "axisregistry"; - version = "0.4.5"; + version = "0.4.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-elQUcl6Zh/3xXLduFKbiXZ6uQsDE8C6M3QnTEwaJlaA="; + hash = "sha256-obpjiX86fzokao7UWQUXgarKYRNdxplr6/r2D2d7DCI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index a3588cbe9874..91c140dc7fb8 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.17.0"; + version = "4.18.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6/bqxCAvewKR5lI6ulFpP3THu9DH1rDEFwsRynDJ6+k="; + hash = "sha256-OQ6Aet78NorIz1TlPdv5pW5ImDINLwH+ZQCk52Y+tJM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 189aa05c8056..64cfffff110a 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "17.2.0"; + version = "17.3.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-ihXjijfW5OzilXPegIxaiSdsmfJSDqHzUrhqcEyJhY0="; + hash = "sha256-/JSIGmrNuKlTPzcbb3stPq6heJ65VQFLJKkI1t/nWZE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 7c6c6b7ff7da..c4c4582a0f6d 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "30.5.0"; + version = "30.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7T6jS3mdsNUu5V4vGrSw8J+koI814GHsuarZ+1ohiEQ="; + hash = "sha256-TYDXI+xtTLlYNhfr7AcW59dLJzKsuu0CPtLjzHBT0A4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 748f1423e59e..7f760eecf397 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "6.0.0"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0B+K8u9M/z3edwlc8LNR8DeqV9y6vIVCmevoUIWN0YM="; + hash = "sha256-9WMsfVh9ca/nbbTPVuj1BwhIv6kGZlPbTzqzhvadBps="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 562340f93e4d..a1c8031f0fa3 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.11.4"; + version = "7.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-970pd5G2pXfONqOeoKuxCqD4dba7DTFSLtntK7AojUw="; + hash = "sha256-Xr5KU7/BAw9AH2lOrB7NJ8FB2ATl5vzyNXQrLWKUbks="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index dfca02bc5b3f..3fd78981d046 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.19.0"; + version = "12.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JsCkMgo0o8Kht0UoumgS68tjKgTNZ7HHN3IyxLAaWJc="; + hash = "sha256-E+FrpC/FSsLH6Pl2BiFzpcgrnsBZRyjhNKrDcpZaEbA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 0ff6214bf5b5..a6a805fd33ad 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , glibcLocales , importlib-metadata , logfury @@ -10,28 +10,34 @@ , pytest-lazy-fixture , pytest-mock , pythonOlder +, pythonRelaxDepsHook +, pdm-backend , requests -, setuptools -, setuptools-scm , tqdm , typing-extensions }: buildPythonPackage rec { pname = "b2sdk"; - version = "1.29.1"; + version = "1.32.0"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Talw1P0JnPdU+dDgC8J2TJSOV/LshgQyBbPYEqzKpfA="; + src = fetchFromGitHub { + owner = "Backblaze"; + repo = "b2-sdk-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-xBLMvH51zbrSuBOtMxLeQJt7Wv31OcxBbD72EuLHzuU="; }; nativeBuildInputs = [ - setuptools - setuptools-scm + pdm-backend + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "setuptools" ]; propagatedBuildInputs = [ @@ -53,11 +59,6 @@ buildPythonPackage rec { glibcLocales ]; - postPatch = '' - substituteInPlace setup.py \ - --replace 'setuptools_scm<6.0' 'setuptools_scm' - ''; - disabledTestPaths = [ # requires aws s3 auth "test/integration/test_download.py" diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index 97dfc7a1daf2..2e2a1a66eb48 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { homepage = "https://babel.pocoo.org/"; changelog = "https://github.com/python-babel/babel/releases/tag/v${version}"; description = "Collection of internationalizing tools"; + mainProgram = "pybabel"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index 575c74a17be9..8afa32c50053 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to load, examine, and save fonts in a variety of formats"; + mainProgram = "babelfont"; homepage = "https://github.com/simoncozens/babelfont"; license = licenses.bsd3; maintainers = with maintainers; [ danc86 ]; diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix index 0a07c39482db..abc9fdb1661f 100644 --- a/pkgs/development/python-modules/bagit/default.nix +++ b/pkgs/development/python-modules/bagit/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library and command line utility for working with BagIt style packages"; + mainProgram = "bagit.py"; homepage = "https://libraryofcongress.github.io/bagit-python/"; license = with licenses; [ publicDomain ]; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix index d2083c08fa60..9875cdf0ac1c 100644 --- a/pkgs/development/python-modules/barectf/default.nix +++ b/pkgs/development/python-modules/barectf/default.nix @@ -50,8 +50,13 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + meta = with lib; { description = "Generator of ANSI C tracers which output CTF data streams "; + mainProgram = "barectf"; homepage = "https://github.com/efficios/barectf"; license = licenses.mit; maintainers = with maintainers; [ Madouura ]; diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index 9a4d30f6149a..020f103851cb 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Base58 and Base58Check implementation"; + mainProgram = "base58"; homepage = "https://github.com/keis/base58"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; diff --git a/pkgs/development/python-modules/baseline/default.nix b/pkgs/development/python-modules/baseline/default.nix index a919e42dbc82..d64fbd26f6f3 100644 --- a/pkgs/development/python-modules/baseline/default.nix +++ b/pkgs/development/python-modules/baseline/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy String Baseline"; + mainProgram = "baseline"; longDescription = '' This tool streamlines creation and maintenance of tests which compare string output against a baseline. diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix index f2e8acfe7a0e..ed1bf400f631 100644 --- a/pkgs/development/python-modules/batchspawner/default.nix +++ b/pkgs/development/python-modules/batchspawner/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers"; + mainProgram = "batchspawner-singleuser"; homepage = "https://github.com/jupyterhub/batchspawner"; changelog = "https://github.com/jupyterhub/batchspawner/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 86ca3020bacc..ef82df7dfb95 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.28"; + version = "0.6.1"; format = "setuptools"; # Python 2 not supported and not some old Python 3 because MPL doesn't support @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0NKxx3dGNNsYc0nD9nIwJ1wpDJHu4Ny+Z/zzj4jys40="; + sha256 = "sha256-3N8w/LiTLsDZbHp3z26FvDg3vStB2l3XkIWx+Mma1G0="; }; nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; diff --git a/pkgs/development/python-modules/bc-jsonpath-ng/default.nix b/pkgs/development/python-modules/bc-jsonpath-ng/default.nix index 5565adcd8899..2322f0407f9f 100644 --- a/pkgs/development/python-modules/bc-jsonpath-ng/default.nix +++ b/pkgs/development/python-modules/bc-jsonpath-ng/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSONPath implementation for Python"; + mainProgram = "bc_jsonpath_ng"; homepage = "https://github.com/bridgecrewio/jsonpath-ng"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 25dc3fa419be..7f3832eeeb05 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parser for HCL2 written in Python using Lark"; + mainProgram = "hcl2tojson"; longDescription = '' This parser only supports HCL2 and isn't backwards compatible with HCL v1. It can be used to parse any HCL2 config file such as Terraform. diff --git a/pkgs/development/python-modules/bcf/default.nix b/pkgs/development/python-modules/bcf/default.nix index 68501e08d1e3..08fb7d4249bd 100644 --- a/pkgs/development/python-modules/bcf/default.nix +++ b/pkgs/development/python-modules/bcf/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/hardwario/bch-firmware-tool"; description = "HARDWARIO Firmware Tool"; + mainProgram = "bcf"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ cynerd ]; diff --git a/pkgs/development/python-modules/bcg/default.nix b/pkgs/development/python-modules/bcg/default.nix index 2a520f23f51f..c039a1e30072 100644 --- a/pkgs/development/python-modules/bcg/default.nix +++ b/pkgs/development/python-modules/bcg/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/hardwario/bch-gateway"; description = "HARDWARIO Gateway (Python Application «bcg»)"; + mainProgram = "bcg"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ cynerd ]; diff --git a/pkgs/development/python-modules/bch/default.nix b/pkgs/development/python-modules/bch/default.nix index 448559c592e2..2885cc47bfe1 100644 --- a/pkgs/development/python-modules/bch/default.nix +++ b/pkgs/development/python-modules/bch/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/hardwario/bch-control-tool"; description = "HARDWARIO Hub Control Tool"; + mainProgram = "bch"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ cynerd ]; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 9ae71f9ffef6..a8f751056d90 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "4.1.1"; + version = "4.1.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3zf1QY1PHNz/hF9g50egFTifpOY3A8kYMwhl4GrYAAc="; + hash = "sha256-MzE6EgCjrpC3VYfOrFArBIuED8aef3oJBbX4f6x6Elg="; }; cargoRoot = "src/_bcrypt"; @@ -35,7 +35,7 @@ buildPythonPackage rec { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-QYg1+DsZEdXB74vuS4SFvV0n5GXkuwHkOS9j1ogSTjA="; + hash = "sha256-fTD1AKvyeni5ukYjK53gueKLey+rcIUjW/0R289xeb0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index b009a54a83c5..baa20facc81f 100644 --- a/pkgs/development/python-modules/bdffont/default.nix +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "bdffont"; - version = "0.0.16"; + version = "0.0.17"; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-2qR9uKQk9zrKpyekpZJht8uZOp8PK01sv2CYyP+BqcA="; + hash = "sha256-JBPo5tmwnXRzPpZbBrcW2wEC/XNd8M+mi58CRIpOVL0="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix index 9dcd709bff11..f1e1ee3a4b02 100644 --- a/pkgs/development/python-modules/beancount-black/default.nix +++ b/pkgs/development/python-modules/beancount-black/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Opinioned code formatter for Beancount"; + mainProgram = "bean-black"; homepage = "https://github.com/LaunchPlatform/beancount-black/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ambroisie ]; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 9e9d15bec0cb..75ae136d2887 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , chardet , hatchling , html5lib @@ -22,8 +21,8 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.12.2"; - format = "pyproject"; + version = "4.12.3"; + pyproject = true; outputs = ["out" "doc"]; @@ -31,21 +30,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-SSu8adyjXRLarHHE2xv/8Mh2wA70ov+sziJtRjjrcto="; + hash = "sha256-dOPRko7cBw0hdIGFxG4/szSQ8i9So63e6a7g9Pd4EFE="; }; - patches = [ - # Fix test with libxml 2.12. - # https://bugs.launchpad.net/beautifulsoup/+bug/2045481 - (fetchpatch { - url = "https://bugs.launchpad.net/beautifulsoup/+bug/2045481/+attachment/5726132/+files/2045481.diff"; - hash = "sha256-f/Wkh7El4r1iWM2/CSi5AKE1+NsEP3D5pxWgBcZ//Vs="; - excludes = [ - "CHANGELOG" - ]; - }) - ]; - nativeBuildInputs = [ hatchling sphinxHook diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index b313e88b6c57..942981d004c9 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/behave/behave"; description = "behaviour-driven development, Python style"; + mainProgram = "behave"; license = licenses.bsd2; maintainers = with maintainers; [ alunduil maxxk ]; }; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index e93f810a61f8..344e14a30f0c 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to implement EZSP for EmberZNet devices"; + mainProgram = "bellows"; homepage = "https://github.com/zigpy/bellows"; changelog = "https://github.com/zigpy/bellows/releases/tag/${version}"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index 8441d25e71c6..6946f45e050f 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -69,7 +69,7 @@ }: let - version = "1.1.11"; + version = "1.2.5"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -105,7 +105,7 @@ buildPythonPackage { owner = "bentoml"; repo = "BentoML"; rev = "refs/tags/v${version}"; - hash = "sha256-2EjltGfmLalgPD9XNYYduYGzqbumqoglVVL+AbRzMJE="; + hash = "sha256-GBKxyjCs02mxYiMK4GhgFUATRCUSVf8mFbWjuPVD7SU="; }; # https://github.com/bentoml/BentoML/pull/4227 should fix this test diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 86f1e2574db7..d4da87d07433 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "betamax"; - version = "0.8.1"; + version = "0.9.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1hki1c2vs7adq7zr56wi6i5bhrkia4s2ywpv2c98ibnczz709w2v"; + sha256 = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index f5cc7d9253ea..e1d9f75a9a90 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -80,6 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "Code generator & library for Protobuf 3 and async gRPC"; + mainProgram = "protoc-gen-python_betterproto"; longDescription = '' This project aims to provide an improved experience when using Protobuf / gRPC in a modern Python environment by making use of modern language diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index c70268dea0b5..9c526a0f22c9 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "bids-validator"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M7D4ZcGqPjn7klGN8WP6a3lHjRqhAq9S/VNwSl7y6kY="; + hash = "sha256-Rv8fBCLm16K33co+H0WcN7rSaKoS1bjGvg2pKcEhm/4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index a6ce06c8a971..65f4e8f7d7c8 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/yutto-dev/biliass"; description = "Convert Bilibili XML/protobuf danmaku to ASS subtitle"; + mainProgram = "biliass"; license = licenses.gpl3Only; maintainers = with maintainers; [ linsui ]; }; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 5fe28afbb574..48ddcc9e7d62 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -76,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/bimmerconnected/bimmer_connected/releases/tag/${version}"; description = "Library to read data from the BMW Connected Drive portal"; + mainProgram = "bimmerconnected"; homepage = "https://github.com/bimmerconnected/bimmer_connected"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index 67b64e2a71af..f61432b229f8 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mangling of various file formats that conveys binary information (Motorola S-Record, Intel HEX, TI-TXT, ELF and binary files)"; + mainProgram = "bincopy"; homepage = "https://github.com/eerimoq/bincopy"; license = licenses.mit; maintainers = with maintainers; [ frogamic sbruder ]; diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 9a83a6239867..b3725caa3d6d 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/ReFirmLabs/binwalk"; description = "A tool for searching a given binary image for embedded files"; + mainProgram = "binwalk"; maintainers = [ maintainers.koral ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/bip32/default.nix b/pkgs/development/python-modules/bip32/default.nix index 96f37498c93b..165cf6231eea 100644 --- a/pkgs/development/python-modules/bip32/default.nix +++ b/pkgs/development/python-modules/bip32/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { hash = "sha256-o8UKR17XDWp1wTWYeDL0DJY+D11YI4mg0UuGEAPkHxE="; }; + # https://github.com/darosior/python-bip32/pull/40/files + postPatch = '' + substituteInPlace requirements.txt \ + --replace-fail 'coincurve>=15.0,<19' 'coincurve>=15.0,<20' + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 2895aac54621..8a748ed5b1b8 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.8.5"; + version = "2.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t1ZP0hjMRHn38BBtNB4Jb3iQe0eGWu7/cCyAffGSfAE="; + hash = "sha256-qPKGpRoyMjcV13dV7ZWflL7xOXLpov5xtgnkDm0nlX4="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 5c391bbc2dfd..d5bdf77fb592 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for representing and manipulating file sizes with different prefix"; + mainProgram = "bitmath"; homepage = "https://github.com/tbielawa/bitmath"; license = licenses.mit; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix index ace0dbe66c42..b29405d00791 100644 --- a/pkgs/development/python-modules/black-macchiato/default.nix +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is a small utility built on top of the black Python code formatter to enable formatting of partial files"; + mainProgram = "black-macchiato"; homepage = "https://github.com/wbolster/black-macchiato"; license = licenses.bsd3; maintainers = with maintainers; [ jperras ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 73ce7f8d30fd..edc13d3457dd 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "black"; - version = "23.11.0"; + version = "24.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TGiFWCX/Qy0ZcimEb5cbxNZmbOkEkuWwIBO8rKTZqwU="; + hash = "sha256-vOTyXCfDQ15NrOSBW8sgCLh+Fn479O5HzNxc6QbrSJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix index bafd5254b968..da4e23e527b1 100644 --- a/pkgs/development/python-modules/blinkstick/default.nix +++ b/pkgs/development/python-modules/blinkstick/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = { description = "Python package to control BlinkStick USB devices"; + mainProgram = "blinkstick"; homepage = "https://github.com/arvydas/blinkstick-python"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ np perstark ]; diff --git a/pkgs/development/python-modules/blobfile/default.nix b/pkgs/development/python-modules/blobfile/default.nix index 9c99c8502774..039468acca4a 100644 --- a/pkgs/development/python-modules/blobfile/default.nix +++ b/pkgs/development/python-modules/blobfile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "blobfile"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "christopher-hesse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vVoiNIN/LNdbedaOQ+gtj4jhzmrGri49fftHKG+K/fg="; + hash = "sha256-VBh1JMP+8FEqD0uXpxA5RRMFH9XIUb4FUgsPq3vZWHM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index b2d341b67c1e..4444e3475946 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; + mainProgram = "blockdiag"; homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index 18437efceb4b..bc260ee07ed1 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Blockstream Satellite CLI"; + mainProgram = "blocksat-cli"; homepage = "https://github.com/Blockstream/satellite"; changelog = "https://github.com/Blockstream/satellite/releases/tag/v${version}"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/bloodhound-py/default.nix b/pkgs/development/python-modules/bloodhound-py/default.nix index f1bdcd362ade..bf8fd3f942de 100644 --- a/pkgs/development/python-modules/bloodhound-py/default.nix +++ b/pkgs/development/python-modules/bloodhound-py/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python based ingestor for BloodHound, based on Impacket"; + mainProgram = "bloodhound-python"; homepage = "https://github.com/dirkjanm/BloodHound.py"; license = licenses.mit; maintainers = with maintainers; [ exploitoverload ]; diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix new file mode 100644 index 000000000000..11d26f32fbae --- /dev/null +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, gssapi +, hatchling +, ldap3 +, pyasn1 +, pytestCheckHook +, pythonOlder +, winacl +}: + +buildPythonPackage rec { + pname = "bloodyad"; + version = "1.1.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "CravateRouge"; + repo = "bloodyAD"; + rev = "refs/tags/v${version}"; + hash = "sha256-wnq+HTAPnC7pSGI2iytSyHmdqtUq2pUnNwZnsGX8CL4="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + cryptography + gssapi + ldap3 + pyasn1 + winacl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bloodyAD" + ]; + + disabledTests = [ + # Tests require network access + "test_01AuthCreateUser" + "test_02SearchAndGetChildAndGetWritable" + "test_03UacOwnerGenericShadowGroupPasswordDCSync" + "test_04ComputerRbcdGetSetAttribute" + "test_06AddRemoveGetDnsRecord" + ]; + + meta = with lib; { + description = "Module for Active Directory Privilege Escalations"; + homepage = "https://github.com/CravateRouge/bloodyAD"; + changelog = "https://github.com/CravateRouge/bloodyAD/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/bluecurrent-api/default.nix b/pkgs/development/python-modules/bluecurrent-api/default.nix index ca19887a0fb0..26c631706a17 100644 --- a/pkgs/development/python-modules/bluecurrent-api/default.nix +++ b/pkgs/development/python-modules/bluecurrent-api/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, pythonRelaxDepsHook , setuptools , pytz , websockets @@ -13,26 +12,21 @@ buildPythonPackage rec { pname = "bluecurrent-api"; - version = "1.0.6"; + version = "1.2.3"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-XHVdtkiG0ff/OY8g+W5iur7OAyhhk1UGA+XUfB2L8/o="; + hash = "sha256-mWRTSMS68+J1Z4PYOFF/UvofSqV1wv0gjiTACEWDfNg="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook + build-system = [ setuptools ]; - pythonRemoveDeps = [ - "asyncio" - ]; - - propagatedBuildInputs = [ + dependencies = [ pytz websockets ]; diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 2a39c28d0fdb..9a146770fd6d 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -13,18 +13,23 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.3.0"; - format = "pyproject"; + version = "1.4.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "bluetooth-auto-recovery"; rev = "refs/tags/v${version}"; - hash = "sha256-4DFi7UrEQgU7dckUuGxj/sWyystx8NYb6xK4hyurKKo="; + hash = "sha256-fXR7leW+eXaQZ22IyeVhpS5/MOnuAiunUGMdtfVrlos="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov=bluetooth_auto_recovery --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,11 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bluetooth_auto_recovery --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "bluetooth_auto_recovery" ]; diff --git a/pkgs/development/python-modules/bme280spi/default.nix b/pkgs/development/python-modules/bme280spi/default.nix index 4a32b507680b..7747925a2478 100644 --- a/pkgs/development/python-modules/bme280spi/default.nix +++ b/pkgs/development/python-modules/bme280spi/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for BME280 sensor through spidev"; + mainProgram = "bme280spi"; homepage = "https://github.com/Kuzj/bme280spi"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index a54608df9fc8..63fa524f9fa3 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -128,6 +128,7 @@ buildPythonPackage rec { meta = { description = "Statistical and novel interactive HTML plots for Python"; + mainProgram = "bokeh"; homepage = "https://github.com/bokeh/bokeh"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ orivej ]; diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 6f5155643432..f53d49af8d51 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Band-structure interpolator and transport coefficient calculator"; + mainProgram = "btp2"; homepage = "http://www.boltztrap.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/borb/default.nix b/pkgs/development/python-modules/borb/default.nix index 2c20e8ff7fb7..f82da30ff50f 100644 --- a/pkgs/development/python-modules/borb/default.nix +++ b/pkgs/development/python-modules/borb/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "borb"; - version = "2.1.21"; + version = "2.1.22"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-gnsPsvchvcUlWwmhDIazuc8/83ZRKc29VKhIDFSoFlE="; + hash = "sha256-T+uSq/KF3p4zJJhQeompJIJ6BWhYFK9Ko9w0sZFtFhE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index 060ac57ae00e..578c218372b5 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -4,47 +4,50 @@ , pytestCheckHook , pythonOlder , pythonRelaxDepsHook - +, setuptools , build , coloredlogs , packaging , pip +, readme-renderer , toml , twine -, wheel }: buildPythonPackage rec { pname = "bork"; - version = "7.0.2"; + version = "8.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "duckinator"; repo = pname; - rev = "v${version}"; - hash = "sha256-sHCPT6nTenE6mbTifNPtg0OMNIJCs7LRcF8Xuk+MwLs="; + rev = "refs/tags/v${version}"; + hash = "sha256-BDwVhKmZ/F8CvpT6dEI5moQZx8wHy1TwdOl889XogEo="; }; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ "packaging" + "readme-renderer" "twine" "wheel" ]; - propagatedBuildInputs = [ + dependencies = [ build coloredlogs packaging pip - toml + readme-renderer twine - wheel + ] ++ lib.optionals (pythonOlder "3.11") [ + toml ]; pythonImportsCheck = [ @@ -56,12 +59,19 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "-m 'not network'" ]; + disabledTests = [ + # tries to call python -m bork + "test_repo" + ]; + meta = with lib; { description = "Python build and release management tool"; + mainProgram = "bork"; homepage = "https://github.com/duckinator/bork"; maintainers = with maintainers; [ nicoo ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index ef609f3cdf04..a3d2f9a99e62 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.61"; + version = "1.34.69"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LhxHv+AKNAHJL6d+5FYL2mFSzDRX8qwA5KNJyKhTx3Y="; + hash = "sha256-k/tPhkDNAacOnTyUOVxn+2GX9eZiPS858YNXtbmtvfw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index aa9bcd2246b5..e8ce2d73f11b 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.34.49"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.34.58"; # N.B: if you change this, change botocore and awscli to a matching version pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "boto"; repo = "boto3"; rev = "refs/tags/${version}"; - hash = "sha256-/pgbLSL5RJ5RrKUAfQ1QNJykBdICrpqnuziHOVHt1JI="; + hash = "sha256-2L4pHjrDoy7dPZm0nx+NXZV/K3ZVx7FrNGYZTMrwAs4="; }; nativeBuildInputs = [ @@ -31,7 +31,6 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "botocore" "s3transfer" ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 5e3aefbe8170..5b2d19b7e463 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.61"; - format = "pyproject"; + version = "1.34.69"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-yOzieubWIEqCOipt9HEo1vnhxOYyUuHhHYb2NemLQVk="; + hash = "sha256-RjJI/R1ue2igxXvddY0Exr0MXCw7+oGv351k8JMLWbw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 89b6dbe07821..f956687016ef 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.34.49"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.34.58"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-2JQQvGBnPq/xaZ8/H9yw46Xh96agSMDYjDzlw1SUM+w="; + hash = "sha256-11IWlSiG3FE+obXil5pq8I/u0vU34/wQLkoKLq1WOjU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index d4503c85c988..e81609908758 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.9.5"; + version = "0.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M/VOt0p7io0K+VHrAmBJQ71VigH0Ll1D5it6+/o/3jg="; + hash = "sha256-IaFtQWrgOhVHDOiPQ4oG8l+Q0igWamYVWEReGccbVoI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 9e8d84950e5e..8e89ce8d14cc 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://bottlepy.org/"; description = "A fast and simple micro-framework for small web-applications"; + mainProgram = "bottle.py"; downloadPage = "https://github.com/bottlepy/bottle"; license = licenses.mit; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/bpemb/default.nix b/pkgs/development/python-modules/bpemb/default.nix new file mode 100644 index 000000000000..ab6d5357e53b --- /dev/null +++ b/pkgs/development/python-modules/bpemb/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, setuptools + +, gensim +, numpy +, requests +, sentencepiece +, tqdm +}: + +buildPythonPackage { + pname = "bpemb"; + version = "0.3.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bheinzerling"; + repo = "bpemb"; + rev = "ec85774945ca76dd93c1d9b4af2090e80c5779dc"; + hash = "sha256-nVaMXb5TBhO/vWE8AYAA3P9dSPI8O+rmzFvbEj8VEkE="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + gensim + numpy + requests + sentencepiece + tqdm + ]; + + # need network connection for tests + doCheck = false; + + pythonImportsCheck = [ + "bpemb" + ]; + + meta = with lib; { + description = "Byte-pair embeddings in 275 languages"; + homepage = "https://github.com/bheinzerling/bpemb"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 121777da32d8..ca6c66261660 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx Doxygen renderer"; + mainProgram = "breathe-apidoc"; homepage = "https://github.com/michaeljones/breathe"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index eba18b98c0ab..59880be41293 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "brian2"; - version = "2.5.4"; + version = "2.6.0"; format = "setuptools"; src = fetchPypi { pname = "Brian2"; inherit version; - hash = "sha256-XMXSOwcH8fLgzXCcT+grjYxhBdtF4H/Vr+S7J4GYZSw="; + hash = "sha256-qYeIMn8l2V2Ckpj5AY7TWihFnfZ//JcP5VacUUfYCf4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/broadbean/default.nix b/pkgs/development/python-modules/broadbean/default.nix index edf4ca1080ce..a5554b5d9ba2 100644 --- a/pkgs/development/python-modules/broadbean/default.nix +++ b/pkgs/development/python-modules/broadbean/default.nix @@ -15,31 +15,16 @@ buildPythonPackage rec { pname = "broadbean"; - version = "0.11.0"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-e+LAcmWxT+SkaWtToPgg+x3QRu5fCSm+w4dLCcyZrw8="; + hash = "sha256-v+Ov6mlSnaJG98ooA9AhPGJflrFafKQoO5wi+PxcZVw="; }; - patches = [ - # https://github.com/QCoDeS/broadbean/pull/538 - (fetchpatch { - name = "drop-wheel-from-pyproject.patch"; - url = "https://github.com/QCoDeS/broadbean/commit/31a2147e4f452fef1ca2b56b1cb0b10ac85ac867.patch"; - hash = "sha256-lBikIRhaf3ecwE7NZrYWeHkQCHQdfS9eeOcFExGIsVk="; - }) - # https://github.com/QCoDeS/broadbean/pull/638 - (fetchpatch { - name = "unpin-versioningit-dependency.patch"; - url = "https://github.com/QCoDeS/broadbean/commit/e4fd6c38d076aa3a6542dcd8fa7d2eb9d7a9b789.patch"; - hash = "sha256-mw68pWAjztWBw22MeoWVbwIwjzMOJRtv6HctN3v6A2A="; - }) - ]; - nativeBuildInputs = [ setuptools versioningit diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index c19190e815ce..60907fe7f139 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "brother"; - version = "4.0.0"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FLaSj1LQy/eWPxU1a4WGpsdoN5Zi4EwrgCmz8AXGeLc="; + hash = "sha256-n1CIozKuF0+N8Vg3QA2jy5xNLDBJPdnhVT/xg1R+t90="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 57e9f4f7d082..4edc9e1524b4 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for Oracle Berkeley DB"; homepage = "https://www.jcea.es/programacion/pybsddb.htm"; - license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x + license = with licenses; [ agpl3Only ]; # License changed from bsd3 to agpl3 since 6.x maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index b869d89e8f16..cc99d7696c5b 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.8.0"; + version = "3.8.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-P+37i7E1/OF3XKC828ycxYC9Zw+b8Bw5XrfPbL6sPVY="; + hash = "sha256-eaRFHrISxYovQLtNUPrgNw3ATClHqpZ+Us+JGmNNbyY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix index f67be664c227..894f2070c231 100644 --- a/pkgs/development/python-modules/bugz/default.nix +++ b/pkgs/development/python-modules/bugz/default.nix @@ -19,6 +19,7 @@ buildPythonPackage { meta = with lib; { homepage = "https://github.com/williamh/pybugz"; description = "Command line interface for Bugzilla"; + mainProgram = "bugz"; license = licenses.gpl2; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index b671dbf70782..e7b1db45a4ad 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python-bugzilla/python-bugzilla"; description = "Bugzilla XMLRPC access module"; + mainProgram = "bugzilla"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ pierron ]; diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index ce7dba941ce7..23a19f89f279 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library and CLI tools for interacting with buienradar"; + mainProgram = "buienradar"; homepage = "https://github.com/mjj4791/python-buienradar"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 42c7786d78ae..7d56257a377d 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "build"; - version = "1.0.3"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/buildcatrust/default.nix b/pkgs/development/python-modules/buildcatrust/default.nix index e56d50fb9d4d..5fc3eab56039 100644 --- a/pkgs/development/python-modules/buildcatrust/default.nix +++ b/pkgs/development/python-modules/buildcatrust/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "buildcatrust"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-mjX+T5xo6cD1GxJ49Tx7zthPbGPFPYaf2qcNKVHEzJA="; + hash = "sha256-Ac10CZdihFBmr5LE6xFKx4+zr2n5nyR23px6N4vN05M="; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Build SSL/TLS trust stores"; + mainProgram = "buildcatrust"; homepage = "https://github.com/lukegb/buildcatrust"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index ace266347994..5a2f577d2b18 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A software build and configuration system"; + mainProgram = "buildout"; downloadPage = "https://github.com/buildout/buildout"; homepage = "https://www.buildout.org"; license = licenses.zpl21; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 57a739349d5c..733494a8314a 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Data fitting with bayesian uncertainty analysis"; + mainProgram = "bumps"; homepage = "https://bumps.readthedocs.io/"; changelog = "https://github.com/bumps/bumps/releases/tag/v${version}"; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 7e811b2255a4..a13d5a9b73c3 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://bundlewrap.org/"; description = "Easy, Concise and Decentralized Config management with Python"; + mainProgram = "bw"; license = [ licenses.gpl3 ] ; maintainers = with maintainers; [ wamserma ]; }; diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix index 600fd1467b9c..4f7fd7c7b17b 100644 --- a/pkgs/development/python-modules/bwapy/default.nix +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/ACEnglish/bwapy"; description = "Python bindings to bwa mem aligner"; + mainProgram = "bwamempy"; license = licenses.mpl20; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index 582bc6b8ca0c..d66cfa62044d 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -81,6 +81,7 @@ buildPythonPackage rec { meta = { description = "Various Python utility functions"; + mainProgram = "publish"; homepage = "https://github.com/boxine/bx_py_utils"; changelog = "https://github.com/boxine/bx_py_utils/releases/tag/${src.rev}"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index c40d0b8d4ee5..8cfaaa5fa9b0 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Httplib2 caching for requests"; + mainProgram = "doesitcache"; homepage = "https://github.com/ionrock/cachecontrol"; changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 4cb5d0e0dcce..12f2a88cb249 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.10.2"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "pallets"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2V2FvZC8jM84fZEdK9ShzFrjO8goOQsN6cnJTHDDL9E="; + hash = "sha256-gSBY8zMGVn5Ndu4OexMP1v7bhXAAdl2UcEjjKFa21rE="; }; nativeCheckInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { disabledTestPaths = [ # requires set up local server "tests/test_dynamodb_cache.py" + "tests/test_mongodb_cache.py" ]; pythonImportsCheck = [ "cachelib" ]; diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index 931279b5a9ac..037f02b4d3ee 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -82,6 +82,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/python-cachier/cachier"; description = "Persistent, stale-free, local and cross-machine caching for functions"; + mainProgram = "cachier"; maintainers = with lib.maintainers; [ pbsds ]; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 46c556818ee1..ddabd2098824 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,25 +1,28 @@ { lib , buildPythonPackage -, fetchPypi -, isPy3k , cairocffi , cssselect2 , defusedxml +, fetchPypi , pillow -, tinycss2 , pytestCheckHook +, setuptools +, tinycss2 }: buildPythonPackage rec { - pname = "CairoSVG"; - version = "2.7.0"; - disabled = !isPy3k; + pname = "cairosvg"; + version = "2.7.1"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-rE3HwdOLOhVxfbJjOjo4MBLgvmZMcnyRFjfmr2pJKTw="; + pname = "CairoSVG"; + inherit version; + hash = "sha256-QyUx1yNHKRuanr+2d3AmtgdWP9hxnEbudC2wrvcnG6A="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; propagatedNativeBuildInputs = [ cairocffi ]; @@ -44,8 +47,10 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://cairosvg.org"; + changelog = "https://github.com/Kozea/CairoSVG/releases/tag/${version}"; license = licenses.lgpl3Plus; description = "SVG converter based on Cairo"; + mainProgram = "cairosvg"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/calmjs/default.nix b/pkgs/development/python-modules/calmjs/default.nix index a605034b7a93..031ebfb493f8 100644 --- a/pkgs/development/python-modules/calmjs/default.nix +++ b/pkgs/development/python-modules/calmjs/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework for building toolchains and utilities for working with the Node.js ecosystem"; + mainProgram = "calmjs"; homepage = "https://github.com/calmjs/calmjs"; license = licenses.gpl2; maintainers = with maintainers; [ onny ]; diff --git a/pkgs/development/python-modules/camelot/default.nix b/pkgs/development/python-modules/camelot/default.nix index 392bdf9a7ec8..ae5a89e80166 100644 --- a/pkgs/development/python-modules/camelot/default.nix +++ b/pkgs/development/python-modules/camelot/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library to extract tabular data from PDFs"; + mainProgram = "camelot"; homepage = "http://camelot-py.readthedocs.io"; changelog = "https://github.com/camelot-dev/camelot/blob/v${version}/HISTORY.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index cb2b7f6fcce7..2b6c0696f155 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "cantools"; - version = "39.4.4"; + version = "39.4.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bo6Ri2ZxpiqfOZBUbs5WI+Hetx3vsc74WplVrDAdqZ4="; + hash = "sha256-WU8q6A3q24xrCOjhMi1C4lj0DULIDWiG2E4BQ/kLWiM="; }; postPatch = '' @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools to work with CAN bus"; + mainProgram = "cantools"; homepage = "https://github.com/cantools/cantools"; changelog = "https://github.com/cantools/cantools/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 55503c9f6205..be8fa4fba9f4 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -3,6 +3,7 @@ , capstone , stdenv , setuptools +, pythonAtLeast }: buildPythonPackage rec { @@ -10,6 +11,9 @@ buildPythonPackage rec { version = lib.getVersion capstone; format = "setuptools"; + # distutils usage + disabled = pythonAtLeast "3.12"; + src = capstone.src; sourceRoot = "${src.name}/bindings/python"; diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix index a0541fc1467f..7373ac0691cc 100644 --- a/pkgs/development/python-modules/cart/default.nix +++ b/pkgs/development/python-modules/cart/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the CaRT Neutering format"; + mainProgram = "cart"; homepage = "https://github.com/CybercentreCanada/cart"; changelog = "https://github.com/CybercentreCanada/cart/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index f1f52eb9c987..05529a9c00da 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -83,6 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Process geospatial data to create maps and perform analyses"; + mainProgram = "feature_download"; license = licenses.lgpl3Plus; homepage = "https://scitools.org.uk/cartopy/docs/latest/"; maintainers = with maintainers; [ mredaelli ]; diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix index 36efc1aab3bc..5a244096bcd5 100644 --- a/pkgs/development/python-modules/case/default.nix +++ b/pkgs/development/python-modules/case/default.nix @@ -1,16 +1,17 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pynose , pythonOlder -, pytestCheckHook +, pythonRelaxDepsHook +, setuptools , six }: buildPythonPackage rec { pname = "case"; version = "1.5.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,8 +20,18 @@ buildPythonPackage rec { sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1"; }; - propagatedBuildInputs = [ - nose + build-system = [ + setuptools + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + # replaced with pynopse for python 3.12 compat + "nose" + ]; + + dependencies = [ + pynose six ]; diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix index 3c86e97f49f9..b3134003cfbd 100644 --- a/pkgs/development/python-modules/catppuccin/default.nix +++ b/pkgs/development/python-modules/catppuccin/default.nix @@ -11,27 +11,34 @@ buildPythonPackage rec { pname = "catppuccin"; version = "1.3.2"; + # Note: updating to later versions breaks catppuccin-gtk + # It would be ideal to only update this after catppuccin-gtk + # gets support for the newer version + pyproject = true; src = fetchFromGitHub { owner = "catppuccin"; repo = "python"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-spPZdQ+x3isyeBXZ/J2QE6zNhyHRfyRQGiHreuXzzik="; }; - nativeBuildInputs = [ + build-system = [ poetry-core poetry-dynamic-versioning ]; - passthru.optional-dependencies = { + optional-dependencies = { pygments = [ pygments ]; rich = [ rich ]; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); + # can be removed next version disabledTestPaths = [ "tests/test_flavour.py" # would download a json to check correctness of flavours ]; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 2db51887e21f..73f994cce5a8 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}"; description = "Python CBOR (de)serializer with extensive tag support"; + mainProgram = "cbor2"; homepage = "https://github.com/agronholm/cbor2"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/celery-types/default.nix b/pkgs/development/python-modules/celery-types/default.nix index cc77baff0444..fd39ab0901f4 100644 --- a/pkgs/development/python-modules/celery-types/default.nix +++ b/pkgs/development/python-modules/celery-types/default.nix @@ -8,24 +8,26 @@ buildPythonPackage rec { pname = "celery-types"; - version = "0.20.0"; - format = "pyproject"; + version = "0.22.0"; + pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { - inherit pname version; - hash = "sha256-5cdiVVYF7QWSuu2dUZIwBGzo56EcZ6ghVVwIt87OGWA="; + pname = "celery_types"; + inherit version; + hash = "sha256-DsrS+lpu3tCh+Rnl4eOBzC/wY1/ksh21O0ZhtodtWzA="; }; - propagatedBuildInputs = [ - typing-extensions - ]; nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ + typing-extensions + ]; + doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 587c17b3eca9..a787e1fce4ea 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -74,6 +74,8 @@ buildPythonPackage rec { # test_multi tries to create directories under /var "t/unit/bin/test_multi.py" "t/unit/apps/test_multi.py" + # requires moto<5 + "t/unit/backends/test_s3.py" ]; disabledTests = [ @@ -103,6 +105,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed task queue"; + mainProgram = "celery"; homepage = "https://github.com/celery/celery/"; changelog = "https://github.com/celery/celery/releases/tag/v${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 1d7f2d57cc1b..cc71268dee0b 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "CLI Application Framework for Python"; + mainProgram = "cement"; homepage = "https://builtoncement.com/"; license = licenses.bsd3; maintainers = with maintainers; [ eqyiel ]; diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 901f70dddd2e..97b4f7085387 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -74,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API wrapper for the Censys Search Engine (censys.io)"; + mainProgram = "censys"; homepage = "https://github.com/censys/censys-python"; changelog = "https://github.com/censys/censys-python/releases/tag/v${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix index 5e28aca3c642..1b12ea1e5efb 100644 --- a/pkgs/development/python-modules/cepa/default.nix +++ b/pkgs/development/python-modules/cepa/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Controller library that allows applications to interact with Tor"; + mainProgram = "tor-prompt"; homepage = "https://github.com/onionshare/cepa"; license = licenses.lgpl3Only; maintainers = with maintainers; [ bbjubjub ]; diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix index b1cbde96ab38..de89116b4c92 100644 --- a/pkgs/development/python-modules/cert-chain-resolver/default.nix +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolve / obtain the certificate intermediates of a x509 certificate"; + mainProgram = "cert-chain-resolver"; homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver"; changelog = "https://github.com/rkoopmans/python-certificate-chain-resolver/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/certauth/default.nix b/pkgs/development/python-modules/certauth/default.nix index c69eccf10cd6..efdd6c03b256 100644 --- a/pkgs/development/python-modules/certauth/default.nix +++ b/pkgs/development/python-modules/certauth/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple CertificateAuthority and host certificate creation, useful for man-in-the-middle HTTPS proxy"; + mainProgram = "certauth"; homepage = "https://github.com/ikreymer/certauth"; license = licenses.mit; maintainers = with maintainers; [ Luflosi ]; diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix index dd3b161caf5d..794c35f4d75c 100644 --- a/pkgs/development/python-modules/certipy-ad/default.nix +++ b/pkgs/development/python-modules/certipy-ad/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "certipy-ad"; version = "4.8.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -37,6 +37,10 @@ buildPythonPackage rec { --replace "pyasn1==0.4.8" "pyasn1" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ asn1crypto cryptography @@ -49,8 +53,8 @@ buildPythonPackage rec { pyopenssl requests requests-ntlm - unicrypto setuptools + unicrypto ]; # Project has no tests @@ -62,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library and CLI tool to enumerate and abuse misconfigurations in Active Directory Certificate Services"; + mainProgram = "certipy"; homepage = "https://github.com/ly4k/Certipy"; changelog = "https://github.com/ly4k/Certipy/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index 33bfc2f72e78..e0ee3b6319b7 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/LLNL/certipy"; description = "wrapper for pyOpenSSL"; + mainProgram = "certipy"; license = licenses.bsd3; maintainers = with maintainers; [ isgy ]; }; diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index 641941e7f38d..4adb682f6dce 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -92,6 +92,7 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly construct, mock & deploy PKI test configurations using simple declarative configuration"; + mainProgram = "certomancer"; homepage = "https://github.com/MatthiasValvekens/certomancer"; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix index e86277cf2782..324145639a3a 100644 --- a/pkgs/development/python-modules/cffsubr/default.nix +++ b/pkgs/development/python-modules/cffsubr/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { broken = stdenv.isDarwin; description = "Standalone CFF subroutinizer based on AFDKO tx"; + mainProgram = "cffsubr"; homepage = "https://github.com/adobe-type-tools/cffsubr"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index d1fa5de4793d..bca9fbd06fbb 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; + mainProgram = "cfn-flip"; homepage = "https://github.com/awslabs/aws-cfn-template-flip"; license = licenses.asl20; maintainers = with maintainers; [ kamadorueda psyanticy ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index c98715f9ab02..e4561df27121 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.84.0"; + version = "0.86.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-N1bMJdPgl3Ohe4MhmFB5KH2FK4Vp2jB0RUscLFDvi2k="; + hash = "sha256-QkxCQ8YPRZSqAidmPus4JCgzez6uuRWvcaqfZsvugtY="; }; propagatedBuildInputs = [ @@ -76,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; + mainProgram = "cfn-lint"; homepage = "https://github.com/aws-cloudformation/cfn-lint"; changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 2d65a03f68d0..4dfd3901ef7f 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility tools for control groups of Linux"; + mainProgram = "cgutil"; maintainers = with maintainers; [ layus ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 915e40544a82..2e880508e0b4 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -66,6 +66,10 @@ buildPythonPackage rec { websocket-client ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTestPaths = [ # Don't check the templates and the sample app "chalice/templates" @@ -102,6 +106,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Serverless Microframework for AWS"; + mainProgram = "chalice"; homepage = "https://github.com/aws/chalice"; changelog = "https://github.com/aws/chalice/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 7c78de37d36d..f0170eb641e3 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/chardet/chardet/releases/tag/${version}"; description = "Universal encoding detector"; + mainProgram = "chardetect"; homepage = "https://github.com/chardet/chardet"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index 2f6c3533dd77..2a6a13dc0bf8 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for encoding and language detection"; + mainProgram = "normalizer"; homepage = "https://charset-normalizer.readthedocs.io/"; changelog = "https://github.com/Ousret/charset_normalizer/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix index 13434cc86d05..fe35f5a52bd3 100644 --- a/pkgs/development/python-modules/chat-downloader/default.nix +++ b/pkgs/development/python-modules/chat-downloader/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple tool used to retrieve chat messages from livestreams, videos, clips and past broadcasts"; + mainProgram = "chat_downloader"; homepage = "https://github.com/xenova/chat-downloader"; changelog = "https://github.com/xenova/chat-downloader/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 832cac1f7872..1533329d5572 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Check MANIFEST.in in a Python source package for completeness"; + mainProgram = "check-manifest"; homepage = "https://github.com/mgedmin/check-manifest"; changelog = "https://github.com/mgedmin/check-manifest/blob/${version}/CHANGES.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index 6c261cff35fd..c39b70407931 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "A parser for SPF and DMARC DNS records"; + mainProgram = "checkdmarc"; homepage = "https://github.com/domainaware/checkdmarc"; changelog = "https://github.com/domainaware/checkdmarc/blob/${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 89d4d69b9161..602afd0f755f 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -98,6 +98,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-performance, pure-Python HTTP"; + mainProgram = "cheroot"; homepage = "https://github.com/cherrypy/cheroot"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 903be65bf068..6d1fffbdedc9 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -137,6 +137,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object-oriented HTTP framework"; + mainProgram = "cherryd"; homepage = "https://cherrypy.dev/"; changelog = "https://github.com/cherrypy/cherrypy/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix index 48b1a5c5c157..6a122ecf31e3 100644 --- a/pkgs/development/python-modules/chevron/default.nix +++ b/pkgs/development/python-modules/chevron/default.nix @@ -24,6 +24,7 @@ buildPythonPackage { meta = with lib; { homepage = "https://github.com/noahmorrison/chevron"; description = "A python implementation of the mustache templating language"; + mainProgram = "chevron"; license = licenses.mit; maintainers = with maintainers; [ dhkl ]; }; diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 37cc44da3f72..6b1ad4dc6976 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -154,6 +154,7 @@ buildPythonPackage rec { meta = with lib; { description = "The AI-native open-source embedding database"; + mainProgram = "chroma"; homepage = "https://github.com/chroma-core/chroma"; changelog = "https://github.com/chroma-core/chroma/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index d46a6bdb70d6..264b0f3b3481 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/brechtm/citeproc-py"; description = "Citation Style Language (CSL) parser for Python"; + mainProgram = "csl_unsorted"; license = licenses.bsd2; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index e9654b0e67d5..84f63752e2ae 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Communicate with your Coldcard using Python"; + mainProgram = "ckcc"; homepage = "https://github.com/Coldcard/ckcc-protocol"; license = licenses.mit; maintainers = with maintainers; [ hkjn ]; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 05a86d09ee77..a6a28221ce66 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.1.0"; + version = "10.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-/2PIsSsYr/R7DuTX/ndBAOX7C3IaFqPw16ZAX8E1Vk8="; + hash = "sha256-36XceC40cL0SywY0Mus/s8OCO0ujWqxEIKZW+fvd7lw="; }; pythonRelaxDeps = [ @@ -102,6 +102,7 @@ buildPythonPackage rec { meta = with lib; { description = "Clarifai Python Utilities"; + mainProgram = "clarifai"; homepage = "https://github.com/Clarifai/clarifai-python"; changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index fdaf384262b8..073ac338fb0b 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "cleanlab"; - version = "2.5.0"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "cleanlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5XQQVrhjpvjwtFM79DqttObmw/GQLkMQVXb5jhiC8e0="; + hash = "sha256-+uJtm/t6Ri25V/9N/2fcOgCOBaBy8PrsM/tO1uX7FEY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index 6ad07d8ec62e..fd8e4f61dceb 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "CleverCSV is a Python package for handling messy CSV files"; + mainProgram = "clevercsv"; longDescription = '' CleverCSV is a Python package for handling messy CSV files. It provides a drop-in replacement for the builtin CSV module with improved dialect diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix index d63079f725e2..0dd3609197f8 100644 --- a/pkgs/development/python-modules/clf/default.nix +++ b/pkgs/development/python-modules/clf/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/ncrocfer/clf"; description = "Command line tool to search snippets on Commandlinefu.com"; + mainProgram = "clf"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/cliche/default.nix b/pkgs/development/python-modules/cliche/default.nix index e0657336a093..b51801d8d2d3 100644 --- a/pkgs/development/python-modules/cliche/default.nix +++ b/pkgs/development/python-modules/cliche/default.nix @@ -30,6 +30,7 @@ buildPythonPackage { meta = with lib; { description = "Build a simple command-line interface from your functions :computer:"; + mainProgram = "cliche"; homepage = "https://github.com/kootenpv/cliche"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/click-odoo/default.nix b/pkgs/development/python-modules/click-odoo/default.nix index 2dd211d24a01..b4cd69ed978a 100644 --- a/pkgs/development/python-modules/click-odoo/default.nix +++ b/pkgs/development/python-modules/click-odoo/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Odoo scripting helper library"; + mainProgram = "click-odoo"; homepage = "https://github.com/acsone/click-odoo"; license = licenses.lgpl3Only; maintainers = with maintainers; [ yajo ]; diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix index 770d4e76fb72..d8fad65bef0d 100644 --- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix +++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage +, cython_3 , fetchPypi -, setuptools , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "clickhouse-cityhash"; version = "1.0.2.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +18,8 @@ buildPythonPackage rec { hash = "sha256-ezEl19CqE8LMTnWDqWWmv7CqlqEhMUdbRCVSustV9Pg="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + cython_3 setuptools ]; diff --git a/pkgs/development/python-modules/clickhouse-cli/default.nix b/pkgs/development/python-modules/clickhouse-cli/default.nix index 8abe4c1b3aa6..170d15239303 100644 --- a/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "A third-party client for the Clickhouse DBMS server"; + mainProgram = "clickhouse-cli"; homepage = "https://github.com/hatarist/clickhouse-cli"; license = licenses.mit; maintainers = with maintainers; [ ivan-babrou ]; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index 4c073d21c967..5be944efdb1d 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.2"; + version = "0.7.3"; format = "setuptools"; @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-UOS0Z8KsMqyFBPfVc8Lag7zfw1DNgNDEnvAbmG15FGg="; + hash = "sha256-MA902Dyx3a8GTZ52LYY0UrWqNEFmibqIsdz6PFZIkIY="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix index 3abeeb013ff6..716914b3caee 100644 --- a/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -1,22 +1,23 @@ { lib , buildPythonPackage -, fetchFromGitHub -, setuptools -, pytz -, tzlocal , clickhouse-cityhash -, zstd -, lz4 +, cython_3 +, fetchFromGitHub , freezegun +, lz4 , mock , nose , pytestCheckHook , pytest-xdist +, pytz +, setuptools +, tzlocal +, zstd }: buildPythonPackage rec { pname = "clickhouse-driver"; - version = "0.2.5"; + version = "0.2.7"; format = "setuptools"; # pypi source doesn't contain tests @@ -24,16 +25,20 @@ buildPythonPackage rec { owner = "mymarilyn"; repo = "clickhouse-driver"; rev = version; - hash = "sha256-o5v37jPKmvUW4GFVD742nHSdO0g0z2FA4FkacbaRfNA="; + hash = "sha256-l0YHWY25PMHgZG/sAZjtGhwmcxWdA8k96zlm9hbKcek="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + cython_3 setuptools + ]; + + propagatedBuildInputs = [ + clickhouse-cityhash + lz4 pytz tzlocal - clickhouse-cityhash zstd - lz4 ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 9715a41852b6..f36ccba9718f 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "cliff"; - version = "4.4.0"; + version = "4.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qo1ASqLWtNhjnGG9bcR6yzZW68P8Alsbe7B68rrveF8="; + hash = "sha256-LzjOi9HqSVjWbxWwZqxH5l1h9gC5MZuSHhLp6cvNmdA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 89f5ef6fbf5c..3f14fae210d2 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -12,6 +12,7 @@ , psutil , pydantic , pytestCheckHook +, pytest_7 , pytest-cases , pytest-cov , pytest-xdist @@ -65,7 +66,7 @@ buildPythonPackage rec { google-cloud-storage psutil pydantic - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) pytest-cases pytest-cov pytest-xdist diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index bb4340eec4c6..7c559db4337a 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for AWS IAM security assessment"; + mainProgram = "cloudsplaining"; homepage = "https://github.com/salesforce/cloudsplaining"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 87fef1f934cf..c8fbbc7ad9d1 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -11,11 +11,12 @@ }: buildPythonPackage rec { - pname = "ClusterShell"; + pname = "clustershell"; version = "1.9.2"; src = fetchPypi { - inherit pname version; + pname = "ClusterShell"; + inherit version; hash = "sha256-rsF/HG4GNBC+N49b+sDO2AyUI1G44wJNBUwQNPzShD0="; }; diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index aaa29b577eed..1c5e80961d54 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "2022.10.27"; + version = "2024.1.14"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-k9msdxbqkBygv9GK47aPH2v1HeCDDD8jPvc0/NUqB5k="; + hash = "sha256-ogjBcm4SujhRJc7yxtN1xBxd6kzCZzp3r3ErHb8HTpA="; }; propagatedNativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix index aa2781a7fd86..cba1de6aab46 100644 --- a/pkgs/development/python-modules/coapthon3/default.nix +++ b/pkgs/development/python-modules/coapthon3/default.nix @@ -1,13 +1,13 @@ { buildPythonPackage, cachetools, fetchFromGitHub, isPy27, lib }: buildPythonPackage rec { - pname = "CoAPthon3"; + pname = "coapthon3"; version = "1.0.2"; disabled = isPy27; src = fetchFromGitHub { owner = "Tanganelli"; - repo = pname; + repo = "CoAPthon3"; rev = version; hash = "sha256-9QApoPUu3XFZY/lgjAsf5r2StFiRtUd1UXWDrzYUh6w="; }; diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 19571b93ac1e..5e56c2ef139d 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "coconut"; - version = "3.0.4"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - hash = "sha256-TIYep9EuCfcN8bp0vkaoB5W626lrD4PVh+oYKmVrfeY="; + hash = "sha256-xlA/yryUXZCU56gJ0y7M9JHgWkvXiB09ywyf0sP1o+4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 22cc1ced7762..0e758490b803 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -65,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/cocotb/cocotb/releases/tag/v${version}"; description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python"; + mainProgram = "cocotb-config"; homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; maintainers = with maintainers; [ matthuszagh jleightcap ]; diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index c6af62860d4b..ccc95b894f39 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python report uploader for Codecov"; + mainProgram = "codecov"; homepage = "https://codecov.io/"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 92d44c82ef3d..7f039aa24faf 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -1,15 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: buildPythonPackage rec { pname = "cogapp"; - version = "3.3.0"; - format = "setuptools"; + version = "3.4.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1be95183f70282422d594fa42426be6923070a4bd8335621f6347f3aeee81db0"; + sha256 = "sha256-qAbV254xihotP86YgAgXkWjn2xPl5VsZt5dj+budKYI="; }; + nativeBuildInputs = [ + setuptools + ]; + # there are no tests doCheck = false; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 323efb118503..0383e7d0f9cf 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "4.52"; + version = "4.56"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C2w447+hxsFrjLpV3wrSzptuVb1JTyppq+NUzMCU+Iw="; + hash = "sha256-rOAQzT1A/q74WnfazCMDtou7SnP0h+UGCyBxihqLmzc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix index 58423859779a..2cdb2d8f4fe2 100644 --- a/pkgs/development/python-modules/coincurve/default.nix +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "coincurve"; - version = "18.0.0"; + version = "19.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ofek"; repo = "coincurve"; rev = "refs/tags/v${version}"; - hash = "sha256-Z5g6ten8wNICoFu7+aZc6r8ET+RDmFeb93ONjsTzcbw="; + hash = "sha256-T60iKRrc8/t86nqf8/R4971SjOw586YNCWWBuLd9MjM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 5085489127ba..421be646d19e 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Coin Metrics API v4 client library"; + mainProgram = "coinmetrics"; homepage = "https://coinmetrics.github.io/api-client-python/site/index.html"; license = licenses.mit; maintainers = with maintainers; [ centromere ]; diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index efee49934d87..0b64ccabdbe1 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "colorcet"; - version = "3.0.1"; + version = "3.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UUVaIDU9EvrJH5U3cthAnyR05qDbGvP6T3AF9AWiSAs="; + hash = "sha256-KSGzzYGiKIqvLWPbwM48JtzYgujDicxQXWiGv3qppOs="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of perceptually uniform colormaps"; + mainProgram = "colorcet"; homepage = "https://colorcet.pyviz.org"; license = licenses.cc-by-40; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index edc708f93e06..3f4dd4188040 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Colored stream handler for Python's logging module"; + mainProgram = "coloredlogs"; homepage = "https://github.com/xolox/python-coloredlogs"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; diff --git a/pkgs/development/python-modules/colout/default.nix b/pkgs/development/python-modules/colout/default.nix index e01193cd36ec..6325b6be5bda 100644 --- a/pkgs/development/python-modules/colout/default.nix +++ b/pkgs/development/python-modules/colout/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Color Up Arbitrary Command Output"; + mainProgram = "colout"; homepage = "https://github.com/nojhan/colout"; license = licenses.gpl3Only; maintainers = with maintainers; [ badele ]; diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix index bf6d74ea5f61..a6cf342ba04e 100644 --- a/pkgs/development/python-modules/commonmark/default.nix +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser for the CommonMark Markdown spec"; + mainProgram = "cmark"; homepage = "https://github.com/rolandshoemaker/CommonMark-py"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/compiledb/default.nix b/pkgs/development/python-modules/compiledb/default.nix index 25472793cce0..a97db47ffdb7 100644 --- a/pkgs/development/python-modules/compiledb/default.nix +++ b/pkgs/development/python-modules/compiledb/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for generating Clang's JSON Compilation Database files"; + mainProgram = "compiledb"; license = licenses.gpl3; homepage = "https://github.com/nickdiego/compiledb"; maintainers = with maintainers; [ multun ]; diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index f587a2963800..9ab5590e4e3b 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "CFF table subroutinizer for FontTools"; + mainProgram = "compreffor"; homepage = "https://github.com/googlefonts/compreffor"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/compressed-rtf/default.nix b/pkgs/development/python-modules/compressed-rtf/default.nix new file mode 100644 index 000000000000..2f149d1aac1f --- /dev/null +++ b/pkgs/development/python-modules/compressed-rtf/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "compressed-rtf"; + version = "1.0.6-unstable-2023-10-15"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "delimitry"; + repo = "compressed_rtf"; + # https://github.com/delimitry/compressed_rtf/issues/15 + rev = "581400c1b4c69ab0d944cfb5ca82c32059bbcc96"; + hash = "sha256-ivvND+cOCAmRyO8yL0+WhFY/2OkrJ+E/o4xWWd7ivHA="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "compressed_rtf" + ]; + + pytestFlagsArray = [ + "tests/tests.py" + ]; + + meta = with lib; { + description = "Compressed Rich Text Format (RTF) compression and decompression"; + homepage = "https://github.com/delimitry/compressed_rtf"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix index 85ee8bda114e..53586d9bb0c8 100644 --- a/pkgs/development/python-modules/concurrent-log-handler/default.nix +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -1,20 +1,26 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , portalocker }: buildPythonPackage rec { pname = "concurrent-log-handler"; - version = "0.9.24"; - format = "setuptools"; + version = "0.9.25"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-APVkbG5fb8Y2VFNvO0Sqorm3SyMkXhT1JY7ZHOOdEuI="; + pname = "concurrent_log_handler"; + inherit version; + hash = "sha256-HixvAhQU4hTT2sZhB4lIJ6PnjbYwGDBKTynlW6VJrCI="; }; - propagatedBuildInputs = [ + build-system = [ + hatchling + ]; + + dependencies = [ portalocker ]; @@ -26,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python logging handler that allows multiple processes to safely write to the same log file concurrently"; - homepage = "https://pypi.org/project/concurrent-log-handler"; + homepage = "https://github.com/Preston-Landers/concurrent-log-handler"; license = licenses.asl20; maintainers = [ maintainers.bbjubjub ]; }; diff --git a/pkgs/development/python-modules/confight/default.nix b/pkgs/development/python-modules/confight/default.nix index 5933ffc5d842..718b0614b111 100644 --- a/pkgs/development/python-modules/confight/default.nix +++ b/pkgs/development/python-modules/confight/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python context manager for managing pid files"; + mainProgram = "confight"; homepage = "https://github.com/avature/confight"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mkg20001 ]; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 9dc6d16097a2..4495401250a2 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,16 +1,28 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, setuptools-scm }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, setuptools +, setuptools-scm +}: buildPythonPackage rec { pname = "configparser"; - version = "6.0.0"; - format = "pyproject"; + version = "6.0.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-7JFKseVsZy3h9cNIOWTmj3GzTkV5BLe3bga5Iq7AZ6g="; + src = fetchFromGitHub { + owner = "jaraco"; + repo = "configparser"; + rev = "refs/tags/v${version}"; + hash = "sha256-r+poK+knBQi48Z1VrNFqUt9Qm9iGERAOTFa4bKfXi0g="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -18,12 +30,6 @@ buildPythonPackage rec { export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; - preCheck = '' - # avoid FileNotFoundError - # FileNotFoundError: [Errno 2] No such file or directory: 'cfgparser.3' - cd tests - ''; - meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; homepage = "https://github.com/jaraco/configparser"; diff --git a/pkgs/development/python-modules/connect-box/default.nix b/pkgs/development/python-modules/connect-box/default.nix index b7ba433478b2..34ca8dbb01df 100644 --- a/pkgs/development/python-modules/connect-box/default.nix +++ b/pkgs/development/python-modules/connect-box/default.nix @@ -3,36 +3,54 @@ , attrs , buildPythonPackage , defusedxml -, fetchPypi +, fetchFromGitHub , pythonOlder +, pytest-asyncio +, pytestCheckHook +, setuptools +, pytest-vcr +, syrupy }: buildPythonPackage rec { pname = "connect-box"; - version = "0.3.1"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; - src = fetchPypi { - pname = "connect_box"; - inherit version; - hash = "sha256-x1ozcj3IL+iI/QtS12yEudCqNknCmyb5ew88Z39xaLA="; + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = "python-connect-box"; + rev = "refs/tags/${version}"; + hash = "sha256-zUvZRnxVzg9izvUbp7QVcyu6Bw3dUXHOr0kOQRWEZVc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp attrs defusedxml ]; - # No tests are present - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + pytest-vcr + syrupy + ]; pythonImportsCheck = [ "connect_box" ]; + pytestFlagsArray = [ + "--vcr-record=none" + ]; + meta = with lib; { description = "Interact with a Compal CH7465LG cable modem/router"; longDescription = '' diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index aa5b58570478..46524a80b43c 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -89,10 +89,16 @@ buildPythonPackage rec { disabledTests = [ # AssertionError "test_headers" + # waiter.acquire() deadlock + "test_cors_server_error" + "test_get_bad_default_response" + "test_schema_response" + "test_writeonly" ]; meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; + mainProgram = "connexion"; homepage = "https://github.com/spec-first/connexion"; changelog = "https://github.com/spec-first/connexion/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix index 4fd2e762b9c4..e2dd1d32b76a 100644 --- a/pkgs/development/python-modules/controku/default.nix +++ b/pkgs/development/python-modules/controku/default.nix @@ -45,6 +45,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/benthetechguy/controku/releases/tag/${version}"; description = "Control Roku devices from the comfort of your own desktop"; + mainProgram = "controku"; homepage = "https://github.com/benthetechguy/controku"; license = licenses.gpl3Only; maintainers = with maintainers; [ mjm ]; diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index 601799ba24e7..39a935e5e850 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utils for converting between date formats and calculating holidays"; + mainProgram = "censusgeocode"; homepage = "https://github.com/fitnr/convertdate"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/conway-polynomials/default.nix b/pkgs/development/python-modules/conway-polynomials/default.nix new file mode 100644 index 000000000000..d5b57a10aa39 --- /dev/null +++ b/pkgs/development/python-modules/conway-polynomials/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "conway-polynomials"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-btIwBgm8558BddW4VGhY7sAoVPi+MjfbjRRJzMzBxYE="; + }; + + pythonImportsCheck = [ "conway_polynomials" ]; + + meta = with lib; { + description = "Python interface to Frank Lübeck's Conway polynomial database"; + homepage = "https://github.com/sagemath/conway-polynomials"; + maintainers = teams.sage.members; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index 35e14b394e2e..6818f9021a44 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cookiecutter"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; # not sure why this is broken @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-5h6QNHSOP0G4vSwR8A0DB4S0hxHE1cQjY8UJiaZTMew="; + hash = "sha256-2yH4Fp6k9P3CQI1IykSFk0neJkf75JSp1sPt/AVCwhw="; }; nativeBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/audreyr/cookiecutter"; description = "A command-line utility that creates projects from project templates"; + mainProgram = "cookiecutter"; license = licenses.bsd3; maintainers = with maintainers; [ kragniz ]; }; diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 75f7a6ffb2e4..ff6ede5dcf20 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cornice"; - version = "6.0.1"; + version = "6.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "6edf6f206ff1c3d108d7a7b9ae640a2f4737cfc04f0914ccc4eefe511d3a8985"; + sha256 = "sha256-v9G2wqmRp8yxsggrbenjuPGYtqK0oHqwgA4F3wWkU2E="; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix index e378b71b43b8..23a8bee16d21 100644 --- a/pkgs/development/python-modules/correctionlib/default.nix +++ b/pkgs/development/python-modules/correctionlib/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provides a well-structured JSON data format for a wide variety of ad-hoc correction factors encountered in a typical HEP analysis"; + mainProgram = "correction"; homepage = "https://cms-nanoaod.github.io/correctionlib/"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/development/python-modules/corsair-scan/default.nix b/pkgs/development/python-modules/corsair-scan/default.nix index 82ef32b2d7b3..4d7190906b26 100644 --- a/pkgs/development/python-modules/corsair-scan/default.nix +++ b/pkgs/development/python-modules/corsair-scan/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to check for Cross-Origin Resource Sharing (CORS) misconfigurations"; + mainProgram = "corsair"; homepage = "https://github.com/Santandersecurityresearch/corsair_scan"; changelog = "https://github.com/Santandersecurityresearch/corsair_scan/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index ed40735a2063..e65bc8577e4b 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -80,6 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "Common OVF Tool"; + mainProgram = "cot"; longDescription = '' COT (the Common OVF Tool) is a tool for editing Open Virtualization Format (.ovf, .ova) virtual appliances, with a focus on virtualized network appliances such as the Cisco CSR 1000V and Cisco IOS XRv platforms. diff --git a/pkgs/development/python-modules/courlan/default.nix b/pkgs/development/python-modules/courlan/default.nix index f6676d4b6896..bd73aad1977d 100644 --- a/pkgs/development/python-modules/courlan/default.nix +++ b/pkgs/development/python-modules/courlan/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Clean, filter and sample URLs to optimize data collection"; + mainProgram = "courlan"; homepage = "https://github.com/adbar/courlan"; changelog = "https://github.com/adbar/courlan/blob/v${version}/HISTORY.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index eba9e13865d8..4e4c86ae1063 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.3.2"; + version = "7.4.3"; pyproject = true; # uses f strings @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-vjKtKTQbAXDnlcpZDhwH6B/AYctbEMdM5yA0kUhEBO8="; + hash = "sha256-J29gd6XGFEekjRM+0T51nAnmKv8NyEJ0po3BhmAQTVI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index dd3aeb50afb8..c1b144109bea 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = { description = "Show coverage stats online via coveralls.io"; + mainProgram = "coveralls"; homepage = "https://github.com/coveralls-clients/coveralls-python"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index 4006c4f28ef3..4efc13b53038 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = { description = "A simple testing framework for command line applications"; + mainProgram = "cram"; homepage = "https://bitheap.org/cram/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index 03d823812c15..7a799429907e 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -4,35 +4,31 @@ , rustPlatform , stdenv , libiconv -, brotli , hypothesis -, lz4 -, memory-profiler , numpy -, py -, pytest-benchmark +, pytest-xdist , pytestCheckHook -, python-snappy -, zstd }: buildPythonPackage rec { pname = "cramjam"; - version = "2.6.2.post1"; - format = "pyproject"; + version = "2.8.2"; + pyproject = true; src = fetchFromGitHub { owner = "milesgranger"; repo = "pyrus-cramjam"; rev = "refs/tags/v${version}"; - hash = "sha256-KU1JVNEQJadXNiIWTvI33N2NSq994xoKxcAGGezFjaI="; + hash = "sha256-BO35s7qOW4+l968I9qn9L1m2BtgRFNYUNlA7W1sctT8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-w1bEf+etLgR/YOyLmC3lFtO9fqAx8z2aul/XIKUQb5k="; + hash = "sha256-YWXf+ZDJLq6VxI5sa9G63fCPz2377BVSTmPM0mQSu8M="; }; + buildAndTestSubdir = "cramjam-python"; + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook @@ -41,24 +37,18 @@ buildPythonPackage rec { buildInputs = lib.optional stdenv.isDarwin libiconv; nativeCheckInputs = [ - brotli hypothesis - lz4 - memory-profiler numpy - py - pytest-benchmark + pytest-xdist pytestCheckHook - python-snappy - zstd ]; pytestFlagsArray = [ - "--benchmark-disable" + "cramjam-python/tests" ]; disabledTestPaths = [ - "benchmarks/test_bench.py" + "cramjam-python/benchmarks/test_bench.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index 2ff39e63981b..c8abe86e5ebf 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/Nicoretti/crc/releases/tag/${version}"; description = "Python module for calculating and verifying predefined & custom CRC's"; + mainProgram = "crc"; homepage = "https://nicoretti.github.io/crc/"; license = licenses.bsd2; maintainers = with maintainers; [ jleightcap ]; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 76859ec88ff8..8ed90b65f7a2 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB"; + mainProgram = "credstash"; homepage = "https://github.com/LuminalOSS/credstash"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/criticality-score/default.nix b/pkgs/development/python-modules/criticality-score/default.nix index e1ff87549364..ffea5ad31dad 100644 --- a/pkgs/development/python-modules/criticality-score/default.nix +++ b/pkgs/development/python-modules/criticality-score/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool for computing the Open Source Project Criticality Score."; + mainProgram = "criticality_score"; homepage = "https://github.com/ossf/criticality_score"; changelog = "https://github.com/ossf/criticality_score/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 03f7c636393b..8db83b619969 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "croniter"; - version = "2.0.2"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i/8Wya9O8ftvBUFpc7j3y1SZfALy+DZSUfm/Hd7ZGGY="; + hash = "sha256-KHY605xAThWRQIdPCAEM/YoY9MKnzqHOc+lQakOAz8E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/crossplane/default.nix b/pkgs/development/python-modules/crossplane/default.nix index 20b4d4204f4c..d69708b8e212 100644 --- a/pkgs/development/python-modules/crossplane/default.nix +++ b/pkgs/development/python-modules/crossplane/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "NGINX configuration file parser and builder"; + mainProgram = "crossplane"; homepage = "https://github.com/nginxinc/crossplane"; license = licenses.asl20; maintainers = with maintainers; [ kaction ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 4ae2e77de6ac..838ae389d38f 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -25,21 +25,21 @@ buildPythonPackage rec { pname = "cryptography"; - version = "42.0.2"; # Also update the hash in vectors.nix + version = "42.0.5"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4OxSujx/G32BPNUmSaWz7x/A1DMhncjJOCfFfqts+Ig="; + hash = "sha256-b+B+7JXf1HfrlTCu9b6tNP7IGbOq9sW9bSBWXaYHv+E="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-jw/FC5rQO77h6omtBp0Nc2oitkVbNElbkBUduyprTIc="; + hash = "sha256-Pw3ftpcDMfZr/w6US5fnnyPVsFSB9+BuIKazDocYjTU="; }; patches = [ @@ -95,10 +95,6 @@ buildPythonPackage rec { disabledTestPaths = [ # save compute time by not running benchmarks "tests/bench" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # aarch64-darwin forbids W+X memory, but this tests depends on it: - # * https://cffi.readthedocs.io/en/latest/using.html#callbacks - "tests/hazmat/backends/test_openssl_memleak.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index a5654de86cbb..a19ab7579d1f 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-rc3M9dnuZhqWAq0h0lJfZ4ugem52jOeYNZlOIIurDhY="; + hash = "sha256-UFzV47DLMtoVJvBwQrf8OKS2w1ZxDLc9K192sDejjtE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index e377b35ee5be..fc18fadc3a3a 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; src = fetchPypi { pname = "CryptoParser"; inherit version; - hash = "sha256-SG7I/uOWZapjZ5zGW1HndGqaYc2k2aRWf3IWlartIJE="; + hash = "sha256-1A0VEpUPsYtEu2aT+ldt/Z/PtV8lvD+9jSx75yGB6Ao="; }; postPatch = '' diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 56dab1fbbb54..8ef955f56f8f 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction layer for smart contract build systems"; + mainProgram = "crytic-compile"; homepage = "https://github.com/crytic/crytic-compile"; changelog = "https://github.com/crytic/crytic-compile/releases/tag/${version}"; license = licenses.agpl3Plus; diff --git a/pkgs/development/python-modules/css-html-js-minify/default.nix b/pkgs/development/python-modules/css-html-js-minify/default.nix index 304624a90ca0..f84dfbcaaecb 100644 --- a/pkgs/development/python-modules/css-html-js-minify/default.nix +++ b/pkgs/development/python-modules/css-html-js-minify/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "StandAlone Async cross-platform Minifier for the Web"; + mainProgram = "css-html-js-minify"; homepage = "https://github.com/juancarlospaco/css-html-js-minify"; license = with licenses; [ gpl3Plus lgpl3Plus mit ]; maintainers = with maintainers; [ FlorianFranzen ]; diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index 44c142b89308..41caa34dedac 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -9,6 +9,7 @@ # native darwin dependencies , libiconv , Security +, SystemConfiguration # tests , pytestCheckHook @@ -52,6 +53,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security + SystemConfiguration ]; pythonImportsCheck = [ @@ -66,6 +68,9 @@ buildPythonPackage rec { disabledTests = [ # fails to connect to local server "test_remote_stylesheet" + ] ++ lib.optionals (stdenv.isDarwin) [ + # pyo3_runtime.PanicException: event loop thread panicked + "test_invalid_href" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cssbeautifier/default.nix b/pkgs/development/python-modules/cssbeautifier/default.nix index 02f1de52af7e..1fc1aeed8437 100644 --- a/pkgs/development/python-modules/cssbeautifier/default.nix +++ b/pkgs/development/python-modules/cssbeautifier/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "CSS unobfuscator and beautifier"; + mainProgram = "css-beautify"; homepage = "https://github.com/beautifier/js-beautify"; changelog = "https://github.com/beautifier/js-beautify/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix index c9daf5d45827..6ab7f590f6d2 100644 --- a/pkgs/development/python-modules/cssmin/default.nix +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python port of the YUI CSS compression algorithm"; + mainProgram = "cssmin"; homepage = "https://github.com/zacharyvoase/cssmin"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index ab8615b0fe9b..10f62f29280c 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { importlib-resources ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = [ # access network "test_parseUrl" diff --git a/pkgs/development/python-modules/cu2qu/default.nix b/pkgs/development/python-modules/cu2qu/default.nix index ddad0b741b1e..67315205b706 100644 --- a/pkgs/development/python-modules/cu2qu/default.nix +++ b/pkgs/development/python-modules/cu2qu/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/googlefonts/cu2qu/releases/tag/v${version}"; description = "Cubic-to-quadratic bezier curve conversion"; + mainProgram = "cu2qu"; homepage = "https://github.com/googlefonts/cu2qu"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index e67704be7898..74ec6c13a5ae 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -1,25 +1,34 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage -, py , pytestCheckHook , pytest-html +, pyyaml +, setuptools }: buildPythonPackage rec { pname = "cucumber-tag-expressions"; - version = "4.1.0"; - format = "setuptools"; + version = "6.1.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"; + src = fetchFromGitHub{ + owner = "cucumber"; + repo = "tag-expressions"; + rev = "refs/tags/v${version}"; + hash = "sha256-etJKAOamCq63HsUqJMPBnmn0YFO3ZHOvs3/rDHN7YPU="; }; + sourceRoot = "${src.name}/python"; + + build-system = [ + setuptools + ]; + nativeCheckInputs = [ - py pytestCheckHook pytest-html + pyyaml ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 5085fd2691bf..842645597062 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -40,14 +40,14 @@ let in buildPythonPackage rec { pname = "cupy"; - version = "12.3.0"; + version = "13.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R9syEU5v3UjQUQy/Cwiwk1Ui19+j45QWsMDaORQyNSQ="; + hash = "sha256-LwTnhX9pKnEzYNycOwZwmAarhAT8o5ta+XIcBKKXmq4="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix index 120325a7b8e5..267cd94f41d8 100644 --- a/pkgs/development/python-modules/cvss/default.nix +++ b/pkgs/development/python-modules/cvss/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for CVSS2/3/4"; + mainProgram = "cvss_calculator"; homepage = "https://github.com/RedHatProductSecurity/cvss"; changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}"; license = with licenses; [ lgpl3Plus ]; diff --git a/pkgs/development/python-modules/cwl-upgrader/default.nix b/pkgs/development/python-modules/cwl-upgrader/default.nix index 874af6d65941..d3f3978dc0b7 100644 --- a/pkgs/development/python-modules/cwl-upgrader/default.nix +++ b/pkgs/development/python-modules/cwl-upgrader/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to upgrade CWL syntax to a newer version"; + mainProgram = "cwl-upgrader"; homepage = "https://github.com/common-workflow-language/cwl-upgrader"; changelog = "https://github.com/common-workflow-language/cwl-upgrader/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index 4f818bc49339..1c147ddbb88b 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.15.15"; + version = "6.15.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cx_Freeze"; inherit version; - hash = "sha256-dMCr5ulaBBXLT79VxiW8JQEml4P6wt0tcetNeOk/Ihk="; + hash = "sha256-xjmRiG/ypTGfjw0HwDSaa74aZbXzIPi5JDiI5jyaSiI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 7b04f6869252..10cd64f83e62 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "6.4.3"; + version = "6.4.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-9enilHkZ07loBisKObUmVLhJeXgY/HUiVrf2scPFB60="; + hash = "sha256-PNacp16WZHNblFyA117hSL87IKGMrW0OYNXCSoBoO8Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index fe0ca2e17a09..107b552a631c 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interrupt and signal handling for Cython"; + mainProgram = "cysignals-CSI"; homepage = "https://github.com/sagemath/cysignals/"; maintainers = teams.sage.members; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index e46d0816577d..64ac6ad9dfd0 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.12.2"; + version = "0.12.3"; format = "setuptools"; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-MdSwRV1y2RRkX4A9kX2vTzFNEVxw3gV404IN64sQH2Y="; + hash = "sha256-RQPcWfTO1TpUZDJyxh3DBdHbv719a98paUjenzTDooI="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 70150799f5f0..1cb0a1998493 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django ASGI (HTTP/WebSocket) server"; + mainProgram = "daphne"; homepage = "https://github.com/django/daphne"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 99f332b66955..6a9adcad5454 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -36,16 +36,16 @@ buildPythonPackage rec { pname = "dash"; - version = "2.15.0"; + version = "2.16.1"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-38BOw/CrauT/usVWCI735J0zRf9wzScUgbfGTy5B7ng="; + hash = "sha256-IPyGQXrC2FTTSIC4IFGwKTceyzPYAe4jwDoO5C9YeF0="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/@plotly/dash-jupyterlab/yarn.lock"; - hash = "sha256-mkiyrA0jGiP0zbabSjgHFLEUX3f+LZdJ8eARI5QA8CU="; + hash = "sha256-L/or8jO6uEypI5krwy/ElIxa6jJrXGsCRZ9mh+0kcGA="; }; preBuild = '' diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index ed3215595c2b..6ee614d23a93 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Deploy Dask using mpi4py"; + mainProgram = "dask-mpi"; homepage = "https://github.com/dask/dask-mpi"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/dask-yarn/default.nix b/pkgs/development/python-modules/dask-yarn/default.nix index 044c70f64f89..acea511b2495 100644 --- a/pkgs/development/python-modules/dask-yarn/default.nix +++ b/pkgs/development/python-modules/dask-yarn/default.nix @@ -65,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Deploy dask on YARN clusters"; + mainProgram = "dask-yarn"; longDescription = ''Dask-Yarn deploys Dask on YARN clusters, such as are found in traditional Hadoop installations. Dask-Yarn provides an easy interface to quickly start, diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 5fa73cea10f7..44614185f73f 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -127,6 +127,8 @@ buildPythonPackage rec { "--reruns 3" # Don't run tests that require network access "-m 'not network'" + # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. + "-W" "ignore::pytest.PytestRemovedIn8Warning" ]; disabledTests = lib.optionals stdenv.isDarwin [ @@ -169,6 +171,7 @@ buildPythonPackage rec { meta = with lib; { description = "Minimal task scheduling abstraction"; + mainProgram = "dask"; homepage = "https://dask.org/"; changelog = "https://docs.dask.org/en/latest/changelog.html"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 1533055f3c89..b7cb1311b6b4 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.0.3"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-pwSDDkBcyaT5+qA/W8v5loi0yXK8R0ugASmbalwYw70="; + hash = "sha256-LiA+zZuhPPXgBb8B1vZ/PuAYMrBXzxgd1CXwugf0mk8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix index 603fd25e9b2a..0cc0eed0f51f 100644 --- a/pkgs/development/python-modules/dataclass-wizard/default.nix +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of simple, yet elegant wizarding tools for interacting with the Python dataclasses module"; + mainProgram = "wiz"; homepage = "https://github.com/rnag/dataclass-wizard"; changelog = "https://github.com/rnag/dataclass-wizard/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 1375dd7e780a..8b0b0956b89d 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.48.0"; + version = "0.49.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1NZhNYw+f4Afv+FRGPXM8Iub2bH0W4uRBgWWUoPtrWQ="; + hash = "sha256-TLenmRr2ytuGj+RQzUVkc+ZfEfxni3189hBE/xxgdNg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index 00a25158bc87..9f4fc81e4066 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -27,7 +27,7 @@ let in buildPythonPackage rec { pname = "dataprep-ml"; - version = "0.0.21"; + version = "0.0.22"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dataprep_ml"; inherit version; - hash = "sha256-BtnRmj5JtgNdCFowgNdpIZn5vUdw8QYCWneHfDgC4/c="; + hash = "sha256-umSL5E6yLwjFwhIprCySHNaPKeESwGGzgInZMPNBMcs="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 0505ea7e13cc..3555387b3ab1 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.15.0"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Q8cSgupfj6xKD0bYgL6bvYBwdYDdNaiWEWWUrRvwc4g="; + hash = "sha256-mLiIE1RYUNUhh8nhG7TBr7XUdWlJzeWDuUNvoBk0eyw="; }; # remove pyarrow<14.0.1 vulnerability fix @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-access datasets and evaluation metrics for natural language processing"; + mainProgram = "datasets-cli"; homepage = "https://github.com/huggingface/datasets"; changelog = "https://github.com/huggingface/datasets/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index b89d5bbd06ee..a3c43a528aab 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -99,6 +99,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multi-tool for exploring and publishing data"; + mainProgram = "datasette"; homepage = "https://datasette.io/"; changelog = "https://github.com/simonw/datasette/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index cb0fb38ab9b7..899da93bfc5d 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { meta = with lib;{ description = "Data visualization toolchain based on aggregating into a grid"; + mainProgram = "datashader"; homepage = "https://datashader.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 10cf43f4f648..eb64e3795937 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.99.3"; + version = "0.99.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lAJypyrCfRah22mq/vggaEASzDVT/+mHXVzS46nLadw="; + hash = "sha256-MFEi1U0RNvrfDtV4HpvPgKTCibAh76z7Gnmj32IubYw="; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; checkPhase = '' - ${python.interpreter} dbf/test.py + ${python.interpreter} -m dbf.test ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 806444d411b1..b537da2a3055 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.9"; + version = "1.7.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-ff+cdY6xy14w30BDn1ct/2Q+4j8cQupJrJHb4vO58J0="; + hash = "sha256-0cKzQjAnj0JMrHyA/gOgYceM6g1URJFgQtp90m09Nkw="; }; sourceRoot = "${src.name}/core"; diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index a51cb07f099c..894dbed29f26 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -5,6 +5,7 @@ , dbt-postgres , fetchFromGitHub , hatchling +, pythonRelaxDepsHook , hypothesis , importlib-metadata , jinja2 @@ -31,8 +32,13 @@ buildPythonPackage rec { hash = "sha256-uvwcnOKjwxEmA+/QRGSRofpoE4jZzmE02mGSDLINrJw="; }; + pythonRelaxDeps = [ + "importlib-metadata" + ]; + nativeBuildInputs = [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index f0def3a3ad38..1923fb5733c1 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "ddt"; - version = "1.7.0"; + version = "1.7.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0XjRFavyWhuDJ+lPhaA+8JsdewyiVvYgMoSwJPL8cN8="; + hash = "sha256-0hXWsIOWMBPEoZseTc1qlugOQ6t3UZWXpqz88umj4Es="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index 941efb131111..b24d8be44826 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -62,6 +62,10 @@ buildPythonPackage rec { flake8 ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = [ # needs internet access "test_smoke_has" diff --git a/pkgs/development/python-modules/debianbts/default.nix b/pkgs/development/python-modules/debianbts/default.nix index 7d0a53e033bc..013f8724067c 100644 --- a/pkgs/development/python-modules/debianbts/default.nix +++ b/pkgs/development/python-modules/debianbts/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to Debian's Bug Tracking System"; + mainProgram = "debianbts"; homepage = "https://github.com/venthur/python-debianbts"; downloadPage = "https://pypi.org/project/python-debianbts/"; changelog = "https://github.com/venthur/python-debianbts/blob/${version}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix index 620f615b6e51..14fdff4243ca 100644 --- a/pkgs/development/python-modules/debtcollector/default.nix +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "debtcollector"; - version = "2.5.0"; + version = "3.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3J0a0/dFxD9LvtvKMPn/6JBajAKMmSbmEHeEfV6iV6s="; + hash = "sha256-KokX0lsOHx0NNl08HG7Px6UiselxbooaSpFRJvfM6m8="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/debts/default.nix b/pkgs/development/python-modules/debts/default.nix index 3128f7128832..c82a65500451 100644 --- a/pkgs/development/python-modules/debts/default.nix +++ b/pkgs/development/python-modules/debts/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { inherit (src.meta) homepage; description = "A simple library and cli-tool to help you solve some debts settlement scenarios"; + mainProgram = "debts"; license = licenses.beerware; maintainers = [ maintainers.symphorien ]; }; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 2fc23833dafd..4ba770e251c6 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -5,29 +5,31 @@ , fetchFromGitHub , substituteAll , gdb -, django -, flask -, gevent -, psutil -, pytest-timeout -, pytest-xdist +, lldb , pytestCheckHook +, pytest-xdist +, pytest-timeout +, importlib-metadata +, psutil +, django , requests -, llvmPackages +, gevent +, numpy +, flask }: buildPythonPackage rec { pname = "debugpy"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - hash = "sha256-FW1RDmj4sDBS0q08C82ErUd16ofxJxgVaxfykn/wVBA="; + hash = "sha256-2TkieSQYxnlUroSD9wNKNaHUTLRksFWL/6XmSNGTCA4="; }; patches = [ @@ -46,6 +48,12 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch + + # Attach pid tests are disabled by default on windows & macos, + # but are also flaky on linux: + # - https://github.com/NixOS/nixpkgs/issues/262000 + # - https://github.com/NixOS/nixpkgs/issues/251045 + ./skip-attach-pid-tests.patch ] ++ lib.optionals stdenv.isLinux [ # Hard code GDB path (used to attach to process) (substituteAll { @@ -56,7 +64,7 @@ buildPythonPackage rec { # Hard code LLDB path (used to attach to process) (substituteAll { src = ./hardcode-lldb.patch; - inherit (llvmPackages) lldb; + inherit lldb; }) ]; @@ -66,24 +74,31 @@ buildPythonPackage rec { set -x cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process rm *.so *.dylib *.dll *.exe *.pdb - ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ + $CXX linux_and_mac/attach.cpp -Ilinux_and_mac -std=c++11 -fPIC -nostartfiles ${{ "x86_64-linux" = "-shared -o attach_linux_amd64.so"; "i686-linux" = "-shared -o attach_linux_x86.so"; "aarch64-linux" = "-shared -o attach_linux_arm64.so"; - "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86_64.dylib"; - "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86.dylib"; - "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_arm64.dylib"; + "x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_x86_64.dylib"; + "i686-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_x86.dylib"; + "aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_arm64.dylib"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; nativeCheckInputs = [ + ## Used to run the tests: + pytestCheckHook + pytest-xdist + pytest-timeout + + ## Used by test helpers: + importlib-metadata + psutil + + ## Used in Python code that is run/debugged by the tests: django flask gevent - psutil - pytest-timeout - pytest-xdist - pytestCheckHook + numpy requests ]; @@ -107,13 +122,6 @@ buildPythonPackage rec { # Fixes hanging tests on Darwin __darwinAllowLocalNetworking = true; - disabledTests = [ - # testsuite gets stuck at this one - "test_attach_pid_client" - ]; - # TODO? https://github.com/NixOS/nixpkgs/issues/262000 - doCheck = !stdenv.isLinux; - pythonImportsCheck = [ "debugpy" ]; diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index 7cfb1a49ec38..e368357d5cc2 100644 --- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,12 +1,12 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 7dacc1f9..f303e20a 100644 +index d0921956..459c89c0 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py -@@ -631,6 +631,7 @@ class Session(object): +@@ -704,6 +704,7 @@ class Session(object): if "PYTHONPATH" in self.config.env: # If specified, launcher will use it in lieu of PYTHONPATH it inherited # from the adapter when spawning debuggee, so we need to adjust again. + self.config.env.prepend_to("PYTHONPATH", os.environ["PYTHONPATH"]) self.config.env.prepend_to("PYTHONPATH", DEBUGGEE_PYTHONPATH.strpath) - return self._request_start("launch") + # Adapter is going to start listening for server and spawn the launcher at diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 2fe09a70151a..5cc68b21b3c6 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,8 +1,8 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index ed43e370..d3d6669a 100644 +index 85f3353b..56fab577 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -404,7 +404,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -410,7 +410,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ diff --git a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch index 3a1013187351..215e7ee0f9ca 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch @@ -1,8 +1,8 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index d3d6669a..2ded8d9c 100644 +index 56fab577..989ede03 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -494,7 +494,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d +@@ -500,7 +500,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch index 11d565b98060..9fa42a0605f8 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index 3abc811b..91354604 100644 +index 1bfba237..414bb4d5 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ import sys diff --git a/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch new file mode 100644 index 000000000000..a993940f7266 --- /dev/null +++ b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch @@ -0,0 +1,27 @@ +diff --git a/tests/debug/runners.py b/tests/debug/runners.py +index dc60d0ae..cf4a06a3 100644 +--- a/tests/debug/runners.py ++++ b/tests/debug/runners.py +@@ -163,7 +163,7 @@ def _attach_common_config(session, target, cwd): + @_runner + @contextlib.contextmanager + def attach_pid(session, target, cwd=None, wait=True): +- if wait and not sys.platform.startswith("linux"): ++ if wait: + pytest.skip("https://github.com/microsoft/ptvsd/issues/1926") + + log.info("Attaching {0} to {1} by PID.", session, target) +diff --git a/tests/debugpy/test_attach.py b/tests/debugpy/test_attach.py +index afabc1ac..2fff3982 100644 +--- a/tests/debugpy/test_attach.py ++++ b/tests/debugpy/test_attach.py +@@ -151,8 +151,7 @@ def test_reattach(pyfile, target, run): + + + @pytest.mark.parametrize("pid_type", ["int", "str"]) +-@pytest.mark.skipif( +- not sys.platform.startswith("linux"), ++@pytest.mark.skip( + reason="https://github.com/microsoft/debugpy/issues/311", + ) + def test_attach_pid_client(pyfile, target, pid_type): diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index ac0e0a9d469b..d9eaddb7bf4a 100644 --- a/pkgs/development/python-modules/deemix/default.nix +++ b/pkgs/development/python-modules/deemix/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Deezer downloader built from the ashes of Deezloader Remix"; + mainProgram = "deemix"; homepage = "https://git.freezerapp.xyz/RemixDev/deemix-py"; license = licenses.gpl3Plus; maintainers = with maintainers; [ natto1784 ]; diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 64cae1af74c1..350ce76eca49 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Deep Difference and Search of any Python object/data"; + mainProgram = "deep"; homepage = "https://github.com/seperman/deepdiff"; changelog = "https://github.com/seperman/deepdiff/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/deepdish/default.nix b/pkgs/development/python-modules/deepdish/default.nix index da73114835f8..7033e2f9f851 100644 --- a/pkgs/development/python-modules/deepdish/default.nix +++ b/pkgs/development/python-modules/deepdish/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flexible HDF5 saving/loading and other data science tools from the University of Chicago."; + mainProgram = "ddls"; homepage = "https://github.com/uchicago-cs/deepdish"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix index 4840329d75c9..aa4a0b2ed1e5 100644 --- a/pkgs/development/python-modules/deepl/default.nix +++ b/pkgs/development/python-modules/deepl/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A language translation API that allows other computer programs to send texts and documents to DeepL's servers and receive high-quality translations"; + mainProgram = "deepl"; homepage = "https://github.com/DeepLcom/deepl-python"; changelog = "https://github.com/DeepLcom/deepl-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/defang/default.nix b/pkgs/development/python-modules/defang/default.nix new file mode 100644 index 000000000000..d51573c0dc4f --- /dev/null +++ b/pkgs/development/python-modules/defang/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromBitbucket +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "defang"; + version = "0.5.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromBitbucket { + owner = "johannestaas"; + repo = "defang"; + rev = "refs/tags/${version}"; + hash = "sha256-OJfayJeVf2H1/jg7/fu2NiHhRHNCaLGI29SY8BnJyxI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "defang" + ]; + + meta = with lib; { + description = "Module to defang and refang malicious URLs"; + homepage = "https://bitbucket.org/johannestaas/defang"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/development/python-modules/dehinter/default.nix index 1775e01fa8c9..276959b84b32 100644 --- a/pkgs/development/python-modules/dehinter/default.nix +++ b/pkgs/development/python-modules/dehinter/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility for removing hinting data from TrueType and OpenType fonts"; + mainProgram = "dehinter"; homepage = "https://github.com/source-foundry/dehinter"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix index 6927d656a9f2..5edfd4afc341 100644 --- a/pkgs/development/python-modules/deid/default.nix +++ b/pkgs/development/python-modules/deid/default.nix @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Best-effort anonymization for medical images"; + mainProgram = "deid"; homepage = "https://pydicom.github.io/deid"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/dek/default.nix b/pkgs/development/python-modules/dek/default.nix new file mode 100644 index 000000000000..147cc40e316b --- /dev/null +++ b/pkgs/development/python-modules/dek/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, xmod +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dek"; + version = "1.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rec"; + repo = "dek"; + rev = "v${version}"; + hash = "sha256-DYODdImTRCukGmGbkZ+9TQeI9DYaeRd/EHS6VND5IDs="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + xmod + ]; + + nativeBuildInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dek" + ]; + + meta = with lib; { + description = "The decorator-decorator"; + homepage = "https://github.com/rec/dek"; + changelog = "https://github.com/rec/dek/blob/${src.rev}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/demes/default.nix b/pkgs/development/python-modules/demes/default.nix index 986bb7f9ac9f..4eadd670a1e1 100644 --- a/pkgs/development/python-modules/demes/default.nix +++ b/pkgs/development/python-modules/demes/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { numpy ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTestPaths = [ "tests/test_spec.py" ]; @@ -51,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for describing and manipulating demographic models"; + mainProgram = "demes"; homepage = "https://github.com/popsim-consortium/demes-python"; license = licenses.isc; maintainers = with maintainers; [ alxsimon ]; diff --git a/pkgs/development/python-modules/demesdraw/default.nix b/pkgs/development/python-modules/demesdraw/default.nix index 42e9fdc4c5f9..2672f8714685 100644 --- a/pkgs/development/python-modules/demesdraw/default.nix +++ b/pkgs/development/python-modules/demesdraw/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Drawing functions for Demes demographic models"; + mainProgram = "demesdraw"; homepage = "https://github.com/grahamgower/demesdraw"; license = licenses.isc; maintainers = with maintainers; [ alxsimon ]; diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix index 50668ec38834..6e83b001e6e1 100644 --- a/pkgs/development/python-modules/demjson3/default.nix +++ b/pkgs/development/python-modules/demjson3/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; + mainProgram = "jsonlint"; homepage = "https://github.com/nielstron/demjson3/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/demoji/default.nix b/pkgs/development/python-modules/demoji/default.nix new file mode 100644 index 000000000000..f8ce40a77de1 --- /dev/null +++ b/pkgs/development/python-modules/demoji/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +, pytestCheckHook +, ujson +}: + +buildPythonPackage rec { + pname = "demoji"; + version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bsolomon1124"; + repo = "demoji"; + rev = "refs/tags/v${version}"; + hash = "sha256-ojy4JiM6xvP9J40Z5uFCMUZvZtLZ1le2p/2/NfAUAtk="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "pytest-runner" "" + ''; + + build-system = [ + setuptools + ]; + + passthru.optional-dependencies = { + ujson = [ + ujson + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "demoji" + ]; + + meta = with lib; { + description = "Module to find/replace/remove emojis in text strings"; + homepage = "https://github.com/bsolomon1124/demoji"; + changelog = "https://github.com/bsolomon1124/demoji/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/deprecat/default.nix b/pkgs/development/python-modules/deprecat/default.nix index da81c63cca86..194859ad531a 100644 --- a/pkgs/development/python-modules/deprecat/default.nix +++ b/pkgs/development/python-modules/deprecat/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "deprecat"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mjhajharia"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Xl/IC+ImFUxxLry15MIIVRf6aR+gA9K5S2IQomkv+o="; + hash = "sha256-uAabZAtZDhcX6TfiM0LnrAzxxS64ys+vdodmxO//0x8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index d14b3d523b6f..589df5624778 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -43,6 +43,11 @@ buildPythonPackage rec { pkgs.gitMinimal ]; + pytestFlagsArray = [ + # Pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + preCheck = '' export HOME=$(mktemp -d); ''; diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index ed6c77c6abc6..4f4094e2cf9c 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generates passphrases by concatenating words randomly picked from wordlists"; + mainProgram = "diceware"; homepage = "https://github.com/ulif/diceware"; changelog = "https://github.com/ulif/diceware/blob/v${version}/CHANGES.rst"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index 8c716135a104..f6dc8cd20a68 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/icometrix/dicom2nifti"; description = "Library for converting dicom files to nifti"; + mainProgram = "dicom2nifti"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 62fb5caa8efb..6a68a695fbbb 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.4"; + version = "1.7.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "delfick"; repo = "python-dict2xml"; rev = "refs/tags/release-${version}"; - hash = "sha256-58sWvdkbt+czo96RUxB2vdOl/wqSU3BNIozSEdixWO8="; + hash = "sha256-GNvG1VFz/qkkTrKleMrq8n6kcIYtfhUlQMyCqH9uQzw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/diffimg/default.nix b/pkgs/development/python-modules/diffimg/default.nix index e5afcdf8cdf1..c1769d118f90 100644 --- a/pkgs/development/python-modules/diffimg/default.nix +++ b/pkgs/development/python-modules/diffimg/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pillow , unittestCheckHook +, pythonAtLeast }: buildPythonPackage rec { @@ -21,7 +22,10 @@ buildPythonPackage rec { # fix offered to upstream https://github.com/nicolashahn/diffimg/pull/6 postPatch = '' substituteInPlace diffimg/test.py \ - --replace "from diff import diff" "from diffimg.diff import diff" + --replace-warn "from diff import diff" "from diffimg.diff import diff" + '' + lib.optionalString (pythonAtLeast "3.12") '' + substituteInPlace diffimg/test.py \ + --replace-warn "3503192421617232" "3503192421617233" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index 8cfe8e361184..39464efe47fd 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "diffusers"; - version = "0.26.3"; + version = "0.27.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "diffusers"; rev = "refs/tags/v${version}"; - hash = "sha256-1pIe1OU+vIrHM6KIZtHRMXklBZrugDV+I/OBNQYqvXI="; + hash = "sha256-aRnbU3jN40xaCsoMFyRt1XB+hyIYMJP2b/T1yZho90c="; }; nativeBuildInputs = [ @@ -147,6 +147,7 @@ buildPythonPackage rec { meta = with lib; { description = "State-of-the-art diffusion models for image and audio generation in PyTorch"; + mainProgram = "diffusers-cli"; homepage = "https://github.com/huggingface/diffusers"; changelog = "https://github.com/huggingface/diffusers/releases/tag/${src.rev}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index d6fdd2b97d2d..cdfdb401e94d 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dill"; - version = "0.3.7"; + version = "0.3.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; - rev = "refs/tags/dill-${version}"; - hash = "sha256-1cRGA5RuNjlpc3jq9SAsUYgmPauIV8zRF9SxOmveljI="; + rev = "refs/tags/${version}"; + hash = "sha256-r65JgQH+5raiRX8NYELUB9B0zLy4z606EkFJaNpapNc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index 20d855bf0d26..f7f099b3bb1a 100644 --- a/pkgs/development/python-modules/dinghy/default.nix +++ b/pkgs/development/python-modules/dinghy/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "A GitHub activity digest tool"; + mainProgram = "dinghy"; homepage = "https://github.com/nedbat/dinghy"; changelog = "https://github.com/nedbat/dinghy/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/dingz/default.nix b/pkgs/development/python-modules/dingz/default.nix index 6ad22e7f4ced..10354264861e 100644 --- a/pkgs/development/python-modules/dingz/default.nix +++ b/pkgs/development/python-modules/dingz/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for interacting with Dingz devices"; + mainProgram = "dingz"; homepage = "https://github.com/home-assistant-ecosystem/python-dingz"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix index e56495f3899e..a2856ba209ea 100644 --- a/pkgs/development/python-modules/dirigera/default.nix +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dirigera"; - version = "1.0.10"; + version = "1.0.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Leggin"; repo = "dirigera"; rev = "refs/tags/v${version}"; - hash = "sha256-FuytNb+AiimKZPhX7qaxKvM4Y9NofvrzMGLW1PPu3Cw="; + hash = "sha256-kZlmfoGbvSv13+UqCE73ToLfrzzQ9AOxefRTxUvxMCg="; }; nativeBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for controlling the IKEA Dirigera Smart Home Hub"; + mainProgram = "generate-token"; homepage = "https://github.com/Leggin/dirigera"; changelog = "https://github.com/Leggin/dirigera/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 7b212feee0ce..6ee624cc4256 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Shellitem structures"; + mainProgram = "parse-lnk"; homepage = "https://github.com/fox-it/dissect.shellitem"; changelog = "https://github.com/fox-it/dissect.shellitem/releases/tag/${version}"; license = licenses.agpl3Only; diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index 255d64dc0ce9..d085d842b711 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing various utility functions for the other Dissect modules"; + mainProgram = "dump-nskeyedarchiver"; homepage = "https://github.com/fox-it/dissect.util"; changelog = "https://github.com/fox-it/dissect.util/releases/tag/${version}"; license = licenses.agpl3Only; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index cf31574e6fdb..1f2d17395065 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.7"; + version = "0.3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-na/lSzSgKOr9lQOdXl1IUaE3NFQPEzEGDTHJkW5xR6g="; + hash = "sha256-FTDqE+NQAxtjEthYDdtrJ6EEJ1oxEGUjuPEjeH9JT2Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 73ded7625dca..9aab5f47e430 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "distro"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-AuER0dxqUKu47ta/McPkjtiwgw0eoqG3jGF2XCUT/dg="; + hash = "sha256-L6d8b9iUDxFu4da5Si+QsTteqNAZuYvIuv3KvN2b2+0="; }; nativeBuildInputs = [ @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/nir0s/distro"; description = "Linux Distribution - a Linux OS platform information API."; + mainProgram = "distro"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 799881ebee35..1e619035bd05 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -1,25 +1,29 @@ { lib +, boto3 , buildPythonPackage -, fetchFromGitHub -, requests , django -, boto3 +, fetchFromGitHub , hatchling -, python , mock +, python +, pythonOlder +, requests , responses +, urllib3 }: buildPythonPackage rec { pname = "django-anymail"; - version = "10.2"; + version = "10.3"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "anymail"; - repo = pname; + repo = "django-anymail"; rev = "refs/tags/v${version}"; - hash = "sha256-k4C82OYm2SdjxeLScrkkitumjYgWkMNFlNeGW+C1Z8o="; + hash = "sha256-5uSpPeXpMkpuzMXzsGE6uQJWP/Dt/oqakB8Xb5G1eZY="; }; nativeBuildInputs = [ @@ -27,8 +31,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - requests django + requests + urllib3 ]; nativeCheckInputs = [ @@ -37,7 +42,9 @@ buildPythonPackage rec { ] ++ passthru.optional-dependencies.amazon-ses; passthru.optional-dependencies = { - amazon-ses = [ boto3 ]; + amazon-ses = [ + boto3 + ]; }; checkPhase = '' @@ -46,11 +53,14 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "anymail" ]; + pythonImportsCheck = [ + "anymail" + ]; meta = with lib; { description = "Django email backends and webhooks for Mailgun"; homepage = "https://github.com/anymail/django-anymail"; + changelog = "https://github.com/anymail/django-anymail/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index a8d367e854af..543c483023df 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook + +# build-system +, setuptools + +# dependencies +, calmjs +, django-appconf +, jinja2 , rcssmin , rjsmin -, django-appconf + +# tests , beautifulsoup4 , brotli -, pytestCheckHook +, csscompressor , django-sekizai +, pytestCheckHook , pytest-django -, csscompressor -, calmjs -, jinja2 -, python + }: buildPythonPackage rec { pname = "django-compressor"; version = "4.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "django_compressor"; @@ -26,7 +34,17 @@ buildPythonPackage rec { hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "rcssmin" + "rjsmin" + ]; + + dependencies = [ beautifulsoup4 calmjs django-appconf @@ -35,7 +53,9 @@ buildPythonPackage rec { rjsmin ]; - checkInputs = [ + env.DJANGO_SETTINGS_MODULE = "compressor.test_settings"; + + nativeCheckInputs = [ beautifulsoup4 brotli csscompressor @@ -53,8 +73,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "compressor" ]; - DJANGO_SETTINGS_MODULE = "compressor.test_settings"; - meta = with lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; homepage = "https://django-compressor.readthedocs.org/"; diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index ba32b7576403..087ffab30139 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "A helper for organizing Django settings"; + mainProgram = "django-cadmin"; homepage = "https://django-configurations.readthedocs.io/"; license = licenses.bsd0; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/django-context-decorator/default.nix b/pkgs/development/python-modules/django-context-decorator/default.nix index a23f5c874a76..00f4a80e9526 100644 --- a/pkgs/development/python-modules/django-context-decorator/default.nix +++ b/pkgs/development/python-modules/django-context-decorator/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , django , pytestCheckHook }: buildPythonPackage rec { pname = "django-context-decorator"; - version = "1.6.0"; - format = "setuptools"; + version = "1.6.1"; + pyproject = true; src = fetchFromGitHub { owner = "rixx"; repo = "django-context-decorator"; rev = "v${version}"; - hash = "sha256-/FDGWGC1Pdu+RLyazDNZv+CMf5vscXprLdN8ELjUFNo="; + hash = "sha256-lNmZDsguOu2+gtMVjbwr709sbLCQOQ1sAePN7UJQbcw="; }; + build-system = [ + flit-core + ]; + pythonImportsCheck = [ "django_context_decorator" ]; diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix index ed3add9a5cd0..e8f04f188a54 100644 --- a/pkgs/development/python-modules/django-csp/default.nix +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -1,20 +1,47 @@ -{ lib, fetchPypi, buildPythonPackage, django }: +{ lib +, fetchPypi +, buildPythonPackage + +# build-system +, setuptools + +# dependencies +, django + +# tests +, jinja2 +, pytest-django +, pytestCheckHook +}: buildPythonPackage rec { pname = "django-csp"; - version = "3.7"; - format = "setuptools"; + version = "3.8"; + pyproject = true; src = fetchPypi { inherit version; pname = "django_csp"; - sha256 = "01eda02ad3f10261c74131cdc0b5a6a62b7c7ad4fd017fbefb7a14776e0a9727"; + hash = "sha256-7w8an32Nporm4WnALprGYcDs8E23Dg0dhWQFEqaEccA="; }; - # too complicated to setup - needs a running django instance - doCheck = false; + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + django + ]; - propagatedBuildInputs = [ django ]; + nativeCheckInputs = [ + jinja2 + pytest-django + pytestCheckHook + ]; meta = with lib; { description = "Adds Content-Security-Policy headers to Django"; diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 474ede58b770..5e77c5bfc590 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -51,6 +51,9 @@ buildPythonPackage rec { disabledTestPaths = [ # requires network access "tests/management/commands/test_pipchecker.py" + # django.db.utils.OperationalError: no such table: django_extensions_permmodel + "tests/test_dumpscript.py" + ]; meta = with lib; { diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index 8d8e266014cb..6716c1f003a2 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -13,15 +13,14 @@ buildPythonPackage rec { pname = "django-health-check"; - version = "3.17.0"; + version = "3.18.1"; format = "setuptools"; src = fetchFromGitHub { owner = "KristianOellegaard"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-f87dgB2pDc+A0h41FX13qTj6Zzw5I4QwsDoC6yPkvAE="; - leaveDotGit = true; + hash = "sha256-4fl7x0pleI1yL+tEWGt5Gmcl6ZKETQz2AsNQDVIAwy8="; }; buildInputs = [ @@ -42,6 +41,11 @@ buildPythonPackage rec { redis ]; + disabledTests = [ + # commandline output mismatch + "test_command_with_non_existence_subset" + ]; + postPatch = '' # We don't want to generate coverage substituteInPlace setup.cfg \ diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index 7ea1ba4a58d9..aeb37f5aa99a 100644 --- a/pkgs/development/python-modules/django-leaflet/default.nix +++ b/pkgs/development/python-modules/django-leaflet/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-leaflet"; - version = "0.29.0"; + version = "0.29.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-L23Ixxh/0i5itvK3tC7thpIPgb7DEqplSYHr5byOCGY="; + hash = "sha256-ECtocPJHYR1DsFLeVMVdtlia4UNOJyNMsU1CrX1aVsQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix index 216b24e3c0c0..c1078160b6eb 100644 --- a/pkgs/development/python-modules/django-otp/default.nix +++ b/pkgs/development/python-modules/django-otp/default.nix @@ -1,46 +1,63 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling , django , freezegun -, pythonOlder , qrcode +, pytest +, python }: buildPythonPackage rec { pname = "django-otp"; - version = "1.1.3"; - format = "setuptools"; - disabled = pythonOlder "3"; + version = "1.3.0post1"; + pyproject = true; src = fetchFromGitHub { owner = "django-otp"; repo = "django-otp"; rev = "v${version}"; - hash = "sha256-Ac9p7q9yaUr3WTTGxCY16Yo/Z8i1RtnD2g0Aj2pqSXY="; + hash = "sha256-Q8YTCYERyoAXenSiDabxuxaWiD6ZeJKKKgaR/Rg3y20="; }; - postPatch = '' - patchShebangs manage.py - ''; + build-system = [ + hatchling + ]; - propagatedBuildInputs = [ + dependencies = [ django qrcode ]; + env.DJANGO_SETTINGS_MODUOLE = "test.test_project.settings"; + nativeCheckInputs = [ freezegun + pytest ]; checkPhase = '' - ./manage.py test django_otp + runHook preCheck + + export PYTHONPATH=$PYTHONPATH:test + export DJANGO_SETTINGS_MODULE=test_project.settings + ${python.interpreter} -m django test django_otp + + runHook postCheck ''; - pythonImportsCheck = [ "django_otp" ]; + pytestFlagsArray = [ + "src/django_otp/test.py" + ]; + + pythonImportsCheck = [ + "django_otp" + ]; meta = with lib; { - homepage = "https://github.com/jazzband/django-model-utils"; + homepage = "https://github.com/django-otp/django-otp"; + changelog = "https://github.com/django-otp/django-otp/blob/${src.rev}/CHANGES.rst"; description = "Pluggable framework for adding two-factor authentication to Django using one-time passwords"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 9fc04339c226..8ce7bc0340a9 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -1,25 +1,37 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , django , django-appconf + +# tests , pytest-django , pytestCheckHook }: buildPythonPackage rec { pname = "django-statici18n"; - version = "2.3.1"; - format = "setuptools"; + version = "2.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "zyegfryed"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-2fFJJNdF0jspS7djDL8sToPTetzNR6pfNp5ohCNa30I="; + repo = "django-statici18n"; + # https://github.com/zyegfryed/django-statici18n/issues/59 + rev = "9b83a8f0f2e625dd5f56d53cfe4e07aca9479ab6"; + hash = "sha256-KrIlWmN7um9ad2avfANOza579bjYkxTo9F0UFpvLu3A="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ django django-appconf ]; @@ -28,7 +40,7 @@ buildPythonPackage rec { "statici18n" ]; - DJANGO_SETTINGS_MODULE = "tests.test_project.project.settings"; + env.DJANGO_SETTINGS_MODULE = "tests.test_project.project.settings"; nativeCheckInputs = [ pytest-django diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 29b4aff06309..b835a6fb0766 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -80,6 +80,11 @@ buildPythonPackage rec { "test_storage_save_gzip" ]; + disabledTestPaths = [ + # ImportError: cannot import name 'mock_s3' from 'moto' + "tests/test_s3.py" + ]; + meta = with lib; { description = "Collection of custom storage backends for Django"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index d7b2097e2e7d..4340c5ab2c97 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch2 , pythonOlder , substituteAll @@ -43,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.10"; + version = "4.2.11"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sSYO04GxChF1PHNERAjhmGnzJB/EXJhc1VowF3x4nRM="; + hash = "sha256-bm/z2y2N0MmGtO7IVUyOT5GbXB/2KltDkMF6/y7W5cQ="; }; patches = [ @@ -62,11 +61,6 @@ buildPythonPackage rec { # and disable failing tests ./django_4_tests.patch - (fetchpatch2 { - # fix test on 3.12; https://github.com/django/django/pull/17843 - url = "https://github.com/django/django/commit/bc8471f0aac8f0c215b9471b594d159783bac19b.patch"; - hash = "sha256-g1T9b73rmQ0uk1lB+iQy1XwK3Qin3mf5wpRsyYISJaw="; - }) ] ++ lib.optionals withGdal [ (substituteAll { src = ./django_4_set_geos_gdal_lib.patch; @@ -143,6 +137,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://docs.djangoproject.com/en/${lib.versions.majorMinor version}/releases/${version}/"; description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."; + mainProgram = "django-admin"; homepage = "https://www.djangoproject.com"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index e2dc4ce14887..1499469c06b8 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { uritemplate ]; + pytestFlagsArray = [ + # ytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "rest_framework" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 1947a07b835a..457ad4de643d 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dm-sonnet"; - version = "2.0.0"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deepmind"; repo = "sonnet"; - rev = "v${version}"; - hash = "sha256-YSMeH5ZTfP1OdLBepsxXAVczBG/ghSjCWjoz/I+TFl8="; + rev = "refs/tags/v${version}"; + hash = "sha256-WkloUbqSyPG3cbLG8ktsjdluACkCbUZ7t6rYWst8rs8="; }; patches = [ diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix index 6cc982c5df53..b9647c5ed804 100644 --- a/pkgs/development/python-modules/dns-lexicon/default.nix +++ b/pkgs/development/python-modules/dns-lexicon/default.nix @@ -110,6 +110,7 @@ buildPythonPackage rec { meta = with lib; { description = "Manipulate DNS records on various DNS providers in a standardized way"; + mainProgram = "lexicon"; homepage = "https://github.com/AnalogJ/lexicon"; changelog = "https://github.com/AnalogJ/lexicon/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index 915918bc54b6..48c00b0d5cc3 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Style checker for Sphinx (or other) RST documentation"; + mainProgram = "doc8"; homepage = "https://github.com/pycqa/doc8"; changelog = "https://github.com/PyCQA/doc8/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 5e0240034413..517b777735d7 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = { changelog = "https://github.com/PyCQA/docformatter/blob/${src.rev}/CHANGELOG.md"; description = "Formats docstrings to follow PEP 257"; + mainProgram = "docformatter"; homepage = "https://github.com/myint/docformatter"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/docstr-coverage/default.nix b/pkgs/development/python-modules/docstr-coverage/default.nix index ba0945ad15af..b9a6080fa7df 100644 --- a/pkgs/development/python-modules/docstr-coverage/default.nix +++ b/pkgs/development/python-modules/docstr-coverage/default.nix @@ -32,6 +32,7 @@ buildPythonPackage { meta = with lib; { description = "Docstring coverage analysis and rating for Python"; + mainProgram = "docstr-coverage"; homepage = "https://github.com/HunterMcGushion/docstr_coverage"; changelog = "https://github.com/HunterMcGushion/docstr_coverage/blob/master/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix index 958adb3ffbf1..5a720d1954dd 100644 --- a/pkgs/development/python-modules/docstring-to-markdown/default.nix +++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "docstring-to-markdown"; - version = "0.13"; + version = "0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,13 +16,12 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-r+TRYofTRDCBC0s+bJRhagepEQbbj5WeI5FRtaVPt24="; + hash = "sha256-ykqY7LFIOTuAddYkKDzIltq8FpLVz4v2ZA3Y0cZH9ms="; }; - patches = [ - # So pytest-flake8 and pytest-cov won't be needed - ./remove-coverage-tests.patch - ]; + postPatch = '' + sed -i -E '/--(cov|flake8)/d' setup.cfg + ''; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/docstring-to-markdown/remove-coverage-tests.patch b/pkgs/development/python-modules/docstring-to-markdown/remove-coverage-tests.patch deleted file mode 100644 index 68bc626ced91..000000000000 --- a/pkgs/development/python-modules/docstring-to-markdown/remove-coverage-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git i/setup.cfg w/setup.cfg -index e880e74..e77133e 100644 ---- i/setup.cfg -+++ w/setup.cfg -@@ -34,11 +34,7 @@ docstring-to-markdown = py.typed - [tool:pytest] - addopts = - --pyargs tests -- --cov docstring_to_markdown -- --cov-fail-under=98 -- --cov-report term-missing:skip-covered - -p no:warnings -- --flake8 - -vv - - [flake8] diff --git a/pkgs/development/python-modules/docx2txt/default.nix b/pkgs/development/python-modules/docx2txt/default.nix index 6b3c2777d78c..97c7f2b77692 100644 --- a/pkgs/development/python-modules/docx2txt/default.nix +++ b/pkgs/development/python-modules/docx2txt/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A pure python-based utility to extract text and images from docx files"; + mainProgram = "docx2txt"; homepage = "https://github.com/ankushshah89/python-docx2txt"; license = licenses.mit; maintainers = with maintainers; [ ilkecan ]; diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix index 161e23f648a5..ada91ac3181e 100644 --- a/pkgs/development/python-modules/dodgy/default.nix +++ b/pkgs/development/python-modules/dodgy/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Looks at Python code to search for things which look \"dodgy\" such as passwords or diffs"; + mainProgram = "dodgy"; homepage = "https://github.com/landscapeio/dodgy"; license = licenses.mit; maintainers = with maintainers; [ diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index 190219cf1c0c..f855de38ffa2 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -57,6 +57,7 @@ let doit = buildPythonPackage rec { meta = with lib; { homepage = "https://pydoit.org/"; description = "A task management & automation tool"; + mainProgram = "doit"; license = licenses.mit; longDescription = '' doit is a modern open-source build-tool written in python diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index f722c80bdad7..fdf7705469ee 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert graphs generated by Graphviz to LaTeX friendly formats"; + mainProgram = "dot2tex"; homepage = "https://github.com/kjellmf/dot2tex"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/downloader-cli/default.nix b/pkgs/development/python-modules/downloader-cli/default.nix index e6334daff641..248bafca3967 100644 --- a/pkgs/development/python-modules/downloader-cli/default.nix +++ b/pkgs/development/python-modules/downloader-cli/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Downloader with an awesome customizable progressbar"; + mainProgram = "dw"; homepage = "https://github.com/deepjyoti30/downloader-cli"; changelog = "https://github.com/deepjyoti30/downloader-cli/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index fc60abddc69f..ece3ef403a04 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "dploot"; - version = "2.2.5"; + version = "2.6.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-SINtHw9q1cNqwtvSpPQUgYj6PzEqKXV0WXuKiPvkFQU="; + hash = "sha256-Fko8zsIjVG1Cmeiect239HGCStJ8VccGTE102cTIr58="; }; pythonRelaxDeps = true; @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/zblurx/dploot"; description = "DPAPI looting remotely in Python"; + mainProgram = "dploot"; changelog = "https://github.com/zblurx/dploot/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ vncsb ]; diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index 53c4d5053e62..f38a2fbf86bc 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "drf-spectacular"; - version = "0.26.5"; + version = "0.27.1"; format = "setuptools"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular"; rev = "refs/tags/${version}"; - hash = "sha256-sK+upLh0mi8eHKh1Wt9FoLRjqlHitTSX0Zl54S4Ce6E="; + hash = "sha256-R6rxEo9SNNziXRWB+01UUInParpGcFDIkDZtN4k+dFE="; }; patches = [ @@ -79,6 +79,8 @@ buildPythonPackage rec { disabledTests = [ # requires django with gdal "test_rest_framework_gis" + # outdated test artifact + "test_pydantic_decoration" ]; pythonImportsCheck = [ "drf_spectacular" ]; diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix index 1505103146ad..49c5dbb51db4 100644 --- a/pkgs/development/python-modules/dronecan/default.nix +++ b/pkgs/development/python-modules/dronecan/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "dronecan"; - version = "1.0.25"; + version = "1.0.26"; format = "setuptools"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - hash = "sha256-0WKmVZwE6OgBckWWvPcn5BYqXMEt6Mr1P68UMHfRp4I="; + hash = "sha256-D2odxa9ADswrg6rgKLTyQulHpGec1r0lWRUZDV5YvyE="; }; nativeCheckInputs = [ @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the DroneCAN v1 protocol stack"; + mainProgram = "dronecan_bridge.py"; longDescription = '' DroneCAN is a lightweight protocol designed for reliable communication in aerospace and robotic applications via CAN bus. ''; diff --git a/pkgs/development/python-modules/ds-store/default.nix b/pkgs/development/python-modules/ds-store/default.nix index 6436fc478add..70fc1198916d 100644 --- a/pkgs/development/python-modules/ds-store/default.nix +++ b/pkgs/development/python-modules/ds-store/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/al45tair/ds_store"; description = "Manipulate Finder .DS_Store files from Python"; + mainProgram = "ds_store"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix index a28c2d860885..ab08f7b9c2ed 100644 --- a/pkgs/development/python-modules/ds4drv/default.nix +++ b/pkgs/development/python-modules/ds4drv/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = { description = "Userspace driver for the DualShock 4 controller"; + mainProgram = "ds4drv"; homepage = "https://github.com/chrippa/ds4drv"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index 33090ff4be7c..22e76d6036cb 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "1.3.1"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-PULrKRHrCuDFZcR+5ha0PjkN438QFgf2CrpYhKIqYTs="; + hash = "sha256-4L7hLDd/hYYdhnkcPRK48FnHutbyDXpnhQoVXUQLoDo="; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to parse Dutch Smart Meter Requirements (DSMR)"; + mainProgram = "dsmr_console"; homepage = "https://github.com/ndokter/dsmr_parser"; changelog = "https://github.com/ndokter/dsmr_parser/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix index c93793018c4f..d67cb02aa112 100644 --- a/pkgs/development/python-modules/dsnap/default.nix +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility for downloading and mounting EBS snapshots using the EBS Direct API's"; + mainProgram = "dsnap"; homepage = "https://github.com/RhinoSecurityLabs/dsnap"; changelog = "https://github.com/RhinoSecurityLabs/dsnap/releases/tag/v${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index cb4fa7fcdf47..4647dbbb3002 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -12,8 +12,8 @@ buildPythonPackage rec { pname = "dtschema"; - version = "2023.04"; - format = "setuptools"; + version = "2024.02"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "devicetree-org"; repo = "dt-schema"; rev = "refs/tags/v${version}"; - sha256 = "sha256-w9TsRdiDTdExft7rdb2hYcvxP6hxOFZKI3hITiNSwgw="; + sha256 = "sha256-UJU8b9BzuuUSHRjnA6hOd1bMPNOlk4LNtrQV5aZmGhI="; }; patches = [ diff --git a/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch b/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch index eb1ec34a95d6..093b13023fb3 100644 --- a/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch +++ b/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch @@ -1,13 +1,13 @@ -diff --git a/setup.py b/setup.py -index 62db8af..4a980c1 100755 ---- a/setup.py -+++ b/setup.py -@@ -52,7 +52,7 @@ setuptools.setup( - 'ruamel.yaml>0.15.69', - 'jsonschema>=4.1.2', - 'rfc3987', -- 'pylibfdt', -+ 'libfdt', - ], +diff --git a/pyproject.toml b/pyproject.toml +index 2192a68..6a7ba95 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -27,7 +27,7 @@ dependencies = [ + "ruamel.yaml>0.15.69", + "jsonschema>=4.1.2,<4.18", + "rfc3987", +- "pylibfdt", ++ "libfdt", + ] - classifiers=[ + [project.scripts] diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix index 6a35cb9d1fa3..11164736a2c0 100644 --- a/pkgs/development/python-modules/dtw-python/default.nix +++ b/pkgs/development/python-modules/dtw-python/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python port of R's Comprehensive Dynamic Time Warp algorithms package"; + mainProgram = "dtw"; homepage = "https://github.com/DynamicTimeWarping/dtw-python"; changelog = "https://github.com/DynamicTimeWarping/dtw-python/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index fd197f9305d6..83fd0bbb6908 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -14,7 +14,7 @@ }: buildPythonPackage rec { - inherit (duckdb) patches pname src version; + inherit (duckdb) patches pname rev src version; pyproject = true; postPatch = (duckdb.postPatch or "") + '' @@ -31,8 +31,11 @@ buildPythonPackage rec { env = { BUILD_HTTPFS = 1; DUCKDB_BUILD_UNITY = 1; + OVERRIDE_GIT_DESCRIBE="v${version}-0-g${rev}"; }; + dontPretendSetuptoolsSCMVersion = true; + nativeBuildInputs = [ pybind11 setuptools-scm diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 76447627c4c5..708762bb2622 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "3.9.9"; + version = "5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "deedy5"; repo = "duckduckgo_search"; rev = "refs/tags/v${version}"; - hash = "sha256-swuMCobYF5u41O1Qp5Gx/n8BIgSEnhRVZ5Owk3IPbeI="; + hash = "sha256-OZFkSFyXC2MFP2MbKwF/qR8zvCFzPKgLmX+nuIztOpw="; }; nativeBuildInputs = [ @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine"; + mainProgram = "ddgs"; homepage = "https://github.com/deedy5/duckduckgo_search"; changelog = "https://github.com/deedy5/duckduckgo_search/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index 1e24f9112920..582d572a4420 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/duecredit/duecredit"; description = "Simple framework to embed references in code"; + mainProgram = "duecredit"; changelog = "https://github.com/duecredit/duecredit/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 7cbd3ea50efc..f4929849869e 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.19.0"; + version = "1.19.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - hash = "sha256-wMIqm1bUub89ExnbvJBzuZ9479el8EgwVcfPpI+SD5Y="; + hash = "sha256-oLJlBytdp9uVdKEdYDMz/IYnPP7XVnCUcThKO3IiW10="; }; nativeBuildInputs = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dynamic version generation"; + mainProgram = "dunamai"; homepage = "https://github.com/mtkennerly/dunamai"; changelog = "https://github.com/mtkennerly/dunamai/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/durus/default.nix b/pkgs/development/python-modules/durus/default.nix index 456ae010d63c..43884551c731 100644 --- a/pkgs/development/python-modules/durus/default.nix +++ b/pkgs/development/python-modules/durus/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "Durus"; + pname = "durus"; version = "4.2"; src = fetchPypi { - inherit version pname; + pname = "Durus"; + inherit version; sha256 = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c"; }; @@ -21,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object persistence layer"; + mainProgram = "durus"; homepage = "https://github.com/nascheme/durus"; license = licenses.mit; maintainers = with maintainers; [ grindhold ]; diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix index 339e36fc0489..dc166c55027e 100644 --- a/pkgs/development/python-modules/dvc-azure/default.nix +++ b/pkgs/development/python-modules/dvc-azure/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "dvc-azure"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TB7yY5b2AWBFt8+AnxyKyP6hoXi6cdHVjtffapRVfHc="; + hash = "sha256-UsvHDVQUtQIZs9sKFvaK0l2rp24/Igrr5OSbPGSYriA="; }; # Prevent circular dependency diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 86f8cf2483e5..d4a9573f9a9b 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.9.0"; + version = "3.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-rgqSgNsqAGATzu3ZX8LWRiFJt0xTTLaF8bUNOgA3s2w="; + hash = "sha256-pr5RtVlGKKtpcmmCNGqcLiBFzJcajpqtPjBbzeCCHF8="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "DVC's data management subsystem"; + mainProgram = "dvc-data"; homepage = "https://github.com/iterative/dvc-data"; changelog = "https://github.com/iterative/dvc-data/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/dvc-http/default.nix b/pkgs/development/python-modules/dvc-http/default.nix index efe97c502cec..48fb723cbc54 100644 --- a/pkgs/development/python-modules/dvc-http/default.nix +++ b/pkgs/development/python-modules/dvc-http/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , dvc-objects , fsspec +, funcy , pythonOlder , pythonRelaxDepsHook , setuptools-scm @@ -12,25 +13,26 @@ buildPythonPackage rec { pname = "dvc-http"; version = "2.32.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "dvc-http"; rev = "refs/tags/${version}"; hash = "sha256-ru/hOFv/RcS/7SBpTJU8xFxdllmaiH4dV1ouS6GGKkY="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ + aiohttp-retry dvc-objects fsspec - aiohttp-retry + funcy ]; # Currently it's not possible to run the tests diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 778bcf39fa27..7911c1c411ad 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "3.0.6"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-objects"; rev = "refs/tags/${version}"; - hash = "sha256-os4MzxB4IuqJ9EsKZXGzOU23Qf6LLLiV6SLaNpMlEp8="; + hash = "sha256-CXZKya22i2PhHk/CYd10AlzkiOBo5xZfR9l4rnkaV5Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix index a15295649d4e..e112eca578c7 100644 --- a/pkgs/development/python-modules/dvc-s3/default.nix +++ b/pkgs/development/python-modules/dvc-s3/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dvc-s3"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ax2Wsjfvu4hoF99eDPT2sbFhl30wuYtGdEonYCCkJMY="; + hash = "sha256-0yD5FsinQat3cbmY5teClFS0KEGUvED2Ah/JCbTtZ/s="; }; # Prevent circular dependency diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index d05a37f7ad79..885e4915d1af 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.43.1"; + version = "3.48.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-9JS8N4BWikmXoo5TtpUD5El2vHST80NEOBdxkHfK4ME="; + hash = "sha256-vO+i0BU8mQuLfgb1rcGRmlb8gpHsRxgdwuJHRERA4Pw="; }; pythonRelaxDeps = [ @@ -166,6 +166,7 @@ buildPythonPackage rec { meta = with lib; { description = "Version Control System for Machine Learning Projects"; + mainProgram = "dvc"; homepage = "https://dvc.org"; changelog = "https://github.com/iterative/dvc/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index cc22a3aad233..7090433431a9 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -17,13 +17,13 @@ , optuna , pandas , pillow -, pytestCheckHook +, psutil +, pynvml , pythonOlder , ruamel-yaml , scikit-learn , scmrepo , setuptools-scm -, tabulate , tensorflow , torch , transformers @@ -32,23 +32,23 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.42.0"; + version = "3.45.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "dvclive"; rev = "refs/tags/${version}"; - hash = "sha256-7MesRCfXr/f2MBokZhraFQqIuOyWCjIDRYZcvzM5Ezc="; + hash = "sha256-76PjBPr3m1y5osW024dkhuvuXl2FiZ5oxlJ1Ucq8msI="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dvc dvc-render dvc-studio-client @@ -56,6 +56,8 @@ buildPythonPackage rec { gto ruamel-yaml scmrepo + psutil + pynvml ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix index 1199f75c450d..18d76f8e6766 100644 --- a/pkgs/development/python-modules/easyocr/default.nix +++ b/pkgs/development/python-modules/easyocr/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ready-to-use OCR with 80+ supported languages and all popular writing scripts"; + mainProgram = "easyocr"; homepage = "https://github.com/JaidedAI/EasyOCR"; changelog = "https://github.com/JaidedAI/EasyOCR/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ebcdic/default.nix b/pkgs/development/python-modules/ebcdic/default.nix new file mode 100644 index 000000000000..430ebfe24c58 --- /dev/null +++ b/pkgs/development/python-modules/ebcdic/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ebcdic"; + version = "1.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "roskakori"; + repo = "CodecMapper"; + rev = "refs/tags/v${version}"; + hash = "sha256-gRyZychcF3wYocgVbdF255cSuZh/cl8X0WH/Iplkmxc="; + }; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/roskakori/CodecMapper/issues/18 + "test_can_lookup_ebcdic_codec" + "test_can_recode_euro_sign" + "test_has_codecs" + "test_has_ignored_codec_names" + ]; + + pythonImportsCheck = [ + "ebcdic" + ]; + + meta = with lib; { + description = "Additional EBCDIC codecs"; + homepage = "https://github.com/roskakori/CodecMapper/tree/master/ebcdic"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ed25519-blake2b/default.nix b/pkgs/development/python-modules/ed25519-blake2b/default.nix index 2783662ad2cf..1260261adf46 100644 --- a/pkgs/development/python-modules/ed25519-blake2b/default.nix +++ b/pkgs/development/python-modules/ed25519-blake2b/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ed25519 public-key signatures (BLAKE2b fork)"; + mainProgram = "edsig"; homepage = "https://github.com/Matoking/python-ed25519-blake2b"; changelog = "https://github.com/Matoking/python-ed25519-blake2b/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index 1ebfdcfc844d..7b2c20c39a04 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ed25519 public-key signatures"; + mainProgram = "edsig"; homepage = "https://github.com/warner/python-ed25519"; license = licenses.mit; maintainers = with maintainers; [ np ]; diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 0005a4cb2e63..33cf25b0305a 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, setuptools-scm , coreutils , jinja2 , pandas @@ -13,8 +15,8 @@ buildPythonPackage rec { pname = "edalize"; - version = "0.5.1"; - format = "setuptools"; + version = "0.5.4"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +24,7 @@ buildPythonPackage rec { owner = "olofk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-foq1CwIe86d+s7PlhLlGpnJCwrpOyr+uf5/RMLASSJU="; + hash = "sha256-pgyUpbSVRCHioJc82hZwG+JbpnL7t9ZvN4OcPHFsirs="; }; postPatch = '' @@ -31,6 +33,11 @@ buildPythonPackage rec { patchShebangs tests/mock_commands/vsim ''; + build-system = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ jinja2 ]; @@ -96,6 +103,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction library for interfacing EDA tools"; + mainProgram = "el_docker"; homepage = "https://github.com/olofk/edalize"; changelog = "https://github.com/olofk/edalize/releases/tag/v${version}"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix index 822eacc0843f..d7c55b265a45 100644 --- a/pkgs/development/python-modules/editdistance/default.nix +++ b/pkgs/development/python-modules/editdistance/default.nix @@ -2,14 +2,16 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, cython +, cython_3 +, pdm-backend +, setuptools , pythonOlder }: buildPythonPackage rec { pname = "editdistance"; - version = "0.6.2"; - format = "setuptools"; + version = "0.8.1"; + pyproject =true; disabled = pythonOlder "3.7"; @@ -17,19 +19,17 @@ buildPythonPackage rec { owner = "roy-ht"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-42PEK2KhR7rZLfNX9T45V6on+5CoINfKvntz/YQBJco="; + hash = "sha256-Ncdg8S/UHYqJ1uFnHk9qhHMM3Lrop00woSu3PLKvuBI="; }; nativeBuildInputs = [ - cython + cython_3 + pdm-backend + setuptools ]; - preBuild = '' - cythonize --inplace editdistance/bycython.pyx - ''; - nativeCheckInputs = [ - pytestCheckHook + pytestCheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/editdistpy/default.nix b/pkgs/development/python-modules/editdistpy/default.nix new file mode 100644 index 000000000000..a785e1b05b67 --- /dev/null +++ b/pkgs/development/python-modules/editdistpy/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, pytestCheckHook + +, pythonOlder + +, setuptools +, cython_3 + +, symspellpy +, numpy +, editdistpy +}: + +buildPythonPackage rec { + pname = "editdistpy"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mammothb"; + repo = "editdistpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-4CtKadKpFmlZnz10NG0404oFl9DkdQwWwRSWgUPdh94="; + }; + + build-system = [ + setuptools + cython_3 + ]; + + # error: infinite recursion encountered + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + symspellpy + numpy + ]; + + preCheck = '' + rm -r editdistpy + ''; + + passthru.tests = { + check = editdistpy.overridePythonAttrs ( + _: { + doCheck = true; + } + ); + }; + + pythonImportsCheck = [ + "editdistpy" + ]; + + meta = with lib; + { + description = "Fast Levenshtein and Damerau optimal string alignment algorithms"; + homepage = "https://github.com/mammothb/editdistpy"; + changelog = "https://github.com/mammothb/editdistpy/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/editor/default.nix b/pkgs/development/python-modules/editor/default.nix new file mode 100644 index 000000000000..3cbc44cc5dff --- /dev/null +++ b/pkgs/development/python-modules/editor/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, runs +, xmod +, pytestCheckHook +, tdir +}: + +buildPythonPackage rec { + pname = "editor"; + version = "1.6.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rec"; + repo = "editor"; + rev = "v${version}"; + hash = "sha256-FVtat3gUsK5Lv6XSkVXj0hY6NkMGw6LxRWMJrZ/cIis="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + runs + xmod + ]; + + nativeCheckInputs = [ + pytestCheckHook + tdir + ]; + + pythonImportsCheck = [ + "editor" + ]; + + meta = with lib; { + description = "Open the default text editor"; + homepage = "https://github.com/rec/editor"; + changelog = "https://github.com/rec/editor/blob/${src.rev}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index f55442b2f584..f074fcc4634a 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "EditorConfig File Locator and Interpreter for Python"; + mainProgram = "editorconfig"; homepage = "https://github.com/editorconfig/editorconfig-core-py"; license = licenses.psfl; maintainers = with maintainers; [ nickcao ]; diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index 006e096b44d1..5ce1552c519c 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool which computes a dependency graph between active Python eggs"; + mainProgram = "eggdeps"; homepage = "http://thomas-lotze.de/en/software/eggdeps/"; license = licenses.zpl20; }; diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix index f8645e795629..ac2acebc6f7f 100644 --- a/pkgs/development/python-modules/elastic-transport/default.nix +++ b/pkgs/development/python-modules/elastic-transport/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "elastic-transport"; - version = "8.10.0"; + version = "8.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "elastic-transport-python"; rev = "refs/tags/v${version}"; - hash = "sha256-4W9p9niHf2EMY+sS1RCdqWndzvpz8pKrIlLo3NxJ8mk="; + hash = "sha256-ZLzaCiopdkhpqjzZzv/NT1+f5bHZYuqQvSgM5jeMaqg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index f2e5a4b599a6..a89cb3f0a4c5 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "elasticsearch"; - version = "8.11.0"; + version = "8.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nghBO+r/Oka8EMbFcGmoRwTfaqqTCFxzffB/WKKBG3g="; + sha256 = "sha256-AMmXcg+9Dyr+VBfIGTz2XRFoF6AlDeBSHjDD6B8AuKw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 2362aa747c50..4bf4f45a29cb 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://eliot.readthedocs.io"; description = "Logging library that tells you why it happened"; + mainProgram = "eliot-prettyprint"; license = licenses.asl20; maintainers = with maintainers; [ dpausp ]; }; diff --git a/pkgs/development/python-modules/eliqonline/default.nix b/pkgs/development/python-modules/eliqonline/default.nix index b972d6addd25..3d3261071bbc 100644 --- a/pkgs/development/python-modules/eliqonline/default.nix +++ b/pkgs/development/python-modules/eliqonline/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client to the Eliq Online API"; + mainProgram = "eliqonline"; homepage = "https://github.com/molobrakos/eliqonline"; license = licenses.lgpl3Only; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix index 6391e86a5670..a538be01ae9d 100644 --- a/pkgs/development/python-modules/elmax/default.nix +++ b/pkgs/development/python-modules/elmax/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API client for the Elmax Cloud services"; + mainProgram = "poetry-template"; homepage = "https://github.com/home-assistant-ecosystem/python-elmax"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 0f176e45fd07..eea86196c229 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , dnspython -, fetchFromGitHub +, fetchPypi , idna , pytestCheckHook , pythonOlder @@ -9,16 +9,15 @@ buildPythonPackage rec { pname = "email-validator"; - version = "2.1.0"; + version = "2.1.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "JoshData"; - repo = "python-${pname}"; - rev = "refs/tags/v${version}"; - hash = "sha256-58DuQslADM7glrnlSSP6TtIDTlwuS0/GK8+izatqDxI="; + src = fetchPypi { + pname = "email_validator"; + inherit version; + hash = "sha256-IApwaAugiQS+bR7vcpIFzA1odjQ5mlkk2EJTPvuCS4Q="; }; propagatedBuildInputs = [ @@ -42,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Email syntax and deliverability validation library"; + mainProgram = "email_validator"; homepage = "https://github.com/JoshData/python-email-validator"; changelog = "https://github.com/JoshData/python-email-validator/releases/tag/v${version}"; license = licenses.cc0; diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix index ffae39669ad4..123e098efff7 100644 --- a/pkgs/development/python-modules/empy/default.nix +++ b/pkgs/development/python-modules/empy/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "http://www.alcyone.com/software/empy/"; description = "A templating system for Python."; + mainProgram = "em.py"; maintainers = with maintainers; [ nkalupahana ]; license = licenses.lgpl21Only; }; diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix index a06cb2b3f44a..c7be7ba9e7fa 100644 --- a/pkgs/development/python-modules/emv/default.nix +++ b/pkgs/development/python-modules/emv/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of the EMV chip-and-pin smartcard protocol"; + mainProgram = "emvtool"; homepage = "https://github.com/russss/python-emv"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/development/python-modules/energyflow/default.nix b/pkgs/development/python-modules/energyflow/default.nix index 5f89337f0de2..7308d0289023 100644 --- a/pkgs/development/python-modules/energyflow/default.nix +++ b/pkgs/development/python-modules/energyflow/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - pname = "EnergyFlow"; - version = "1.3.2"; + pname = "energyflow"; + version = "1.3.3"; src = fetchFromGitHub { owner = "pkomiske"; - repo = pname; - rev = "v${version}"; - hash = "sha256-fjT8c0ZTjdufP334upPzRVdTJDIBs84I7PkFu4CMcQw="; + repo = "EnergyFlow"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ioyk0IpyxcDdL2+3zkUa6yydavyphoh4do7GCz5nG60="; }; postPatch = '' diff --git a/pkgs/development/python-modules/enocean/default.nix b/pkgs/development/python-modules/enocean/default.nix index 02db2a696409..925c87ed3f8e 100644 --- a/pkgs/development/python-modules/enocean/default.nix +++ b/pkgs/development/python-modules/enocean/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "EnOcean serial protocol implementation"; + mainProgram = "enocean_example.py"; homepage = "https://github.com/kipe/enocean"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index ce1a07dda3f2..b22660efb6f6 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy access to environment variables from Python"; + mainProgram = "envs"; homepage = "https://github.com/capless/envs"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix index 76d14e191cac..09db4df764d6 100644 --- a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix +++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -37,6 +37,7 @@ buildPythonPackage { meta = with lib; { description = "Find an unused port, reliably"; + mainProgram = "ephemeral-port-reserve"; homepage = "https://github.com/Yelp/ephemeral-port-reserve/"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index 511f8d17ecbe..10fed495d6ea 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to remove commented-out code from Python files"; + mainProgram = "eradicate"; homepage = "https://github.com/myint/eradicate"; changelog = "https://github.com/wemake-services/eradicate/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/espeak-phonemizer/default.nix b/pkgs/development/python-modules/espeak-phonemizer/default.nix index 42eb17326921..5b9352905374 100644 --- a/pkgs/development/python-modules/espeak-phonemizer/default.nix +++ b/pkgs/development/python-modules/espeak-phonemizer/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/rhasspy/espeak-phonemizer/releases/tag/v${version}"; description = "Uses ctypes and libespeak-ng to transform test into IPA phonemes"; + mainProgram = "espeak-phonemizer"; homepage = "https://github.com/rhasspy/espeak-phonemizer"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/esprima/default.nix b/pkgs/development/python-modules/esprima/default.nix index 9f03e8a1e877..774288c69943 100644 --- a/pkgs/development/python-modules/esprima/default.nix +++ b/pkgs/development/python-modules/esprima/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser for standard-compliant ECMAScript"; + mainProgram = "esprima"; homepage = "https://github.com/Kronuz/esprima-python"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix index 4cc241430c47..f36128784dad 100644 --- a/pkgs/development/python-modules/ete3/default.nix +++ b/pkgs/development/python-modules/ete3/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python framework for the analysis and visualization of trees"; + mainProgram = "ete3"; homepage = "http://etetoolkit.org/"; license = licenses.gpl3Only; maintainers = with maintainers; [ delehef ]; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index b6990e50330f..fd1d034138e9 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-l7aP0l4YVoMhUobvOlTjgZm2JF9f6L5r7cEYm+QlY1A="; + hash = "sha256-+0ePV/7CAuJg5UyRkrMXaS/WPbLRHZk+cLzf+inMzVg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 659a2314d6dd..fd34a11241cf 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -3,29 +3,34 @@ , fetchPypi , linuxHeaders , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "evdev"; - version = "1.6.1"; - format = "setuptools"; + version = "1.7.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KZ24YozHOyN/wcxX08KUj6oHVuKli2GUtb+B3CCB8eM="; + hash = "sha256-lb0qHgxs4s16LsxubNlzb/eUs61ctU2B2MvC5BTQuHA="; }; - buildInputs = [ - linuxHeaders - ]; - patchPhase = '' substituteInPlace setup.py \ - --replace /usr/include/linux ${linuxHeaders}/include/linux + --replace-fail /usr/include ${linuxHeaders}/include ''; + build-system = [ + setuptools + ]; + + buildInputs = [ + linuxHeaders + ]; + doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/eventkit/default.nix b/pkgs/development/python-modules/eventkit/default.nix new file mode 100644 index 000000000000..f0bda6bf4d0f --- /dev/null +++ b/pkgs/development/python-modules/eventkit/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, lib +, fetchPypi +, numpy +}: +let + pname = "eventkit"; + version = "1.0.3"; + hash = "sha256-mUl/bzxjilD/dhby+M2Iexi7/zdl3BvYaBVU2xRnyTM="; +in buildPythonPackage { + inherit pname version; + + src = fetchPypi { + inherit pname version hash; + }; + + propagatedBuildInputs = [ numpy ]; + dontUseSetuptoolsCheck = true; + + meta = with lib; { + homepage = "https://github.com/erdewit/eventkit"; + description = "Event-driven data pipelines"; + license = licenses.bsd2; + maintainers = with maintainers; [ cab404 ]; + }; +} diff --git a/pkgs/development/python-modules/execnb/default.nix b/pkgs/development/python-modules/execnb/default.nix index ef915d912a91..56b1bf1388ed 100644 --- a/pkgs/development/python-modules/execnb/default.nix +++ b/pkgs/development/python-modules/execnb/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/fastai/execnb"; description = "Execute a jupyter notebook, fast, without needing jupyter"; + mainProgram = "exec_nb"; license = licenses.asl20; maintainers = with maintainers; [ rxiao ]; }; diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index c9500d6f278b..40d15a9fa594 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/xolox/python-executor/blob/${version}/CHANGELOG.rst"; description = "Programmer friendly subprocess wrapper"; + mainProgram = "executor"; homepage = "https://github.com/xolox/python-executor"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix index 6c2a1847782a..31edf9707eba 100644 --- a/pkgs/development/python-modules/exifread/default.nix +++ b/pkgs/development/python-modules/exifread/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy to use Python module to extract Exif metadata from tiff and jpeg files"; + mainProgram = "EXIF.py"; homepage = "https://github.com/ianare/exif-py"; license = licenses.bsd0; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix new file mode 100644 index 000000000000..592172fc3d25 --- /dev/null +++ b/pkgs/development/python-modules/extract-msg/default.nix @@ -0,0 +1,70 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, compressed-rtf +, ebcdic +, fetchFromGitHub +, olefile +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, red-black-tree-mod +, rtfde +, setuptools +, tzlocal +}: + +buildPythonPackage rec { + pname = "extract-msg"; + version = "0.48.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "TeamMsgExtractor"; + repo = "msg-extractor"; + rev = "refs/tags/v${version}"; + hash = "sha256-oN5blYU8LR2O1LEb6naL33UXjBk9xpINl4h6HSaN7PQ="; + }; + + pythonRelaxDeps = [ + "olefile" + "red-black-tree-mod" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + compressed-rtf + ebcdic + olefile + red-black-tree-mod + rtfde + tzlocal + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "extract_msg" + ]; + + pytestFlagsArray = [ + "extract_msg_tests/*.py" + ]; + + meta = with lib; { + description = "Extracts emails and attachments saved in Microsoft Outlook's .msg files"; + homepage = "https://github.com/TeamMsgExtractor/msg-extractor"; + changelog = "https://github.com/TeamMsgExtractor/msg-extractor/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 612ee8b84375..55027f8813c1 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -76,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Universal archive extractor using z7zip, libarchive, other libraries and the Python standard library"; + mainProgram = "extractcode"; homepage = "https://github.com/nexB/extractcode"; changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix index 64873c94d324..0673643de0db 100644 --- a/pkgs/development/python-modules/extruct/default.nix +++ b/pkgs/development/python-modules/extruct/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extract embedded metadata from HTML markup"; + mainProgram = "extruct"; homepage = "https://github.com/scrapinghub/extruct"; changelog = "https://github.com/scrapinghub/extruct/blob/v${version}/HISTORY.rst"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 9c29db7fa837..7717ba2601cd 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python module and command line program for processing ID3 tags"; + mainProgram = "eyeD3"; homepage = "https://eyed3.nicfit.net/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index e0c7b76d1e61..3619db37b812 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to read and write DXF drawings (interface to the DXF file format)"; + mainProgram = "ezdxf"; homepage = "https://github.com/mozman/ezdxf/"; license = licenses.mit; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/development/python-modules/f90nml/default.nix b/pkgs/development/python-modules/f90nml/default.nix index 2e9610bb353e..ad2d1c8c604d 100644 --- a/pkgs/development/python-modules/f90nml/default.nix +++ b/pkgs/development/python-modules/f90nml/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for working with Fortran Namelists"; + mainProgram = "f90nml"; homepage = "https://f90nml.readthedocs.io"; license = licenses.asl20; maintainers = with maintainers; [ loicreynier ]; diff --git a/pkgs/development/python-modules/fabric/default.nix b/pkgs/development/python-modules/fabric/default.nix index 04cc53f28b7d..3494c8951712 100644 --- a/pkgs/development/python-modules/fabric/default.nix +++ b/pkgs/development/python-modules/fabric/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic remote execution"; + mainProgram = "fab"; homepage = "https://www.fabfile.org/"; license = licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/development/python-modules/fairscale/default.nix b/pkgs/development/python-modules/fairscale/default.nix index 42a7da74f9bc..3041ac51de6a 100644 --- a/pkgs/development/python-modules/fairscale/default.nix +++ b/pkgs/development/python-modules/fairscale/default.nix @@ -64,6 +64,7 @@ buildPythonPackage { meta = with lib; { description = "PyTorch extensions for high performance and large scale training"; + mainProgram = "wgit"; homepage = "https://github.com/facebookresearch/fairscale"; changelog = "https://github.com/facebookresearch/fairscale/releases/tag/v${version}"; license = with licenses; [ mit asl20 bsd3 ]; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 3b087601453f..7e6d5c76cfb2 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fake-useragent"; - version = "1.5.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fake-useragent"; repo = "fake-useragent"; rev = "refs/tags/${version}"; - hash = "sha256-EzSofIHNwn7GPhnTNbo/451szB759w5T8poXj8XVNUU="; + hash = "sha256-BDXJJeT29GWkN9DoVl8sxXFpV/eMqu3mqlvMr2lzJM8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 68e0e4e3b5ea..ec667330a62b 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "faker"; - version = "20.1.0"; + version = "24.0.0"; pyproject = true; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-Vio6CcPtOhp7IOE9efkE39/F50D3KBPs+V5M9x5aL1I="; + hash = "sha256-6m94TEBzDeD3cGfknnjN1ZDvsAvsPTP1d0kiYiBsF/w="; }; nativeBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for generating fake user data"; + mainProgram = "faker"; homepage = "http://faker.rtfd.org"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index b0880c384dba..5dc0dd2e0b56 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -1,11 +1,12 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder , isPyPy , fetchFromGitHub # build -, cython +, cython_3 , setuptools # tests @@ -17,6 +18,7 @@ , orjson , pytest-asyncio , pytestCheckHook +, pytest_7 , pyyaml , rapidjson , requests @@ -28,7 +30,7 @@ buildPythonPackage rec { pname = "falcon"; - version = "3.1.1"; + version = "3.1.3"; format = "pyproject"; disabled = pythonOlder "3.5"; @@ -36,13 +38,13 @@ buildPythonPackage rec { owner = "falconry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5Lhz4qI/x7yK9tqQg4CvYNug+fp9l6ErNGH1pVybZ6c="; + hash = "sha256-7719gOM8WQVjODwOSo7HpH3HMFFeCGQQYBKktBAevig="; }; nativeBuildInputs = [ setuptools ] ++ lib.optionals (!isPyPy) [ - cython + cython_3 ]; __darwinAllowLocalNetworking = true; @@ -59,7 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ # https://github.com/falconry/falcon/blob/master/requirements/tests - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) pyyaml requests rapidjson @@ -88,6 +90,9 @@ buildPythonPackage rec { disabledTestPaths = [ # needs a running server "tests/asgi/test_asgi_servers.py" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # ModuleNotFoundError: No module named 'distutils' + "tests/asgi/test_cythonized_asgi.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index c1c5dbac14fe..6919123258da 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-1haWRuWK9WCgdR4geT2w3E95+CapBYDohGowUmnJ2H4="; + hash = "sha256-EE61RPantD1u9NNhyPRjoRkBifM3u16b0BC2aQC8UBA="; }; postPatch = '' @@ -78,6 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Security tools report parsers for Faraday"; + mainProgram = "faraday-plugins"; homepage = "https://github.com/infobyte/faraday_plugins"; changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; diff --git a/pkgs/development/python-modules/farm-haystack/default.nix b/pkgs/development/python-modules/farm-haystack/default.nix index efc68f4cb0ad..e090778735d3 100644 --- a/pkgs/development/python-modules/farm-haystack/default.nix +++ b/pkgs/development/python-modules/farm-haystack/default.nix @@ -91,14 +91,14 @@ buildPythonPackage rec { pname = "farm-haystack"; - version = "1.23.0"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "deepset-ai"; repo = "haystack"; rev = "refs/tags/v${version}"; - hash = "sha256-rZG7768kEV1fa9zyAu7DsXlX+2eV8FcDnEssGD2qvII="; + hash = "sha256-lAXzWnHpOBVjgleFTYqlZ34hmZkcrPJ/h1kk4iVVvec="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix index 81459a860488..ff8ac701cf27 100644 --- a/pkgs/development/python-modules/fastai/default.nix +++ b/pkgs/development/python-modules/fastai/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/fastai/fastai"; description = "The fastai deep learning library"; + mainProgram = "configure_accelerate"; changelog = "https://github.com/fastai/fastai/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ rxiao ]; diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix index bde53ac71325..3af37ecd587d 100644 --- a/pkgs/development/python-modules/fastapi-sso/default.nix +++ b/pkgs/development/python-modules/fastapi-sso/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fastapi-sso"; - version = "0.12.1"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tomasvotava"; repo = "fastapi-sso"; rev = "refs/tags/${version}"; - hash = "sha256-/Mt0pmZYsWp/n9YHCy/bFKUPzmoRFB0cHKCNxEfxMLs="; + hash = "sha256-7gBJ6Etb9X2mJzrWYpNGAl3NFoI1bz+PcGfUsMgRlN8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 74f816d9b8a6..67193638dd5a 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -38,16 +38,16 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.109.0"; + version = "0.110.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tiangolo"; - repo = pname; + repo = "fastapi"; rev = "refs/tags/${version}"; - hash = "sha256-iZBc0tYGmhQuOL/pdthhBYYnZhe+wEttoinePNAIgEs="; + hash = "sha256-OXWJ1PKJSJGzYNT8HHXvxMxjUtI4K6edpI+Z5B3TvhI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index f685d210b87b..fed754d72945 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -10,12 +10,13 @@ , python-dateutil , python-snappy , pythonOlder +, zlib-ng , zstandard }: buildPythonPackage rec { pname = "fastavro"; - version = "1.9.0"; + version = "1.9.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-10r12Ya+FKMgdOTmgYH1xb6vOXNLLw073VzCvo2x9kg="; + hash = "sha256-UWvNEi6vzQknUws+b7UCFUajMUJkfnQkfBeCR0XfqQY="; }; preBuild = '' @@ -55,7 +56,8 @@ buildPythonPackage rec { pandas pytestCheckHook python-dateutil - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + zlib-ng + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); # Fails with "AttributeError: module 'fastavro._read_py' has no attribute # 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676. @@ -68,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast read/write of AVRO files"; + mainProgram = "fastavro"; homepage = "https://github.com/fastavro/fastavro"; changelog = "https://github.com/fastavro/fastavro/blob/${version}/ChangeLog"; license = licenses.mit; diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index 0302770761ed..a2c8173fe42a 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "fastembed"; - version = "0.1.2"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "fastembed"; rev = "refs/tags/v${version}"; - hash = "sha256-FW85xeRcrPL3euXcQ3dS40SapimFgpWtRu6XiIzdzSM="; + hash = "sha256-ufgco5wPBG19GM99rZV7LKQqEzzCv24I8026SMz0CH4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix index 83c1fcaee866..5e18509e79fd 100644 --- a/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { meta = with lib; { description = "Makes entry_points specified in setup.py load more quickly"; + mainProgram = "fastep"; homepage = "https://github.com/ninjaaron/fast-entry_points"; license = licenses.bsd2; maintainers = with maintainers; [ nixy ]; diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 93edef365178..c5381986d1c9 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + dontUseSetuptoolsCheck = true; disabledTests = [ diff --git a/pkgs/development/python-modules/faust-cchardet/default.nix b/pkgs/development/python-modules/faust-cchardet/default.nix index 6ee8b07137ee..6a1c8ad2ed81 100644 --- a/pkgs/development/python-modules/faust-cchardet/default.nix +++ b/pkgs/development/python-modules/faust-cchardet/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = { changelog = "https://github.com/faust-streaming/cChardet/blob/${src.rev}/CHANGES.rst"; description = "High-speed universal character encoding detector"; + mainProgram = "cchardetect"; homepage = "https://github.com/faust-streaming/cChardet"; license = lib.licenses.mpl11; maintainers = with lib.maintainers; [ dotlambda ivan ]; diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 1b42710b16fc..0800994eb61d 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -34,6 +34,10 @@ buildPythonPackage rec { requests-mock ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "favicon" ]; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index b430b1a200a2..46e51c49bda1 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "feedgen"; - version = "0.9.0"; + version = "1.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0jl0b87l7v6c0f1nx6k81skjhdj5i11kmchdjls00mynpvdip0cf"; + sha256 = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo="; }; propagatedBuildInputs = [ python-dateutil lxml ]; diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 6d0f35e27887..fc3cad7892e3 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Run an ffmpeg command with progress"; + mainProgram = "ffmpeg-progress-yield"; homepage = "https://github.com/slhck/ffmpeg-progress-yield"; changelog = "https://github.com/slhck/ffmpeg-progress-yield/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/filecheck/default.nix b/pkgs/development/python-modules/filecheck/default.nix index 9d8c22756fb9..2ce3e7c1fe8a 100644 --- a/pkgs/development/python-modules/filecheck/default.nix +++ b/pkgs/development/python-modules/filecheck/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { homepage = "https://github.com/mull-project/FileCheck.py"; license = licenses.asl20; description = "Python port of LLVM's FileCheck, flexible pattern matching file verifier"; + mainProgram = "filecheck"; maintainers = with maintainers; [ yorickvp ]; }; } diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index f0d1caa25d27..b4479e61baa3 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Infer file type and MIME type of any file/buffer"; + mainProgram = "filetype"; homepage = "https://github.com/h2non/filetype.py"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/find-libpython/default.nix b/pkgs/development/python-modules/find-libpython/default.nix index 7a26be2b38ed..33dcb7e812a6 100644 --- a/pkgs/development/python-modules/find-libpython/default.nix +++ b/pkgs/development/python-modules/find-libpython/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Finds the libpython associated with your environment, wherever it may be hiding"; + mainProgram = "find_libpython"; changelog = "https://github.com/ktbarrett/find_libpython/releases/tag/v${version}"; homepage = "https://github.com/ktbarrett/find_libpython"; license = licenses.mit; diff --git a/pkgs/development/python-modules/findimports/default.nix b/pkgs/development/python-modules/findimports/default.nix index b809d7835d96..edd442729237 100644 --- a/pkgs/development/python-modules/findimports/default.nix +++ b/pkgs/development/python-modules/findimports/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for the analysis of Python import statements"; + mainProgram = "findimports"; homepage = "https://github.com/mgedmin/findimports"; changelog = "https://github.com/mgedmin/findimports/blob/${version}/CHANGES.rst"; license = with licenses; [ gpl2Only /* or */ gpl3Only ]; diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 7ada2d813dd4..a405ab3d6ec0 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -46,6 +46,7 @@ buildPythonPackage { meta = with lib; { description = "A utility to find python versions on your system"; + mainProgram = "findpython"; homepage = "https://github.com/frostming/findpython"; changelog = "https://github.com/frostming/findpython/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index a200ef7efac5..e19875296ff0 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -93,6 +93,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt"; description = "OGR's neat, nimble, no-nonsense API for Python"; + mainProgram = "fio"; homepage = "https://fiona.readthedocs.io/"; license = licenses.bsd3; maintainers = teams.geospatial.members; diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix index bc5a4d1dbdf7..5acd1ff48022 100644 --- a/pkgs/development/python-modules/firebase-messaging/default.nix +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -1,40 +1,35 @@ { lib +, async-timeout , buildPythonPackage -, fetchFromGitHub - -# build-system -, poetry-core - -# dependencies , cryptography +, fetchFromGitHub , http-ece +, poetry-core , protobuf +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder , requests - -# docs +, requests-mock , sphinx -, sphinxHook , sphinx-autodoc-typehints , sphinx-rtd-theme - -# tests -, async-timeout -, requests-mock -, pytest-asyncio -, pytest-mock -, pytestCheckHook +, sphinxHook }: buildPythonPackage rec { pname = "firebase-messaging"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "sdb9696"; repo = "firebase-messaging"; - rev = version; - hash = "sha256-e3Ny3pnAfOpNERvvtE/jqSDIsM+YwLq/hbw753QpJ6o="; + rev = "refs/tags/${version}"; + hash = "sha256-8e+S12ZMqAmK7OR7O45QsRa0UKQq6cngeaqz2ugi6iY="; }; outputs = [ @@ -75,9 +70,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A library to subscribe to GCM/FCM and receive notifications within a python application"; + description = "Library to subscribe to GCM/FCM and receive notifications within a python application"; homepage = "https://github.com/sdb9696/firebase-messaging"; - changelog = "https://github.com/sdb9696/firebase-messaging/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/sdb9696/firebase-messaging/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/fireflyalgorithm/default.nix b/pkgs/development/python-modules/fireflyalgorithm/default.nix index 38ddb6772a70..2a51a96f114f 100644 --- a/pkgs/development/python-modules/fireflyalgorithm/default.nix +++ b/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "An implementation of the stochastic nature-inspired algorithm for optimization"; + mainProgram = "firefly-algorithm"; homepage = "https://github.com/firefly-cpp/FireflyAlgorithm"; changelog = "https://github.com/firefly-cpp/FireflyAlgorithm/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/firetv/default.nix b/pkgs/development/python-modules/firetv/default.nix index 652f69033dde..71525fe802f7 100644 --- a/pkgs/development/python-modules/firetv/default.nix +++ b/pkgs/development/python-modules/firetv/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Communicate with an Amazon Fire TV device via ADB over a network"; + mainProgram = "firetv-server"; homepage = "https://github.com/happyleavesaoc/python-firetv/"; license = licenses.mit; maintainers = [ maintainers.makefu ]; diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 68c9895f2b90..3598500e37f5 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.3.10"; + version = "4.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-QXPIeOVrgcasrF48gMEz9Bg/Q0Qv2URVK9n0Aj9brOs="; + hash = "sha256-pk1MO1GXVHdEx8QffrD+Aga6Fnc2nOR5A90Iw8m3U70="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index fdc40c244303..9d1c889dda4c 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = "flask-marshmallow"; rev = "refs/tags/${version}"; - hash = "sha256-QoktZcyVJXkHr8fCVYt3ZkYq52nxCsZu+AgaDyrZHWs="; + hash = "sha256-GQLkt/CJf/QI8emvlW8xSRziGnncwfMSxBccW0Bb8I0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 9fab0385e463..e922b3d54341 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -3,7 +3,6 @@ , fetchPypi , pythonOlder , setuptools -, fetchpatch # extras: babel , babel @@ -37,18 +36,18 @@ # tests , argon2-cffi +, freezegun , mongoengine , mongomock , peewee , pony , pytestCheckHook -, python-dateutil , zxcvbn }: buildPythonPackage rec { pname = "flask-security-too"; - version = "5.3.3"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -56,19 +55,9 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - hash = "sha256-we2TquU28qP/ir4eE67J0Nlft/8IL8w7Ny3ypSE5cNk="; + hash = "sha256-dzVHHC5Lsh6rUC+cOyNEe/uHVTzkObhFffgSvFOfKoI="; }; - patches = [ - # https://github.com/Flask-Middleware/flask-security/pull/901 - (fetchpatch { - name = "fixes-for-py_webauthn-2.0.patch"; - url = "https://github.com/Flask-Middleware/flask-security/commit/5725f7021343567ec0b25c890e859f4e84c93ba6.patch"; - hash = "sha256-4EgwT4zRj0mh4ZaoZFz7H5KeiZ9zs+BY4siYm8DwMfU="; - excludes = [ "CHANGES.rst" ]; - }) - ]; - nativeBuildInputs = [ setuptools ]; @@ -109,13 +98,14 @@ buildPythonPackage rec { nativeCheckInputs = [ argon2-cffi + freezegun mongoengine mongomock peewee pony pytestCheckHook - python-dateutil zxcvbn + freezegun ] ++ passthru.optional-dependencies.babel ++ passthru.optional-dependencies.common diff --git a/pkgs/development/python-modules/flask-session-captcha/default.nix b/pkgs/development/python-modules/flask-session-captcha/default.nix index 8a71b99c1539..539fd49c613b 100644 --- a/pkgs/development/python-modules/flask-session-captcha/default.nix +++ b/pkgs/development/python-modules/flask-session-captcha/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage # build-system @@ -18,24 +17,16 @@ buildPythonPackage rec { pname = "flask-session-captcha"; - version = "1.3.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "Tethik"; repo = pname; - rev = "v${version}"; - hash = "sha256-V0f3mXCfqwH2l3OtJKOHGdrlKAFxs2ynqXvNve7Amkc="; + rev = "refs/tags/v${version}"; + hash = "sha256-0g8nnnmTfcb9VqrtJ6kkfCFm+AYVrPZNWUPNQSjVTgQ="; }; - patches = [ - (fetchpatch { - # https://github.com/Tethik/flask-session-captcha/pull/44 - url = "https://github.com/Tethik/flask-session-captcha/commit/3f79c22a71c60dd60e9df61b550cce641603dcb6.patch"; - hash = "sha256-MXsoSytBNbcg3HU6IWlvf2MgNUL78T5ToxKGv4YMtZw="; - }) - ]; - nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix index 45afea65a4a5..4f968505edaa 100644 --- a/pkgs/development/python-modules/flask-swagger/default.nix +++ b/pkgs/development/python-modules/flask-swagger/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { homepage = "https://github.com/gangverk/flask-swagger"; license = licenses.mit; description = "Extract swagger specs from your flask project"; + mainProgram = "flaskswagger"; maintainers = with maintainers; [ vanschelven ]; }; } diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 083cf33c88fd..8c60066b1975 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "flask"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ZIn1G7Nmbe9vMU4V8Z1QoYaaGa4OjJo2Qf/mbHfUJAM="; + hash = "sha256-giwD9LeZIEJQp+6Ese3cQGZTlTM5c9+53uv+Ql/vy30="; }; nativeBuildInputs = [ @@ -76,6 +76,7 @@ buildPythonPackage rec { changelog = "https://flask.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${replaceStrings [ "." ] [ "-" ] version}"; homepage = "https://flask.palletsprojects.com/"; description = "The Python micro framework for building web applications"; + mainProgram = "flask"; longDescription = '' Flask is a lightweight WSGI web application framework. It is designed to make getting started quick and easy, with the ability diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index b906ba9d4322..c7fc681955a3 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "flax"; - version = "0.7.5"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "google"; repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-NDah0ayQbiO1/sTU1DDf/crPq5oLTnSuosV7cFHlTM8="; + hash = "sha256-3UzMSJoKw+V1WLBJ+Zf7aF7CDNBsvWnRUfNgb3K4v1A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flet-core/default.nix b/pkgs/development/python-modules/flet-core/default.nix index 9b1a00107a67..99612c52b5ad 100644 --- a/pkgs/development/python-modules/flet-core/default.nix +++ b/pkgs/development/python-modules/flet-core/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, flet-client-flutter # build-system , poetry-core @@ -12,14 +12,10 @@ buildPythonPackage rec { pname = "flet-core"; - version = "0.20.2"; + inherit (flet-client-flutter) version src; pyproject = true; - src = fetchPypi { - pname = "flet_core"; - inherit version; - hash = "sha256-czkboJD/PjJA3F/z42qClErxNbQUgMt7QtbLd7yxhhw="; - }; + sourceRoot = "${src.name}/sdk/python/packages/flet-core"; nativeBuildInputs = [ poetry-core @@ -37,6 +33,6 @@ buildPythonPackage rec { description = "The library is the foundation of Flet framework and is not intended to be used directly"; homepage = "https://flet.dev/"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.heyimnova ]; + maintainers = with lib.maintainers; [ heyimnova lucasew ]; }; } diff --git a/pkgs/development/python-modules/flet-runtime/_setup_runtime.py b/pkgs/development/python-modules/flet-runtime/_setup_runtime.py new file mode 100644 index 000000000000..3a25fb7b959a --- /dev/null +++ b/pkgs/development/python-modules/flet-runtime/_setup_runtime.py @@ -0,0 +1,3 @@ +import os +if 'FLET_VIEW_PATH' not in os.environ: + os.environ["FLET_VIEW_PATH"] = "@flet-client-flutter@/bin" diff --git a/pkgs/development/python-modules/flet-runtime/default.nix b/pkgs/development/python-modules/flet-runtime/default.nix index 9e643fa81289..e2cae32ad418 100644 --- a/pkgs/development/python-modules/flet-runtime/default.nix +++ b/pkgs/development/python-modules/flet-runtime/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, flet-client-flutter , poetry-core , pythonRelaxDepsHook , flet-core @@ -10,14 +10,18 @@ buildPythonPackage rec { pname = "flet-runtime"; - version = "0.20.2"; + inherit (flet-client-flutter) version src; + pyproject = true; - src = fetchPypi { - pname = "flet_runtime"; - inherit version; - hash = "sha256-92gyaMME2R7k3AAFKsl7kIv8mVwi8pwQsGLD0ml82Q0="; - }; + sourceRoot = "${src.name}/sdk/python/packages/flet-runtime"; + + postPatch = '' + substitute ${./_setup_runtime.py} src/flet_runtime/_setup_runtime.py \ + --replace @flet-client-flutter@ ${flet-client-flutter} + + echo -e "import flet_runtime._setup_runtime\n$(cat src/flet_runtime/__init__.py)" > src/flet_runtime/__init__.py + ''; nativeBuildInputs = [ poetry-core @@ -43,6 +47,6 @@ buildPythonPackage rec { description = "A base package for Flet desktop and Flet mobile"; homepage = "https://flet.dev/"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.wegank ]; + maintainers = with lib.maintainers; [ lucasew wegank ]; }; } diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 961267915d4b..0dbed81022a6 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage -, fetchPypi +, flet-client-flutter , pythonRelaxDepsHook # build-system , poetry-core # propagates +, fastapi , flet-core , flet-runtime , httpx @@ -14,6 +15,7 @@ , packaging , qrcode , cookiecutter +, uvicorn , watchdog , websocket-client , websockets @@ -22,13 +24,11 @@ buildPythonPackage rec { pname = "flet"; - version = "0.20.2"; + inherit (flet-client-flutter) version src; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-3LhQI/hjenTxG/1DZP/zn2zs00rT5BviDAQYb2vucBM="; - }; + sourceRoot = "${src.name}/sdk/python/packages/flet"; nativeBuildInputs = [ poetry-core @@ -37,11 +37,15 @@ buildPythonPackage rec { pythonRelaxDeps = [ "websockets" + "cookiecutter" + "watchdog" ]; propagatedBuildInputs = [ + fastapi flet-core flet-runtime + uvicorn websocket-client watchdog oauthlib @@ -50,6 +54,8 @@ buildPythonPackage rec { packaging qrcode cookiecutter + fastapi + uvicorn ]; doCheck = false; @@ -63,7 +69,7 @@ buildPythonPackage rec { homepage = "https://flet.dev/"; changelog = "https://github.com/flet-dev/flet/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.heyimnova ]; + maintainers = with lib.maintainers; [ heyimnova lucasew ]; mainProgram = "flet"; }; } diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix index 43b865b9faa3..650573d73fc5 100644 --- a/pkgs/development/python-modules/flipr-api/default.nix +++ b/pkgs/development/python-modules/flipr-api/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for Flipr API"; + mainProgram = "flipr-api"; homepage = "https://github.com/cnico/flipr-api"; changelog = "https://github.com/cnico/flipr-api/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index a1be6821b2f7..a2e2ddfcdb7f 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/pypa/flit/blob/${version}/doc/history.rst"; description = "A simple packaging tool for simple packages"; + mainProgram = "flit"; homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 4dbce567c700..b3a57c134a12 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -6,6 +6,7 @@ , lz4 , msgpack , pytestCheckHook +, pytest_7 , pythonOlder , setuptools , setuptools-scm @@ -51,7 +52,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/flowlogs-reader/default.nix b/pkgs/development/python-modules/flowlogs-reader/default.nix index 41b1970ca780..7769bdcb427b 100644 --- a/pkgs/development/python-modules/flowlogs-reader/default.nix +++ b/pkgs/development/python-modules/flowlogs-reader/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier"; + mainProgram = "flowlogs_reader"; homepage = "https://github.com/obsrvbl/flowlogs-reader"; license = licenses.asl20; maintainers = with maintainers; [ cransom ]; diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index 2afef24b9b1c..8d9610d2d448 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -1,24 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, msgpack }: +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, hatchling + +# dependencies +, msgpack + +# tests +, pytestCheckHook, +}: buildPythonPackage rec { pname = "fluent-logger"; - version = "0.10.0"; - format = "setuptools"; + version = "0.11.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "678bda90c513ff0393964b64544ce41ef25669d2089ce6c3b63d9a18554b9bfa"; + src = fetchFromGitHub { + owner = "fluent"; + repo = "fluent-logger-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-PfyjJZT5K/IMsyyWNZdh/CZf+uZHeJGfhyAPuu0IhJk="; }; - prePatch = '' - substituteInPlace setup.py \ - --replace "msgpack<1.0.0" "msgpack" - ''; + build-system = [ + hatchling + ]; - propagatedBuildInputs = [ msgpack ]; + dependencies = [ + msgpack + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; - # Tests fail because absent in package - doCheck = false; pythonImportsCheck = [ "fluent" "fluent.event" diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 252c602f9371..d33e21a43a24 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to communicate with the flux_led smart bulbs"; + mainProgram = "flux_led"; homepage = "https://github.com/Danielhiversen/flux_led"; changelog = "https://github.com/Danielhiversen/flux_led/releases/tag/${version}"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/flynt/default.nix b/pkgs/development/python-modules/flynt/default.nix index ab513e09c63a..0e0b73d20f4e 100644 --- a/pkgs/development/python-modules/flynt/default.nix +++ b/pkgs/development/python-modules/flynt/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "command line tool to automatically convert a project's Python code from old format style strings into Python 3.6+'s f-strings"; + mainProgram = "flynt"; homepage = "https://github.com/ikamensh/flynt"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 3efaaa38cbe1..9c2df4de6322 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "folium"; - version = "0.15.1"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - hash = "sha256-CHPHxp8xEZhEEMLvhs/xAiOr2Hw6B+5svFNY+QvQa+U="; + hash = "sha256-ADDqjZUQVI4K/Bf38905g1K9TD2/e1RYvYWddvFtdrU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix index 9ff5bc1c351b..09ed7270ebd3 100644 --- a/pkgs/development/python-modules/font-v/default.nix +++ b/pkgs/development/python-modules/font-v/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python utility for manipulating font version headers"; + mainProgram = "font-v"; homepage = "https://github.com/source-foundry/font-v"; license = licenses.mit; maintainers = with maintainers; [ danc86 ]; diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index 3d1a2331e5e8..15404df86d81 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -44,12 +44,12 @@ buildPythonPackage rec { pname = "fontbakery"; - version = "0.10.4"; + version = "0.11.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Ye/TMGvURxSU2yoohwYbSo5RvrmbHKdMnFNj2lUvtMk="; + hash = "sha256-61EXlf+d5kJeUF41OEnGNLaOcSvFWUDFgarVvHQZYmw="; }; patches = [ diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 2269e18c32a9..7911750bbeeb 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "fontmake"; - version = "3.7.1"; + version = "3.8.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Nb09/BRPR0H3rHrbDIhcrgOyJp55KCIdPvUr/vh2Z0U="; + hash = "sha256-m0cRLm9Jbqlsf9NwR7Lma2NZYUjy5IDJYOorVbdLDuw="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index e07ab3c0d953..6d48088a2660 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -4,6 +4,7 @@ , pythonOlder , isPyPy , fetchFromGitHub +, setuptools , setuptools-scm , fs , lxml @@ -14,38 +15,43 @@ , lz4 , scipy , munkres +, pycairo , matplotlib , sympy , xattr , skia-pathops , uharfbuzz , pytestCheckHook +, pytest_7 }: buildPythonPackage rec { pname = "fonttools"; - version = "4.46.0"; - format = "setuptools"; + version = "4.49.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QpC1OWpqhJpzS59OG8A/nndWDoeYyAFUTIcsppLzM8Y="; + hash = "sha256-8xQVuAnIS/mwYKwI+ow0YArIP8wFTKWGLZ+NCgIFYok="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - passthru.optional-dependencies = let + optional-dependencies = let extras = { ufo = [ fs ]; lxml = [ lxml ]; woff = [ (if isPyPy then brotlicffi else brotli) zopfli ]; unicode = lib.optional (pythonOlder "3.11") unicodedata2; graphite = [ lz4 ]; - interpolatable = [ (if isPyPy then munkres else scipy) ]; + interpolatable = [ pycairo (if isPyPy then munkres else scipy) ]; plot = [ matplotlib ]; symfont = [ sympy ]; type1 = lib.optional stdenv.isDarwin xattr; @@ -57,7 +63,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytestCheckHook + # test suite fails with pytest>=8.0.1 + # https://github.com/fonttools/fonttools/issues/3458 + (pytestCheckHook.override { pytest = pytest_7; }) ] ++ lib.concatLists (lib.attrVals ([ "woff" # "interpolatable" is not included because it only contains 2 tests at the time of writing but adds 270 extra dependencies @@ -66,7 +74,7 @@ buildPythonPackage rec { "pathops" # broken ] ++ [ "repacker" - ]) passthru.optional-dependencies); + ]) optional-dependencies); pythonImportsCheck = [ "fontTools" ]; @@ -89,11 +97,17 @@ buildPythonPackage rec { "Tests/misc/plistlib_test.py" "Tests/pens" "Tests/ufoLib" + + # test suite fails with pytest>=8.0.1 + # https://github.com/fonttools/fonttools/issues/3458 + "Tests/ttLib/woff2_test.py" + "Tests/ttx/ttx_test.py" ]; meta = with lib; { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; + changelog = "https://github.com/fonttools/fonttools/blob/${version}/NEWS.rst"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; }; diff --git a/pkgs/development/python-modules/fordpass/default.nix b/pkgs/development/python-modules/fordpass/default.nix index f5a4ea3b0d43..3ddef9d172c3 100644 --- a/pkgs/development/python-modules/fordpass/default.nix +++ b/pkgs/development/python-modules/fordpass/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the FordPass API"; + mainProgram = "demo.py"; homepage = "https://github.com/clarkd/fordpass-python"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix index 418cd3d958cd..7f825cb251e3 100644 --- a/pkgs/development/python-modules/formbox/default.nix +++ b/pkgs/development/python-modules/formbox/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "A script to format mbox as HTML/XML"; + mainProgram = "formbox"; homepage = "https://trong.loang.net/~cnx/formbox"; license = licenses.agpl3Plus; maintainers = [ maintainers.McSinyx ]; diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix index d8b6088124d4..02dcfd0fbd6e 100644 --- a/pkgs/development/python-modules/formulae/default.nix +++ b/pkgs/development/python-modules/formulae/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , setuptools +, setuptools-scm , pytestCheckHook , numpy , pandas @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "formulae"; - version = "0.5.1"; + version = "0.5.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,10 +21,13 @@ buildPythonPackage rec { owner = "bambinos"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nmqGdXqsesRhR06FDS5t64C6+Bz1B97W+PkHrfV7Qmg="; + hash = "sha256-A0CI0bpoRYFAcPiNAf5haQu9BEqmBgxF7HfIl4qcML0="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index 4b606f277249..7b989e3e3608 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Live coding music with SuperCollider"; + mainProgram = "FoxDot"; homepage = "https://foxdot.org/"; license = licenses.cc-by-sa-40; maintainers = with maintainers; [ mrmebelman ]; diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix index 292478ea2557..fdd43f1ca5c8 100644 --- a/pkgs/development/python-modules/fpdf2/default.nix +++ b/pkgs/development/python-modules/fpdf2/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "fpdf2"; - version = "2.7.7"; + version = "2.7.8"; pyproject = true; src = fetchFromGitHub { owner = "py-pdf"; repo = "fpdf2"; - rev = version; - hash = "sha256-6B68kwxAW3cHpwMTDhj3C4zEOR6o6USqpSXB7uxcEXs="; + rev = "refs/tags/${version}"; + hash = "sha256-6aedXr8Yhes1aYIslBvw2HzRc4BwYDIiGJvEdp1tFSc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 97abc4562fe6..54d3d8f34f79 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , buildPythonPackage +, fetchpatch # build-system , cysignals @@ -30,6 +31,13 @@ buildPythonPackage rec { hash = "sha256-M3ZnDL0Ui3UAa5Jn/Wr5pAHhghP7EAaQD/sx5QZ58ZQ="; }; + patches = [ + (fetchpatch { + url = "https://github.com/fplll/fpylll/commit/fc432b21fa7e4b9891f5b761b3539989eb958f2b.diff"; + hash = "sha256-+UidQ5xnlmjeVeVvR4J2zDzAuXP5LUPXCh4RP4o9oGA="; + }) + ]; + nativeBuildInputs = [ cython_3 cysignals diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index 4758712f0fb4..cb56a789deda 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with the Freebox OS API"; + mainProgram = "freebox_api"; homepage = "https://github.com/hacf-fr/freebox-api"; changelog = "https://github.com/hacf-fr/freebox-api/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index e8c564a477ba..2279e70ada6a 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "freezegun"; - version = "1.3.1"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SJhDl7O1jvXfxkXWowSwBg9hK87P2q9Fzor/AHemy2o="; + hash = "sha256-EJObC6D/Wtrs87BqXC9zBx2WeOUHxertsjx2HVasd0s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/frozenlist2/default.nix b/pkgs/development/python-modules/frozenlist2/default.nix new file mode 100644 index 000000000000..2cbac731c577 --- /dev/null +++ b/pkgs/development/python-modules/frozenlist2/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, setuptools +}: + +buildPythonPackage rec { + pname = "frozenlist2"; + version = "1.0.0"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "rohanpm"; + repo = "frozenlist2"; + rev = "v${version}"; + hash = "sha256-fF0oFZ2q1wRH7IKBlCjm3Za4xtEMSHyEaGL09rHgtTY="; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ "frozenlist2" ]; + + meta = with lib; { + description = "An immutable list for Python"; + homepage = "https://github.com/rohanpm/frozenlist2"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index a90fe66a48cc..648879ec85cb 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2023.10.0"; + version = "2024.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; rev = "refs/tags/${version}"; - hash = "sha256-cLkCQQbb/AakDSz1NTrVlHh8LdgoqtjX8OPT+Nb1NA4="; + hash = "sha256-C+47BcIELZTEARXW8fAMHMjyKUWxU1tNKWGoPPtt/fQ="; }; propagatedBuildInputs = [ @@ -126,6 +126,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + __darwinAllowLocalNetworking = true; disabledTests = [ @@ -144,6 +148,8 @@ buildPythonPackage rec { # this two tests however, assume nanosecond resolution "test_modified" "test_touch" + # tries to access /home, ignores $HOME + "test_directories" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index f0a096ae87d9..36469c4ea82a 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Given Unicode text, make its representation consistent and possibly less broken"; + mainProgram = "ftfy"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; license = licenses.mit; maintainers = with maintainers; [ aborsu ]; diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index 389c3b3f1278..57cf42f38ab5 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/asottile/future-fstrings"; description = "A backport of fstrings to python<3.6"; + mainProgram = "future-fstrings-show"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; broken = pythonOlder "3.6"; # dependency tokenize-rt not packaged diff --git a/pkgs/development/python-modules/future-typing/default.nix b/pkgs/development/python-modules/future-typing/default.nix index e2c9a76c6920..04d4af30e07a 100644 --- a/pkgs/development/python-modules/future-typing/default.nix +++ b/pkgs/development/python-modules/future-typing/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use generic type hints and new union syntax `|` with python 3.6+"; + mainProgram = "future_typing"; homepage = "https://github.com/PrettyWood/future-typing"; license = licenses.mit; maintainers = with maintainers; [ kfollesdal ]; diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index 7c6c21d4d356..cc54a7744292 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch # build-system , setuptools @@ -9,25 +8,14 @@ buildPythonPackage rec { pname = "future"; - version = "0.18.3"; + version = "1.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-NKF0Nu0elml6hvnePRWjsL4B2LyN6cHf/Vn7gjTtUwc="; + hash = "sha256-vSloMJMHhh7a4UWKT4pPNZjAO+Q7l1IQdq6/XZTAewU="; }; - patches = [ - (fetchpatch { - url = "https://github.com/PythonCharmers/python-future/commit/1901c1c347bcad603e8404b64656994eb2cc0439.patch"; - hash = "sha256-wUSWVs7+KTsTmEM4OkpViAjDGWqx5h0SLPIacMZCpWU="; - excludes = [ - "build.sh" - "docs/whatsnew.rst" - ]; - }) - ]; - nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/fvs/default.nix b/pkgs/development/python-modules/fvs/default.nix index 2f075f4be8f0..8a8df6b325ac 100644 --- a/pkgs/development/python-modules/fvs/default.nix +++ b/pkgs/development/python-modules/fvs/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "File Versioning System with hash comparison and data storage to create unlinked states that can be deleted"; + mainProgram = "fvs"; homepage = "https://github.com/mirkobrombin/FVS"; license = licenses.mit; maintainers = with maintainers; [ bryanasdev000 ]; diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 6991c3f4ab1b..3fa79dbe3f1c 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Chip support package for Cypress EZ-USB FX2 series microcontrollers"; + mainProgram = "fx2tool"; homepage = "https://github.com/whitequark/libfx2"; license = licenses.bsd0; maintainers = with maintainers; [ emily ]; diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index 52428bc3c4eb..479d51683023 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.11.3"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NpmNIwZqvWAJDkUEb6+GpfQaRCVtjQk4odkaOd2D2ok="; + hash = "sha256-x4CVY2i/SCjq/c1Xfx3gdx7jTims1aKd05ziN4DdE1g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 42363ecdcdd4..3e039ec5aac9 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.13"; + version = "0.2.15"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-9At9v+7jOt43qPOhZpFYBEXA2zUfp8MAGO4/676kcBU="; + hash = "sha256-N6PJLsT8BnjGaOLeohDo3ACOyVb/iOCw3LAXZMjwoyw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index f6612811a692..c3e6bae9ed42 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.44"; + version = "0.4.45"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-CgLWstmhWXI2w6KBSpIGp8G1smWAKXC0goHKw3I9rJ4="; + hash = "sha256-dN4WQZ2FLkyqCGYFBICodHR7yBdrLvx4NE6OqB0SgZo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gassist-text/default.nix b/pkgs/development/python-modules/gassist-text/default.nix index b413c19d4093..a8e7b14de892 100644 --- a/pkgs/development/python-modules/gassist-text/default.nix +++ b/pkgs/development/python-modules/gassist-text/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gassist-text"; - version = "0.0.10"; + version = "0.0.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "gassist_text"; rev = "refs/tags/${version}"; - hash = "sha256-BSMflCSYNAaQVTOqKWyr9U9Q70ley1jjF6ndOVum+GA="; + hash = "sha256-XFHyI48TuPBJjHA4dLSpYv62Y5zK0knrIqNKBoWnEeU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gatt/default.nix b/pkgs/development/python-modules/gatt/default.nix index ae43ba4c5215..9543aa6a5e04 100644 --- a/pkgs/development/python-modules/gatt/default.nix +++ b/pkgs/development/python-modules/gatt/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bluetooth (Generic Attribute Profile) GATT SDK for Python"; + mainProgram = "gattctl"; homepage = "https://github.com/getsenic/gatt-python/"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/gawd/default.nix b/pkgs/development/python-modules/gawd/default.nix index c5a8eb964067..3fee09a5d5b5 100644 --- a/pkgs/development/python-modules/gawd/default.nix +++ b/pkgs/development/python-modules/gawd/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = { changelog = "https://github.com/pooya-rostami/gawd/releases/tag/${version}"; description = "Gawd is a Python library and command-line tool for computing syntactic differences between two GitHub Actions workflow files"; + mainProgram = "gawd"; homepage = "https://github.com/pooya-rostami/gawd"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ drupol ]; diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 81fe8ae04295..7b8b32b2c5de 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -1,28 +1,33 @@ { lib , buildPythonPackage , fetchPypi +, colorlog , jinja2 , lxml , pygments , pythonOlder +, tomli }: buildPythonPackage rec { pname = "gcovr"; - version = "6.0"; + version = "7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hjjV9E3vEOOOMWbIozvvZkPsIEaH4Kx9NFzkGpjFdQs="; + hash = "sha256-4+lctWyojbvnQctdaaor5JTrL8KgnuT2UWRKZw7lrrM="; }; propagatedBuildInputs = [ + colorlog jinja2 lxml pygments + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; # There are no unit tests in the pypi tarball. Most of the unit tests on the @@ -32,12 +37,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "gcovr" - "gcovr.workers" "gcovr.configuration" ]; meta = with lib; { description = "Python script for summarizing gcov data"; + mainProgram = "gcovr"; homepage = "https://www.gcovr.com/"; changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; license = licenses.bsd0; diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 04af8e58ef79..71d52947b0c4 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2023.4.0"; + version = "2024.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FHS+g0SuYH9OPiE/+p2SHrsWfzBQ82GM6hTph8koh+o="; + hash = "sha256-6O09lP2cWLzeMTBathb3O/tVGZPEHSqujfUPWZIBUJI="; }; propagatedBuildInputs = [ @@ -50,11 +50,18 @@ buildPythonPackage rec { vcrpy ]; + disabledTests =[ + # Cannot connect to host storage.googleapis.com:443 + "test_credentials_from_raw_token" + ]; + disabledTestPaths = [ # Tests require a running Docker instance "gcsfs/tests/test_core.py" "gcsfs/tests/test_mapping.py" "gcsfs/tests/test_retry.py" + "gcsfs/tests/derived/gcsfs_test.py" + "gcsfs/tests/test_inventory_report_listing.py" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 0fe18c1a96de..1b0b3aa70b92 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -2,6 +2,9 @@ , beautifulsoup4 , buildPythonPackage , fetchPypi +, hatchling +, hatch-vcs +, hatch-fancy-pypi-readme , filelock , requests , tqdm @@ -12,16 +15,22 @@ buildPythonPackage rec { pname = "gdown"; - version = "4.7.3"; - format = "setuptools"; + version = "5.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N+3DoO3aGn/l68xjHDqtBhJYJ2ZGBjDuUvSBuh7Hrv4="; + hash = "sha256-VQpy3FyigZ/kvMFdgNBdfJjAuQ5XJWJUt30CVrnfRoM="; }; + build-system = [ + hatchling + hatch-vcs + hatch-fancy-pypi-readme + ]; + propagatedBuildInputs = [ beautifulsoup4 filelock @@ -41,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "A CLI tool for downloading large files from Google Drive"; + mainProgram = "gdown"; homepage = "https://github.com/wkentaro/gdown"; changelog = "https://github.com/wkentaro/gdown/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 3cbc255ec7a0..62fca9823a12 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for GE smart appliances"; + mainProgram = "gehome-appliance-data"; homepage = "https://github.com/simbaja/gehome"; changelog = "https://github.com/simbaja/gehome/blob/master/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix index 5a6f76d720bc..e6b91d24f804 100644 --- a/pkgs/development/python-modules/gemfileparser/default.nix +++ b/pkgs/development/python-modules/gemfileparser/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to parse Ruby Gemfile, .gemspec and Cocoapod .podspec file using Python"; + mainProgram = "parsegemfile"; homepage = "https://github.com/gemfileparser/gemfileparser"; license = with licenses; [ gpl3Plus /* or */ mit ]; maintainers = [ ]; diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix index b7a2cc1d64a7..7ab4c747f21d 100644 --- a/pkgs/development/python-modules/genzshcomp/default.nix +++ b/pkgs/development/python-modules/genzshcomp/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically generated zsh completion function for Python's option parser modules"; + mainProgram = "genzshcomp"; homepage = "https://bitbucket.org/hhatto/genzshcomp/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/geoip/default.nix b/pkgs/development/python-modules/geoip/default.nix index f1e84bd8c3be..6f66b3d67e1f 100644 --- a/pkgs/development/python-modules/geoip/default.nix +++ b/pkgs/development/python-modules/geoip/default.nix @@ -1,15 +1,14 @@ -{lib, buildPythonPackage, fetchPypi -, libgeoip, nose}: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, libgeoip +}: buildPythonPackage rec { pname = "geoip"; version = "1.3.2"; - format = "setuptools"; - - nativeCheckInputs = [ nose ]; - propagatedBuildInputs = [ - libgeoip - ]; + pyproject = true; src = fetchPypi { pname = "GeoIP"; @@ -17,9 +16,17 @@ buildPythonPackage rec { sha256 = "1rphxf3vrn8wywjgr397f49s0s22m83lpwcq45lm0h2p45mdm458"; }; + build-system = [ + setuptools + ]; + + propagatedBuildInputs = [ + libgeoip + ]; + # Tests cannot be run because they require data that isn't included in the # release tarball. - checkPhase = "true"; + doCheck = false; meta = { description = "MaxMind GeoIP Legacy Database - Python API"; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index dea210a9a6cc..4a0bec9476e8 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -2,6 +2,8 @@ , aiohttp , buildPythonPackage , fetchPypi +, setuptools +, setuptools-scm , maxminddb , mocket , pytestCheckHook @@ -14,16 +16,21 @@ buildPythonPackage rec { pname = "geoip2"; - version = "4.7.0"; - format = "setuptools"; + version = "4.8.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-O93kmU9ryRfq+rW1Hnctc3sq4AA3pbhQAfsG3Gj3ed8="; + hash = "sha256-3ZzBgLfUFyQkDqSB1dU5FJ5lsjT2QoKyMbkXB5SprDU="; }; + build-system = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ aiohttp maxminddb diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix index 0f9742c34381..622027f8aff7 100644 --- a/pkgs/development/python-modules/geomet/default.nix +++ b/pkgs/development/python-modules/geomet/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary) and vice versa"; + mainProgram = "geomet"; homepage = "https://github.com/geomet/geomet"; changelog = "https://github.com/geomet/geomet/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 3178b959475a..becd876ee860 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Geometry optimization code for molecular structures"; + mainProgram = "geometric-optimize"; homepage = "https://github.com/leeping/geomeTRIC"; license = [ licenses.bsd3 ]; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/python-modules/gerbonara/default.nix b/pkgs/development/python-modules/gerbonara/default.nix index 2e79e8aa3d43..15ec60ccc385 100644 --- a/pkgs/development/python-modules/gerbonara/default.nix +++ b/pkgs/development/python-modules/gerbonara/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic library for reading/modifying/writing Gerber/Excellon/IPC-356 files"; + mainProgram = "gerbonara"; homepage = "https://github.com/jaseg/gerbonara"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ wulfsta ]; diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 0340642417c4..a62f47c2ece5 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to get the MAC address of network interfaces and hosts on the local network"; + mainProgram = "getmac"; homepage = "https://github.com/GhostofGoes/getmac"; changelog = "https://github.com/GhostofGoes/getmac/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 0863a52d003d..d6264794a505 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "gevent"; - version = "23.9.1"; + version = "24.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-csACI1OQ1G+Uk4qWkg2IVtT/2d32KjA6DXwRiJQJfjQ="; + hash = "sha256-Qy/Hb2gKz3zxiMLuD106tztjwfAxFMfNijTOu+WqIFY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix index 626495ed6f77..2e1e2ab36fde 100644 --- a/pkgs/development/python-modules/gflanguages/default.nix +++ b/pkgs/development/python-modules/gflanguages/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gflanguages"; - version = "0.5.13"; + version = "5.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LoppJHzX0dOpHnwMCyS1ACdIO4cqwb370ksvsXDFHzQ="; + hash = "sha256-AGXpg9EhwdhrcbdcHqz2v9TLaWH1F5gr0QhSuEN2GDA="; }; # Relax the dependency on protobuf 3. Other packages in the Google Fonts diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index b4a5e584ed52..4bcde153ba32 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { homepage = "https://github.com/kilink/ghdiff"; license = licenses.mit; description = "Generate Github-style HTML for unified diffs."; + mainProgram = "ghdiff"; maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/python-modules/ghp-import/default.nix b/pkgs/development/python-modules/ghp-import/default.nix index 956b1098e33f..8d7ec98b13c7 100644 --- a/pkgs/development/python-modules/ghp-import/default.nix +++ b/pkgs/development/python-modules/ghp-import/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Copy your docs directly to the gh-pages branch"; + mainProgram = "ghp-import"; homepage = "https://github.com/c-w/ghp-import"; license = licenses.asl20; maintainers = with maintainers; [ veehaitch ]; diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix index c7f3c0d52cda..18bd6124b152 100644 --- a/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/pkgs/development/python-modules/ghrepo-stats/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module and CLI tool for GitHub repo statistics"; + mainProgram = "show-ghstats"; homepage = "https://github.com/mrbean-bremen/ghrepo-stats"; changelog = "https://github.com/mrbean-bremen/ghrepo-stats/blob/v${version}/CHANGES.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix index c1ac1a5148b8..b9d06fc34cce 100644 --- a/pkgs/development/python-modules/gibberish-detector/default.nix +++ b/pkgs/development/python-modules/gibberish-detector/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to detect gibberish strings"; + mainProgram = "gibberish-detector"; homepage = "https://github.com/domanchi/gibberish-detector"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix index 5f4fede287d1..fa0fa0148b8d 100644 --- a/pkgs/development/python-modules/git-filter-repo/default.nix +++ b/pkgs/development/python-modules/git-filter-repo/default.nix @@ -1,15 +1,19 @@ { lib , buildPythonPackage -, fetchpatch +, fetchFromGitHub , fetchPypi +, fetchpatch +, installShellFiles , pythonOlder , setuptools-scm +, writeScript }: buildPythonPackage rec { pname = "git-filter-repo"; version = "2.38.0"; - format = "setuptools"; + docs_version = "01ead411966a83dfcfb35f9d2e8a9f7f215eaa65"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -18,6 +22,13 @@ buildPythonPackage rec { hash = "sha256-/hdT4Y8L1tPJtXhoyAEa59BWpuurcGcGOWoV71MScl4="; }; + docs = fetchFromGitHub { + owner = "newren"; + repo = "git-filter-repo"; + rev = docs_version; + hash = "sha256-Z/3w3Rguo8sfuc/OQ25eFbMfiOHjxQqPY6S32zuvoY4="; + }; + patches = [ # https://github.com/newren/git-filter-repo/pull/498 (fetchpatch { @@ -28,8 +39,13 @@ buildPythonPackage rec { }) ]; + postInstall = '' + installManPage ${docs}/man1/git-filter-repo.1 + ''; + nativeBuildInputs = [ setuptools-scm + installShellFiles ]; # Project has no tests @@ -41,8 +57,23 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly rewrite git repository history"; + mainProgram = "git-filter-repo"; homepage = "https://github.com/newren/git-filter-repo"; license = with licenses; [ mit /* or */ gpl2Plus ]; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ aiotter fab ]; }; + + passthru.updateScript = writeScript "update-${pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl jq nix-update + + set -eu -o pipefail + + # Update program + nix-update ${pname} + + # Update docs + docs_latest=$(curl -s https://api.github.com/repos/newren/git-filter-repo/commits/heads/docs/status | jq -r '.sha') + [[ "${docs_version}" = "$docs_latest" ]] || update-source-version ${pname} "$docs_latest" --version-key=docs_version --source-key=docs + ''; } diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index 5f1879638d1c..f64e4afa61ad 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { homepage = "https://github.com/mystor/git-revise"; changelog = "https://github.com/mystor/git-revise/blob/${version}/CHANGELOG.md"; license = licenses.mit; + mainProgram = "git-revise"; maintainers = with maintainers; [ emily ]; }; } diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix index 0f223b03760a..ac18f2604f83 100644 --- a/pkgs/development/python-modules/git-sweep/default.nix +++ b/pkgs/development/python-modules/git-sweep/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A command-line tool that helps you clean up Git branches"; + mainProgram = "git-sweep"; homepage = "https://github.com/arc90/git-sweep"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/python-modules/github-to-sqlite/default.nix b/pkgs/development/python-modules/github-to-sqlite/default.nix index 0dfeb4244939..67ec970bda7b 100644 --- a/pkgs/development/python-modules/github-to-sqlite/default.nix +++ b/pkgs/development/python-modules/github-to-sqlite/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Save data from GitHub to a SQLite database"; + mainProgram = "github-to-sqlite"; homepage = "https://github.com/dogsheep/github-to-sqlite"; license = licenses.asl20; maintainers = with maintainers; [ sarcasticadmin ]; diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 50ec8128885c..ad737eb7b3bc 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -7,6 +7,7 @@ , poetry-core , pydantic , pyjwt +, pytest-xdist , pytestCheckHook , pythonOlder , pythonRelaxDepsHook @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.11.1"; + version = "0.11.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; rev = "refs/tags/v${version}"; - hash = "sha256-nPXs6thXAshDojgHSNyEeBN/jNJkfFECSuY5f51Zozo="; + hash = "sha256-GRuEzRqDfhLCanuQnCkMXmDnfNkLFb35Gixl9pWmA8w="; }; pythonRelaxDeps = [ @@ -33,15 +34,15 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov=githubkit --cov-append --cov-report=term-missing" "" + --replace-fail "--cov=githubkit --cov-append --cov-report=term-missing" "" ''; - nativeBuildInputs = [ + build-systems = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ hishel httpx pydantic @@ -70,6 +71,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-xdist ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index 50afd5ea4aa8..d76d0366c461 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.40"; + version = "3.1.42"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; rev = "refs/tags/${version}"; - hash = "sha256-a5Ez6SuSqrJE306FrFjEnSoVhALVvubF1pLW4awK4gM="; + hash = "sha256-qpADumkfm8DHNlB2JeH/7sYrJqtYdFLv5YQAV0q5//s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glad/default.nix b/pkgs/development/python-modules/glad/default.nix index 889012b648ab..def3766765e8 100644 --- a/pkgs/development/python-modules/glad/default.nix +++ b/pkgs/development/python-modules/glad/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs"; + mainProgram = "glad"; homepage = "https://github.com/Dav1dde/glad"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/glad2/default.nix b/pkgs/development/python-modules/glad2/default.nix index 57ee88c4997a..c4e03c164e6d 100644 --- a/pkgs/development/python-modules/glad2/default.nix +++ b/pkgs/development/python-modules/glad2/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "glad2"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7eFjn2nyugjx9JikCnB/NKYJ0k6y6g1sk2RomnmM99A="; + hash = "sha256-ugdXtqo6IEtjeHOxPQubQIZa4ZbfcpD8bAHYGOWK+Bw="; }; propagatedBuildInputs = [ @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multi-Language GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specifications"; + mainProgram = "glad"; homepage = "https://github.com/Dav1dde/glad"; license = licenses.mit; maintainers = with maintainers; [ kranzes ]; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 380ada5d33a6..7f0dfe2d5e87 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "11.0.1"; + version = "13.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-eeUjtRsP3c6fbGMJ+oxkMou3BrLWyEelP4ipPQFpXkM="; + hash = "sha256-gzeAyrfgVwNLNSeGIDr5TyGvywCUy+1gEEcfXcIaX5E="; }; postPatch = '' @@ -57,6 +57,7 @@ buildPythonPackage rec { disabledTests = [ # Network access "test_validate_ping" + "test_logging" # Fails since yamllint 1.27.x "test_yaml_lint" ]; @@ -67,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK"; + mainProgram = "glean_parser"; homepage = "https://github.com/mozilla/glean_parser"; changelog = "https://github.com/mozilla/glean_parser/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 6ad0646401a0..cd8528125780 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.32.0"; + version = "3.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-otf1A8onfi6u3Vv7IxBtziLEy2UqVeJxw1u+XIfSchA="; + hash = "sha256-DjGwwpXzYRq5/hiUs/l8kD/yA58vbhvrKirKDlWoAmY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 05c6110ae7c9..eb770051f09d 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Restructuring data, the Python way"; + mainProgram = "glom"; longDescription = '' glom helps pull together objects from other objects in a declarative, dynamic, and downright simple way. diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix index 98fdd3d9aa4c..ac1625471011 100644 --- a/pkgs/development/python-modules/glyphsets/default.nix +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "glyphsets"; - version = "0.6.11"; + version = "0.6.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ACeD9O/kOE2we95gW4ak8504Y+azoqNyMeeVaWmEzak="; + hash = "sha256-lMRgchadgKyfFLw6ZF1sJAKBAK75zmw77L34MW9p7TI="; }; patches = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Fonts glyph set metadata"; + mainProgram = "glyphsets"; homepage = "https://github.com/googlefonts/glyphsets"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 7cf9adbb3bf6..41b257f4d975 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.6.0"; + version = "6.6.6"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-2Y7JhaZJXKERQXEI9cDCx7m95El6AicU0t+X3Gntbxk="; + hash = "sha256-IF/mm6JOulB4kLZ1rRnZHjQth5RkgroDWuZ+HzMZYjM="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/gntp/default.nix b/pkgs/development/python-modules/gntp/default.nix index c334ebe5ce37..4376a0378223 100644 --- a/pkgs/development/python-modules/gntp/default.nix +++ b/pkgs/development/python-modules/gntp/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/kfdm/gntp/"; description = "Python library for working with the Growl Notification Transport Protocol"; + mainProgram = "gntp"; license = licenses.mit; maintainers = [ maintainers.jfroche ]; }; diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index 16125400c94b..2f3884aa07ff 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Access your Google contacts from the command line"; + mainProgram = "goobook"; longDescription = '' The purpose of GooBook is to make it possible to use your Google Contacts from the command-line and from MUAs such as Mutt. diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index fa7086b7719d..fa2ee6aa8d6d 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.120.0"; + version = "2.121.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oMh2nK2VdnaLyzGRyx9VD2qzKQy6BCutsPsXu6A/cMw="; + hash = "sha256-34Y+zk24s2zhBT69mD5D+8W2ZCCe7XjoLMhK5W3axsA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 905f301c2cc8..efe5dcd33541 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.27.0"; + version = "2.28.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6GOlbMwtjvqD33qAJyYB5DSH+ppyijdiBchsJqrvqCE="; + hash = "sha256-NPwwRsJXztzxYi/Esx/Cvnkj2bTUSXPUgRJezFDYOIU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 9adf04e4344f..ab3466c621c7 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -19,21 +19,21 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.25.0"; + version = "3.25.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JiPKFOew9Pd2NuY7wDlFQ/N06m9IRutWO+d/YJspry0="; + hash = "sha256-xKiqk55Ccm6DaB2aG5xo08nVqL69q8hvro+BPaY0/m4="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ grpc-google-iam-v1 google-api-core google-cloud-access-context-manager diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index d6952abe84f0..1cda61e13757 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "BigQuery Storage API API client library"; + mainProgram = "fixup_bigquery_storage_v1_keywords.py"; homepage = "https://github.com/googleapis/python-bigquery-storage"; changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 0a7c67ec7aa7..baeb3a72644e 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.18.0"; + version = "3.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dPD8bwupR3+AjSWSTcigUsVffKkQZOg+FtPuX7fKd6s="; + hash = "sha256-jjEdrkl2jhUB/NxekWv/S34WlHHlcHkZ9Kb3igKztaY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index c30f659da4b9..0125fbe66c12 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -14,21 +14,21 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.43.0"; + version = "2.44.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RfGhQv1wr5fMMHleMamwSKQ2opv3nppGSvUe4UdFiT0="; + hash = "sha256-heNvRcepXqayn/impyP5h4L+eOJjGV1hMrZyg96aZKU="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core libcst proto-plus diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 091729e95f69..84168c911f28 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.3.3"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N7gCc8jX7uGugWs6IK5DWF6lBQbLDmDzz1vl+H8Tc8s="; + hash = "sha256-m3dJJyqBK95Y//KIaNDF4vWFuC834JofbtLU0Q8TQHM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 17f57f943099..4248a857bb48 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -15,21 +15,21 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.18.3"; + version = "3.19.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d4MTAZgseV5iI83A7lSkbe/SEgX9ZfQ0pLHfYBStfp4="; + hash = "sha256-Oo0O94fw7dRwPn4nyRobX4W9vgTWFgkTLsdyaffVJpI="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core grpc-google-iam-v1 libcst diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 9e1ca821bdae..93c85687dd4c 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.12.2"; + version = "2.14.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YDHQwZEfx5zguLuPb+FkUoO5wakYi0g9rmI7U7TYGBw="; + hash = "sha256-yC6ZP4qSGcW6H84TnDSu1vAZ3V+bRc6VbVQwWD0q8m4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index deab86952e76..45fd8082d3d0 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.21.2"; + version = "2.21.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8GrZ38gBVE+6EYN4i5ZPawF0g6Zgkapoa1Gr0HSAbIQ="; + hash = "sha256-XofVp7fY9bXJ8PZI81KniGlRqLTHJwPrnOe6gHb8JTM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index c6d253d9cb07..546ab8cb544e 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.9.0"; + version = "3.10.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TeyxsL7UoOPA5Yo3ZkbmAC1r58rQOeNGaCLoZlBy6jM="; + hash = "sha256-2T00c1EkDdsUz+IBmHotMs+df0eLiy+r7TAVtCWzJ08="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 902593045eb4..6f9162b757a7 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -14,21 +14,21 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.8"; + version = "0.3.9"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-va5Ql8GPMLszgjjSkI6am6IGQnEqvi+YSBcTFeu254U="; + hash = "sha256-Vohliy9W+fkY4YmSIvw6WiWVlLBk+Fo9CvZG/VKeU1o="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-auth proto-plus diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 5c4ce89104c2..c4517465a55c 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -17,21 +17,21 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.20.1"; + version = "2.20.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ttBvGCeWgnPEK1egn2QkYmSclQTcD4dW+Zdw9OPnVa0="; + hash = "sha256-dq8PF5UJ5DHSu+P1H0JiVng9yVm49FjBNwyxnW974LE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core grpc-google-iam-v1 grpcio @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Pub/Sub API client library"; + mainProgram = "fixup_pubsub_v1_keywords.py"; homepage = "https://github.com/googleapis/python-pubsub"; changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 69009eb54678..e3e5939e1b60 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,21 +13,21 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.18.3"; + version = "2.19.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HbL0CTJFNuNPmFCB04njl0yjo2aN94RcrQvgOrjA+n0="; + hash = "sha256-u5GENYNaFOuUeF9NTZCHvc8bbeMGQy1+2qfWLn94DDA="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core grpc-google-iam-v1 proto-plus diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 27794f0cc958..c8c055555d3f 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.43.0"; + version = "3.44.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BmLpX+MUZ0o7iy+jwZ6B5UTZT1hMppZbmMlQg6iGQiI="; + hash = "sha256-NTzAsG/UVn2BxPwUxE/ZnXqkCA9LwhmDRoq3LdstLIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 72d95a9410d6..146f4c726d1c 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "System test utilities for google-cloud-python"; + mainProgram = "lower-bound-checker"; homepage = "https://github.com/googleapis/python-test-utils"; changelog ="https://github.com/googleapis/python-test-utils/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 920cd984df33..dfcc2e06034a 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -7,14 +7,16 @@ , protobuf , pythonOlder , pythonRelaxDepsHook +, pydantic +, setuptools , tqdm , typing-extensions }: buildPythonPackage rec { pname = "google-generativeai"; - version = "0.3.2"; - format = "setuptools"; + version = "0.4.1"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -22,22 +24,24 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-SL0jnuDHjeiqDq1VvWr4vQPFZ5yyea/OAGArmxztwB4="; + hash = "sha256-+PRsxwy8Um6wCku9s7h8ERKEhcFsomEYAwYg+vpAGyg="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-ai-generativelanguage google-auth google-api-core protobuf + pydantic tqdm typing-extensions ]; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index 3cc5c3d43664..88c60e45e134 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google's i18n address data packaged for Python"; + mainProgram = "update-validation-files"; homepage = "https://github.com/mirumee/google-i18n-address"; changelog = "https://github.com/mirumee/google-i18n-address/releases/tag/${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 31564a0536d9..44cd15ba33cd 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for Google Nest Device Access using the Smart Device Management API"; + mainProgram = "google_nest"; homepage = "https://github.com/allenporter/python-google-nest-sdm"; changelog = "https://github.com/allenporter/python-google-nest-sdm/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index 912b444541ad..99a2a98f1fdb 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -14,6 +14,11 @@ buildPythonPackage rec { sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9"; }; + postPatch = '' + substituteInPlace pasta/augment/inline_test.py \ + --replace-fail assertRaisesRegexp assertRaisesRegex + ''; + propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 846b390b9c9d..e740bc404867 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.6.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lyhS9sZfkz4VpKIQwrlpMHY7Rxl830ql9b6kNe+2Juc="; + hash = "sha256-Xxj1+pg29LCDFiBkocLJjBcjm/2pylCtlwzPkF8+Yls="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google/default.nix b/pkgs/development/python-modules/google/default.nix index 7dc34933d452..3dc2cdb34514 100644 --- a/pkgs/development/python-modules/google/default.nix +++ b/pkgs/development/python-modules/google/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings to the Google search engine"; + mainProgram = "google"; homepage = "https://pypi.org/project/google/"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index e8a469e51b06..a56c73b173a7 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.61.0"; + version = "1.62.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-imSGapf2MEpxeYc6Rl1u7pe3ok7Gz9eOD1delrghJAs="; + hash = "sha256-g/Ds6flOVnLM7YL1ktKl7fUnqW7ReU8LqzbVc1yZYnc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix index d1dd1de8e82f..3ffd029c2692 100644 --- a/pkgs/development/python-modules/googletrans/default.nix +++ b/pkgs/development/python-modules/googletrans/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Googletrans is python library to interact with Google Translate API"; + mainProgram = "translate"; homepage = "https://py-googletrans.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ unode ]; diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix index 8c86b44df353..f1ae7880a279 100644 --- a/pkgs/development/python-modules/gotailwind/default.nix +++ b/pkgs/development/python-modules/gotailwind/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modul to communicate with Tailwind garage door openers"; + mainProgram = "tailwind"; homepage = "https://github.com/frenck/python-gotailwind"; changelog = "https://github.com/frenck/python-gotailwind/releases/tag/v$version"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index 769670edf433..1c70d37b0dbb 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Play Downloader via Command line"; + mainProgram = "gplaycli"; homepage = "https://github.com/matlink/gplaycli"; changelog = "https://github.com/matlink/gplaycli/releases/tag/${version}"; license = licenses.agpl3Plus; diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index cd0ef5b174a6..f9823ffbdfdb 100644 --- a/pkgs/development/python-modules/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python script to convert the output from many profilers into a dot graph"; + mainProgram = "gprof2dot"; homepage = "https://github.com/jrfonseca/gprof2dot"; changelog = "https://github.com/jrfonseca/gprof2dot/releases/tag/${version}"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix index ce04d7df2273..8b5405507292 100644 --- a/pkgs/development/python-modules/gptcache/default.nix +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Semantic cache for LLMs and fully integrated with LangChain and llama_index"; + mainProgram = "gptcache_server"; homepage = "https://github.com/zilliztech/GPTCache"; changelog = "https://github.com/zilliztech/GPTCache/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch b/pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch new file mode 100644 index 000000000000..bc9f6c7ec64b --- /dev/null +++ b/pkgs/development/python-modules/gpuctypes/0001-fix-dlopen-cuda.patch @@ -0,0 +1,44 @@ +From d448321436e8314d3e2a6a09d4017c4bc10f612d Mon Sep 17 00:00:00 2001 +From: Gaetan Lepage <gaetan@glepage.com> +Date: Sat, 17 Feb 2024 17:37:22 +0100 +Subject: [PATCH] fix-dlopen-cuda + +--- + gpuctypes/cuda.py | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/gpuctypes/cuda.py b/gpuctypes/cuda.py +index acba81c..091f7f7 100644 +--- a/gpuctypes/cuda.py ++++ b/gpuctypes/cuda.py +@@ -143,9 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'): + + + ++NAME_TO_PATHS = { ++ "libcuda.so": ["@driverLink@/lib/libcuda.so"], ++ "libnvrtc.so": ["@libnvrtc@"], ++} ++def _try_dlopen(name): ++ try: ++ return ctypes.CDLL(name) ++ except OSError: ++ pass ++ for candidate in NAME_TO_PATHS.get(name, []): ++ try: ++ return ctypes.CDLL(candidate) ++ except OSError: ++ pass ++ raise RuntimeError(f"{name} not found") ++ + _libraries = {} +-_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda')) +-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) ++_libraries['libcuda.so'] = _try_dlopen('libcuda.so') ++_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so') + + + cuuint32_t = ctypes.c_uint32 +-- +2.43.0 + diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix new file mode 100644 index 000000000000..e5987f78ee07 --- /dev/null +++ b/pkgs/development/python-modules/gpuctypes/default.nix @@ -0,0 +1,127 @@ +{ lib +, config +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, addDriverRunpath +, cudaSupport ? config.cudaSupport +, rocmSupport ? config.rocmSupport +, cudaPackages +, setuptools +, ocl-icd +, rocmPackages +, pytestCheckHook +, gpuctypes +, testCudaRuntime ? false +, testOpenclRuntime ? false +, testRocmRuntime ? false +}: +assert testCudaRuntime -> cudaSupport; +assert testRocmRuntime -> rocmSupport; + +buildPythonPackage rec { + pname = "gpuctypes"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + repo = "gpuctypes"; + owner = "tinygrad"; + rev = "refs/tags/${version}"; + hash = "sha256-xUMvMBK1UhZaMZfik0Ia6+siyZGpCkBV+LTnQvzt/rw="; + }; + + patches = [ + (substituteAll { + src = ./0001-fix-dlopen-cuda.patch; + inherit (addDriverRunpath) driverLink; + libnvrtc = + if cudaSupport + then "${lib.getLib cudaPackages.cuda_nvrtc}/lib/libnvrtc.so" + else "Please import nixpkgs with `config.cudaSupport = true`"; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + postPatch = '' + substituteInPlace gpuctypes/opencl.py \ + --replace "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'" + '' + # hipGetDevicePropertiesR0600 is a symbol from rocm-6. We are currently at rocm-5. + # We are not sure that this works. Remove when rocm gets updated to version 6. + + lib.optionalString rocmSupport '' + substituteInPlace gpuctypes/hip.py \ + --replace "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \ + --replace "/opt/rocm/lib/libhiprtc.so" "${rocmPackages.clr}/lib/libhiprtc.so" \ + --replace "hipGetDevicePropertiesR0600" "hipGetDeviceProperties" + + substituteInPlace gpuctypes/comgr.py \ + --replace "/opt/rocm/lib/libamd_comgr.so" "${rocmPackages.rocm-comgr}/lib/libamd_comgr.so" + ''; + + pythonImportsCheck = [ "gpuctypes" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = lib.optionals (!testOpenclRuntime) [ + "test/test_opencl.py" + ] ++ lib.optionals (!rocmSupport) [ + "test/test_hip.py" + ] ++ lib.optionals (!cudaSupport) [ + "test/test_cuda.py" + ]; + + # Require GPU access to run (not available in the sandbox) + pytestFlagsArray = lib.optionals (!testCudaRuntime) [ + "-k" "'not TestCUDADevice'" + ] ++ lib.optionals (!testRocmRuntime) [ + "-k" "'not TestHIPDevice'" + ] ++ lib.optionals (testCudaRuntime || testOpenclRuntime || testRocmRuntime) [ + "-v" + ]; + + # Running these tests requires special configuration on the builder. + # e.g. https://github.com/NixOS/nixpkgs/pull/256230 implements a nix + # pre-build hook which exposes the devices and the drivers in the sandbox + # based on requiredSystemFeatures: + requiredSystemFeatures = lib.optionals testCudaRuntime [ + "cuda" + ] ++ lib.optionals testOpenclRuntime [ + "opencl" + ] ++ lib.optionals testRocmRuntime [ + "rocm" + ]; + + passthru.gpuChecks = { + cuda = gpuctypes.override { + cudaSupport = true; + testCudaRuntime = true; + }; + opencl = gpuctypes.override { + testOpenclRuntime = true; + }; + rocm = gpuctypes.override { + rocmSupport = true; + testRocmRuntime = true; + }; + }; + + preCheck = lib.optionalString (cudaSupport && !testCudaRuntime) '' + addToSearchPath LD_LIBRARY_PATH ${lib.getLib cudaPackages.cuda_cudart}/lib/stubs + ''; + + # If neither rocmSupport or cudaSupport is enabled, no tests are selected + dontUsePytestCheck = !(rocmSupport || cudaSupport) && (!testOpenclRuntime); + + meta = with lib; { + description = "Ctypes wrappers for HIP, CUDA, and OpenCL"; + homepage = "https://github.com/tinygrad/gpuctypes"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage matthewcroughan wozeparrot ]; + }; +} diff --git a/pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch b/pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch new file mode 100644 index 000000000000..8d3b69e35e11 --- /dev/null +++ b/pkgs/development/python-modules/gpuctypes/fix-dlopen-cuda.patch @@ -0,0 +1,32 @@ +diff --git a/gpuctypes/cuda.py b/gpuctypes/cuda.py +index acba81c..aac5fc7 100644 +--- a/gpuctypes/cuda.py ++++ b/gpuctypes/cuda.py +@@ -143,9 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'): + + + ++NAME_TO_PATHS = { ++ "libcuda.so": ["@driverLink@/lib/libcuda.so"], ++ "libnvrtc.so": ["@libnvrtc@"], ++} ++def _try_dlopen(name): ++ try: ++ return ctypes.CDLL(name) ++ except OSError: ++ pass ++ for candidate in NAME_TO_PATHS.get(name, []): ++ try: ++ return ctypes.CDLL(candidate) ++ except OSError: ++ pass ++ raise RuntimeError(f"{name} not found") ++ + _libraries = {} +-_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda')) +-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) ++_libraries['libcuda.so'] = _try_dlopen('libcuda.so') ++_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so') + + + cuuint32_t = ctypes.c_uint32 diff --git a/pkgs/development/python-modules/gpustat/default.nix b/pkgs/development/python-modules/gpustat/default.nix index 8952e84c5c12..e6a35531f55f 100644 --- a/pkgs/development/python-modules/gpustat/default.nix +++ b/pkgs/development/python-modules/gpustat/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple command-line utility for querying and monitoring GPU status"; + mainProgram = "gpustat"; homepage = "https://github.com/wookayin/gpustat"; changelog = "https://github.com/wookayin/gpustat/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix index 40708972823a..2f8e07cccf45 100644 --- a/pkgs/development/python-modules/gpxpy/default.nix +++ b/pkgs/development/python-modules/gpxpy/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python GPX (GPS eXchange format) parser"; + mainProgram = "gpxinfo"; homepage = "https://github.com/tkrajina/gpxpy"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index e4fbda924760..33da65d155cc 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -14,7 +14,7 @@ }: buildPythonPackage rec { - pname = "GPy"; + pname = "gpy"; version = "1.13.0"; pyproject = true; diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 9827f8d5a71a..25b5ed25bae4 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -1,11 +1,13 @@ { lib , aiofiles , aiohttp +, anyio , backoff , botocore , buildPythonPackage , fetchFromGitHub , graphql-core +, httpx , mock , parse , pytest-asyncio @@ -14,6 +16,7 @@ , pythonOlder , requests , requests-toolbelt +, setuptools , urllib3 , vcrpy , websockets @@ -22,8 +25,8 @@ buildPythonPackage rec { pname = "gql"; - version = "3.4.1"; - format = "setuptools"; + version = "3.5.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +34,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/uPaRju2AJCjMCfA29IKQ4Hu71RBu/Yz8jHwk9EE1Eg="; + hash = "sha256-jm0X+X8gQyQYn03gT14bdr79+Wd5KL9ryvrU/0VUtEU="; }; postPatch = '' @@ -40,7 +43,12 @@ buildPythonPackage rec { "websockets>=10,<12;python_version>'3.6'" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ + anyio backoff graphql-core yarl @@ -54,12 +62,13 @@ buildPythonPackage rec { pytest-console-scripts pytestCheckHook vcrpy - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; - passthru.optional-dependencies = { + optional-dependencies = { all = [ aiohttp botocore + httpx requests requests-toolbelt urllib3 @@ -68,6 +77,9 @@ buildPythonPackage rec { aiohttp = [ aiohttp ]; + httpx = [ + httpx + ]; requests = [ requests requests-toolbelt @@ -123,6 +135,7 @@ buildPythonPackage rec { meta = with lib; { description = "GraphQL client in Python"; + mainProgram = "gql-cli"; homepage = "https://github.com/graphql-python/gql"; changelog = "https://github.com/graphql-python/gql/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 99037dc332db..584de835e0d0 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "The command line interface for Gradient"; + mainProgram = "gradient"; homepage = "https://github.com/Paperspace/gradient-cli"; license = licenses.isc; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index c87c41631291..bfcf10a2ea1c 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.19.2"; + version = "4.20.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -66,7 +66,7 @@ buildPythonPackage rec { # and upstream has stopped tagging releases since 3.41.0 src = fetchPypi { inherit pname version; - hash = "sha256-b+WBW7Tfru0fx0Ijv/2R2nChtGMVivjF4D0BuwkGih0="; + hash = "sha256-nvuIpOFib09FJGfkX0TDfb2LV/eDn3EybsFp5A3lzas="; }; # fix packaging.ParserSyntaxError, which can't handle comments diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 6b6527c3bbd9..64d07a538429 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -61,6 +61,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ # Python 3.11 support, https://github.com/graphql-python/graphene-django/pull/1365 "test_django_objecttype_convert_choices_enum_naming_collisions" diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index e87dc333558f..551ff8a86e64 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -2,15 +2,13 @@ , aniso8601 , buildPythonPackage , fetchFromGitHub +, setuptools , graphql-core , graphql-relay -, promise -, py , pytest-asyncio , pytest-benchmark , pytest-mock , pytestCheckHook -, pythonAtLeast , pythonOlder , pytz , snapshottest @@ -19,7 +17,7 @@ buildPythonPackage rec { pname = "graphene"; version = "3.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -30,15 +28,17 @@ buildPythonPackage rec { hash = "sha256-DGxicCXZp9kW/OFkr0lAWaQ+GaECx+HD8+X4aW63vgQ="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aniso8601 graphql-core graphql-relay ]; nativeCheckInputs = [ - promise - py pytestCheckHook pytest-asyncio pytest-benchmark @@ -49,6 +49,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" + "-W ignore::pytest.PytestRemovedIn8Warning" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/graphlib-backport/default.nix b/pkgs/development/python-modules/graphlib-backport/default.nix new file mode 100644 index 000000000000..54d166a88ba2 --- /dev/null +++ b/pkgs/development/python-modules/graphlib-backport/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, setuptools +, poetry-core +}: + +buildPythonPackage rec { + pname = "graphlib-backport"; + version = "1.1.0"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mariushelf"; + repo = "graphlib_backport"; + rev = version; + hash = "sha256-ssJLtBQH8sSnccgcAKLKfYpPyw5U0RIm1F66/Er81lo="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'poetry>=1.0' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' + ''; + + propagatedBuildInputs = [ + setuptools + poetry-core + ]; + + pythonImportsCheck = [ "graphlib" ]; + + meta = with lib; { + description = "Backport of the Python 3.9 graphlib module for Python 3.6+"; + homepage = "https://github.com/mariushelf/graphlib_backport"; + license = licenses.psfl; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index fa5026a52a2e..815e6775c177 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rzX5pSSPm3CjpnCm0gxsgUaeXho9dP7WTanCzBK6Yps="; + hash = "sha256-Bz2T8tVdVOdXt23yPITkDNL46Y5LZPhY3SXZ5bF3CHw="; }; postPatch = '' @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "A utility to diff tree-like files such as JSON and XML"; + mainProgram = "graphtage"; homepage = "https://github.com/trailofbits/graphtage"; changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 8a5286c65609..513e7c858494 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -11,7 +11,7 @@ , freefont_ttf , setuptools , mock -, pytest +, pytest_7 , pytest-mock , python }: @@ -60,7 +60,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - pytest + pytest_7 pytest-mock ]; diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index 7859d2f4c087..7f7c53f70ea3 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }: buildPythonPackage rec { - pname = "GreatFET"; + pname = "greatfet"; version = "2019.5.1.dev0"; src = fetchFromGitHub { @@ -30,5 +30,3 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ mog ]; }; } - - diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 56f6bfae2a42..40b4851b0c77 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "green"; - version = "3.4.3"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iGXQt3tcsThR3WAaWK0sgry1LafKEG8FOMV4fxJzaKY="; + hash = "sha256-O178HRtyKg/2fYD9jHzfbUfNGPlRpGuEvbx7H7yr0/w="; }; patches = [ diff --git a/pkgs/development/python-modules/green/tests.patch b/pkgs/development/python-modules/green/tests.patch index 7e1c3be62e3f..82826834518f 100644 --- a/pkgs/development/python-modules/green/tests.patch +++ b/pkgs/development/python-modules/green/tests.patch @@ -1,22 +1,23 @@ diff --git a/green/test/test_integration.py b/green/test/test_integration.py -index 0cf8cbb..40d9f6b 100644 +index 9a2d824..372e6e0 100644 --- a/green/test/test_integration.py +++ b/green/test/test_integration.py -@@ -41,9 +41,7 @@ class TestFinalizer(unittest.TestCase): +@@ -37,9 +37,7 @@ class TestFinalizer(unittest.TestCase): + ) ) - fh.close() args = [ - sys.executable, - "-m", - "green.cmdline", -+ "@green@", - "--finalizer=test_finalizer0.msg", ++ "@green@" + "--finalizer=test_finalizer.msg", "--maxtasksperchild=1", ] -@@ -58,6 +56,5 @@ class TestFinalizer(unittest.TestCase): +@@ -54,7 +52,6 @@ class TestFinalizer(unittest.TestCase): stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env, - timeout=10, - ).stdout.decode("utf-8") - self.assertIn("finalizer worked", output) + encoding="utf-8", + check=True, + ).stdout diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 8b885133cf2a..6839b2340961 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -14,12 +14,12 @@ let greenlet = buildPythonPackage rec { pname = "greenlet"; - version = "3.0.1"; + version = "3.0.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gWvZSIqUy6eNk+GrtYAA6CZvqcwqqczdbrBpasskAFs="; + hash = "sha256-QzdEQjUyWVVM4zWZ2otpLVqpb4l21WfUut8mM3H75JE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index 2f328434c067..0e127c6ce825 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python3 library and command line for GreyNoise"; + mainProgram = "greynoise"; homepage = "https://github.com/GreyNoise-Intelligence/pygreynoise"; changelog = "https://github.com/GreyNoise-Intelligence/pygreynoise/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index be71df310f9d..0ae203f6331f 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.42.0"; + version = "0.42.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-gleVVwi2exSHz+u8zHhH3nF1duz7qDOpiZBm228ZsSs="; + hash = "sha256-KaD3j96FJJx43m/nfHa4kAft4FcDOdq+2dsiaMY7PPY="; }; nativeBuildInputs = [ @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Signatures for entire Python programs"; + mainProgram = "griffe"; homepage = "https://github.com/mkdocstrings/griffe"; changelog = "https://github.com/mkdocstrings/griffe/blob/${version}/CHANGELOG.md"; license = licenses.isc; diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index 37319e1ede7b..f76fd2548b03 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Preview GitHub Markdown files like Readme locally before committing them"; + mainProgram = "grip"; homepage = "https://github.com/joeyespo/grip"; license = licenses.mit; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index eb91900864ca..4fd21a8bf159 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.62.0"; + version = "1.62.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DWk+nAmIDa6qwGDQw9uhrkcKQ8meXSDf6v1iz34IqF0="; + hash = "sha256-NDHIq7qwBUkSxB31xy8D3fO3pnvoooe7PBijRW+W/3c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 62eae894a267..4aef9f5fbd0f 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.62.0"; + version = "1.62.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-f8puz7vwVJBYuyncxuQ12IW4eNB3Aed6xY4eH1kXNtw="; + hash = "sha256-pJkeXuipereRKW079+hwCxRFY1zBgozJjflFyhgC1/I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 934ac1077ce4..e890280c676c 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "grpcio"; format = "setuptools"; - version = "1.62.0"; + version = "1.62.1"; src = fetchPypi { inherit pname version; - hash = "sha256-dISWr5I4rHjc2YzOZUIfGtzijDl5OT42CWg/zX84gNc="; + hash = "sha256-bEVeAI+obZ6anYW7dtpCd8DX2WaKO/pw2+hunzx1mUc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index bca9611b7e21..717a439393e1 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for manipulating pronunciations using the International Phonetic Alphabet (IPA)"; + mainProgram = "gruut-ipa"; homepage = "https://github.com/rhasspy/gruut-ipa"; license = licenses.mit; maintainers = teams.tts.members; diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index bd6e95909d99..8d18dee9cd8e 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tokenizer, text cleaner, and phonemizer for many human languages"; + mainProgram = "gruut"; homepage = "https://github.com/rhasspy/gruut"; license = licenses.mit; maintainers = teams.tts.members; diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 54062ec39f14..3148c3f2e70c 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "General simulation data file format"; + mainProgram = "gsd"; homepage = "https://github.com/glotzerlab/gsd"; changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 6f107cc610a0..8ed4c6d9beea 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ , pytest-vcr , pytestCheckHook , pythonOlder -, requests +, strenum }: buildPythonPackage rec { pname = "gspread"; - version = "5.12.4"; + version = "6.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-i+QbnF0Y/kUMvt91Wzb8wseO/1rZn9xzeA5BWg1haks="; + hash = "sha256-NY6Q45/XuidDUeBG0QfVaStwp2+BqMSgefDifHu2erU="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ google-auth google-auth-oauthlib - requests + strenum ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/gto/default.nix b/pkgs/development/python-modules/gto/default.nix index 80f41bb4d683..79347e1ce3d8 100644 --- a/pkgs/development/python-modules/gto/default.nix +++ b/pkgs/development/python-modules/gto/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "gto"; - version = "1.6.2"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,14 +32,14 @@ buildPythonPackage rec { owner = "iterative"; repo = "gto"; rev = "refs/tags/${version}"; - hash = "sha256-1+Owhp2otGC/FIdsSz+4vn0sZR696+zOMGNDvjM6KH8="; + hash = "sha256-fUi+/PW05EvgTnoEv1Im1BjZ07VzpZhyW0EjhLUqJGI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace ', "setuptools_scm_git_archive==1.4.1"' "" + --replace-fail ', "setuptools_scm_git_archive==1.4.1"' "" substituteInPlace setup.cfg \ - --replace " --cov=gto --cov-report=term-missing --cov-report=xml" "" + --replace-fail " --cov=gto --cov-report=term-missing --cov-report=xml" "" ''; nativeBuildInputs = [ @@ -92,5 +92,6 @@ buildPythonPackage rec { changelog = "https://github.com/iterative/gto/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "gto"; }; } diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index 0b08a400888f..d53fd34abd69 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , beautifulsoup4 , click , gtts-token @@ -25,7 +26,11 @@ buildPythonPackage rec { hash = "sha256-CCxD73fpHGsO4zSifWLQtgDkbPvPEnA2357umhOCNoI="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ beautifulsoup4 click gtts-token @@ -47,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library and CLI tool to interface with Google Translate text-to-speech API"; + mainProgram = "gtts-cli"; homepage = "https://gtts.readthedocs.io"; changelog = "https://gtts.readthedocs.io/en/latest/changelog.html"; license = licenses.mit; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 4e9fbe4bab23..fce9cc928b51 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library that extracts as much information as possible from a video filename"; + mainProgram = "guessit"; homepage = "https://guessit-io.github.io/guessit/"; changelog = "https://github.com/guessit-io/guessit/raw/v${version}/CHANGELOG.md"; license = licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/gurobipy/darwin.nix b/pkgs/development/python-modules/gurobipy/darwin.nix index 3bd3b3b2a329..ec74f46c180a 100644 --- a/pkgs/development/python-modules/gurobipy/darwin.nix +++ b/pkgs/development/python-modules/gurobipy/darwin.nix @@ -1,33 +1,49 @@ -{ fetchurl, python, xar, cpio, cctools, insert_dylib }: -assert python.pkgs.isPy27 && python.ucsEncoding == 2; -python.pkgs.buildPythonPackage - { pname = "gurobipy"; - version = "7.5.2"; - src = fetchurl - { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_mac64.pkg"; - sha256 = "10zgn8741x48xjdiknj59x66mwj1azhihi1j5a1ajxi2n5fsak2h"; - }; - buildInputs = [ xar cpio cctools insert_dylib ]; - unpackPhase = - '' - xar -xf $src - zcat gurobi*mac64tar.pkg/Payload | cpio -i - tar xf gurobi*_mac64.tar.gz - sourceRoot=$(echo gurobi*/*64) - runHook postUnpack - ''; - patches = [ ./no-clever-setup.patch ]; - postInstall = "mv lib/lib*.so $out/lib"; - postFixup = - '' - install_name_tool -change \ - /System/Library/Frameworks/Python.framework/Versions/2.7/Python \ - ${python}/lib/libpython2.7.dylib \ - $out/lib/python2.7/site-packages/gurobipy/gurobipy.so - install_name_tool -change /Library/gurobi752/mac64/lib/libgurobi75.so \ - $out/lib/libgurobi75.so \ - $out/lib/python2.7/site-packages/gurobipy/gurobipy.so - insert_dylib --inplace $out/lib/libaes75.so \ - $out/lib/python2.7/site-packages/gurobipy/gurobipy.so - ''; - } +{ + lib, + stdenv, + buildPythonPackage, + python, + fetchPypi, +}: + +let + format = "wheel"; + pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; + platforms = rec { + aarch64-darwin = "macosx_10_9_universal2"; + x86_64-darwin = aarch64-darwin; + }; + platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + hashes = rec { + cp311-aarch64-darwin = "sha256-pMwq4TXvr0mrKxZppeW2MQE/KrplWWFGmjKRLKwbHCI="; + cp311-x86_64-darwin = cp311-aarch64-darwin; + cp312-aarch64-darwin = "sha256-5+1QxYOhjbs01S3gqhkQ9Bx/0/NhbXEi710BGpiC5kM="; + cp312-x86_64-darwin = cp312-aarch64-darwin; + }; + hash = + hashes."${pyShortVersion}-${stdenv.system}" + or (throw "Unsupported Python version: ${python.pythonVersion}"); +in +buildPythonPackage rec { + pname = "gurobipy"; + version = "11.0.1"; + inherit format; + + src = fetchPypi { + inherit pname version; + python = pyShortVersion; + abi = pyShortVersion; + dist = pyShortVersion; + inherit format platform hash; + }; + + pythonImportsCheck = [ "gurobipy" ]; + + meta = { + description = "Python interface to Gurobi"; + homepage = "https://www.gurobi.com"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ wegank ]; + platforms = builtins.attrNames platforms; + }; +} diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index cd6a4bfcd25b..59d0da14b17d 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "24.1.0"; + version = "24.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "gvm-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-4uYOhsnprYybt5EB/b4LW8/9cn0Nahc1lYQ+DwPNlOU="; + hash = "sha256-LLXMdT1q6IWsbsRjflpGN5pcjUCXWzdFK3gMw4mBm0U="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix index 6e9e33913fb7..ca7ba30927ab 100644 --- a/pkgs/development/python-modules/gymnasium/default.nix +++ b/pkgs/development/python-modules/gymnasium/default.nix @@ -20,6 +20,7 @@ , pygame , pytestCheckHook , scipy +, stdenv }: buildPythonPackage rec { @@ -60,6 +61,12 @@ buildPythonPackage rec { scipy ]; + # if `doCheck = true` on Darwin, `jaxlib` is evaluated, which is both + # marked as broken and throws an error during evaluation if the package is evaluated anyway. + # disabling checks on Darwin avoids this and allows the package to be built. + # if jaxlib is ever fixed on Darwin, remove this. + doCheck = !stdenv.isDarwin; + disabledTestPaths = [ # mujoco is required for those tests but the mujoco python bindings are not packaged in nixpkgs. "tests/envs/mujoco/test_mujoco_custom_env.py" diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index 81726be3ca6c..50e60cfe7bfd 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -36,6 +36,7 @@ buildPythonPackage { meta = with lib; { description = "A tool to generate native build files"; + mainProgram = "gyp"; homepage = "https://gyp.gsrc.io"; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 0da05c75f2db..5a11243d594e 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -3,20 +3,25 @@ , fetchPypi , pythonOlder , async-timeout +, setuptools }: buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "3.1.0"; - format = "setuptools"; + version = "3.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sheNYtmp1panthglpEqJTdaCgGBTUJRswikl5hu9k7s="; + hash = "sha256-FW8WlrhVL+ryupHAKii8fKBku/6uxdw1uLCKUszkP50="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index 5e01610d6965..5ec42c4df5e4 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools and library for Habitica restful API"; + mainProgram = "habitipy"; homepage = "https://github.com/ASMfreaK/habitipy"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index 5a01f5246f85..cd121822e651 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "hacking"; - version = "6.0.1"; + version = "6.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-YdeEb8G58m7CFnjpkHQmkJX5ZNe72M1kbrbIxML4jcE="; + hash = "sha256-3lBqMSQDThi046acld5JjDRgvLxJwWQ9MXjRW8barBQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 2a78e7c96d37..dae2aae43bf2 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -2,7 +2,6 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch , freezegun , orjson , pydevccu @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.3.0"; + version = "2024.3.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,19 +27,9 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-zSGzdj51StlLMmFZzprQUn6Ry9ahJPUq/Z9hVlKn8oA="; + hash = "sha256-/ulqUyplNu8YTHJKcfNPYzyzPvGkLFtoJDu5SqvfQrs="; }; - patches = [ - # Update pydevccu, extend ruff usage - # https://github.com/danielperna84/hahomematic/pull/1454 - (fetchpatch { - url = "https://github.com/danielperna84/hahomematic/commit/81a9a1c9291e2271ac0b995e7dd4725cfe99c7fe.patch"; - includes = [ "tests/test_central_pydevccu.py" ]; - hash = "sha256-l/wNK0/nOZHyrFp+in3ozmMyN5ifo514esGPJVZlb1g="; - }) - ]; - __darwinAllowLocalNetworking = true; postPatch = '' diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 3730f653ead1..9ee4c0e3f968 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -8,6 +8,7 @@ , cryptography , fetchFromGitHub , pycognito +, pyjwt , pytest-aiohttp , pytest-timeout , pytestCheckHook @@ -21,16 +22,16 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.78.0"; + version = "0.79.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "nabucasa"; - repo = pname; + repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-ZqBYmh+MA4ZuhnUQPn/C8d7CVPrwp6mirsWnoB/ZMFw="; + hash = "sha256-7VhafefF7imvnhdFo6K+18h5kmXvIatKerJ+Qn5zwdQ="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ buildPythonPackage rec { ciso8601 cryptography pycognito + pyjwt snitun ]; diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 229abe5f4a52..98c4181d48c2 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -38,6 +38,7 @@ buildPythonPackage { meta = with lib; { changelog = "https://github.com/home-assistant/hassil/blob/v${version}/CHANGELOG.md"; description = "Intent parsing for Home Assistant"; + mainProgram = "hassil"; homepage = "https://github.com/home-assistant/hassil"; license = licenses.asl20; maintainers = teams.home-assistant.members; diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 63789c90debd..b3f71b73eed3 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "hatch-fancy-pypi-readme"; - version = "23.1.0"; + version = "24.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_fancy_pypi_readme"; inherit version; - hash = "sha256-sd9EBjCUrx6CSM6s1HqSyc8xPWuYI79mr4qSfDlgKH0="; + hash = "sha256-RN0jnxp3m53PjryUAaYR/X9+PhRXjc8iwmXfr3wVFLg="; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fancy PyPI READMEs with Hatch"; + mainProgram = "hatch-fancy-pypi-readme"; homepage = "https://github.com/hynek/hatch-fancy-pypi-readme"; license = licenses.mit; maintainers = with maintainers; [ tjni ]; diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index fe641977812f..cc9b2c18fd14 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/jupyterlab/hatch-jupyter-builder/releases/tag/v${version}"; description = "hatch plugin to help build Jupyter packages"; + mainProgram = "hatch-jupyter-builder"; homepage = "https://github.com/jupyterlab/hatch-jupyter-builder"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 6dca631c967e..49af4f0fb0ff 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modern, extensible Python build backend"; + mainProgram = "hatchling"; homepage = "https://hatch.pypa.io/latest/"; changelog = "https://github.com/pypa/hatch/releases/tag/hatchling-v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/helpdev/default.nix b/pkgs/development/python-modules/helpdev/default.nix index b03b3320153c..160797c9327c 100644 --- a/pkgs/development/python-modules/helpdev/default.nix +++ b/pkgs/development/python-modules/helpdev/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = { description = "Extracts information about the Python environment easily"; + mainProgram = "helpdev"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix index ea29c27563d8..07b8f0ed2d42 100644 --- a/pkgs/development/python-modules/hetzner/default.nix +++ b/pkgs/development/python-modules/hetzner/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/RedMoonStudios/hetzner"; description = "High-level Python API for accessing the Hetzner robot"; + mainProgram = "hetznerctl"; license = licenses.bsd3; maintainers = with maintainers; [ aszlig ]; }; diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index e8ce48aab0ad..9c78027e0a83 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "heudiconv"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KMEvuxRFFbnyAez+cpcHKDDXdrHfeZcqlGNwy8RWTxg="; + hash = "sha256-zRLRdP3LpytHCTrehhPYMmJnss5v6ojjkIPuB8fKR5w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index c742b0a57e66..92235b6ce58a 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.1.1"; + version = "11.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-HFZN/JJQPlVB57xcUUxyXrrD4EqPg9vYCRAa4PAQHow="; + hash = "sha256-ug+T1sRSB+J5FyqzdTR7xZtvybhdzBZYI7g4rX14DHo="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/hid-parser/default.nix b/pkgs/development/python-modules/hid-parser/default.nix index 56aeb503b49c..15b7f3c587f3 100644 --- a/pkgs/development/python-modules/hid-parser/default.nix +++ b/pkgs/development/python-modules/hid-parser/default.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { hypothesis ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "hid_parser" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index c6bb5e7d8015..2408fa2d7e1c 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "hiredis"; - version = "2.3.0"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "hiredis-py"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-OT8zFEHKSAebXV+VzagZDJRPidAhSrqvD2/F1YezVGs="; + hash = "sha256-7hTGXHNECy+dSsop0ULsNZvGFecCIEv+q46s7t/K7k8="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index 4f8dae862c55..2deba68019e5 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -69,6 +69,12 @@ buildPythonPackage rec { "test_redis" ]; + disabledTestPaths = [ + # ImportError: cannot import name 'mock_s3' from 'moto' + "tests/_async/test_storages.py" + "tests/_sync/test_storages.py" + ]; + meta = with lib; { description = "HTTP Cache implementation for HTTPX and HTTP Core"; homepage = "https://github.com/karpetrosyan/hishel"; diff --git a/pkgs/development/python-modules/hist/default.nix b/pkgs/development/python-modules/hist/default.nix index 8d47c7de0f73..17bca6ecb8fa 100644 --- a/pkgs/development/python-modules/hist/default.nix +++ b/pkgs/development/python-modules/hist/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Histogramming for analysis powered by boost-histogram"; + mainProgram = "hist"; homepage = "https://hist.readthedocs.io/"; changelog = "https://github.com/scikit-hep/hist/releases/tag/v${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/histoprint/default.nix b/pkgs/development/python-modules/histoprint/default.nix index 66f06feac946..94f38aacb674 100644 --- a/pkgs/development/python-modules/histoprint/default.nix +++ b/pkgs/development/python-modules/histoprint/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pretty print histograms to the console"; + mainProgram = "histoprint"; homepage = "https://github.com/scikit-hep/histoprint"; license = licenses.mit; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix index 6b606297813d..44aa789f0d04 100644 --- a/pkgs/development/python-modules/hjson/default.nix +++ b/pkgs/development/python-modules/hjson/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A user interface for JSON"; + mainProgram = "hjson"; homepage = "https://github.com/hjson/hjson-py"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index a7c673c38cad..84014ba12899 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.3.0"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-0TqR6jaV34gUZePTYTLX7vToTUg/S6U4pLRuJLXqEA8="; + hash = "sha256-7a9IX9seqI2prGQrIAbGPZlQ3RXU0TL3IFMF04Pm90U="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/hologram/default.nix b/pkgs/development/python-modules/hologram/default.nix index 005834fc99b8..30f50456bad9 100644 --- a/pkgs/development/python-modules/hologram/default.nix +++ b/pkgs/development/python-modules/hologram/default.nix @@ -5,6 +5,7 @@ , jsonschema , pytestCheckHook , python-dateutil +, pythonRelaxDepsHook , setuptools , wheel }: @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + pythonRelaxDepsHook setuptools wheel ]; @@ -44,6 +46,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonRelaxDeps = [ + "python-dateutil" + ]; + pythonImportsCheck = [ "hologram" ]; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 74f7b2dd9deb..03e4d80a4dfa 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python data analysis and visualization seamless and simple"; + mainProgram = "holoviews"; homepage = "https://www.holoviews.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 6ffdda58a6ce..969bc3a9533c 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2024.2.1"; + version = "2024.2.2"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-QMsfs9gUWeaz1LfMZF5J2OFVCPnuckZvvF9x5bQ5uZY="; + hash = "sha256-OWDOJfVQJSJFng5xAQqBNpqB0nXnYVCTq1MwyPtwfIM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index b3d5a232c10a..b7ca71bbb257 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2024.2.1"; + version = "2024.2.2"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -37,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-gHnTuiyCD9A9Ru8xhniNEpCyn+W9zYnCAoTJeGOW7TI="; + hash = "sha256-lo6upkkZYQCtggNU+4/S/JTUqJnAWaWFA6NTt4C2gEM="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-gKZKcCXQ8PvZAPV2QRQl+u+r95CVLBDDDgtC0MT7xw4="; + hash = "sha256-VwiIH/PK4fOQCc+KSHXP1VwHVK1gYnmBXTgKDT1Yt58="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); in fetchPypi { diff --git a/pkgs/development/python-modules/homeassistant-bring-api/default.nix b/pkgs/development/python-modules/homeassistant-bring-api/default.nix index 47730748ae1a..2912e26f5c80 100644 --- a/pkgs/development/python-modules/homeassistant-bring-api/default.nix +++ b/pkgs/development/python-modules/homeassistant-bring-api/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-bring-api"; - version = "0.1.0"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "homeassistant-bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-EQ1Qv4B7axwERKvuMnLizpfA6jRNf/SyB6ktQ2BjFtM="; + hash = "sha256-vfc4xKLeGF2FuBFwqU99qbkUDBK5Uz66S4F2ODRDPa8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index ca5355fcb9a8..4de61606e0c6 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -6,6 +6,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pytest_7 , pythonAtLeast , pythonOlder , pytest-aiohttp @@ -49,7 +50,7 @@ buildPythonPackage rec { aiohttp-wsgi pytest-aiohttp pytest-asyncio - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/hpccm/default.nix b/pkgs/development/python-modules/hpccm/default.nix index 99a0c42b8fa8..35380d7171b6 100644 --- a/pkgs/development/python-modules/hpccm/default.nix +++ b/pkgs/development/python-modules/hpccm/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "HPC Container Maker"; + mainProgram = "hpccm"; homepage = "https://github.com/NVIDIA/hpc-container-maker"; license = licenses.asl20; platforms = platforms.x86; diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index 37843196c9cb..2d814e4ebfac 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "html2text"; - version = "2020.1.16"; + version = "2024.2.26"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Alir3z4"; repo = pname; - rev = version; - sha256 = "1y924clp2hiqg3a9437z808p29mqcx537j5fmz71plx8qrcm5jf9"; + rev = "refs/tags/${version}"; + sha256 = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I="; }; nativeCheckInputs = [ pytestCheckHook ]; @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text"; + mainProgram = "html2text"; homepage = "https://github.com/Alir3z4/html2text/"; license = licenses.gpl3Only; }; diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index 5226a7eb7634..68602cb2cdc9 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -1,28 +1,34 @@ { lib +, backports-datetime-fromisoformat , buildPythonPackage -, fetchPypi -, pythonOlder , charset-normalizer , dateparser +, faust-cchardet +, fetchPypi , lxml , pytestCheckHook , python-dateutil +, pythonOlder +, setuptools , urllib3 -, backports-datetime-fromisoformat }: buildPythonPackage rec { pname = "htmldate"; - version = "1.7.0"; - format = "setuptools"; + version = "1.8.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-AqgA3SJMv3S/SDsEL2ThT1e6DkDGtEBLKE6YvGwwto0="; + hash = "sha256-+Ux9AX9Coc9CLlp8XvEMrLridohjFPJ6mGRkYn8wuxU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ charset-normalizer dateparser @@ -33,6 +39,21 @@ buildPythonPackage rec { backports-datetime-fromisoformat ]; + passthru.optional-dependencies = { + speed = [ + faust-cchardet + urllib3 + ] ++ lib.optionals (pythonOlder "3.11") [ + backports-datetime-fromisoformat + ] ++ urllib3.optional-dependencies.brotli; + all = [ + faust-cchardet + urllib3 + ] ++ lib.optionals (pythonOlder "3.11") [ + backports-datetime-fromisoformat + ] ++ urllib3.optional-dependencies.brotli; + }; + nativeCheckInputs = [ pytestCheckHook ]; @@ -44,13 +65,16 @@ buildPythonPackage rec { "test_download" ]; - pythonImportsCheck = [ "htmldate" ]; + pythonImportsCheck = [ + "htmldate" + ]; meta = with lib; { - description = "Fast and robust extraction of original and updated publication dates from URLs and web pages"; + description = "Module for the extraction of original and updated publication dates from URLs and web pages"; homepage = "https://htmldate.readthedocs.io"; changelog = "https://github.com/adbar/htmldate/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jokatzke ]; + mainProgram = "htmldate"; }; } diff --git a/pkgs/development/python-modules/htmllistparse/default.nix b/pkgs/development/python-modules/htmllistparse/default.nix index ae13f6585a1d..01fa41eae2fe 100644 --- a/pkgs/development/python-modules/htmllistparse/default.nix +++ b/pkgs/development/python-modules/htmllistparse/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/gumblex/htmllisting-parser"; description = "Python parser for Apache/nginx-style HTML directory listing"; + mainProgram = "rehttpfs"; license = licenses.mit; maintainers = with maintainers; [ hexchen ]; }; diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index 9be7dd90abd6..0f0d5222feae 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A configurable HTML Minifier with safety features"; + mainProgram = "htmlmin"; homepage = "https://pypi.python.org/pypi/htmlmin"; license = licenses.bsd3; maintainers = []; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 0fbc8bc73ee9..076babe49b46 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pythonRelaxDepsHook # build-system @@ -26,22 +25,14 @@ buildPythonPackage rec { pname = "httpbin"; - version = "0.10.1"; + version = "0.10.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-e4WWvrDnWntlPDnR888mPW1cR20p4d9ve7K3C/nwaj0="; + hash = "sha256-YyFIaYJhyGhOotK2JM3qhFtAKx/pFzbonfiGQIxjF6k="; }; - patches = [ - (fetchpatch { - # backport flask 3.0 support; drop after 0.10.1 - url = "https://github.com/psf/httpbin/commit/c1d9e33049263fed3cb27806a97f094acc350905.patch"; - hash = "sha256-SYJgQN3ERDgLIaBc4eqDfey+EX4z6CSxLoAA7j+16xI="; - }) - ]; - nativeBuildInputs = [ setuptools pythonRelaxDepsHook diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix index 58d6c48c4e8a..6d1374075886 100644 --- a/pkgs/development/python-modules/httpserver/default.nix +++ b/pkgs/development/python-modules/httpserver/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = { description = "Asyncio implementation of an HTTP server"; + mainProgram = "httpserver"; homepage = "https://github.com/thomwiggers/httpserver"; license = with lib.licenses; [ bsd3 ]; }; diff --git a/pkgs/development/python-modules/httpx-auth/default.nix b/pkgs/development/python-modules/httpx-auth/default.nix index a21e05a567ef..5fc267bfb25f 100644 --- a/pkgs/development/python-modules/httpx-auth/default.nix +++ b/pkgs/development/python-modules/httpx-auth/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "httpx-auth"; - version = "0.21.0"; + version = "0.22.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "httpx_auth"; rev = "refs/tags/v${version}"; - hash = "sha256-tKEYFoIHxiBG18JWyCHzQEwUvrWk/zuCWqj1uYsmh84="; + hash = "sha256-7azPyep+R55CdRwbdo20y4YNV47c8CwXgOj4q4t25oc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 9641597a516d..5c6a296820be 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.26.0"; + version = "0.27.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qMMx1CYu2/yH4NRvZFzJOflAPIbcvMYJqU4r+chuzl0="; + hash = "sha256-13EnSzrCkseK6s6Yz9OpLzqo/2PTFiB31m5fAIJLoZg="; }; nativeBuildInputs = [ @@ -118,6 +118,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/encode/httpx/blob/${src.rev}/CHANGELOG.md"; description = "The next generation HTTP client"; + mainProgram = "httpx"; homepage = "https://github.com/encode/httpx"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index f206bebc4e1b..29786a67e187 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Download and publish models and other files on the huggingface.co hub"; + mainProgram = "huggingface-cli"; homepage = "https://github.com/huggingface/huggingface_hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index 5d0dbd1763da..d8a3fa92e483 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Human friendly output for text interfaces using Python"; + mainProgram = "humanfriendly"; homepage = "https://humanfriendly.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ montag451 ]; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index b0650310cc14..315370de4c2c 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.12"; + version = "1.12.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GLFlPZgyyfjn00AZhsfnryrmeDYWvgvEBr/gsUE0pcY="; + hash = "sha256-Br9UFw/07PTIStXxiN7jkBFzq0ScJgitBbm/1rE+Mus="; }; # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "In-process file monitor/reloader for reloading your code automatically during development"; + mainProgram = "hupper"; homepage = "https://github.com/Pylons/hupper"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/hydra-check/default.nix b/pkgs/development/python-modules/hydra-check/default.nix index 4da98f083c37..78e96dea26ce 100644 --- a/pkgs/development/python-modules/hydra-check/default.nix +++ b/pkgs/development/python-modules/hydra-check/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "check hydra for the build status of a package"; + mainProgram = "hydra-check"; homepage = "https://github.com/nix-community/hydra-check"; license = licenses.mit; maintainers = with maintainers; [ makefu artturin ]; diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index 436a4e7e6213..fb73910aaf1f 100644 --- a/pkgs/development/python-modules/hydra-core/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -64,11 +64,17 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::UserWarning" + ]; + # Test environment setup broken under Nix for a few tests: disabledTests = [ "test_bash_completion_with_dot_in_path" "test_install_uninstall" "test_config_search_path" + # does not raise UserWarning + "test_initialize_compat_version_base" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index bc9cddc48bf0..57d56fa417ca 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/pgjones/hypercorn"; description = "The ASGI web server inspired by Gunicorn"; + mainProgram = "hypercorn"; license = licenses.mit; maintainers = with maintainers; [ dgliwka ]; }; diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix index 605377a2ec39..6cc92ff3ae79 100644 --- a/pkgs/development/python-modules/hyperopt/default.nix +++ b/pkgs/development/python-modules/hyperopt/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed Asynchronous Hyperparameter Optimization"; + mainProgram = "hyperopt-mongo-worker"; homepage = "http://hyperopt.github.io/hyperopt/"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix index 51ea23baf4a2..0d568e15f25b 100644 --- a/pkgs/development/python-modules/hyperscan/default.nix +++ b/pkgs/development/python-modules/hyperscan/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hyperscan"; - version = "0.7.0"; + version = "0.7.7"; pyproject = true; src = fetchFromGitHub { owner = "darvid"; repo = "python-hyperscan"; rev = "refs/tags/v${version}"; - hash = "sha256-XIsYBu2YPbSIZGIhJjPap1ymg7cr0+ozwZtpOj8GFm8="; + hash = "sha256-TNiGh89SnGi0WAqfYudsj7GaVhOifi8ZcmTrMtVbk+c="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index c74631817866..2c99b43f9487 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.91.0"; + version = "6.98.17"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-2iBeB5pLVOunOJb6aGNQ/ZTj8HyeH+UkqvLPF3YVuLk="; + hash = "sha256-2knFmaa334vFo8bbLCmrWAXRDXFcC+GPRqj7RG3FqEQ="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -79,6 +79,14 @@ buildPythonPackage rec { "tests/cover" ]; + disabledTests = if (pythonOlder "3.10") then [ + # not sure why these tests fail with only 3.9 + # FileNotFoundError: [Errno 2] No such file or directory: 'git' + "test_observability" + "test_assume_has_status_reason" + "test_observability_captures_stateful_reprs" + ] else null; + pythonImportsCheck = [ "hypothesis" ]; @@ -109,6 +117,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for property based testing"; + mainProgram = "hypothesis"; homepage = "https://github.com/HypothesisWorks/hypothesis"; changelog = "https://hypothesis.readthedocs.io/en/latest/changes.html#v${lib.replaceStrings [ "." ] [ "-" ] version}"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 5754612b1f29..9aa3406c6006 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "hypothesmith"; - version = "0.3.1"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-h5kXemST6DLIF0aEKoaGdSs7G7lTDW6DK64XWEENrzo="; + hash = "sha256-lsFIAtbI6F2JdSZBdoeNtUso0u2SH9v+3C5rjOPIFxY="; }; patches = [ diff --git a/pkgs/development/python-modules/i2csense/default.nix b/pkgs/development/python-modules/i2csense/default.nix index 064a1e792f42..6923b1d0c3c8 100644 --- a/pkgs/development/python-modules/i2csense/default.nix +++ b/pkgs/development/python-modules/i2csense/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to handle i2c sensors with the Raspberry Pi"; + mainProgram = "i2csense"; homepage = "https://github.com/azogue/i2csense"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 43b810c1d552..fa904248f3e6 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ical"; - version = "7.0.1"; + version = "7.0.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-kvZZfmrE42uoB9v0PuXopH3g9Cf0hwLkCvaNi6CGX8M="; + hash = "sha256-RiwWnRSe0HdeGVo592A+Rk+IvA1Lfp6mY+/ZEyqJBDU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index c1237dc58829..28b5d1b81abb 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/collective/icalendar/blob/v${version}/CHANGES.rst"; description = "A parser/generator of iCalendar files"; + mainProgram = "icalendar"; homepage = "https://github.com/collective/icalendar"; license = licenses.bsd2; maintainers = with maintainers; [ olcai ]; diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index e6950edaa127..122ff64eb088 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API and CLI for the ikea IDÅSEN desk"; + mainProgram = "idasen"; homepage = "https://github.com/newAM/idasen"; changelog = "https://github.com/newAM/idasen/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index ba8b8b67ec93..1a29450f1da5 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "File identification library for Python"; + mainProgram = "identify-cli"; homepage = "https://github.com/chriskuehl/identify"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 99f2ae1c6276..3fc63b13bb39 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ifcopenshell"; - version = "231201"; + version = "240306"; format = "other"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ buildPythonPackage rec { repo = "IfcOpenShell"; rev = "refs/tags/blenderbim-${version}"; fetchSubmodules = true; - sha256 = "sha256-T7XT5gvfzhagecB3jrTyWOawOm4iye7SCsmYhnjtOTE="; + sha256 = "sha256-DtA8KeWipPfOnztKG/lrgLZeOCUG3nWR9oW7OST7koc="; }; nativeBuildInputs = [ gcc10 cmake ]; diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index e2f555121f93..98f38528c144 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "High performance graph data structures and algorithms"; + mainProgram = "igraph"; homepage = "https://igraph.org/python/"; changelog = "https://github.com/igraph/python-igraph/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/ilua/default.nix b/pkgs/development/python-modules/ilua/default.nix index 9eba6781a413..119c6b17f5e3 100644 --- a/pkgs/development/python-modules/ilua/default.nix +++ b/pkgs/development/python-modules/ilua/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Portable Lua kernel for Jupyter"; + mainProgram = "ilua"; homepage = "https://github.com/guysv/ilua"; license = licenses.gpl2Only; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/development/python-modules/image-diff/default.nix b/pkgs/development/python-modules/image-diff/default.nix index d120737c3ffc..8f65994b3885 100644 --- a/pkgs/development/python-modules/image-diff/default.nix +++ b/pkgs/development/python-modules/image-diff/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "CLI tool for comparing images"; + mainProgram = "image-diff"; homepage = "https://github.com/simonw/image-diff"; license = licenses.asl20; maintainers = with maintainers; [ evils ]; diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix index e2e20b4f6c27..55ce39e8648a 100644 --- a/pkgs/development/python-modules/imagehash/default.nix +++ b/pkgs/development/python-modules/imagehash/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python Perceptual Image Hashing Module"; + mainProgram = "find_similar_images.py"; homepage = "https://github.com/JohannesBuchner/imagehash"; license = licenses.bsd2; maintainers = with maintainers; [ e1mo ]; diff --git a/pkgs/development/python-modules/imgdiff/default.nix b/pkgs/development/python-modules/imgdiff/default.nix index 586ed19b2572..6cb92f329334 100644 --- a/pkgs/development/python-modules/imgdiff/default.nix +++ b/pkgs/development/python-modules/imgdiff/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Compare two images side-by-side"; + mainProgram = "imgdiff"; homepage = "https://github.com/mgedmin/imgdiff"; changelog = "https://github.com/mgedmin/imgdiff/blob/${src.rev}/CHANGES.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/imgtool/default.nix b/pkgs/development/python-modules/imgtool/default.nix index 54bd8026d9a6..dc8a9ec63089 100644 --- a/pkgs/development/python-modules/imgtool/default.nix +++ b/pkgs/development/python-modules/imgtool/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "MCUboot's image signing and key management"; + mainProgram = "imgtool"; homepage = "https://github.com/mcu-tools/mcuboot"; license = licenses.asl20; maintainers = with maintainers; [ samueltardieu ]; diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix index 2d7fddb9e5db..65b2df8bef6a 100644 --- a/pkgs/development/python-modules/importlab/default.nix +++ b/pkgs/development/python-modules/importlab/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library that automatically infers dependencies for Python files"; + mainProgram = "importlab"; homepage = "https://github.com/google/importlab"; license = licenses.mit; maintainers = with maintainers; [ sei40kr ]; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 8e8346fffdd7..995d625f5604 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "6.9.0"; + version = "7.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-6Ky1I8M1qRgiZ04Um0bAOZ7E0yjE0fbknCc9pf8CAbk="; + hash = "sha256-GY9WjzIwh4yxtE+9eXX4eQbCIzbbouSn8FJ4woH715I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 80533173c9bb..79012fa9677a 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -1,38 +1,45 @@ { lib -, isPy27 , buildPythonPackage , fetchPypi +, pythonOlder + +# build-system +, setuptools , setuptools-scm + +# dependencies , importlib-metadata -, typing ? null -, pythonOlder -, unittestCheckHook + +# tests +, jaraco-collections +, pytestCheckHook }: buildPythonPackage rec { pname = "importlib-resources"; - version = "6.1.1"; - format = "pyproject"; - disabled = isPy27; + version = "6.1.3"; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "importlib_resources"; inherit version; - hash = "sha256-OJOgASLq/eaJTFmRREalEvcooMGkX5u5tjchtrrPC0o="; + hash = "sha256-VvtFJRl7eFRKM1TqJ3k5UquT+TW7S/dGuEa7EBUCDys="; }; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata - ] ++ lib.optionals (pythonOlder "3.5") [ - typing ]; nativeCheckInputs = [ - unittestCheckHook + pytestCheckHook + jaraco-collections ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index e9103831363b..655fb82c8b79 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/jrosebr1/imutils"; description = "A series of convenience functions to make basic image processing functions"; + mainProgram = "range-detector"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/in-n-out/default.nix b/pkgs/development/python-modules/in-n-out/default.nix index b35e4588a4dd..39c7a3f7de88 100644 --- a/pkgs/development/python-modules/in-n-out/default.nix +++ b/pkgs/development/python-modules/in-n-out/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "in-n-out"; - version = "0.1.9"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "in_n_out"; inherit version; - hash = "sha256-if65ROQg+vQtPCVCFFaBtNVxRDVZMsK4WWlfzcT5oto="; + hash = "sha256-hKJb2/DKl2Dd+rgndujNJWddriHKDpVuIKwOcwL8oZ8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/indexed-bzip2/default.nix b/pkgs/development/python-modules/indexed-bzip2/default.nix index b75a10b98222..53788b566e52 100644 --- a/pkgs/development/python-modules/indexed-bzip2/default.nix +++ b/pkgs/development/python-modules/indexed-bzip2/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for parallel decompression and seeking within compressed bzip2 files"; + mainProgram = "ibzip2"; homepage = "https://github.com/mxmlnkn/indexed_bzip2"; license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952 maintainers = with lib.maintainers; [ mxmlnkn ]; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 8ca4ed136fe9..ff73187938f2 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -8,7 +8,7 @@ # propagated , blessed -, python-editor +, editor , readchar # tests @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "inquirer"; - version = "3.1.4"; + version = "3.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "magmax"; repo = "python-inquirer"; rev = "refs/tags/v${version}"; - hash = "sha256-1xaxLIk4GFRpcodhBX+Co9TgpYkWhB/D4OE4Nny4ijM="; + hash = "sha256-LsZ2SYgBOKZegk7b9DwForwMA49XvIe+Z6WvI1/YscY="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ blessed - python-editor + editor readchar ]; diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix index e62e7f17e874..454106d28b56 100644 --- a/pkgs/development/python-modules/inscriptis/default.nix +++ b/pkgs/development/python-modules/inscriptis/default.nix @@ -1,7 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core , lxml +, fastapi +, httpx , pytestCheckHook , pythonOlder , requests @@ -9,8 +12,8 @@ buildPythonPackage rec { pname = "inscriptis"; - version = "2.3.2"; - format = "setuptools"; + version = "2.5.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,15 +21,21 @@ buildPythonPackage rec { owner = "weblyzard"; repo = "inscriptis"; rev = "refs/tags/${version}"; - hash = "sha256-grsyHqt7ahiNsYKcZN/c5cJaag/nTWTBcaHaXnW1SpU="; + hash = "sha256-9KEkXcdZ7USXfyIXGDrp4p4kJTzF2q30fvOccxF1hBU="; }; + build-system = [ + poetry-core + ]; + propagatedBuildInputs = [ lxml requests ]; nativeCheckInputs = [ + fastapi + httpx pytestCheckHook ]; @@ -36,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTML to text converter"; + mainProgram = "inscript.py"; homepage = "https://github.com/weblyzard/inscriptis"; changelog = "https://github.com/weblyzard/inscriptis/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index 6d5c4a66239c..35d434de760f 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "State-of-the-art 2D and 3D Face Analysis Project"; + mainProgram = "insightface-cli"; homepage = "https://github.com/deepinsight/insightface"; license = licenses.mit; maintainers = with maintainers; [ oddlama ]; diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix new file mode 100644 index 000000000000..476741835116 --- /dev/null +++ b/pkgs/development/python-modules/instructor/default.nix @@ -0,0 +1,41 @@ +{ lib +, python3 +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "instructor"; + version = "0.6.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Af52TGnkqY/t0cPkHoRfhFqa/tuOpQXAI/fFfMTcM4Y="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + docstring-parser + openai + pydantic + rich + tenacity + typer + ]; + + pythonImportsCheck = [ "instructor" ]; + + meta = with lib; { + description = "Structured outputs for llm"; + homepage = "https://github.com/jxnl/instructor"; + changelog = "https://github.com/jxnl/instructor/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + mainProgram = "instructor"; + }; +} diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 15045b4695c4..ccfd6afe3125 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -2,7 +2,8 @@ , aenum , buildPythonPackage , fetchFromGitHub -, httpx +, aiohttp +, aioresponses , poetry-core , pydantic , pytest-asyncio @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "3.6.1"; + version = "4.1.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = "intellifire4py"; rev = "refs/tags/v${version}"; - hash = "sha256-ovJUL8Z98F6gyKG04CoOiQE5dJbp9yTVHcTgniJBvOw="; + hash = "sha256-dMhm2gntLV7ev6UIfHFMATytZo5blTlALuh9sBirkqI="; }; nativeBuildInputs = [ @@ -31,13 +32,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp aenum - httpx pydantic rich ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytest-httpx pytestCheckHook @@ -49,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to read Intellifire fireplace status data"; + mainProgram = "intellifire4py"; homepage = "https://github.com/jeeftor/intellifire4py"; changelog = "https://github.com/jeeftor/intellifire4py/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 797f24eee83a..6df7a76dadd5 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -11,32 +11,36 @@ , tqdm , urllib3 , pythonOlder +, importlib-metadata }: buildPythonPackage rec { pname = "internetarchive"; - version = "3.6.0"; + version = "3.7.0"; + pyproject = true; - format = "pyproject"; + disabled = pythonOlder "3.8"; - disabled = pythonOlder "3.7"; - - # no tests data included in PyPI tarball src = fetchFromGitHub { owner = "jjjake"; repo = "internetarchive"; - rev = "v${version}"; - hash = "sha256-hy5e6DEAwLKn0l2nJD7fyW5r4ZZiH+fuTEDLQen+dNk="; + rev = "refs/tags/v${version}"; + hash = "sha256-krMOjXzI9tmLGLEswXLLqc8J68Gwnl1VrRO2fLbDv0o="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ tqdm docopt requests jsonpatch schema - setuptools # needs pkg_resources at runtime urllib3 + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; nativeCheckInputs = [ @@ -67,7 +71,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python and Command-Line Interface to Archive.org"; homepage = "https://github.com/jjjake/internetarchive"; - changelog = "https://github.com/jjjake/internetarchive/raw/v${version}/HISTORY.rst"; + changelog = "https://github.com/jjjake/internetarchive/blob/v${version}/HISTORY.rst"; license = licenses.agpl3Plus; maintainers = [ maintainers.marsam ]; mainProgram = "ia"; diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix index eab0c1c360aa..a69a0f8f85f6 100644 --- a/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/default.nix @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library for creating and decoding invisible image watermarks"; + mainProgram = "invisible-watermark"; homepage = "https://github.com/ShieldMnt/invisible-watermark"; license = licenses.mit; maintainers = with maintainers; [ Luflosi ]; diff --git a/pkgs/development/python-modules/iocextract/default.nix b/pkgs/development/python-modules/iocextract/default.nix index 3353d912b393..fd00ff991f00 100644 --- a/pkgs/development/python-modules/iocextract/default.nix +++ b/pkgs/development/python-modules/iocextract/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to extract Indicator of Compromises (IOC)"; + mainProgram = "iocextract"; homepage = "https://github.com/InQuest/python-iocextract"; changelog = "https://github.com/InQuest/python-iocextract/releases/tag/v${version}"; license = licenses.gpl2Only; diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix index a3f7e910664c..a485e3df6219 100644 --- a/pkgs/development/python-modules/iocsearcher/default.nix +++ b/pkgs/development/python-modules/iocsearcher/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library and command line tool for extracting indicators of compromise (IOCs)"; + mainProgram = "iocsearcher"; homepage = "https://github.com/malicialab/iocsearcher"; changelog = "https://github.com/malicialab/iocsearcher/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix index 64021cc051b1..50a6a87eac86 100644 --- a/pkgs/development/python-modules/iodata/default.nix +++ b/pkgs/development/python-modules/iodata/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for reading, writing, and converting computational chemistry file formats and generating input files"; + mainProgram = "iodata-convert"; homepage = "https://github.com/theochem/iodata"; license = licenses.lgpl3Only; maintainers = [ maintainers.sheepforce ]; diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index f5911b627c8d..96a4274bac1e 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/gotcha/ipdb"; description = "IPython-enabled pdb"; + mainProgram = "ipdb3"; license = licenses.bsd0; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 509b70b7fd3a..2ad3df50dfc9 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "8.6.1"; - format = "pyproject"; + version = "8.7.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-o5ql75VgFwvw6a/typ/wReG5wYMsSTAzd+3Mkc6p+3c="; + hash = "sha256-QDwJca5Wwrajn/6PNfMcf9FwzhJ5JGKUWc3X96C058M="; }; # We do not need the jupyterlab build dependency, because we do not need to @@ -33,14 +33,14 @@ buildPythonPackage rec { # postPatch = '' substituteInPlace pyproject.toml \ - --replace '"jupyterlab>=3.0.0,==3.*",' "" + --replace '"jupyterlab==4.*",' "" ''; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ decorator entrypoints ipykernel @@ -64,6 +64,7 @@ buildPythonPackage rec { meta = with lib;{ description = "Interactive Parallel Computing with IPython"; homepage = "https://ipyparallel.readthedocs.io/"; + changelog = "https://github.com/ipython/ipyparallel/blob/${version}/docs/source/changelog.md"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e92d5fbbf656..7dacc7e2aa3c 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -8,14 +8,11 @@ , setuptools # Runtime dependencies -, appnope -, backcall , decorator , exceptiongroup , jedi , matplotlib-inline , pexpect -, pickleshare , prompt-toolkit , pygments , stack-data @@ -23,19 +20,22 @@ , typing-extensions # Test dependencies +, pickleshare +, pytest-asyncio , pytestCheckHook +, pytest_7 , testpath }: buildPythonPackage rec { pname = "ipython"; - version = "8.20.0"; + version = "8.22.2"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-LyG9P8HVFVDInuOUSuBLvHvHnhKeoJN9pubGi/2/EXo="; + hash = "sha256-LcqtkEn5BW8f72NRTxdsfUH5MNqnjQW4KhdiAoGPLBQ="; }; nativeBuildInputs = [ @@ -43,12 +43,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - backcall decorator jedi matplotlib-inline pexpect - pickleshare prompt-toolkit pygments stack-data @@ -57,8 +55,6 @@ buildPythonPackage rec { exceptiongroup ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions - ] ++ lib.optionals stdenv.isDarwin [ - appnope ]; pythonImportsCheck = [ @@ -74,7 +70,9 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - pytestCheckHook + pickleshare + pytest-asyncio + (pytestCheckHook.override { pytest = pytest_7; }) testpath ]; diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index 499d6a043854..0a55f0bb4a93 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - hash = "sha256-nFN+IYKZ3jIZSx2pSda5a//mwA82u2A1QJ8khf64gec="; + hash = "sha256-MAqO6wREtnaVCgG88UXYsKlLpkizbtPqmeQ9u3UVnU0="; }; # drop pynpm which tries to install node_modules diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 4e8377a9bd54..b4cefff029dd 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -44,6 +44,11 @@ buildPythonPackage rec { pytz ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + meta = { description = "IPython HTML widgets for Jupyter"; homepage = "https://github.com/jupyter-widgets/ipywidgets"; diff --git a/pkgs/development/python-modules/ipyxact/default.nix b/pkgs/development/python-modules/ipyxact/default.nix index 28652d156a87..5cf7bfa9b2e6 100644 --- a/pkgs/development/python-modules/ipyxact/default.nix +++ b/pkgs/development/python-modules/ipyxact/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/olofk/ipyxact"; description = "IP-XACT parser"; + mainProgram = "ipxact2v"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix index e9226d4aaee5..22d66ef9f14f 100644 --- a/pkgs/development/python-modules/iso-639/default.nix +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/noumar/iso639"; description = "ISO 639 library for Python"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ zraexy ]; }; } diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 6bf563af4784..a3e935907341 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "isort"; - version = "5.12.0"; + version = "5.13.2"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = "refs/tags/${version}"; - hash = "sha256-8ija4xWWZuYkElXLdziV7ulN8dubIsChcZQ5dx9hfO0="; + hash = "sha256-/1iKYmtNRw9u59zzJDwV7b9+EPxFJDHvhjTioGt5LLU="; }; nativeBuildInputs = [ @@ -52,6 +52,8 @@ buildPythonPackage rec { "--ignore=tests/benchmark/" # requires pytest-benchmark "--ignore=tests/integration/" # pulls in 10 other packages "--ignore=tests/unit/profiles/test_black.py" # causes infinite recursion to include black + # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. + "-W" "ignore::pytest.PytestRemovedIn8Warning" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/isosurfaces/default.nix b/pkgs/development/python-modules/isosurfaces/default.nix index 96227ed0aa75..c1caa00b980d 100644 --- a/pkgs/development/python-modules/isosurfaces/default.nix +++ b/pkgs/development/python-modules/isosurfaces/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "isosurfaces"; - version = "0.1.0"; + version = "0.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "fa1b44e5e59d2f429add49289ab89e36f8dcda49b7badd99e0beea273be331f4"; + sha256 = "sha256-+lHr6GTqk1WyaDDif91qQdWli0GfqNS0fjuLgHGNbiE="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index cf66d9be21bd..b779010bc579 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/kolypto/j2cli"; description = "Jinja2 Command-Line Tool"; + mainProgram = "j2"; license = licenses.bsd2; longDescription = '' J2Cli is a command-line tool for templating in shell-scripts, diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index 821c11b01e27..c19c5c64286f 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -93,6 +93,7 @@ buildPythonPackage rec { changelog = "https://github.com/jaraco/jaraco.abode/blob/${version}/CHANGES.rst"; homepage = "https://github.com/jaraco/jaraco.abode"; description = "Library interfacing to the Abode home security system"; + mainProgram = "abode"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee dotlambda ]; }; diff --git a/pkgs/development/python-modules/jaraco-classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix index 6364f89e4cac..8408e80217b2 100644 --- a/pkgs/development/python-modules/jaraco-classes/default.nix +++ b/pkgs/development/python-modules/jaraco-classes/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "jaraco-classes"; - version = "3.3.0"; + version = "3.3.1"; format = "pyproject"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.classes"; rev = "refs/tags/v${version}"; - sha256 = "sha256-DW8qf6G6997vBOaO1+Bdx4LBvKfpl/MiiFqWJYKE/pg="; + sha256 = "sha256-ds84jNEx/2/BnMTbLMvXf/nxKSqyCBM7B7S0NNYagVE="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco-collections/default.nix b/pkgs/development/python-modules/jaraco-collections/default.nix index 3c0d0b6a9aa6..bab89a3f7a60 100644 --- a/pkgs/development/python-modules/jaraco-collections/default.nix +++ b/pkgs/development/python-modules/jaraco-collections/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "jaraco-collections"; - version = "4.3.0"; + version = "5.0.0"; format = "pyproject"; src = fetchPypi { pname = "jaraco.collections"; inherit version; - hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ="; + hash = "sha256-FoDo0J8pX2Jce6kmiAF1om/b5wkrTHbRmOMEdrIc/mg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix index 7e4ca68deb04..b6ff349a533b 100644 --- a/pkgs/development/python-modules/jaraco-email/default.nix +++ b/pkgs/development/python-modules/jaraco-email/default.nix @@ -1,11 +1,10 @@ { lib -, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , setuptools , setuptools-scm +, aiosmtpd , jaraco-text , jaraco-collections , keyring @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "jaraco-email"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.7"; @@ -24,28 +23,16 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.email"; rev = "refs/tags/v${version}"; - hash = "sha256-MR/SX5jmZvEMULgvQbh0JBZjIosNCPWl1wvEoJbdw4Y="; + hash = "sha256-2dU+tbrP86Oy8ej1Xa0+fNRB83tGBTUsOWbZyQsMKu8="; }; - patches = [ - (fetchpatch { - name = "dos2unix-line-endings.patch"; - url = "https://github.com/jaraco/jaraco.email/commit/ab9643598e26cca9c9cdbd34b00c972f547b9236.patch"; - hash = "sha256-Z2WOnR+ELzQciVyUiUq4jaP+Vnc4aseLP7+LWJZoOU8="; - }) - (fetchpatch { - name = "jaraco-collections-4-compatibility.patch"; - url = "https://github.com/jaraco/jaraco.email/commit/e65e5fed0178ddcd009d16883b381c5582f1a9df.patch"; - hash = "sha256-mKxa0ZU1JFeQPemrjQl94buLNY5gXnMCCRKBxdO870M="; - }) - ]; - nativeBuildInputs = [ setuptools setuptools-scm ]; propagatedBuildInputs = [ + aiosmtpd jaraco-text jaraco-collections keyring diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index 4765c1dc301c..e278c1a3832d 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -11,6 +11,7 @@ , keyring , requests , feedparser +, icmplib , jaraco-text , jaraco-logging , jaraco-email @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "jaraco-net"; - version = "9.3.1"; + version = "10.2.0"; disabled = pythonOlder "3.7"; @@ -41,7 +42,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.net"; rev = "refs/tags/v${version}"; - hash = "sha256-aq5v4QlapmMTrqwNA0GtRi/xZCcyoR1giZECBsYwymw="; + hash = "sha256-z9+gz6Sos0uluU5icXJN9OMmWFErVrJXBvoBcKv6Wwg="; }; nativeBuildInputs = [ @@ -56,6 +57,7 @@ buildPythonPackage rec { keyring requests feedparser + icmplib jaraco-text jaraco-logging jaraco-email diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index d41987c9a539..22e4c5aa838d 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -29,7 +29,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.24"; + version = "0.4.25"; pyproject = true; disabled = pythonOlder "3.9"; @@ -38,8 +38,8 @@ buildPythonPackage rec { owner = "google"; repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! - rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-hmx7eo3pephc6BQfoJ3U0QwWBWmhkAc+7S4QmW32qQs="; + rev = "refs/tags/jaxlib-v${version}"; + hash = "sha256-poQQo2ZgEhPYzK3aCs+BjaHTNZbezJAECd+HOdY1Yok="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 199b352b2aa2..e2260aec4b14 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -23,7 +23,7 @@ }: let - inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaVersion; + inherit (cudaPackagesGoogle) autoAddDriverRunpath cudaVersion; version = "0.4.24"; @@ -180,7 +180,7 @@ buildPythonPackage { # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ] - ++ lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ]; + ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; # Dynamic link dependencies buildInputs = [ stdenv.cc.cc.lib ]; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 657a6e52c084..cbce801888e2 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -51,7 +51,7 @@ }@inputs: let - inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaFlags cudaVersion cudnn nccl; + inherit (cudaPackagesGoogle) autoAddDriverRunpath cudaFlags cudaVersion cudnn nccl; pname = "jaxlib"; version = "0.4.24"; @@ -420,7 +420,7 @@ buildPythonPackage { done ''; - nativeBuildInputs = lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ]; + nativeBuildInputs = lib.optionals cudaSupport [ autoAddDriverRunpath ]; propagatedBuildInputs = [ absl-py diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index fca4a554d328..fdc1d1a5a9b1 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -11,12 +11,11 @@ , pytestCheckHook , python-lsp-jsonrpc , pythonOlder -, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.41.1-unstable-2023-10-04"; + version = "0.41.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,17 +23,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pappasam"; repo = pname; - rev = "c4c470cff67e54593a626b22d1b6b05e56fde3a3"; - hash = "sha256-qFBni97B/GkabbznnZtWTG4dCHFkOx5UQjuevxq+Uvo="; + rev = "v${version}"; + hash = "sha256-+k4WOoEbVe7mlPyPj0ttBM+kmjq8V739yHi36BDYK2U="; }; - pythonRelaxDeps = [ - "pygls" - ]; - nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -61,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Language Server for the latest version(s) of Jedi"; + mainProgram = "jedi-language-server"; homepage = "https://github.com/pappasam/jedi-language-server"; changelog = "https://github.com/pappasam/jedi-language-server/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jello/default.nix b/pkgs/development/python-modules/jello/default.nix index 01525078bcaa..0b2d6cff7882 100644 --- a/pkgs/development/python-modules/jello/default.nix +++ b/pkgs/development/python-modules/jello/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "CLI tool to filter JSON and JSON Lines data with Python syntax"; + mainProgram = "jello"; homepage = "https://github.com/kellyjonbrazil/jello"; changelog = "https://github.com/kellyjonbrazil/jello/blob/${src.rev}/CHANGELOG"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 19d6b9e33339..86f89015a001 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; + mainProgram = "jenkins-jobs"; homepage = "https://jenkins-job-builder.readthedocs.io/en/latest/"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 9b8a808b878f..b569483f9211 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -6,6 +6,7 @@ , ipython , keyring , packaging +, pillow , pyjwt , pytestCheckHook , pythonOlder @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "jira"; - version = "3.5.2"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +31,7 @@ buildPythonPackage rec { owner = "pycontribs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9hzKN57OHi2be9C2mtHZU1KcpbcKxiiYDj9Vw7MxTK4="; + hash = "sha256-Wv6xjk1nyFIDKAypyQRlqFglzxe9Ems2ON3PEehUP/Q="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { requests requests-oauthlib requests-toolbelt + pillow typing-extensions ]; diff --git a/pkgs/development/python-modules/jiwer/default.nix b/pkgs/development/python-modules/jiwer/default.nix index d042726daa6a..2c1566350246 100644 --- a/pkgs/development/python-modules/jiwer/default.nix +++ b/pkgs/development/python-modules/jiwer/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple and fast python package to evaluate an automatic speech recognition system"; + mainProgram = "jiwer"; homepage = "https://github.com/jitsi/jiwer"; changelog = "https://github.com/jitsi/jiwer/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index db761a982305..6a5ef26c4fa5 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/jmespath/jmespath.py"; description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; + mainProgram = "jp.py"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 1206c816b3d8..5332bf6c4381 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/certbot/josepy/blob/v${version}/CHANGELOG.rst"; description = "JOSE protocol implementation in Python"; + mainProgram = "jws"; homepage = "https://github.com/certbot/josepy"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix new file mode 100644 index 000000000000..ce5e18ec1349 --- /dev/null +++ b/pkgs/development/python-modules/joserfc/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, cryptography +, pycryptodome + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "joserfc"; + version = "0.9.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "authlib"; + repo = "joserfc"; + rev = version; + hash = "sha256-+NFCveMPzE0hSs2Qe20/MDHApXVtU3cR/GPFKPqfVV4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + cryptography + ]; + + optional-dependencies = { + drafts = [ + pycryptodome + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.flatten (lib.attrValues optional-dependencies); + + pythonImportsCheck = [ + "joserfc" + ]; + + meta = with lib; { + description = "Implementations of JOSE RFCs in Python"; + homepage = "https://github.com/authlib/joserfc"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/jproperties/default.nix b/pkgs/development/python-modules/jproperties/default.nix index b7c2a1e296ef..b01f39d0432a 100644 --- a/pkgs/development/python-modules/jproperties/default.nix +++ b/pkgs/development/python-modules/jproperties/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Java Property file parser and writer for Python"; + mainProgram = "propconv"; homepage = "https://github.com/Tblue/python-jproperties"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index 9a33ecf46d4b..64b616382518 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildPythonPackage , six @@ -24,14 +23,14 @@ let in buildPythonPackage rec { pname = "jpylyzer"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "openpreserve"; repo = pname; rev = version; - hash = "sha256-LBVOwjWC/HEvGgoi8WxEdl33M4JrfdHEj1Dk7f1NAiA="; + hash = "sha256-SK6Z+JkFBD9V99reRZf+jM8Z2SiDNSG72gusp2FPfmI="; }; propagatedBuildInputs = [ six ]; @@ -43,6 +42,12 @@ in buildPythonPackage rec { preCheck = lib.optionalString doFullCheck '' sed -i '/^testFilesDir = /ctestFilesDir = "${testFiles}"' tests/unit/test_testfiles.py ''; + + disabledTests = [ + # missing file, but newer test files breaks other tests + "test_groundtruth_complete" + ]; + disabledTestPaths = lib.optionals (!doFullCheck) [ "tests/unit/test_testfiles.py" ]; @@ -57,6 +62,7 @@ in buildPythonPackage rec { meta = with lib; { description = "JP2 (JPEG 2000 Part 1) image validator and properties extractor"; + mainProgram = "jpylyzer"; homepage = "https://jpylyzer.openpreservation.org/"; license = licenses.lgpl3; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index d3fc765f4c86..85da49876eb3 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "JavaScript unobfuscator and beautifier"; + mainProgram = "js-beautify"; homepage = "http://jsbeautifier.org"; changelog = "https://github.com/beautify-web/js-beautify/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/json-merge-patch/default.nix b/pkgs/development/python-modules/json-merge-patch/default.nix index 5b8c0a2fa4be..9cafcc30fd4b 100644 --- a/pkgs/development/python-modules/json-merge-patch/default.nix +++ b/pkgs/development/python-modules/json-merge-patch/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON Merge Patch library"; + mainProgram = "json-merge-patch"; homepage = "https://github.com/open-contracting/json-merge-patch"; license = licenses.bsd3; maintainers = [ ]; diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 9bd62060457c..f758ae924496 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; + mainProgram = "generate-schema-doc"; homepage = "https://github.com/coveooss/json-schema-for-humans"; changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix index b75020c0e5bf..2d348403c499 100644 --- a/pkgs/development/python-modules/json-tricks/default.nix +++ b/pkgs/development/python-modules/json-tricks/default.nix @@ -29,6 +29,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "json_tricks" ]; diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index 786f33b385dc..b244a79114c0 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/dpranke/pyjson5"; description = "A Python implementation of the JSON5 data format"; + mainProgram = "pyjson5"; license = licenses.asl20; maintainers = with maintainers; [ veehaitch ]; }; diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 23a4200500a4..55cf2a95d773 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.27.5"; + version = "4.27.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-MSvgOF/5X78HSSRvv1TBmaYZgcUVMKGaHfzXu3lIGVY="; + hash = "sha256-JWa08jCdtP9xwLaTYw0024DogDC0WQvKZ8xRDTEhsvE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix index d9f6d5556fb5..49e3974e7350 100644 --- a/pkgs/development/python-modules/jsonconversion/default.nix +++ b/pkgs/development/python-modules/jsonconversion/default.nix @@ -1,26 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, numpy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonRelaxDepsHook +, pytestCheckHook +, pdm-backend +, numpy +, setuptools +}: buildPythonPackage rec { pname = "jsonconversion"; - version = "0.2.13"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-4hMY0N/Px+g5zn3YzNfDWPyi8Pglvd/c2N9SeC4JoZ0="; + src = fetchFromGitHub { + owner = "DLR-RM"; + repo = "python-jsonconversion"; + rev = "refs/tags/${version}"; + hash = "sha256-XmAQXu9YkkMUvpf/QVk4u1p8UyNfRb0NeoLxC1evCT4="; }; - postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner'" "" - ''; + build-system = [ + pdm-backend + pythonRelaxDepsHook + ]; - nativeCheckInputs = [ pytestCheckHook numpy ]; + pythonRemoveDeps = [ + "pytest-runner" + "pytest" + ]; - pythonImportsCheck = [ "jsonconversion" ]; + dependencies = [ + numpy + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsonconversion" + ]; meta = with lib; { description = "This python module helps converting arbitrary Python objects into JSON strings and back"; - homepage = "https://pypi.org/project/jsonconversion/"; + homepage = "https://github.com/DLR-RM/python-jsonconversion"; license = licenses.bsd2; maintainers = [ maintainers.terlar ]; }; diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 6985a6edba3a..dcfa56d686ae 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = { description = "Diff JSON and JSON-like structures in Python"; + mainProgram = "jdiff"; homepage = "https://github.com/ZoomerAnalytics/jsondiff"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/jsonformatter/default.nix b/pkgs/development/python-modules/jsonformatter/default.nix new file mode 100644 index 000000000000..f800493b2c93 --- /dev/null +++ b/pkgs/development/python-modules/jsonformatter/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, setuptools +}: + +buildPythonPackage rec { + pname = "jsonformatter"; + version = "0.3.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "MyColorfulDays"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-oK419J/MIxRT+1j/5Yklj1F+4d3wuMXR8IVqJAMKPNw="; + }; + + nativeBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ + "jsonformatter" + ]; + + meta = with lib; { + description = "jsonformatter is a formatter for python output json log, e.g. output LogStash needed log"; + homepage = "https://github.com/MyColorfulDays/jsonformatter"; + license = licenses.bsd2; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/jsonpath-ng/default.nix b/pkgs/development/python-modules/jsonpath-ng/default.nix index 104c7cc3e422..0496df1622ff 100644 --- a/pkgs/development/python-modules/jsonpath-ng/default.nix +++ b/pkgs/development/python-modules/jsonpath-ng/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSONPath implementation"; + mainProgram = "jsonpath_ng"; homepage = "https://github.com/h2non/jsonpath-ng"; changelog = "https://github.com/h2non/jsonpath-ng/blob/v${version}/History.md"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/jsonpath-rw/default.nix b/pkgs/development/python-modules/jsonpath-rw/default.nix index d2b177c742ab..5801ba47e21f 100644 --- a/pkgs/development/python-modules/jsonpath-rw/default.nix +++ b/pkgs/development/python-modules/jsonpath-rw/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/kennknowles/python-jsonpath-rw"; description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming"; + mainProgram = "jsonpath.py"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index bff05f256247..4e3fd813144b 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-43q7pL+zykpGR9KLufRwZDb3tGyKgzO0pxirr6jkazc="; + hash = "sha256-VpH0RJUyeFirOpW5xECnm0HjVCG+Gm4JpHtsm5Qh/QY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index 455acd531146..ff44d8ff978c 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolve JSON Pointers in Python"; + mainProgram = "jsonpointer"; homepage = "https://github.com/stefankoegl/python-json-pointer"; license = licenses.bsd2; # "Modified BSD license, says pypi" }; diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix index 598b0fdf3e83..1fad4ed64e10 100644 --- a/pkgs/development/python-modules/jsonschema-path/default.nix +++ b/pkgs/development/python-modules/jsonschema-path/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , poetry-core +, pythonRelaxDepsHook , pathable , pyyaml , referencing @@ -31,6 +32,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "referencing" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index 7e8c668a0791..c41d8b35cf09 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -60,6 +60,8 @@ buildPythonPackage rec { responses ]; + passthru.skipBulkUpdate = true; # newer versions under the jsonschema-path name + meta = with lib; { changelog = "https://github.com/p1c2u/jsonschema-spec/releases/tag/${version}"; description = "JSONSchema Spec with object-oriented paths"; diff --git a/pkgs/development/python-modules/jsonschema-specifications/default.nix b/pkgs/development/python-modules/jsonschema-specifications/default.nix index 07fd3dcd5895..6d4a6478374b 100644 --- a/pkgs/development/python-modules/jsonschema-specifications/default.nix +++ b/pkgs/development/python-modules/jsonschema-specifications/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jsonschema-specifications"; - version = "2023.11.2"; + version = "2023.12.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jsonschema_specifications"; inherit version; - hash = "sha256-lHL8T+pHTNdL6korGQ2uzLWp5NsuqA7896G1gvyagbg="; + hash = "sha256-SKdnh7PnD17VPxFg0rgfWG5MptFUjF3nCF0WgmdHZMw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 10074463f80a..97147b055e93 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.20.0"; + version = "4.21.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-T2FP1G2NYSWGEJmJl3Q+xUkqZIszz0eMHdwj7UWYpfo="; + hash = "sha256-hXJ8ACefX6a+2+YjjSqmQDvt2LSGSrESB9B988wbLuU="; }; postPatch = '' @@ -92,6 +92,7 @@ buildPythonPackage rec { meta = with lib; { description = "An implementation of JSON Schema validation"; + mainProgram = "jsonschema"; homepage = "https://github.com/python-jsonschema/jsonschema"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index 988fde1f4408..490f919a712a 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Manipulates JUnit/xUnit Result XML files"; + mainProgram = "junitparser"; license = licenses.asl20; homepage = "https://github.com/weiwei/junitparser"; maintainers = with maintainers; [ multun ]; diff --git a/pkgs/development/python-modules/jupyter-c-kernel/default.nix b/pkgs/development/python-modules/jupyter-c-kernel/default.nix index 7b03afc86af7..c15d8dff3f6f 100644 --- a/pkgs/development/python-modules/jupyter-c-kernel/default.nix +++ b/pkgs/development/python-modules/jupyter-c-kernel/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Minimalistic C kernel for Jupyter"; + mainProgram = "install_c_kernel"; homepage = "https://github.com/brendanrius/jupyter-c-kernel/"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix index 7a2501f317b7..4a7ebfbd8319 100644 --- a/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/pkgs/development/python-modules/jupyter-cache/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "A defined interface for working with a cache of jupyter notebooks"; + mainProgram = "jcache"; homepage = "https://github.com/executablebooks/jupyter-cache"; changelog = "https://github.com/executablebooks/jupyter-cache/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index b131e347393c..3f20ac8b4da0 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.0.2"; + version = "2.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-EpWFsVWCi/6IOuM/zgPIer3arMDGjPPxhm/tZC4aji4="; + hash = "sha256-3N3w6JJ0SHa1EYBED/aU1g0IX9nDHf4iseGPwEK1zpw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-console/default.nix b/pkgs/development/python-modules/jupyter-console/default.nix index 715557bad733..81276bcc411e 100644 --- a/pkgs/development/python-modules/jupyter-console/default.nix +++ b/pkgs/development/python-modules/jupyter-console/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { meta = { description = "Jupyter terminal console"; + mainProgram = "jupyter-console"; homepage = "https://github.com/jupyter/jupyter_console"; changelog = "https://github.com/jupyter/jupyter_console/releases/tag/v${version}"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/jupyter-contrib-core/default.nix b/pkgs/development/python-modules/jupyter-contrib-core/default.nix index 7bd1c29eb6ea..0da8c5f4f151 100644 --- a/pkgs/development/python-modules/jupyter-contrib-core/default.nix +++ b/pkgs/development/python-modules/jupyter-contrib-core/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Common utilities for jupyter-contrib projects"; + mainProgram = "jupyter-contrib"; homepage = "https://github.com/jupyter-contrib/jupyter_contrib_core"; license = licenses.bsd3; maintainers = with maintainers; [ GaetanLepage ]; diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 28aa80927763..c4ea9f7b704e 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -74,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}"; description = "Configurable event system for Jupyter applications and extensions"; + mainProgram = "jupyter-events"; homepage = "https://github.com/jupyter/jupyter_events"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index 0822b1cbcc76..74fc46f39afa 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jupyter-lsp"; - version = "2.2.3"; + version = "2.2.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-M9vLxd8kI3/1yLaWsE/0aJ/NMWy41JV9Yg/lUE19LD8="; + hash = "sha256-XlADMUk0QGU0jmiGCPPG1lTvBtmFa2dlW9e2usnuLVk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix index 5fc0a95fc7bf..bf3506e9572a 100644 --- a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix +++ b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "A jupyter notebook serverextension providing config interfaces for nbextensions"; + mainProgram = "jupyter-nbextensions_configurator"; homepage = "https://github.com/jupyter-contrib/jupyter_nbextensions_configurator"; license = licenses.bsd3; maintainers = with maintainers; [ GaetanLepage ]; diff --git a/pkgs/development/python-modules/jupyter-server-fileid/default.nix b/pkgs/development/python-modules/jupyter-server-fileid/default.nix index 302a521cdc4e..300f4bb835dd 100644 --- a/pkgs/development/python-modules/jupyter-server-fileid/default.nix +++ b/pkgs/development/python-modules/jupyter-server-fileid/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = { changelog = "https://github.com/jupyter-server/jupyter_server_fileid/blob/${src.rev}/CHANGELOG.md"; description = "An extension that maintains file IDs for documents in a running Jupyter Server"; + mainProgram = "jupyter-fileid"; homepage = "https://github.com/jupyter-server/jupyter_server_fileid"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 77993d24fd2c..6b0160202d87 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.12.5"; + version = "2.13.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-DttibJS6oigJvhMj+XcM8cAKlSsXCXWS5A0D5qOVFok="; + hash = "sha256-yAv7BJ6iAFPD2WQcKt1ISLOAc7958XKc6h+u0y/Bx44="; }; nativeBuildInputs = [ @@ -118,6 +118,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/jupyter-server/jupyter_server/blob/v${version}/CHANGELOG.md"; description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications"; + mainProgram = "jupyter-server"; homepage = "https://github.com/jupyter-server/jupyter_server"; license = licenses.bsdOriginal; maintainers = lib.teams.jupyter.members; diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 409539ccb4a7..1f45886c84e5 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "JupyterHub Spawner using systemd for resource isolation"; + mainProgram = "check-kernel.bash"; homepage = "https://github.com/jupyterhub/systemdspawner"; changelog = "https://github.com/jupyterhub/systemdspawner/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index eba16194d69c..deecae0b7ea5 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab-lsp"; - version = "5.0.3"; + version = "5.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qcijpkZJS+SE1+MXSrHSQV7WD0dzzshHmqW6N+XwS8k="; + hash = "sha256-rqyECTrabSDvV64Ol4EcxXlqDKtyN7Mvjt35k8C7A1Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index 4e542e8ebf9f..c1470c58893d 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.25.3"; + version = "2.25.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-hG8SWooZZWYR31sD5ZEsg5POppAIWbqmT6UV62So3EA="; + hash = "sha256-IJgZjh6C4NuYJED5tRNhddc76izUKmSAqm/VAssjxPk="; }; postPatch = '' @@ -70,6 +70,10 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + disabledTestPaths = [ # require optional language pack packages for tests "tests/test_translation_api.py" diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index ed909d15f6a6..4be3dc7b1487 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -4,6 +4,7 @@ , hatch-jupyter-builder , hatchling , async-lru +, httpx , packaging , tornado , ipykernel @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.0.12"; + version = "4.1.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ll2S76gqU47XDMs5aNmqu6eIhA2oguE9ewYXgM3tw7c="; + hash = "sha256-4DyCwSStigiS5Ji53eecUIaLLCZ4Gayj9VzkfFfr6x0="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-lru + httpx packaging tornado ipykernel diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index aa7d1c172c67..dbab01e01a54 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -1,23 +1,24 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchPypi , substituteAll , findutils , krb5 -, stdenv +, setuptools }: buildPythonPackage rec { pname = "k5test"; - version = "0.10.3"; - format = "setuptools"; + version = "0.10.4"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nJ3uvK1joxXoGDPUXp/RK/IBZmQ7iry5/29NaxhMVx8="; + hash = "sha256-4VJJHmYC9qk7PVM9OHvUWQ8kdgk7aEIXD/C5PeZL7zA="; }; patches = [ @@ -29,16 +30,23 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + ]; + # No tests doCheck = false; - pythonImportsCheck = [ "k5test" ]; + pythonImportsCheck = [ + "k5test" + ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Library for setting up self-contained Kerberos 5 environment"; homepage = "https://github.com/pythongssapi/k5test"; + changelog = "https://github.com/pythongssapi/k5test/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 1de5eff46285..e2d0f67bc2cb 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Official API for https://www.kaggle.com, accessible using a command line tool implemented in Python 3"; + mainProgram = "kaggle"; homepage = "https://github.com/Kaggle/kaggle-api"; license = licenses.asl20; maintainers = with maintainers; [ mbalatsko ]; diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index e11e16fbedbc..a4c92ea35ed7 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module provides fast well-formed XML templates"; + mainProgram = "kajiki"; homepage = "https://github.com/nandoflorestan/kajiki"; changelog = "https://github.com/jackrosenthal/kajiki/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index c86e2a2d6f3a..d570ae3b0066 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Configuration manager for python applications"; + mainProgram = "kaptan"; homepage = "https://kaptan.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix index fee502989ba0..ffed577e7222 100644 --- a/pkgs/development/python-modules/karton-asciimagic/default.nix +++ b/pkgs/development/python-modules/karton-asciimagic/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Decoders for ascii-encoded executables for the Karton framework"; + mainProgram = "karton-asciimagic"; homepage = "https://github.com/CERT-Polska/karton-asciimagic"; changelog = "https://github.com/CERT-Polska/karton-asciimagic/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix index 7bdac115385f..f4a8e2f5868b 100644 --- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "AutoIt script ripper for Karton framework"; + mainProgram = "karton-autoit-ripper"; homepage = "https://github.com/CERT-Polska/karton-autoit-ripper"; changelog = "https://github.com/CERT-Polska/karton-autoit-ripper/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index 9f19e1ab6b9e..bb104b291491 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "File type classifier for the Karton framework"; + mainProgram = "karton-classifier"; homepage = "https://github.com/CERT-Polska/karton-classifier"; changelog = "https://github.com/CERT-Polska/karton-classifier/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index 8d8b51bc842f..90ede387f922 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static configuration extractor for the Karton framework"; + mainProgram = "karton-config-extractor"; homepage = "https://github.com/CERT-Polska/karton-config-extractor"; changelog = "https://github.com/CERT-Polska/karton-config-extractor/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 60e21e63b116..b90653dddd46 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web application that allows for Karton task and queue introspection"; + mainProgram = "karton-dashboard"; homepage = "https://github.com/CERT-Polska/karton-dashboard"; changelog = "https://github.com/CERT-Polska/karton-dashboard/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 090b19f02ce7..0fd9713beaf6 100644 --- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Karton service that uploads analyzed artifacts and metadata to MWDB Core"; + mainProgram = "karton-mwdb-reporter"; homepage = "https://github.com/CERT-Polska/karton-mwdb-reporter"; changelog = "https://github.com/CERT-Polska/karton-mwdb-reporter/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index 2c6dc57d9966..1d5c4d56173e 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "File and analysis artifacts yara matcher for the Karton framework"; + mainProgram = "karton-yaramatcher"; homepage = "https://github.com/CERT-Polska/karton-yaramatcher"; changelog = "https://github.com/CERT-Polska/karton-yaramatcher/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index fe11b2538cce..eedbd7da41f1 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "kazoo"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-gAMYx/PatkjN9hbfslvavu+rKmg3qmlR4Po/+A5laWk="; + hash = "sha256-kFeWrk9MEr1OSukubl0BhDnmtWyM+7JIJTYuebIw2rE="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix index e381feb6dd4e..354ce597e6ec 100644 --- a/pkgs/development/python-modules/keep/default.nix +++ b/pkgs/development/python-modules/keep/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/orkohunter/keep"; description = "A Meta CLI toolkit: Personal shell command keeper and snippets manager"; + mainProgram = "keep"; platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index a65116524633..d4a62c74a639 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "KeepKey Python client"; + mainProgram = "keepkeyctl"; homepage = "https://github.com/keepkey/python-keepkey"; license = licenses.gpl3; maintainers = with maintainers; [ np ]; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index b91925b574e6..c74579296223 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "3.0.0"; + version = "3.0.5"; format = "wheel"; src = fetchPypi { inherit format pname version; - hash = "sha256-/z8++iqlzBNLHYuFaTqrMlWLHZyGBjChP1iTTm0ckI0="; + hash = "sha256-SgIvLpfqWj2xLtgJ/8t84e+NNP6urFIxXshVPe0tz5c="; python = "py3"; dist = "py3"; }; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 28df79fb9998..ba2c56d99682 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "keyring"; - version = "24.3.0"; + version = "24.3.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5zDs/9MJZYoI7oJTWjtexLTIZpqb4R77ZiSdjgrrmiU="; + hash = "sha256-wzJ7b/r8DovvvbWXys20ko/+XBIS92RfGG5tmVeomNs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index 6265ef7bb756..1621bcb30d95 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Encrypted file keyring backend"; + mainProgram = "cryptfile-convert"; homepage = "https://github.com/frispete/keyrings.cryptfile"; changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index c3e13d8b0fc4..412080ba846f 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.4.0"; + version = "5.6.0"; pyproject= true; src = fetchPypi { inherit pname version; - hash = "sha256-GsE0FRzrAuULaK143smCG/if5TvTb8hlhQHEewfL31M="; + hash = "sha256-7LfzR1nr4QPbNyqwlTwLghkp3dSX8zKqaz72yqz/7Yg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/khanaa/default.nix b/pkgs/development/python-modules/khanaa/default.nix new file mode 100644 index 000000000000..8548def29c3d --- /dev/null +++ b/pkgs/development/python-modules/khanaa/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, pythonOlder + +, unittestCheckHook + +, setuptools +}: + +buildPythonPackage rec { + pname = "khanaa"; + version = "0.0.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "cakimpei"; + repo = "khanaa"; + rev = "refs/tags/v${version}"; + hash = "sha256-BzxNHYMkp5pdJYQ80EI5jlP654yX9woW7wz1jArCln4="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ "-s" "tests" ]; + + pythonImportsCheck = [ "khanaa" ]; + + meta = with lib; + { + description = "A tool to make spelling Thai more convenient"; + homepage = "https://github.com/cakimpei/khanaa"; + changelog = "https://github.com/cakimpei/khanaa/blob/main/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix index 3352d25a3c07..9c3286d1c62c 100644 --- a/pkgs/development/python-modules/kinparse/default.nix +++ b/pkgs/development/python-modules/kinparse/default.nix @@ -32,6 +32,7 @@ buildPythonPackage { meta = with lib; { description = "A Parser for KiCad EESCHEMA netlists"; + mainProgram = "kinparse"; homepage = "https://github.com/xesscorp/kinparse"; license = licenses.mit; maintainers = with maintainers; [ matthuszagh ]; diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index dd04b97010dd..d9b8e23fe416 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - pname = "Kivy"; + pname = "kivy"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index b46c2c65eee3..6b60c78465bb 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "The first Git web viewer that Just Works"; + mainProgram = "klaus"; homepage = "https://github.com/jonashaag/klaus"; license = licenses.isc; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/python-modules/kml2geojson/default.nix b/pkgs/development/python-modules/kml2geojson/default.nix index 489e80f94f04..50f0097df7e8 100644 --- a/pkgs/development/python-modules/kml2geojson/default.nix +++ b/pkgs/development/python-modules/kml2geojson/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to convert KML to GeoJSON"; + mainProgram = "k2g"; homepage = "https://github.com/mrcagney/kml2geojson"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 27190f8733e8..1651d25c69ea 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -92,6 +92,11 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "kombu" ]; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix new file mode 100644 index 000000000000..fa7949eff097 --- /dev/null +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -0,0 +1,65 @@ +{ lib +, async-timeout +, buildPythonPackage +, defang +, dnspython +, fetchFromGitHub +, playwrightcapture +, poetry-core +, pythonOlder +, redis +, requests +, pythonRelaxDepsHook +, sphinx +, ua-parser +}: + +buildPythonPackage rec { + pname = "lacuscore"; + version = "1.8.10"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ail-project"; + repo = "LacusCore"; + rev = "refs/tags/v${version}"; + hash = "sha256-X3Bs/eMkpobRqiGB70ujvaIO1xWftEBZFyR9i5eN7/A="; + }; + + pythonRelaxDeps = [ + "redis" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + async-timeout + defang + dnspython + playwrightcapture + redis + requests + sphinx + ua-parser + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "lacuscore" + ]; + + meta = with lib; { + description = "The modulable part of Lacus"; + homepage = "https://github.com/ail-project/LacusCore"; + changelog = "https://github.com/ail-project/LacusCore/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 6e7b52a16b70..350e9a903690 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.30"; + version = "0.1.32"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-4ToBblXn8IL/Pu7aLQy1BbiaiDDjojwdE00KideHGJQ="; + hash = "sha256-1iaDvsvyD1HxKHV5GgQjIPReqgyHomfTC8A7waB/XsI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index a0153b28ef7b..f9352c5f9876 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -185,6 +185,7 @@ buildPythonPackage rec { meta = with lib; { description = "Building applications with LLMs through composability"; + mainProgram = "langchain-server"; homepage = "https://github.com/langchain-ai/langchain"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/langid/default.nix b/pkgs/development/python-modules/langid/default.nix index fe8f07e85b23..1f1c16777300 100644 --- a/pkgs/development/python-modules/langid/default.nix +++ b/pkgs/development/python-modules/langid/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Langid.py is a standalone Language Identification (LangID) tool"; + mainProgram = "langid"; homepage = "https://pypi.org/project/langid/"; license = licenses.bsd2; maintainers = with maintainers; [ mbalatsko ]; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 5ab6970da9fb..33fcdcad63f0 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.23"; + version = "0.1.31"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-AiXTIk20T9symFUenCxnOUXhyNAkffbEt8acEU0EMBg="; + hash = "sha256-eQ2oP1I7uc9s9vrDqKCIqMGuh1+MjUpLFukp3Fg0RM0="; }; sourceRoot = "${src.name}/python"; @@ -82,6 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; + mainProgram = "langsmith"; homepage = "https://github.com/langchain-ai/langsmith-sdk"; changelog = "https://github.com/langchain-ai/langsmith-sdk/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index 50f74dc2d811..93c900e307c3 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lark"; - version = "1.1.8"; + version = "1.1.9"; format = "pyproject"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = "refs/tags/${version}"; - hash = "sha256-bGNoQeiAC2JIFOhgYUnc+nApa2ovFzXnpl9JQAE11hM="; + hash = "sha256-pWLKjELy10VNumpBHjBYCO2TltKsZx1GhQcGMHsYJNk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/laspy/default.nix b/pkgs/development/python-modules/laspy/default.nix index 1cc46f2a36de..5375ed6f9ebe 100644 --- a/pkgs/development/python-modules/laspy/default.nix +++ b/pkgs/development/python-modules/laspy/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interface for reading/modifying/creating .LAS LIDAR files"; + mainProgram = "laspy"; homepage = "https://github.com/laspy/laspy"; changelog = "https://github.com/laspy/laspy/blob/${version}/CHANGELOG.md"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index ef677b82e03d..9286792de21b 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "latexcodec"; - version = "2.0.1"; + version = "3.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "16pynfnn8y8xp55yp06i721fccv5dlx9ba6k5bzcwq9j6wf5b8ia"; + sha256 = "sha256-kX3F/iQnYswZ2WPmVItC1joRgCjN0zYdYjl+O2OLa8U="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 2eec2c6e2827..4026bbbe5531 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.9.0"; + version = "1.10.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ZZ+1gJ+kYpuKGsUQb2ac/HvvJvuzid2lOz4BDRrE664="; + hash = "sha256-eCR7bUX0OlLvNcJbVYFFnoURciVAikEoo9r4v5ZIrGk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lcov-cobertura/default.nix b/pkgs/development/python-modules/lcov-cobertura/default.nix index 2c9a3595fca5..a2f91b8436de 100644 --- a/pkgs/development/python-modules/lcov-cobertura/default.nix +++ b/pkgs/development/python-modules/lcov-cobertura/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = { description = "Converts code coverage from lcov format to Cobertura's XML format"; + mainProgram = "lcov_cobertura"; homepage = "https://eriwen.github.io/lcov-to-cobertura-xml/"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/ldfparser/default.nix b/pkgs/development/python-modules/ldfparser/default.nix index 4b83fb53252e..d012e32da0f0 100644 --- a/pkgs/development/python-modules/ldfparser/default.nix +++ b/pkgs/development/python-modules/ldfparser/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "LIN Description File parser written in Python"; + mainProgram = "ldfparser"; homepage = "https://github.com/c4deszes/ldfparser"; changelog = "https://github.com/c4deszes/ldfparser/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index e51f5f458868..138a412017fe 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -4,17 +4,17 @@ , six , cssselect , lxml -, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "leather"; - version = "0.3.4"; + version = "0.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b43e21c8fa46b2679de8449f4d953c06418666dc058ce41055ee8a8d3bb40918"; + sha256 = "sha256-+WS+wghvMVOmwW5wfyDLcY+BH1evEWB19MD0gFxgi5U="; }; propagatedBuildInputs = [ six ]; @@ -22,15 +22,9 @@ buildPythonPackage rec { nativeCheckInputs = [ cssselect lxml - nose + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; - meta = with lib; { homepage = "http://leather.rtfd.io"; description = "Python charting library"; diff --git a/pkgs/development/python-modules/ledgercomm/default.nix b/pkgs/development/python-modules/ledgercomm/default.nix index 94466d2dfaed..b4493eaa1a88 100644 --- a/pkgs/development/python-modules/ledgercomm/default.nix +++ b/pkgs/development/python-modules/ledgercomm/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to send and receive APDU through HID or TCP socket. It can be used with a Ledger Nano S/X or with the Speculos emulator."; + mainProgram = "ledgercomm-send"; homepage = "https://github.com/LedgerHQ/ledgercomm"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index c13f57ffd3f0..a8d9c612e157 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/LedgerHQ/ledgerctl"; description = "A library to control Ledger devices"; + mainProgram = "ledgerctl"; license = licenses.mit; maintainers = with maintainers; [ d-xo erdnaxe ]; }; diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix index 788cb1e2056b..42ebe98dccc9 100644 --- a/pkgs/development/python-modules/lexid/default.nix +++ b/pkgs/development/python-modules/lexid/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "micro library to increment lexically ordered numerical ids"; + mainProgram = "lexid_incr"; homepage = "https://pypi.org/project/lexid/"; license = licenses.mit; maintainers = with maintainers; [ kfollesdal ]; diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 9dab13428a95..8afdbf97e184 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.5.2"; + version = "1.5.6"; format = "setuptools"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "LibreTranslate"; repo = "LibreTranslate"; rev = "refs/tags/v${version}"; - hash = "sha256-8bbVpC53wH9GvwwHHlPEYQd/zqMXIqrwixwn4HY6FMg="; + hash = "sha256-43VnxgtapMRKyXxqsvBgSMUxvpbLI+iOfW3FA0/POpE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix index 1de2afd290a6..5bb2072b7117 100644 --- a/pkgs/development/python-modules/librouteros/default.nix +++ b/pkgs/development/python-modules/librouteros/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = [ # Disable tests which require QEMU to run "test_login" diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index 8c84a76dc994..85f4b24533e6 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python binding for libsass to compile Sass/SCSS"; + mainProgram = "pysassc"; homepage = "https://sass.github.io/libsass-python/"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index fbccd1be7363..7204e502d8ec 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.31.0"; + version = "0.35.0"; pyproject = true; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MzHS/HzEZ4vDfNRpJ9AU9vFkw7LwloltxyibxEGWRSw="; + hash = "sha256-1Xt2sl4L56TnveufD2j9k6eQQ+HllDxagv1APrErQYc="; }; postPatch = '' @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://libtmux.git-pull.com/"; changelog = "https://github.com/tmux-python/libtmux/raw/v${version}/CHANGES"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ otavio ]; }; } diff --git a/pkgs/development/python-modules/liccheck/default.nix b/pkgs/development/python-modules/liccheck/default.nix index 713fc3cca23c..fc2f1945888c 100644 --- a/pkgs/development/python-modules/liccheck/default.nix +++ b/pkgs/development/python-modules/liccheck/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Check python packages from requirement.txt and report issues"; + mainProgram = "liccheck"; homepage = "https://github.com/dhatim/python-license-check"; changelog = "https://github.com/dhatim/python-license-check/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 4988a3d25674..a17f4e829cae 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "license-expression"; - version = "30.2.0"; + version = "30.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nexB"; repo = "license-expression"; rev = "refs/tags/v${version}"; - hash = "sha256-vsQsHi2jdB0OiV6stm1APjQvr+238UoKgaaeXVx/isI="; + hash = "sha256-nHqfnetVyz4W2Q6onH0mU/4x9e/vD4rbl9DF4TYqWzs="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 53b0941fc36b..f1d94bad1af2 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -12,6 +12,7 @@ # tests , pytest-timeout , pytestCheckHook +, pytest_7 }: buildPythonPackage rec { @@ -41,7 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-timeout - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) ]; disabledTests = [ diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index e0c1fcf9a14c..4fafc1180baf 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "limits"; - version = "3.7.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-0h3ofungHkjycUvNJ3jf+VB/GSrshgUDECN2YoPGzzg="; + hash = "sha256-X4nf9ifhJjTNKnQuAxRNK9j/MzfAC58kv+19zMWtKg8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 10decb4f3f52..d50b3fa36f49 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Line-by-line profiler"; + mainProgram = "kernprof"; homepage = "https://github.com/pyutils/line_profiler"; changelog = "https://github.com/pyutils/line_profiler/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix index 660e3cd2d9b9..f539303a5933 100644 --- a/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "linkify-it-py"; - version = "2.0.2"; + version = "2.0.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tsutsu3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e3k2RblqvzWSSIrJL6ib2dxFw7T5vXlN8DrCV1qEr6w="; + hash = "sha256-BLwIityUZDVdSbvTpLf6QUlZUavWzG/45Nfffn18/vU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index c0c54862c6e8..1e94825cedc5 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.10.0"; + version = "5.13.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "linode"; repo = "python-linode-api"; rev = "refs/tags/v${version}"; - hash = "sha256-LQW1AKgCbsE2OxZHtuU6zSHv7/Ak2S07O8YuoC9mS+U="; + hash = "sha256-WB4CurdokRKh1eD6FZR2SeMpa3Z0BzLb0ldI7SYPEVI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix index d7dd857c360b..9b63a4e88377 100644 --- a/pkgs/development/python-modules/lit/default.nix +++ b/pkgs/development/python-modules/lit/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = { description = "Portable tool for executing LLVM and Clang style test suites"; + mainProgram = "lit"; homepage = "http://llvm.org/docs/CommandGuide/lit.html"; license = lib.licenses.ncsa; maintainers = with lib.maintainers; [ dtzWill ]; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 8f33fcdce4e1..c65bf018ed04 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.31.6"; + version = "1.33.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-OwIOggEfhvGKVTNiVWAt2osGk3R80U0wmcU6KAshpGw="; + hash = "sha256-o2MqZ9d2YDe0eQtao9OO9Ysl3cKTGiHqaYknOvcyCT4="; }; postPatch = '' @@ -97,6 +97,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use any LLM as a drop in replacement for gpt-3.5-turbo. Use Azure, OpenAI, Cohere, Anthropic, Ollama, VLLM, Sagemaker, HuggingFace, Replicate (100+ LLMs)"; + mainProgram = "litellm"; homepage = "https://github.com/BerriAI/litellm"; changelog = "https://github.com/BerriAI/litellm/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index 5943671d6fc2..15b9d121862f 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = { description = "Runs a local server that reloads as you develop"; + mainProgram = "livereload"; homepage = "https://github.com/lepture/python-livereload"; license = lib.licenses.bsd3; maintainers = with lib; [ ]; diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix index fa3140a9f661..027fcc2a15af 100644 --- a/pkgs/development/python-modules/lizard/default.nix +++ b/pkgs/development/python-modules/lizard/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/terryyin/lizard/blob/${version}/CHANGELOG.md"; description = "Code analyzer without caring the C/C++ header files"; + mainProgram = "lizard"; downloadPage = "https://github.com/terryyin/lizard"; homepage = "http://www.lizard.ws"; license = licenses.mit; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 8a71591eb27d..df6e3b92e289 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.18"; + version = "0.10.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-xNPvaXODY159x8Fl3HRdYCdYeFNIieX5TsLTfup8Dtg="; + hash = "sha256-F7k5gtmhFdn369Ws5PSJ/xTid6ONstoWPotk+DmDtLw="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index e65edce158db..284f03f67a59 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.3.8"; + version = "0.3.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-PUc5cmaH5mAufKy8nxfUONOZiaSnMyT8mRIrOu+jhKQ="; + hash = "sha256-vra6Tbt6V3CKtvEPfVMUFZjjneGgQKYeb1pxw6XVaxM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lmcloud/default.nix b/pkgs/development/python-modules/lmcloud/default.nix index 5b048bf3e346..9712527f86a7 100644 --- a/pkgs/development/python-modules/lmcloud/default.nix +++ b/pkgs/development/python-modules/lmcloud/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "lmcloud"; - version = "0.4.35"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = "zweckj"; repo = "lmcloud"; rev = "refs/tags/v${version}"; - hash = "sha256-TUve21yamtEmEceK/V1w7IZjnMgKConMfSY/GlqFpp8="; + hash = "sha256-uiyZGFfSJrTjw0CvHrCor4Ef5hdkMbEHGHQH3+NxYWE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ authlib bleak httpx diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix new file mode 100644 index 000000000000..94fd7aaee190 --- /dev/null +++ b/pkgs/development/python-modules/lnkparse3/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "lnkparse3"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Matmaus"; + repo = "LnkParse3"; + rev = "refs/tags/v${version}"; + hash = "sha256-aWMkLFbmikdj4mlAPpo0qrxfE8zgRcSV83aiws03XsQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "LnkParse3" + ]; + + meta = with lib; { + description = "Windows Shortcut file (LNK) parser"; + homepage = "https://github.com/Matmaus/LnkParse3"; + changelog = "https://github.com/Matmaus/LnkParse3/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 1386ce2cb712..23423950c23a 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "3.0.2"; + version = "3.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KNM/HjSWVwenLqtXbaRP70k7b7YXk//aKGEkBxPp1fA="; + hash = "sha256-53pbt7kNaYQRsLb+OI8gLwR3cBE18ZKLZmG4aP1/93E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 39b27be9f93f..13a791482296 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "localstack"; - version = "3.0.2"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-HncD/lhYfBrqtXF8F1Gz7JqwrASoHbsXvp1HXM5rldw="; + hash = "sha256-r0KRPtsLr6Pyn/va93reLdHHKtiOLB1uflAJ2L/uZmU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index cc08451950fe..b8fadc0832ad 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python packages and modules used by Logilab "; + mainProgram = "logilab-pytest"; homepage = "https://logilab-common.readthedocs.io/"; changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/branch/default/CHANGELOG.md"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix index d0603fcdf0b3..2bc6981955b1 100644 --- a/pkgs/development/python-modules/logster/default.nix +++ b/pkgs/development/python-modules/logster/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parses log files, generates metrics for Graphite and Ganglia"; + mainProgram = "logster"; license = licenses.gpl3Plus; homepage = "https://github.com/etsy/logster"; }; diff --git a/pkgs/development/python-modules/loopy/default.nix b/pkgs/development/python-modules/loopy/default.nix index 8bdde865df9b..995c99e100ec 100644 --- a/pkgs/development/python-modules/loopy/default.nix +++ b/pkgs/development/python-modules/loopy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "loopy"; - version = "2020.2.1"; + version = "2024.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inducer"; repo = pname; - rev = "v${version}"; - hash = "sha256-GL2GY3fbP9yMEQYyuh4CRHpeN9DGnZxbMt6jC+O/C0g="; + rev = "refs/tags/v${version}"; + hash = "sha256-R0Wry4r8Y7VKqsyrZ3odEOUy4T9di9rFQzq7BD0LG58="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lpc-checksum/default.nix b/pkgs/development/python-modules/lpc-checksum/default.nix index 2ebdba9fe095..9a0249980360 100644 --- a/pkgs/development/python-modules/lpc-checksum/default.nix +++ b/pkgs/development/python-modules/lpc-checksum/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python script to calculate LPC firmware checksums"; + mainProgram = "lpc_checksum"; homepage = "https://pypi.org/project/lpc-checksum/"; license = licenses.mit; maintainers = with maintainers; [ otavio ]; diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index a7860e91542e..dea8c8d194aa 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)"; + mainProgram = "lsassy"; homepage = "https://github.com/Hackndo/lsassy"; changelog = "https://github.com/Hackndo/lsassy/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/ltpycld2/default.nix b/pkgs/development/python-modules/ltpycld2/default.nix index 558dab085dd9..b8e19ae49990 100644 --- a/pkgs/development/python-modules/ltpycld2/default.nix +++ b/pkgs/development/python-modules/ltpycld2/default.nix @@ -5,13 +5,14 @@ }: buildPythonPackage rec { - pname = "LTpycld2"; + pname = "ltpycld2"; version = "0.42"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "LTpycld2"; + inherit version; sha256 = "948d0c1ab5518ab4efcbcc3cd73bb29f809f1dfb30f4d2fbd81b175a1ffeb516"; }; diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix index d6ff66594f47..4059288da674 100644 --- a/pkgs/development/python-modules/luddite/default.nix +++ b/pkgs/development/python-modules/luddite/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "luddite"; - version = "1.0.3"; + version = "1.0.4"; format = "setuptools"; src = fetchFromGitHub { owner = "jumptrading"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JXIM7/5LO95oabM16GwAt3v3a8uldGpGXDWmVic8Ins="; + hash = "sha256-iJ3h1XRBzLd4cBKFPNOlIV5Z5XJ/miscfIdkpPIpbJ8="; }; postPatch = '' @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks for out-of-date package versions"; + mainProgram = "luddite"; homepage = "https://github.com/jumptrading/luddite"; license = licenses.asl20; maintainers = with maintainers; [ emilytrau ]; diff --git a/pkgs/development/python-modules/lunarcalendar/default.nix b/pkgs/development/python-modules/lunarcalendar/default.nix index e5233fec6cb7..03a94e5e4cdc 100644 --- a/pkgs/development/python-modules/lunarcalendar/default.nix +++ b/pkgs/development/python-modules/lunarcalendar/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/wolfhong/LunarCalendar"; description = "A Lunar-Solar Converter, containing a number of lunar and solar festivals in China"; + mainProgram = "lunar-find"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index 7be84dae9bc3..946d79da85dc 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to control Lupusec alarm control panels"; + mainProgram = "lupupy"; homepage = "https://github.com/majuss/lupupy"; changelog = "https://github.com/majuss/lupupy/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 2ce4565ecf82..6a3f45b414b7 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-sEim7bCLLkHo6A1onbDQruyNigVKtim5DDAQI8CYUVo="; + hash = "sha256-JDD1X0/5xuqGN/Qw67tTFqfoWUd7Ah80/mimK01tG6Y="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Lightweight Extensible Message Format for Reticulum"; + mainProgram = "lxmd"; homepage = "https://github.com/markqvist/lxmf"; changelog = "https://github.com/markqvist/LXMF/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix index 6f2bed6acb20..05360af054fc 100644 --- a/pkgs/development/python-modules/lyricwikia/default.nix +++ b/pkgs/development/python-modules/lyricwikia/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "LyricWikia API for song lyrics"; + mainProgram = "lyrics"; homepage = "https://github.com/enricobacis/lyricwikia"; changelog = "https://github.com/enricobacis/lyricwikia/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 8bc09d315a3a..4110a96a3328 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "4.3.2"; + version = "4.3.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aVnXCrTh+0Ip+FgYWN7hLw8N3iQCmXSywhReD5RTUfI="; + hash = "sha256-ZvGUkb9DoheYY2/sejUhxgh2lS5eoBrFCXR4E0IcFcs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 7353831bad39..48a4cba83ddb 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "m2crypto"; - version = "0.40.1"; + version = "0.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "M2Crypto"; inherit version; - hash = "sha256-u/0RPsVXCMBYFiUqTwnkI33087v8gXHLvDMFfSV7uzA="; + hash = "sha256-OhNYx+6EkEbZF4Knd/F4a/AnocHVG1+vjxlDW/w/FJU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 9ff8dfbf0e73..af3681f453ca 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "m3u8"; - version = "3.6.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "globocom"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JLYRkibcvmNct2eIBfBP7z3gR680xhZL/Kn/1S7feoo="; + hash = "sha256-sxLT3a9f38RZqzEzqyZos3G38vzHPzhMexfBN2qzbxQ="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { "test_load_should_create_object_from_uri" "test_load_should_create_object_from_uri_with_relative_segments" "test_load_should_remember_redirect" + "test_raise_timeout_exception_if_timeout_happens_when_loading_from_uri" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/mac-alias/default.nix b/pkgs/development/python-modules/mac-alias/default.nix index 159dfa1d89ad..913ea42403ed 100644 --- a/pkgs/development/python-modules/mac-alias/default.nix +++ b/pkgs/development/python-modules/mac-alias/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/al45tair/mac_alias"; description = "Generate or read binary Alias and Bookmark records from Python code"; + mainProgram = "mac_alias"; longDescription = '' mac_alias lets you generate or read binary Alias and Bookmark records from Python code. diff --git a/pkgs/development/python-modules/mac-vendor-lookup/default.nix b/pkgs/development/python-modules/mac-vendor-lookup/default.nix index d4a1be562f9e..dbbd16dd6ea2 100644 --- a/pkgs/development/python-modules/mac-vendor-lookup/default.nix +++ b/pkgs/development/python-modules/mac-vendor-lookup/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Find the vendor for a given MAC address"; + mainProgram = "mac_vendor_lookup"; homepage = "https://github.com/bauerj/mac_vendor_lookup"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix index aa65bb91bad0..b999706dafde 100644 --- a/pkgs/development/python-modules/macfsevents/default.nix +++ b/pkgs/development/python-modules/macfsevents/default.nix @@ -6,11 +6,12 @@ }: buildPythonPackage rec { - pname = "MacFSEvents"; + pname = "macfsevents"; version = "0.8.4"; src = fetchPypi { - inherit pname version; + pname = "MacFSEvents"; + inherit version; sha256 = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs="; }; diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 4645174e122f..92c8dee9b0be 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -23,6 +23,7 @@ , watchdog , pytestCheckHook , nixosTests +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -67,6 +68,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + # https://github.com/samschott/maestral/commit/2c50d2ddb49a845ea97bd6b0f68c45d723fb304c + # Allow the use of survey >= 5 + # Remove after new maestral release along with pythonRelaxDepsHook + "survey" ]; preCheck = '' @@ -96,6 +105,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-source Dropbox client for macOS and Linux"; + mainProgram = "maestral"; homepage = "https://maestral.app"; changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix new file mode 100644 index 000000000000..6e4099004317 --- /dev/null +++ b/pkgs/development/python-modules/magika/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, click +, fetchPypi +, magika +, numpy +, onnxruntime +, poetry-core +, python-dotenv +, pythonOlder +, stdenv +, tabulate +, testers +, tqdm +}: + +buildPythonPackage rec { + pname = "magika"; + version = "0.5.0"; + pyproject = true; + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-r6C7iDCG/o3JEvweQGb4upr+LuHvmNtkwtduZGehCsc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + numpy + onnxruntime + python-dotenv + tabulate + tqdm + ]; + + pythonImportsCheck = [ "magika" ]; + + passthru.tests.version = testers.testVersion { package = magika; }; + + meta = with lib; { + description = "Magika: Detect file content types with deep learning"; + homepage = "https://github.com/google/magika"; + license = licenses.asl20; + maintainers = with maintainers; [ mihaimaruseac ]; + mainProgram = "magika"; + # Currently, disabling on AArch64 as it onnx runtime crashes on ofborg + broken = stdenv.isAarch64 && stdenv.isLinux; + }; +} diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 4ecb12642ccd..5364fd25c21f 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "A mail parser for python 2 and 3"; + mainProgram = "mailparser"; homepage = "https://github.com/SpamScope/mail-parser"; license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix index d28c5cc6c69d..d05376bcb279 100644 --- a/pkgs/development/python-modules/maison/default.nix +++ b/pkgs/development/python-modules/maison/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to read settings from config files"; + mainProgram = "maison"; homepage = "https://github.com/dbatten5/maison"; changelog = "https://github.com/dbatten5/maison/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 0a84359b27b6..0f512f8ec3a7 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "mako"; - version = "1.3.0"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mako"; inherit version; - hash = "sha256-46nTiP0A6HBD7b6HkvRYgKwBFOnErcafbpv7LFXjsRs="; + hash = "sha256-KgyK1/YnQnGzu3Rn3TfPnMbatLwZy2mk7xBmlALeaY4="; }; nativeBuildInputs = [ @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Super-fast templating language"; + mainProgram = "mako-render"; homepage = "https://www.makotemplates.org/"; changelog = "https://docs.makotemplates.org/en/latest/changelog.html"; license = licenses.mit; diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index ed521cf6d247..0f15b6a1066c 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/pkgs/development/python-modules/malduck/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helper for malware analysis"; + mainProgram = "malduck"; homepage = "https://github.com/CERT-Polska/malduck"; changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix index 74a12d9a5866..1f0c911d5df8 100644 --- a/pkgs/development/python-modules/managesieve/default.nix +++ b/pkgs/development/python-modules/managesieve/default.nix @@ -2,19 +2,33 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "managesieve"; - version = "0.7.1"; - format = "setuptools"; + version = "0.8"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "44930a3b48332d23b35a5305ae7ba47904d4485ed1b7a22208b7d5ad9d60427a"; + hash = "sha256-2CCb6h69H58YT1byj/fkrfzGsMUbr0GHpJLcMpsSE/M="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "managesieve" + ]; meta = with lib; { description = "ManageSieve client library for remotely managing Sieve scripts"; @@ -22,5 +36,6 @@ buildPythonPackage rec { # PSFL for the python module, GPLv3 only for sieveshell license = with licenses; [ gpl3Only psfl ]; maintainers = with maintainers; [ dadada ]; + mainProgram = "sieveshell"; }; } diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 26c76cbb1659..94aa5f443596 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/ionelmc/python-manhole"; description = "Debugging manhole for Python applications"; + mainProgram = "manhole-cli"; license = licenses.bsd2; maintainers = with maintainers; [ ivan ]; }; diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix index 8bc2710c5a43..0d3e02ed732c 100644 --- a/pkgs/development/python-modules/manifest-ml/default.nix +++ b/pkgs/development/python-modules/manifest-ml/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "manifest-ml"; - version = "0.1.8"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "HazyResearch"; repo = "manifest"; rev = "refs/tags/v${version}"; - hash = "sha256-d34TIZYDB8EDEIZUH5mDzfDHzFT290DwjPLJkNneklc="; + hash = "sha256-6m1XZOXzflBYyq9+PinbrW+zqvNGFN/aRDHH1b2Me5E="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index fae1981b1a86..e0101a6672aa 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.4"; + version = "1.5"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-ETvsxUKAP0xiFqpVO921Rup+1/A2DKyaK/oBr1K315I="; + hash = "sha256-a3v2WfJ42bh2LlAsH9ekpLFsAlOiTTLGNknTW2mTxCI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix new file mode 100644 index 000000000000..8873ac724c68 --- /dev/null +++ b/pkgs/development/python-modules/marimo/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, click +, jedi +, markdown +, pymdown-extensions +, pygments +, tomlkit +, uvicorn +, starlette +, websockets +, docutils +, black +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "marimo"; + version = "0.3.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-nCH8JmeU81aJHHGJ1DOOCL9iarBXTBGauQKyHpU66Rk="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + click + jedi + markdown + pymdown-extensions + pygments + tomlkit + uvicorn + starlette + websockets + docutils + black + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "marimo" + ]; + + meta = with lib; { + description = "A reactive Python notebook that's reproducible, git-friendly, and deployable as scripts or apps"; + homepage = "https://github.com/marimo-team/marimo"; + license = licenses.asl20; + mainProgram = "marimo"; + maintainers = with maintainers; [ akshayka dmadisetti ]; + }; +} diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index d7be3fabfab7..f31af525f1e6 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/Python-Markdown/markdown/blob/${src.rev}/docs/changelog.md"; description = "Python implementation of John Gruber's Markdown"; + mainProgram = "markdown_py"; homepage = "https://github.com/Python-Markdown/markdown"; license = licenses.bsd3; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 91c10116e1bd..1c375523ae60 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/trentm/python-markdown2/blob/${src.rev}/CHANGES.md"; description = "A fast and complete Python implementation of Markdown"; + mainProgram = "markdown2"; homepage = "https://github.com/trentm/python-markdown2"; license = licenses.mit; maintainers = with maintainers; [ hbunke ]; diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index 00af58297b92..19f842938007 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTML to Markdown converter"; + mainProgram = "markdownify"; homepage = "https://github.com/matthewwithanm/python-markdownify"; license = licenses.mit; maintainers = [ maintainers.McSinyx ]; diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 2883b6b31add..7b5b2932407a 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.6.0"; + version = "8.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "refs/tags/v${version}"; - hash = "sha256-+1bMo5D+7kbkZHcAvmgC1WxNk6Ba04iLccMqTKrxt80="; + hash = "sha256-IHHYYtQrdSAtZxbd/YV9J+c4B23HLr9gr01OE6Tgj94="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix index d375901a0f3f..17f674271194 100644 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = [ "test_custom_error_in_deserialize_by_name" "test_custom_error_in_deserialize_by_value" diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index e74072692398..cc73a3c229a3 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, flit-core , marshmallow , packaging , sqlalchemy @@ -11,16 +12,21 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.30.0"; - format = "setuptools"; + version = "1.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-Ka0KT9G0oeUtywf5Zz0oSmsHlRQZFswhadTuml0Ac0c="; + pname = "marshmallow_sqlalchemy"; + inherit version; + hash = "sha256-IKDy/N1b3chkRPoBRh8X+bahKo3dTKjJs0/i8uNdAKI="; }; + build-system = [ + flit-core + ]; + propagatedBuildInputs = [ marshmallow packaging diff --git a/pkgs/development/python-modules/masky/default.nix b/pkgs/development/python-modules/masky/default.nix index 4d03c4d57d93..aadd429fa881 100644 --- a/pkgs/development/python-modules/masky/default.nix +++ b/pkgs/development/python-modules/masky/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to remotely dump domain credentials"; + mainProgram = "masky"; homepage = "https://github.com/Z4kSec/Masky"; changelog = "https://github.com/Z4kSec/Masky/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix index 4f90bb7f3698..0d7ad7b2528a 100644 --- a/pkgs/development/python-modules/mathlibtools/default.nix +++ b/pkgs/development/python-modules/mathlibtools/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Supporting tool for Lean's mathlib"; + mainProgram = "leanproject"; homepage = "https://github.com/leanprover-community/mathlib-tools"; changelog = "https://github.com/leanprover-community/mathlib-tools/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 8fb5c7c292cf..788df3d9458e 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -77,7 +77,7 @@ let in buildPythonPackage rec { - version = "3.8.2"; + version = "3.8.3"; pname = "matplotlib"; format = "pyproject"; @@ -85,7 +85,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Aal4uHG4ge52AXFS8fGgy/a9X3uP+Mlt8N8b1X2HVaE="; + hash = "sha256-e0FiOemuOL5UsCirv5BIr/UFSpq6VBa+8L0X+RYs4WE="; }; env.XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix index f20812606869..77643ece548d 100644 --- a/pkgs/development/python-modules/matplotx/default.nix +++ b/pkgs/development/python-modules/matplotx/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/nschloe/matplotx"; description = "More styles and useful extensions for Matplotlib"; + mainProgram = "matplotx"; changelog = "https://github.com/nschloe/matplotx/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ swflint ]; diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 1bd579afe70c..3f95408364db 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "maxminddb"; - version = "2.5.1"; + version = "2.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SAfTdOZFvWgzTk9Ie6haJxidvBJnqY5kSqaGp5J+BVk="; + hash = "sha256-s8M+T8eCHubJ9Ag3EW4Wq2F1hj1KZO7gJMW+xoZpCoc="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index e96d66826583..96387c8f2575 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -1,30 +1,28 @@ { lib -, fetchFromGitHub , buildPythonPackage - -# build-system -, setuptools - -# dependencies , dateparser +, fetchFromGitHub +, freezegun , humanize -, tzlocal , pendulum -, snaptime -, pytz - -# tests -, freezegun +, pytest-mock , pytestCheckHook +, pythonOlder +, pytz +, setuptools +, snaptime +, tzlocal }: buildPythonPackage rec { pname = "maya"; version = "0.6.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "kennethreitz"; + owner = "timofurrer"; repo = "maya"; rev = "refs/tags/v${version}"; hash = "sha256-4fUyUqVQk/AcQL3xMnU1cQlF5yiD/N9NPAsUPuDTTNY="; @@ -33,7 +31,7 @@ buildPythonPackage rec { postPatch = '' # function was made private in humanize substituteInPlace maya/core.py \ - --replace "humanize.time.abs_timedelta" "humanize.time._abs_timedelta" + --replace-fail "humanize.time.abs_timedelta" "humanize.time._abs_timedelta" ''; nativeBuildInputs = [ @@ -51,12 +49,24 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + pytest-mock pytestCheckHook ]; + pythonImportsCheck = [ + "maya" + ]; + + disabledTests = [ + # https://github.com/timofurrer/maya/issues/202 + "test_parse_iso8601" + ]; + meta = with lib; { description = "Datetimes for Humans"; - homepage = "https://github.com/kennethreitz/maya"; + homepage = "https://github.com/timofurrer/maya"; + changelog = "https://github.com/timofurrer/maya/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index cf817adbaaaa..886cf432f7ba 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for checking the status of Minecraft servers"; + mainProgram = "mcstatus"; homepage = "https://github.com/py-mine/mcstatus"; changelog = "https://github.com/py-mine/mcstatus/releases/tag/v${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 7789104db892..34887cc91fa7 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Table of contents generator for Markdown"; + mainProgram = "md_toc"; homepage = "https://docs.franco.net.eu.org/md-toc/"; changelog = "https://blog.franco.net.eu.org/software/CHANGELOG-md-toc.html"; license = with licenses; [ gpl3Plus ]; diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index cbd95d35fbf3..10be705e1440 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-admon"; - version = "2.0.0"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-admon"; rev = "refs/tags/v${version}"; - hash = "sha256-MRcNExMPH/HIXB2DmN9fA89plo0IZPWXryySK9OZHg8="; + hash = "sha256-TybbkF6+dIfG+1fGYp+bTEdw2GXINZJfOX0QiAaqiWY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 52ad5f97b20e..d399036684e9 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -3,15 +3,18 @@ , fetchFromGitHub , flit-core , mdformat +, mdformat-admon , mdformat-gfm , mdit-py-plugins +, more-itertools , pythonOlder +, pytest-snapshot , pytestCheckHook }: buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "1.1.2"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +23,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-GUSoGx4cwhjQO4AiC9s0YIcK3N/Gr+PrYR3+B8G9CoQ="; + hash = "sha256-cqzsrEsYFX9HnC6fRKqefysT0ZSgAllTJEXleOdepXc="; }; nativeBuildInputs = [ @@ -29,14 +32,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ mdformat + mdformat-admon mdformat-gfm mdit-py-plugins + more-itertools ]; nativeCheckInputs = [ + pytest-snapshot pytestCheckHook ]; + disabledTestPaths = [ + # AssertionError: assert ParsedText(lines=[LineResult(parsed=ParsedLine(line_... + "tests/format/test_parsed_result.py" + ]; + pythonImportsCheck = [ "mdformat_mkdocs" ]; diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index 00a657800da8..9faed762afaa 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mediafile"; - version = "0.10.1"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "beetbox"; repo = pname; rev = "v${version}"; - hash = "sha256-2h17FA0GTY4R+WhZiQtPFYf6gH7XLbI3aOB/nUXFtJI="; + hash = "sha256-5HHfG1hCIbM/QSXgB61yHNNWJTsuyAh6CQJ7SZhZuvo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/memory-profiler/default.nix b/pkgs/development/python-modules/memory-profiler/default.nix index 2176b652597f..9264f136940c 100644 --- a/pkgs/development/python-modules/memory-profiler/default.nix +++ b/pkgs/development/python-modules/memory-profiler/default.nix @@ -21,6 +21,7 @@ python.pkgs.buildPythonPackage rec { meta = with lib; { description = "A module for monitoring memory usage of a process"; + mainProgram = "mprof"; longDescription = '' This is a python module for monitoring memory consumption of a process as well as line-by-line analysis of memory consumption for python programs. diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix index 1523eaf4c8e3..8f496bca53c5 100644 --- a/pkgs/development/python-modules/mercantile/default.nix +++ b/pkgs/development/python-modules/mercantile/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Spherical mercator tile and coordinate utilities"; + mainProgram = "mercantile"; homepage = "https://github.com/mapbox/mercantile"; license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix index e06556dddf35..906c00911737 100644 --- a/pkgs/development/python-modules/merge3/default.nix +++ b/pkgs/development/python-modules/merge3/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of 3-way merge"; + mainProgram = "merge3"; homepage = "https://github.com/breezy-team/merge3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ marsam ]; diff --git a/pkgs/development/python-modules/mergedb/default.nix b/pkgs/development/python-modules/mergedb/default.nix index 3c78026632ba..e5973aa280d2 100644 --- a/pkgs/development/python-modules/mergedb/default.nix +++ b/pkgs/development/python-modules/mergedb/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool/library for deep merging YAML files"; + mainProgram = "mergedb"; homepage = "https://github.com/graysonhead/mergedb"; license = licenses.gpl3Only; maintainers = with maintainers; [ graysonhead ]; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index 4a9001ff1b9c..a7a8fa175ca6 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "2.1.5"; + version = "2.2.4"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mesa"; inherit version; - hash = "sha256-UMf3z1bEElygfqwgY65qhOEK4i9K9gH42muId3mZUjY="; + hash = "sha256-5og3ACS2r36BEGWfqtw6WG6yJwNF5p3M9K25sSmHosM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshcat/default.nix b/pkgs/development/python-modules/meshcat/default.nix index 8f79a1477451..ff1ef37b22e5 100644 --- a/pkgs/development/python-modules/meshcat/default.nix +++ b/pkgs/development/python-modules/meshcat/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/rdeits/meshcat-python"; description = "WebGL-based 3D visualizer for Python"; + mainProgram = "meshcat-server"; license = licenses.mit; maintainers = with maintainers; [ wegank ]; }; diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 313c1bd0920e..f0c170202683 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/nschloe/meshio"; description = "I/O for mesh files."; + mainProgram = "meshio"; license = licenses.mit; maintainers = with maintainers; [ wd15 ]; }; diff --git a/pkgs/development/python-modules/meshlabxml/default.nix b/pkgs/development/python-modules/meshlabxml/default.nix index e0793f3ec978..5f62a773a3d1 100644 --- a/pkgs/development/python-modules/meshlabxml/default.nix +++ b/pkgs/development/python-modules/meshlabxml/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "MeshLabXML"; + pname = "meshlabxml"; version = "2018.3"; src = fetchPypi { - inherit pname version; + pname = "MeshLabXML"; + inherit version; sha256 = "1villmg46hqby5jjkkpxr5bxydr72y5b3cbfngwpyxxdljn091w8"; }; diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index 1a1e14d8ee41..ce3dbe1b44f7 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to access information from the Meteo-France API"; + mainProgram = "meteofrance-api"; homepage = "https://github.com/hacf-fr/meteofrance-api"; changelog = "https://github.com/hacf-fr/meteofrance-api/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 0f13239756d9..18d06579a8a8 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Content management platform built using the Django framework"; + mainProgram = "mezzanine-project"; longDescription = '' Mezzanine is a powerful, consistent, and flexible content management platform. Built using the Django framework, Mezzanine diff --git a/pkgs/development/python-modules/miauth/default.nix b/pkgs/development/python-modules/miauth/default.nix index 486878140e04..c28c5ed96a77 100644 --- a/pkgs/development/python-modules/miauth/default.nix +++ b/pkgs/development/python-modules/miauth/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Authenticate and interact with Xiaomi devices over BLE"; + mainProgram = "miauth"; homepage = "https://github.com/dnandha/miauth"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/micloud/default.nix b/pkgs/development/python-modules/micloud/default.nix index 641581298340..ab934962e216 100644 --- a/pkgs/development/python-modules/micloud/default.nix +++ b/pkgs/development/python-modules/micloud/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Xiaomi cloud connect library"; + mainProgram = "micloud"; homepage = "https://github.com/Squachen/micloud"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/microdata/default.nix b/pkgs/development/python-modules/microdata/default.nix index 140aa10314e1..f7dcfc92f8b9 100644 --- a/pkgs/development/python-modules/microdata/default.nix +++ b/pkgs/development/python-modules/microdata/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for extracting html microdata"; + mainProgram = "microdata"; homepage = "https://github.com/edsu/microdata"; license = licenses.cc0; maintainers = with maintainers; [ ambroisie ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index 40840436fa01..21bc6f76feaa 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "kiota-serialization-json"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-serialization-json-python"; rev = "refs/tags/v${version}"; - hash = "sha256-DhuDIRTm6xATnXpQ+xLpMuaBcWxZHdr8dO1Rl8OvCKQ="; + hash = "sha256-igMqwoKArfQ37pzdjUICgXY795dfg/MX65iwTVe0sLM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/midiutil/default.nix b/pkgs/development/python-modules/midiutil/default.nix index a3527bc6e1cf..6f1e51ae9339 100644 --- a/pkgs/development/python-modules/midiutil/default.nix +++ b/pkgs/development/python-modules/midiutil/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "MIDIUtil"; + pname = "midiutil"; version = "1.2.1"; src = fetchPypi { - inherit pname version; + pname = "MIDIUtil"; + inherit version; sha256 = "02m9sqv36zrzgz5zg2w9qmz8snzlm27yg3ways2hgipgs4xriykr"; }; diff --git a/pkgs/development/python-modules/mike/default.nix b/pkgs/development/python-modules/mike/default.nix index f107d8e632bd..9a48dca54699 100644 --- a/pkgs/development/python-modules/mike/default.nix +++ b/pkgs/development/python-modules/mike/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Manage multiple versions of your MkDocs-powered documentation"; + mainProgram = "mike"; homepage = "https://github.com/jimporter/mike"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index aa168fd0dea0..59c8eb6f68eb 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "An Opinionated Batteries-Included Python 3 CLI Framework"; + mainProgram = "milc-color"; homepage = "https://milc.clueboard.co"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix index 7e18975095b0..9cc654911fc5 100644 --- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mindsdb-evaluator"; - version = "0.0.11"; + version = "0.0.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mindsdb_evaluator"; inherit version; - hash = "sha256-pEfY+ocLEE8qcDjf6AzJxtXo1cqD2LhcBmlLjN0llTA="; + hash = "sha256-SqcBtoY7WZcorAaoyhqNDscf1MkSz0pE993mz1MRXCU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix index 2829a6351ace..58d59512e8b5 100644 --- a/pkgs/development/python-modules/minidump/default.nix +++ b/pkgs/development/python-modules/minidump/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to parse and read Microsoft minidump file format"; + mainProgram = "minidump"; homepage = "https://github.com/skelsec/minidump"; changelog = "https://github.com/skelsec/minidump/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix index c257c7f735a6..369196b15276 100644 --- a/pkgs/development/python-modules/misaka/default.nix +++ b/pkgs/development/python-modules/misaka/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "A CFFI binding for Hoedown, a markdown parsing library"; + mainProgram = "misaka"; homepage = "https://misaka.61924.nl"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix index c95a26eb6e04..aad3a5111da0 100644 --- a/pkgs/development/python-modules/mistletoe/default.nix +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -1,21 +1,24 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage , parameterized +, pygments , pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "mistletoe"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-fQwas3RwR9Fp+fxLkl0cuj9cE+rwuQw2W3LkflnQCgI="; + src = fetchFromGitHub { + owner = "miyuchina"; + repo = "mistletoe"; + rev = "refs/tags/v${version}"; + hash = "sha256-MMBfH4q5AtC/azQUj1a1tMz1MdUf4ad5/tl7lcQCTOw="; }; pythonImportsCheck = [ @@ -24,11 +27,13 @@ buildPythonPackage rec { nativeCheckInputs = [ parameterized + pygments pytestCheckHook ]; meta = with lib; { description = "Fast and extensible Markdown parser"; + mainProgram = "mistletoe"; homepage = "https://github.com/miyuchina/mistletoe"; changelog = "https://github.com/miyuchina/mistletoe/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index 1a0b64efe1e1..4fedc2ff0ff3 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mkdocs-autorefs"; - version = "0.5.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "autorefs"; rev = "refs/tags/${version}"; - hash = "sha256-GZKQlOXhQIQhS/z4cbmS6fhAKYgnVhSXh5a8Od7+TWc="; + hash = "sha256-YORrIQ+iZQZ1U/fe/IH3B/5gN0QxQF73s9vF6qvKL7Q="; }; postPatch = '' @@ -40,6 +40,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # missing pymdownx + "test_reference_implicit_with_code_inlinehilite_plain" + "test_reference_implicit_with_code_inlinehilite_python" + ]; + pythonImportsCheck = [ "mkdocs_autorefs" ]; diff --git a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix index 9dfae93cfec9..01eb0fa2375e 100644 --- a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "mkdocs-git-authors-plugin"; - version = "0.7.2"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timvink"; repo = "mkdocs-git-authors-plugin"; - rev = "v${version}"; - hash = "sha256-jhYwi9HO6kxOS1QmEKb1YnXGSJ4Eyo4Sm07jI4lxXnA="; + rev = "refs/tags/v${version}"; + hash = "sha256-ie6kDrj7ulmdQ7w3n7MnKgIWs321uPFxpQC3DNUGsTg="; }; propagatedBuildInputs = [ mkdocs ]; diff --git a/pkgs/development/python-modules/mkdocs-linkcheck/default.nix b/pkgs/development/python-modules/mkdocs-linkcheck/default.nix index 1f83c11a35dd..18d9a9a9ab29 100644 --- a/pkgs/development/python-modules/mkdocs-linkcheck/default.nix +++ b/pkgs/development/python-modules/mkdocs-linkcheck/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Validate links in Markdown files for static site generators like MkDocs, Hugo or Jekyll"; + mainProgram = "mkdocs-linkcheck"; longDescription = '' This is not a MkDocs plugin, but a companion tool that is useful to validate links in Markdown files for static site generators like MkDocs, Hugo or Jekyll. It can be used with any text files containing links. diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 0aeb5cbe3421..021c9645e321 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.13"; + version = "9.5.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-SFLCNFJNlyJ09d4VsWsxdw7Ctyv1pFHXdqPgBflH294="; + hash = "sha256-VqfjqsTEi5C33MSb83ku37i0hgDyujrdaZbeqpMOvko="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 8a402510ec18..a20958dbb747 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -88,6 +88,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/mkdocs/mkdocs/releases/tag/${version}"; description = "Project documentation with Markdown / static website generator"; + mainProgram = "mkdocs"; downloadPage = "https://github.com/mkdocs/mkdocs"; longDescription = '' MkDocs is a fast, simple and downright gorgeous static site generator that's diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index d73ccba23041..de1ae5e6c72e 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-beLZpf0Zjk6LjveD7c+1XEi4SpQnmmZZOM8dIvzqZGI="; + hash = "sha256-RzyOhlfjLtiG5jelrRG8yS7AWQJuaJMVuNkGpNBGO64="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 1bed42479c8a..0a0efaab4372 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -103,6 +103,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open source platform for the machine learning lifecycle"; + mainProgram = "mlflow"; homepage = "https://github.com/mlflow/mlflow"; changelog = "https://github.com/mlflow/mlflow/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 036bbfac0418..d2d4d32d7a9a 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -29,13 +29,13 @@ let in buildPythonPackage rec { pname = "mlx"; - version = "0.1.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ml-explore"; repo = "mlx"; rev = "refs/tags/v${version}"; - hash = "sha256-xNJPG8XGbC0fy6RGcn1cxCsejyHsgnV35PuP8F1I4R4="; + hash = "sha256-FihdI+3ACKMJfPT2POjTRdtkXs7x+KiQpdpo3RcczBE="; }; pyproject = true; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 7f84aaac49ba..4a743ac664a9 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.23.0"; + version = "0.23.1"; pyproject = true; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "rasbt"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TUZ8SdQAOV1CaIlDl4uXYVHvdlEkOz6E48S3pUS6UE0="; + hash = "sha256-FlP6UqX/Ejk9c3Enm0EJ0xqy7iOhDlFqjWWxd4VIczQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 4e93aaf3311c..c34d2649cda8 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Magnetoencephelography and electroencephalography in Python"; + mainProgram = "mne"; homepage = "https://mne.tools"; changelog = "https://mne.tools/stable/changes/v${version}.html"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix index 3241eab8cafc..b5c04d0bae89 100644 --- a/pkgs/development/python-modules/mobi/default.nix +++ b/pkgs/development/python-modules/mobi/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for unpacking unencrypted mobi files"; + mainProgram = "mobiunpack"; homepage = "https://github.com/iscc/mobi"; license = licenses.gpl3Only; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix index 73d4d7d3df99..e89a36199393 100644 --- a/pkgs/development/python-modules/mobly/default.nix +++ b/pkgs/development/python-modules/mobly/default.nix @@ -2,7 +2,10 @@ , buildPythonPackage , fetchFromGitHub -# runtime +# build-system +, setuptools + +# dependencies , portpicker , pyserial , pyyaml @@ -17,17 +20,21 @@ buildPythonPackage rec { pname = "mobly"; - version = "1.12.2"; - format = "setuptools"; + version = "1.12.3"; + pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "mobly"; rev = "refs/tags/${version}"; - hash = "sha256-leUOC8AQwbuPNphDg4bIFWW+9tTnYvM3/ejHgZDMR44="; + hash = "sha256-hhI1jrHJk4wo49MK8J4VTS2dGmHG2kwzgZeSWBXdXkA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ portpicker pyserial pyyaml diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index fe7ca40ccf05..2a44707bff1b 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -23,6 +23,7 @@ , fastapi , gevent , httpx +, psutil , pytest-asyncio , pytestCheckHook , redis @@ -34,12 +35,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.12.2"; + version = "3.12.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BN9S5/mku+HT1vglyobgHZPWsY0yvbfQfpMRUKrnJQQ="; + hash = "sha256-O+IRX59Z4D188XEmiSCT8H3sg1jhtaboHS3QINEnE0s="; }; nativeBuildInputs = [ @@ -67,6 +68,7 @@ buildPythonPackage rec { fastapi gevent httpx + psutil pytest-asyncio pytestCheckHook redis @@ -95,6 +97,8 @@ buildPythonPackage rec { "test_truesendall_with_dump_from_recording" "test_asyncio_record_replay" "test_gethostbyname" + # httpx read failure + "test_no_dangling_fds" ]; disabledTestPaths = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 6b46ae62258c..309a3cdcfadf 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Molecule aids in the development and testing of Ansible roles"; + mainProgram = "molecule"; homepage = "https://github.com/ansible-community/molecule"; maintainers = with maintainers; [ dawidd6 ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix index 74b88ca8dc73..3f200cb59fc5 100644 --- a/pkgs/development/python-modules/monai-deploy/default.nix +++ b/pkgs/development/python-modules/monai-deploy/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework and tools to design, develop and verify AI applications in healthcare imaging"; + mainProgram = "monai-deploy"; homepage = "https://monai.io/deploy.html"; changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/v${version}.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index 3e63330d5ac2..644f87521a2c 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.27.0"; + version = "0.28.2"; format = "setuptools"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "MongoEngine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UCd7RpsSNDKh3vgVRYrFYWYVLQuK7WI0n/Moukhq5dM="; + hash = "sha256-5wcviRqUTOKqaeusHxS4Er3LD1BpTMW02Tip3d4zAPM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monitorcontrol/default.nix b/pkgs/development/python-modules/monitorcontrol/default.nix index 669077c1376f..920074b65f0b 100644 --- a/pkgs/development/python-modules/monitorcontrol/default.nix +++ b/pkgs/development/python-modules/monitorcontrol/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python monitor controls using DDC-CI"; + mainProgram = "monitorcontrol"; homepage = "https://github.com/newAM/monitorcontrol"; changelog = "https://github.com/newAM/monitorcontrol/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index df3804095665..6ebdc9801030 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "10.1.0"; + version = "10.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Ymw2n6DrN7rAKRvOglmzMv1ZrHkvpUl7WYNzCc1bEUo="; + hash = "sha256-j8y0gMQ9PpmgAIdjTAbdArDVD78IizgN5aQaAV7COeE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/morfessor/default.nix b/pkgs/development/python-modules/morfessor/default.nix index 5301438d4ecd..cf72937a7060 100644 --- a/pkgs/development/python-modules/morfessor/default.nix +++ b/pkgs/development/python-modules/morfessor/default.nix @@ -4,13 +4,14 @@ }: buildPythonPackage rec { - pname = "Morfessor"; + pname = "morfessor"; version = "2.0.6"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "Morfessor"; + inherit version; sha256 = "bb3beac234341724c5f640f65803071f62373a50dba854d5a398567f9aefbab2"; }; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 071b7f3ddb64..b8f7b60c9798 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -20,19 +20,17 @@ # optional-dependencies , aws-xray-sdk , cfn-lint -, docker -, ecdsa , flask , flask-cors +, docker , graphql-core +, joserfc , jsondiff , multipart , openapi-spec-validator , py-partiql-parser , pyparsing -, python-jose , pyyaml -, sshpubkeys # tests , freezegun @@ -43,14 +41,14 @@ buildPythonPackage rec { pname = "moto"; - version = "4.2.13"; + version = "5.0.3"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Aa72pImnJcjXJb09xvcP8b7a7j4mQXUuS0cf8O3ktNc="; + hash = "sha256-BwrC7fia167ihTRIHOaOLzRMimqP7+xUJ+6g1Zm/29s="; }; nativeBuildInputs = [ @@ -75,20 +73,21 @@ buildPythonPackage rec { aws-xray-sdk cfn-lint docker - ecdsa flask flask-cors graphql-core + joserfc jsondiff multipart openapi-spec-validator - py-partiql-parser pyparsing - python-jose + py-partiql-parser pyyaml setuptools - sshpubkeys - ] ++ python-jose.optional-dependencies.cryptography; + ]; + cognitoidp = [ + joserfc + ]; }; __darwinAllowLocalNetworking = true; @@ -121,6 +120,11 @@ buildPythonPackage rec { "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" + # Fails at resolving s3.amazonaws.com + "--deselect=tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_wildcard_urls" + "--deselect=tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_specific_url" + "--deselect=tests/test_core/test_request_passthrough.py::test_passthrough_calls_for_entire_service" + # Download recordings returns faulty JSON "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation_recording_on" "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation__recording_off" diff --git a/pkgs/development/python-modules/mouseinfo/default.nix b/pkgs/development/python-modules/mouseinfo/default.nix index f5c76b875241..9d4fe2af480f 100644 --- a/pkgs/development/python-modules/mouseinfo/default.nix +++ b/pkgs/development/python-modules/mouseinfo/default.nix @@ -7,7 +7,7 @@ , pillow }: buildPythonPackage rec { - pname = "MouseInfo"; + pname = "mouseinfo"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mpris-server/default.nix b/pkgs/development/python-modules/mpris-server/default.nix index 59a668a61e8d..cd790275e085 100644 --- a/pkgs/development/python-modules/mpris-server/default.nix +++ b/pkgs/development/python-modules/mpris-server/default.nix @@ -40,6 +40,10 @@ buildPythonPackage rec { # upstream has no tests doCheck = false; + # update doesn't support python311 and monophony, the only consumer requires + # 0.4.2 + passthru.skipBulkUpdate = true; + meta = with lib; { description = "Publish a MediaPlayer2 MPRIS device to D-Bus"; homepage = "https://pypi.org/project/mpris-server/"; diff --git a/pkgs/development/python-modules/mpyq/default.nix b/pkgs/development/python-modules/mpyq/default.nix index 815c41a80afc..f23feb21f054 100644 --- a/pkgs/development/python-modules/mpyq/default.nix +++ b/pkgs/development/python-modules/mpyq/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { meta = { description = "A Python library for extracting MPQ (MoPaQ) files."; + mainProgram = "mpyq"; homepage = "https://github.com/eagleflo/mpyq"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/python-modules/mqtt2influxdb/default.nix b/pkgs/development/python-modules/mqtt2influxdb/default.nix index e7892732fcdf..351e1ab69085 100644 --- a/pkgs/development/python-modules/mqtt2influxdb/default.nix +++ b/pkgs/development/python-modules/mqtt2influxdb/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/hardwario/bch-mqtt2influxdb"; description = "Flexible MQTT to InfluxDB Bridge"; + mainProgram = "mqtt2influxdb"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ cynerd ]; diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index d9748df70785..89d64611836e 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "0.0.6"; + version = "0.0.7"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-dBwWiJEL76aXqM2vKn4uQsd86Rm3bMeDSsRRs/aLWCE="; + hash = "sha256-kZwgRazvPCmARcfhLByh1E8VPurrb8gVZc96hFfDOvs="; }; buildInputs = [ fftw ]; diff --git a/pkgs/development/python-modules/msg-parser/default.nix b/pkgs/development/python-modules/msg-parser/default.nix index 9670403e640e..5e45338d0787 100644 --- a/pkgs/development/python-modules/msg-parser/default.nix +++ b/pkgs/development/python-modules/msg-parser/default.nix @@ -34,6 +34,7 @@ buildPythonPackage { meta = with lib; { description = "Python module to read, parse and converting Microsoft Outlook MSG E-Mail files."; + mainProgram = "msg_parser"; homepage = "https://github.com/vikramarsid/msg_parser"; license = licenses.bsd2; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 7bcdb42095b3..e1a114d9344b 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "msgpack"; - version = "1.0.7"; + version = "1.0.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Vy78k9t6TSfkBFAZdcptLZd1cFwtkiOQ2Hj892jZLIc="; + hash = "sha256-lcArDifnBuSNDlQm0XEMp44PBijW6J1bWluRpfEidPM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index a1df35addf03..f8ee81afbac2 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -2,46 +2,55 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, flit-core +, setuptools +, httpx +, microsoft-kiota-abstractions +, microsoft-kiota-authentication-azure + ,microsoft-kiota-http , requests +, azure-identity , pytestCheckHook , responses }: buildPythonPackage rec { pname = "msgraph-core"; - version = "0.2.2"; + version = "1.0.0"; + pyproject = true; disabled = pythonOlder "3.5"; - format = "pyproject"; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; - rev = "v${version}"; - hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA="; + rev = "refs/tags/v${version}"; + hash = "sha256-VizjN7sXqPvo9VOSaaUnogTlUDJ1OA2COYNTcVRqhJA="; }; nativeBuildInputs = [ - flit-core + setuptools ]; propagatedBuildInputs = [ + httpx + microsoft-kiota-abstractions + microsoft-kiota-authentication-azure + microsoft-kiota-http requests + ]; nativeCheckInputs = [ + azure-identity pytestCheckHook responses ]; - disabledTestPaths = [ - "tests/integration" + pythonImportsCheck = [ + "msgraph_core" ]; - pythonImportsCheck = [ "msgraph.core" ]; - meta = { description = "Core component of the Microsoft Graph Python SDK"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core"; diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index a53ec6152e37..6b013aa02a63 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -1,38 +1,45 @@ { lib , buildPythonPackage , fetchPypi -, asn1crypto +, pythonOlder +, setuptools +, unicrypto , asyauth , asysocks -, minikerberos +, asn1crypto +, winacl , prompt-toolkit , tqdm -, winacl -, winsspi -, pythonOlder +, wcwidth +, tabulate }: buildPythonPackage rec { pname = "msldap"; - version = "0.5.9"; - format = "setuptools"; + version = "0.5.10"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XzxONiKW4OHrpEftqfIwmIp7KgiCb3s+007JYS68/jM="; + hash = "sha256-Zb/g5QLJTSb0XTZvVnzbYkYvJ/ZVvQri8CKP48n5ibg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - asn1crypto + unicrypto asyauth asysocks - minikerberos + asn1crypto + winacl prompt-toolkit tqdm - winacl - winsspi + wcwidth + tabulate ]; # Project doesn't have tests diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index 4bc2e80642e6..fd297474eb70 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool and library for decrypting MS Office files with passwords or other keys"; + mainProgram = "msoffcrypto-tool"; homepage = "https://github.com/nolze/msoffcrypto-tool"; changelog = "https://github.com/nolze/msoffcrypto-tool/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index 6a82bffaa6c0..ecc0787062f8 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cross-platform multiple screenshots module"; + mainProgram = "mss"; homepage = "https://github.com/BoboTiG/python-mss"; changelog = "https://github.com/BoboTiG/python-mss/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/mullvad-closest/default.nix b/pkgs/development/python-modules/mullvad-closest/default.nix index c5d45dfd1751..62537c244491 100644 --- a/pkgs/development/python-modules/mullvad-closest/default.nix +++ b/pkgs/development/python-modules/mullvad-closest/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Find Mullvad servers with the lowest latency at your location"; + mainProgram = "mullvad-closest"; homepage = "https://github.com/Ch00k/mullvad-closest"; license = licenses.unlicense; maintainers = with maintainers; [ siraben ]; diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 647281b8b4ee..2852fbcbd0d6 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.15"; + version = "0.70.16"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; - rev = "refs/tags/multiprocess-${version}"; - hash = "sha256-fpyFBrQXy5TwbHmce3qg1RiM8JnH3J5skl3es1IQPiw="; + rev = "refs/tags/${version}"; + hash = "sha256-77F5fkZbljq/tuBTkquKEYVubfghUrMZsAdhp1QpH2k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index 0e6e143676bc..c8d813047d5f 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -1,32 +1,21 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , setuptools , setuptools-scm -, wheel , pytestCheckHook }: buildPythonPackage rec { pname = "multiset"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-5FZxyug4Wo5iSKmwejqDKAwtDMQxJxMFjPus3F7Jlz4="; + hash = "sha256-oqUSMaQtkiriJFwpTCNaKfioiOBoZdL84hxuyvER//8="; }; - patches = [ - # https://github.com/wheerd/multiset/pull/115 - (fetchpatch { - name = "relax-setuptools-scm-dependency.patch"; - url = "https://github.com/wheerd/multiset/commit/296187b07691c94b783f65504afc580a355abd96.patch"; - hash = "sha256-vnZR1cyM/2/JfbLuVOxJuC9oMVVVploUHpbzagmo+AE="; - }) - ]; - postPatch = '' # Drop broken version specifier sed -i '/python_requires/d' setup.cfg @@ -35,7 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index f6e8020337c7..9076464d457c 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -23,6 +23,7 @@ buildPythonPackage { meta = with lib; { homepage = "https://github.com/aroig/mutag"; description = "A script to change email tags in a mu indexed maildir"; + mainProgram = "mutag"; license = licenses.gpl3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix index 28e7f8c89f8a..363c909c303b 100644 --- a/pkgs/development/python-modules/mwdblib/default.nix +++ b/pkgs/development/python-modules/mwdblib/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for the mwdb service"; + mainProgram = "mwdb"; homepage = "https://github.com/CERT-Polska/mwdblib"; changelog = "https://github.com/CERT-Polska/mwdblib/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/mwxml/default.nix b/pkgs/development/python-modules/mwxml/default.nix index 0c0471537432..28d303325209 100644 --- a/pkgs/development/python-modules/mwxml/default.nix +++ b/pkgs/development/python-modules/mwxml/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of utilities for processing MediaWiki XML dump data"; + mainProgram = "mwxml"; homepage = "https://github.com/mediawiki-utilities/python-mwxml"; license = licenses.mit; maintainers = with maintainers; [ GaetanLepage ]; diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index ca654c0b9947..27ffdad65e70 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to access meal tracking data stored in MyFitnessPal"; + mainProgram = "myfitnesspal"; homepage = "https://github.com/coddingtonbear/python-myfitnesspal"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index e02abac1b4f8..1e19b77c9c9c 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Type annotations builder for boto3"; + mainProgram = "mypy_boto3_builder"; homepage = "https://github.com/youtype/mypy_boto3_builder"; changelog = "https://github.com/youtype/mypy_boto3_builder/releases/tag/${version}"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index db565039d5a0..fa22b57526a1 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -47,7 +47,7 @@ let }; in rec { - mypy-boto3-accessanalyzer = buildMypyBoto3Package "accessanalyzer" "1.34.54" "sha256-ZglQkseFlqe160S+v5baZ3rfI5QqKsh9IIRPOJEcD3E="; + mypy-boto3-accessanalyzer = buildMypyBoto3Package "accessanalyzer" "1.34.67" "sha256-tgiKSWgKebdPAsyuJTQoFGR9BSLfGMeTVbi1rnPnvfQ="; mypy-boto3-account = buildMypyBoto3Package "account" "1.34.0" "sha256-C2iAiA83tZ/7XRlccf1iddDfDNkuO2F0B5aOxKbHy2Q="; @@ -59,7 +59,7 @@ rec { mypy-boto3-amp = buildMypyBoto3Package "amp" "1.34.39" "sha256-XOousDfEQsZ9z48iH2wVHuUaIwoECwbkHvIAlV3+zu4="; - mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.34.45" "sha256-hV0fg6Y39NkZ6Qa6GyIYicMERjCBAjZYcSsJ+1jXAfA="; + mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.34.63" "sha256-alOtCCZwBcx6g3lm80AzI5aF8WbEABd44A0e6gfZ42o="; mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.34.0" "sha256-wP6fOHAUg4dvrlQ2rUNk/lgIr6JnpWu/0Tr2prTckOk="; @@ -105,7 +105,7 @@ rec { mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.34.0" "sha256-16siojcxNe5MuSZSRJXPAz2UudJozEEyCYUrsGNDAM8="; - mypy-boto3-backup = buildMypyBoto3Package "backup" "1.34.0" "sha256-H4wIDyA+/6sH6X5zp/HGP2vfWIY5HzgTfa1ThXfXwYM="; + mypy-boto3-backup = buildMypyBoto3Package "backup" "1.34.64" "sha256-RvxhEmrOtkvagjaj8x2H7AAp+uK9qDIDe7T9p52rKRc="; mypy-boto3-backup-gateway = buildMypyBoto3Package "backup-gateway" "1.34.0" "sha256-nSIEEDKJfI852/WBQ7OuDPuVijEiMr1vhpkzODbhRRc="; @@ -141,7 +141,7 @@ rec { mypy-boto3-clouddirectory = buildMypyBoto3Package "clouddirectory" "1.34.0" "sha256-lWJQClNEhyq9CN8ThcHtVcEsowIp+V8RXh4rgHAclfM="; - mypy-boto3-cloudformation = buildMypyBoto3Package "cloudformation" "1.34.61" "sha256-fT48eggnNyP/cPXoXvm386zWKfmuyhAyxrtUGwOem0c="; + mypy-boto3-cloudformation = buildMypyBoto3Package "cloudformation" "1.34.66" "sha256-KV3bh48/S2FIm4O9S62Uk4LeuKR4/1rmbCLKP/urvpU="; mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.34.0" "sha256-3n/WEiQdcE253J+CFsskoYlNMXASdzkhPTWneSHDKoM="; @@ -161,7 +161,7 @@ rec { mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.34.0" "sha256-iUgoanqMSyxRopVctyFLiu+otFSgRvdgQPw4mKX3QIk="; - mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.59" "sha256-dkX5QeHjfBrY8mU+/5tKVkJlqAodBYqkW8oei1iqTl0="; + mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.67" "sha256-Kvd8zAHfepA4dulpiQCaT2pfKCH567d6CYd5QlweXIY="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.34.0" "sha256-TsXVy8bx6kaj84PJiNNU+075Tx3WW0mrtZFOyLx9yT4="; @@ -197,7 +197,7 @@ rec { mypy-boto3-config = buildMypyBoto3Package "config" "1.34.45" "sha256-LN1CcIOj9cgzSNCvnUVwLRNPXlitHAlt+5jj6wu6i8E="; - mypy-boto3-connect = buildMypyBoto3Package "connect" "1.34.61" "sha256-LbiRcZWmULytWtEy0J2mXqQtHofbbfbRV2PyvEFcRfA="; + mypy-boto3-connect = buildMypyBoto3Package "connect" "1.34.67" "sha256-kWjC/FacCsC0xevx2dOs67UxaKG1WM3xMahcO3CqZL8="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.34.0" "sha256-Wx9vcjlgXdWZ2qP3Y/hTY2LAeTd+hyyV5JSIuKQ5I5k="; @@ -245,15 +245,15 @@ rec { mypy-boto3-ds = buildMypyBoto3Package "ds" "1.34.0" "sha256-qVtMpsnVLF2rN4WaEhrqlTvWvW28RcHIBjsZYwmYapc="; - mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.34.57" "sha256-itDqozgR636w+OK8wtvO+obJHXohsTr1AMOousvpnbA="; + mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.34.67" "sha256-CUR+8+pr3+C+TjLKIyg4IFczQdNAvqMGXe0hU8xZPSI="; mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.34.0" "sha256-Zx5cJE+fU9NcvK5rLR966AGIKUvfIwdpLaWWdLmuDzc="; mypy-boto3-ebs = buildMypyBoto3Package "ebs" "1.34.0" "sha256-xIrrXOayZed+Jcn4CFXXNgKz/G+RdiuwA04wq+Ry/fs="; - mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.61" "sha256-rRK8Q3zUJuelfYvaUhrqxbsFUn1Xl6oxCahaRhI3+W8="; + mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.66" "sha256-Io0ExXqdar+5A4H66ryaApWIQnEcspQysfBsOit4WyY="; - mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.34.0" "sha256-95TXW9HJHciM+lZCdlUYOwcLhkKE8RJpRx9/dEnu3FU="; + mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.34.63" "sha256-kExmGXEJ5jrvOewmWx7AjVb3boD5GU0cEUp/2PQhzlw="; mypy-boto3-ecr = buildMypyBoto3Package "ecr" "1.34.0" "sha256-uD+wMR6WikLUyoIbAGwY1KPj42S4zr7nWOpPqXxaw0U="; @@ -275,7 +275,7 @@ rec { mypy-boto3-elb = buildMypyBoto3Package "elb" "1.34.0" "sha256-5Eh5D872pVDd7Q+DDh3zpGMVgS8fUJsV+63H1fet73s="; - mypy-boto3-elbv2 = buildMypyBoto3Package "elbv2" "1.34.32" "sha256-jDrQb4A0PVBSxH7vuPXehpEYdU8Hwgv2Sc2+j0OGVJg="; + mypy-boto3-elbv2 = buildMypyBoto3Package "elbv2" "1.34.63" "sha256-snXMLMHLEpJjfX1GJp6FfYgIjkS8vkbf/hESBdhxIfk="; mypy-boto3-emr = buildMypyBoto3Package "emr" "1.34.44" "sha256-zM1VpAaBSxqdZiSrNiaAKfvliNRXMLEmvFvXcFmkZO0="; @@ -291,13 +291,13 @@ rec { mypy-boto3-evidently = buildMypyBoto3Package "evidently" "1.34.0" "sha256-MkBB5iTYJYg2cWFYHR3Qu7TcsDglLPEw0MnoHqij6+A="; - mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.34.24" "sha256-GMHF1MWsAt0EfwcK/OSG14AP80L+9dLNsWygvpU5344="; + mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.34.66" "sha256-G5FMKm9HymvRPtkjvYZt6NVhPUVuBwCR4kQq8/naUFs="; mypy-boto3-finspace-data = buildMypyBoto3Package "finspace-data" "1.34.0" "sha256-8mND5BbdKY5srFwdpxSyfCUTIP4fa9hztP4daUJOB8k="; mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.34.46" "sha256-Fgs7wrwKPK79cYduCR/RYQ2FEZvghDuWI1hXKzFLfJo="; - mypy-boto3-fis = buildMypyBoto3Package "fis" "1.34.0" "sha256-0TJ7iAF9hTOiKoW305p8a5fE0lZrdtoFDj/jjZzfdf0="; + mypy-boto3-fis = buildMypyBoto3Package "fis" "1.34.63" "sha256-TJnzgQGDcybpVqg+p7Tuvw/RoY79cQPPChyHWlMxhiY="; mypy-boto3-fms = buildMypyBoto3Package "fms" "1.34.0" "sha256-tzaSecIXzkC+Zr5MGpU7GaoiGHGsywEglZ8+Ja0XDDo="; @@ -385,7 +385,7 @@ rec { mypy-boto3-ivs = buildMypyBoto3Package "ivs" "1.34.45" "sha256-Ilrtk6ZF1p3GNuZrtiEiNXi3bHI3MYNr6bDpJ8sf4Fg="; - mypy-boto3-ivs-realtime = buildMypyBoto3Package "ivs-realtime" "1.34.0" "sha256-x+B14roN4jNXeLp+Tmwtj28OMeGe80qLMaIbVCzulbY="; + mypy-boto3-ivs-realtime = buildMypyBoto3Package "ivs-realtime" "1.34.62" "sha256-/8P/S2xdYub8/tC0yaUbUfcxfDKpDnfAvmqneXFcAOo="; mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.34.0" "sha256-eNwL7uUI7x30KJwNO5U/0XSV1O4YZYu/zYvGQgz7p+8="; @@ -411,11 +411,11 @@ rec { mypy-boto3-kinesisanalytics = buildMypyBoto3Package "kinesisanalytics" "1.34.0" "sha256-eEoSmwMTa/hsbKbuKuzAZv4jHljGKq3b5Rw7K2Pgc50="; - mypy-boto3-kinesisanalyticsv2 = buildMypyBoto3Package "kinesisanalyticsv2" "1.34.0" "sha256-ZxVW6BKUdgnWKk4J3B2I0vlSLZRR+Dua3Sb/mzIDFNE="; + mypy-boto3-kinesisanalyticsv2 = buildMypyBoto3Package "kinesisanalyticsv2" "1.34.64" "sha256-7sJyrWtBcbrWlCjR7pLdBLgW7sXcRazDPBW+OGwh4Xg="; mypy-boto3-kinesisvideo = buildMypyBoto3Package "kinesisvideo" "1.34.48" "sha256-uYSkwOuYKF3B+sj5IWbDL789Xue2yNY9g14j/2b6k6w="; - mypy-boto3-kms = buildMypyBoto3Package "kms" "1.34.14" "sha256-fGuTdVCmgdqaYdJcEJY7vhvNw+Qi1NXYFST16mXp0UA="; + mypy-boto3-kms = buildMypyBoto3Package "kms" "1.34.65" "sha256-jot13mfxhgvayvQkMxnDvjdwkpGLkwsC2eeAQpMW0II="; mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.34.7" "sha256-/IPOF44ohg59XX+lmMbx8WsaHFpBaMH440Wm5jgrKD4="; @@ -439,7 +439,7 @@ rec { mypy-boto3-location = buildMypyBoto3Package "location" "1.34.18" "sha256-rsjIGenXgdEdgxvilA3IKJkYkpDDQNDfjDQRoj/mxSU="; - mypy-boto3-logs = buildMypyBoto3Package "logs" "1.34.36" "sha256-FUm1TaiKhphSRY4YbliUSdU6eAU1S1r9fVO00nXFPC4="; + mypy-boto3-logs = buildMypyBoto3Package "logs" "1.34.66" "sha256-z1+sSAHdkvBQB/sbRET/mCWFRNHyHmTpIo40GIBG+EE="; mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.34.47" "sha256-M7NaoRHxlH5/zkuMnOlrco2BCPXErv/N7TAVwv2oZuA="; @@ -457,7 +457,7 @@ rec { mypy-boto3-managedblockchain = buildMypyBoto3Package "managedblockchain" "1.34.0" "sha256-gUPuS8/ygIdsfCx6S1zpxP936Ah0o5BT4TaDiEW4wPQ="; - mypy-boto3-managedblockchain-query = buildMypyBoto3Package "managedblockchain-query" "1.34.33" "sha256-HByCyc+gnBu2+5qdtRw6LuRWCu7sVVXxmOJJZgWMFsI="; + mypy-boto3-managedblockchain-query = buildMypyBoto3Package "managedblockchain-query" "1.34.67" "sha256-c2BoAKpgurKaNOTkl3cqc3X1CiaQVfQL5kvQV3/WLww="; mypy-boto3-marketplace-catalog = buildMypyBoto3Package "marketplace-catalog" "1.34.41" "sha256-SZqNZO/36iGuf0jqNIZrbD1BOE7p6xMWhs5Y5VkUl8c="; @@ -481,7 +481,7 @@ rec { mypy-boto3-mediastore-data = buildMypyBoto3Package "mediastore-data" "1.34.0" "sha256-bYlKkBh7Kq4PsToHQ4+K5B3h8+IwyS+7ngEJ5AALBus="; - mypy-boto3-mediatailor = buildMypyBoto3Package "mediatailor" "1.34.45" "sha256-r1rzW4TQ2pZ/Bw+ina6sSLUTEk9+fakZEWYA5gOxXhY="; + mypy-boto3-mediatailor = buildMypyBoto3Package "mediatailor" "1.34.65" "sha256-JJDQuyACp+y5PntLhMZ2rIb1wR/IW0PPPqS8HB54mNk="; mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.34.0" "sha256-3lAWDWzf1MjTDh0+HDnewq0Yo3bUuhSGSSKJvJf6k8g="; @@ -581,7 +581,7 @@ rec { mypy-boto3-rbin = buildMypyBoto3Package "rbin" "1.34.0" "sha256-Y+a/p3r5IgWk4oH6MOeq0e7rMiNvLCqoz1ZE+xXNtOw="; - mypy-boto3-rds = buildMypyBoto3Package "rds" "1.34.58" "sha256-P3s5qNAV9UG6fMSxvkUevKACU3FGjhOne1D0LRi/eMk="; + mypy-boto3-rds = buildMypyBoto3Package "rds" "1.34.65" "sha256-uEgsI/MsacidGZEYWhvXDVE2RUFdtuh027YZbL4Lyb8="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.34.6" "sha256-d+WXt3cSUe5ZxynSjPSJxXgv6evP/rhZrX1ua9rtSx8="; @@ -619,13 +619,13 @@ rec { mypy-boto3-rum = buildMypyBoto3Package "rum" "1.34.49" "sha256-Mq2H+13cjxYRwFfxJpWTAb+W5bx+Vew+jl+zbreRIkQ="; - mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.34.14" "sha256-ccOasGI820QtIltxwXg/alE8/0xKE1BaLvuy46/y6WU="; + mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.34.65" "sha256-L830Es4pJLLws021mr8GqcC75M0zYfFPDSweIRwPfd0="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.34.18" "sha256-53s5ii1gFX9toigiazEtS5Jogg3VFFr+1/uiLzoU7Uo="; mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.34.0" "sha256-xLuGP9Fe0S7zRimt1AKd9KOrytmNd/GTRg5OVi5Xpos="; - mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.53" "sha256-IgZzJstoOg1wzucKqPBx47baLbagrUk1kW4P8cI++cg="; + mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.64" "sha256-Sf1T1aqRMIEZmuA2KH5tzuhTDN8yfFID/+h0DCWxws0="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.34.0" "sha256-jMZ3aWKQPhNec4A/02S1waQi6Mx9JVdENc3kblhsKjA="; @@ -639,7 +639,7 @@ rec { mypy-boto3-sagemaker-runtime = buildMypyBoto3Package "sagemaker-runtime" "1.34.0" "sha256-OJYEdi4xILUZoePcGBcLRHAhwppeybNO+l0kyW3a0Co="; - mypy-boto3-savingsplans = buildMypyBoto3Package "savingsplans" "1.34.0" "sha256-HaloEU3+2VgDekIQ5JltgCCG1jJ/ap1qqDGWR51ggtU="; + mypy-boto3-savingsplans = buildMypyBoto3Package "savingsplans" "1.34.67" "sha256-t+0Ko+Onv24p1Sn59mvR/auXkDTowOEpKwpzuMUqk8w="; mypy-boto3-scheduler = buildMypyBoto3Package "scheduler" "1.34.0" "sha256-+gnQjWPtp7KVI/qIY2aXHD9iM7RZIDl0JwRostfhjzc="; @@ -647,7 +647,7 @@ rec { mypy-boto3-sdb = buildMypyBoto3Package "sdb" "1.34.0" "sha256-13BuAQD8uDwwDhCw+8O3V882H6/oor5Z8mBmjb7HHAU="; - mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.43" "sha256-q79WB3XC/g3Dg7f3DBahv3U9mz/8DKpeNUR+aFeDpos="; + mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.63" "sha256-oZM3PXGPdH1Th4tcx/7y6bj944kuR4isaQ/SsWo1Vkw="; mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.34.20" "sha256-EcLY5SXSN2kJEuo8s2sYJJfq/X78BM1msyI9TfYD7Xw="; @@ -715,7 +715,7 @@ rec { mypy-boto3-textract = buildMypyBoto3Package "textract" "1.34.0" "sha256-AeukQ85jOCNpUxfnedEyacm/bK6pFA32tmhQrieLoMo="; - mypy-boto3-timestream-query = buildMypyBoto3Package "timestream-query" "1.34.0" "sha256-YriLmrbBd3zPny4MBMJV5G0WB4mQZElBZDOd3DTin74="; + mypy-boto3-timestream-query = buildMypyBoto3Package "timestream-query" "1.34.65" "sha256-RSGOulFIOZi/9Z5grP/Zv0A5fy3MJTzph+D9a45MkHA="; mypy-boto3-timestream-write = buildMypyBoto3Package "timestream-write" "1.34.0" "sha256-fKi5nIyU5BffflHVh21HjcuYE+RXDiq0gXbFOKOAYPE="; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 97d7c86e7d90..c94b83bbb4fb 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -9,6 +9,7 @@ , setuptools , types-psutil , types-setuptools +, wheel # propagates , mypy-extensions @@ -23,44 +24,42 @@ , attrs , filelock , pytest-xdist -, pytest-forked , pytestCheckHook -, py -, six }: buildPythonPackage rec { pname = "mypy"; - version = "1.8.0"; - format = "pyproject"; + version = "1.9.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python"; repo = "mypy"; - rev = "refs/tags/v${version}"; - hash = "sha256-1YgAswqLadOVV5ZSi5ZXWYK3p114882IlSx0nKChGPs="; + rev = "refs/tags/${version}"; + hash = "sha256-uOOZX8bKRunTOgYVbmetu2m0B7kijxBgWdNiLCAhiQ4="; }; - nativeBuildInputs = [ + build-system = [ mypy-extensions setuptools types-psutil types-setuptools typing-extensions + wheel ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - propagatedBuildInputs = [ + dependencies = [ mypy-extensions typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { dmypy = [ psutil ]; @@ -89,19 +88,20 @@ buildPythonPackage rec { "mypy.report" ]; - checkInputs = [ + nativeCheckInputs = [ attrs filelock pytest-xdist - pytest-forked pytestCheckHook - py setuptools - six tomli - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); - disabledTests = lib.optionals (pythonAtLeast "3.12") [ + disabledTests = [ + # fails with typing-extensions>=4.10 + # https://github.com/python/mypy/issues/17005 + "test_runtime_typing_objects" + ] ++ lib.optionals (pythonAtLeast "3.12") [ # requires distutils "test_c_unit_test" ]; diff --git a/pkgs/development/python-modules/nameko/default.nix b/pkgs/development/python-modules/nameko/default.nix index aec20b0f43e7..93bc03bcde95 100644 --- a/pkgs/development/python-modules/nameko/default.nix +++ b/pkgs/development/python-modules/nameko/default.nix @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "A microservices framework that lets service developers concentrate on application logic and encourages testability"; + mainProgram = "nameko"; homepage = "https://www.nameko.io/"; changelog = "https://github.com/nameko/nameko/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/names/default.nix b/pkgs/development/python-modules/names/default.nix index 89ca958582c2..3661e7f0d119 100644 --- a/pkgs/development/python-modules/names/default.nix +++ b/pkgs/development/python-modules/names/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = { description = "Generate random names"; + mainProgram = "names"; homepage = "https://github.com/treyhunner/names"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix index 24a27c84bbd5..d5d411728315 100644 --- a/pkgs/development/python-modules/nampa/default.nix +++ b/pkgs/development/python-modules/nampa/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the FLIRT technology"; + mainProgram = "dumpsig.py"; homepage = "https://github.com/thebabush/nampa"; license = licenses.lgpl3Only; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index 95ae7bfb39bb..298a333f3206 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Plugin system for napari (the image visualizer)"; + mainProgram = "npe2"; homepage = "https://github.com/napari/npe2"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 9997d58eb50b..0bccb016570c 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -38,7 +38,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.18"; + version = "0.4.19.post1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -47,7 +47,7 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xF0DYK+226MZpB050IukNvTg2iHMQAIZW0serKRJd/0="; + hash = "sha256-qw5WdFPySNkmm+dNu+hqsmr+csBpHnSl9bMpb4nKEqI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index b39460f71aa6..aef526b4290e 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Natural sorting for Python"; + mainProgram = "natsort"; homepage = "https://github.com/SethMMorton/natsort"; changelog = "https://github.com/SethMMorton/natsort/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/navec/default.nix b/pkgs/development/python-modules/navec/default.nix index 2f39e56b492c..e5712212eb69 100644 --- a/pkgs/development/python-modules/navec/default.nix +++ b/pkgs/development/python-modules/navec/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Compact high quality word embeddings for Russian language"; + mainProgram = "navec-train"; homepage = "https://github.com/natasha/navec"; license = licenses.mit; maintainers = with maintainers; [ npatsakula ]; diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index e2d4fc2810c5..d25509f0184e 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -67,6 +67,7 @@ let nbclient = buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/jupyter/nbclient"; description = "A client library for executing notebooks"; + mainProgram = "jupyter-execute"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index 306d927faa4b..25d9cc73df53 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert"; + mainProgram = "nbconflux"; homepage = "https://github.com/Valassis-Digital-Media/nbconflux"; license = licenses.bsd3; maintainers = [ maintainers.arnoldfarkas ]; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 8897d75a893f..8f4d2a53e811 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -33,14 +33,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.16.1"; + version = "7.16.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-555qB09Juj7SlCjthkh79RUJ2aq2E72FIqwI9tKP1/0="; + hash = "sha256-gxDt1B4cQ5R+Ts8WYUxhRp68AkiY64CMzgmZhg/J+xY="; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/pkgs/development/python-modules/nbexec/default.nix b/pkgs/development/python-modules/nbexec/default.nix index 5eec122cdc59..faed2eedb471 100644 --- a/pkgs/development/python-modules/nbexec/default.nix +++ b/pkgs/development/python-modules/nbexec/default.nix @@ -53,6 +53,7 @@ buildPythonPackage { meta = with lib; { description = "A dead-simple tool for executing Jupyter notebooks from the command line."; + mainProgram = "nbexec"; homepage = "https://github.com/jsvine/nbexec"; changelog = "https://github.com/jsvine/nbexec/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 290663e78a81..f1ef3cd81521 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter Notebook format"; + mainProgram = "jupyter-trust"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh globin ]; diff --git a/pkgs/development/python-modules/nbtlib/default.nix b/pkgs/development/python-modules/nbtlib/default.nix index b70259c9c76d..3ec7ade6a90b 100644 --- a/pkgs/development/python-modules/nbtlib/default.nix +++ b/pkgs/development/python-modules/nbtlib/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python library to read and edit nbt data"; + mainProgram = "nbt"; homepage = "https://github.com/vberlier/nbtlib"; changelog = "https://github.com/vberlier/nbtlib/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 9eaa2c60de29..cce567bfacb3 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -2,13 +2,13 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , coverage , ipykernel , jupyter-client , nbformat , pytestCheckHook , pytest -, six , glibcLocales , matplotlib , sympy @@ -16,21 +16,25 @@ buildPythonPackage rec { pname = "nbval"; - version = "0.10.0"; - format = "setuptools"; + version = "0.11.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tKzv3BEyrvihtbYr+ak9Eo66UoObKFTqPkJZj023vrM="; + hash = "sha256-d8lXl2B7CpaLq9JZfuNJQQLSXDrTdDXeu9rA5G43kJQ="; }; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ coverage ipykernel jupyter-client @@ -68,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "A py.test plugin to validate Jupyter notebooks"; homepage = "https://github.com/computationalmodelling/nbval"; + changelog = "https://github.com/computationalmodelling/nbval/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/nclib/default.nix b/pkgs/development/python-modules/nclib/default.nix index c2717746bf69..f803a2b39980 100644 --- a/pkgs/development/python-modules/nclib/default.nix +++ b/pkgs/development/python-modules/nclib/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module that provides netcat features"; + mainProgram = "serve-stdio"; homepage = "https://nclib.readthedocs.io/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index d3d129efa2dc..71acebc14e01 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/cedadev/ndg_httpsclient/"; description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"; + mainProgram = "ndg_httpclient"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index de40dc3d71cf..5e98ea185700 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub # build-system -, cython +, cython_3 # optional , numpy @@ -16,18 +16,18 @@ buildPythonPackage rec { pname = "ndindex"; - version = "1.7"; + version = "1.8"; format = "setuptools"; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "ndindex"; rev = "refs/tags/${version}"; - hash = "sha256-JP0cEuxXfPTWc1EIUtMsy5Hx6eIo9vDzD0IUXm1lFME="; + hash = "sha256-F52ly3NkrZ0H9XoomMqmWfLl+8X0z26Yx67DB8DUqyU="; }; nativeBuildInputs = [ - cython + cython_3 ]; postPatch = '' diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix index 542ed4f94b64..73b6d83dbe86 100644 --- a/pkgs/development/python-modules/nessclient/default.nix +++ b/pkgs/development/python-modules/nessclient/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation/abstraction of the Ness D8x/D16x Serial Interface ASCII protocol"; + mainProgram = "ness-cli"; homepage = "https://github.com/nickw444/nessclient"; changelog = "https://github.com/nickw444/nessclient/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 65f4fcd61421..bcb478e238b9 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "netaddr"; - version = "0.9.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; + sha256 = "sha256-brj+3wQSxtKU0GiFwRDelFz00i0rUQ0EBPTgaVCFeYc="; }; nativeBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "A network address manipulation library for Python"; + mainProgram = "netaddr"; homepage = "https://netaddr.readthedocs.io/"; downloadPage = "https://github.com/netaddr/netaddr/releases"; changelog = "https://github.com/netaddr/netaddr/blob/${version}/CHANGELOG"; diff --git a/pkgs/development/python-modules/netapp-ontap/default.nix b/pkgs/development/python-modules/netapp-ontap/default.nix index 7516c5da20e3..a770cb63b0b2 100644 --- a/pkgs/development/python-modules/netapp-ontap/default.nix +++ b/pkgs/development/python-modules/netapp-ontap/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library for working with ONTAP's REST APIs simply in Python"; + mainProgram = "ontap-cli"; homepage = "https://devnet.netapp.com/restapi.php"; license = licenses.bsd3; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/development/python-modules/netio/default.nix b/pkgs/development/python-modules/netio/default.nix index 30e9fc1af53a..29159d6288ba 100644 --- a/pkgs/development/python-modules/netio/default.nix +++ b/pkgs/development/python-modules/netio/default.nix @@ -4,8 +4,8 @@ , poetry-core , pyopenssl , pythonOlder +, pythonRelaxDepsHook , requests -, setuptools }: buildPythonPackage rec { @@ -24,6 +24,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pyopenssl" ]; propagatedBuildInputs = [ @@ -40,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with NETIO devices"; + mainProgram = "Netio"; homepage = "https://github.com/netioproducts/PyNetio"; changelog = "https://github.com/netioproducts/PyNetio/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 51e580af4eb2..0c4993cdd694 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -58,6 +58,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # No warnings of type (<class 'DeprecationWarning'>, <class 'PendingDeprecationWarning'>, <class 'FutureWarning'>) were emitted. + "test_connected_raise" + ]; + meta = { changelog = "https://github.com/networkx/networkx/blob/networkx-${version}/doc/release/release_${version}.rst"; homepage = "https://networkx.github.io/"; diff --git a/pkgs/development/python-modules/newversion/default.nix b/pkgs/development/python-modules/newversion/default.nix index 769750163663..fec4f1b0f41f 100644 --- a/pkgs/development/python-modules/newversion/default.nix +++ b/pkgs/development/python-modules/newversion/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 440 version manager"; + mainProgram = "newversion"; homepage = "https://github.com/vemel/newversion"; changelog = "https://github.com/vemel/newversion/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/nh3/default.nix b/pkgs/development/python-modules/nh3/default.nix index 2bcdb6d49cde..5c627edadeeb 100644 --- a/pkgs/development/python-modules/nh3/default.nix +++ b/pkgs/development/python-modules/nh3/default.nix @@ -9,12 +9,12 @@ }: let pname = "nh3"; - version = "0.2.13"; + version = "0.2.15"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-NILPy+lC0jhOF6ykriUPZWHLlSYBC00tpDdfJ6XjcjA="; + hash = "sha256-OyTehgnjmDALU2qPRL/HrvoAMyIsmYuTKFlOJT8r+Gk="; }; in buildPythonPackage { @@ -25,7 +25,7 @@ buildPythonPackage { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Ror2KcIdSeXHa44eUWGiPsKiD935hsBREREySbGedxA="; + hash = "sha256-fetAE3cj9hh4SoPE72Bqco5ytUMiDqbazeS2MHdUibM="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index c3343f842a99..747cf394f4ad 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "niaarm"; - version = "0.3.7"; + version = "0.3.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; rev = "refs/tags/${version}"; - hash = "sha256-0YBjYpeu1eagy9hp/EuXN1cfHztEjR/i4/YFKXS33Co="; + hash = "sha256-p07SuCl433rj6IEMO1eg5QHAUTVfgqYo5gsprMvQg2Y="; }; nativeBuildInputs = [ @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "A minimalistic framework for Numerical Association Rule Mining"; + mainProgram = "niaarm"; homepage = "https://github.com/firefly-cpp/NiaARM"; changelog = "https://github.com/firefly-cpp/NiaARM/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nikola/default.nix b/pkgs/development/python-modules/nikola/default.nix index 461d65a00f8f..2b9e37d62dae 100644 --- a/pkgs/development/python-modules/nikola/default.nix +++ b/pkgs/development/python-modules/nikola/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , aiohttp , babel , blinker @@ -8,6 +7,7 @@ , doit , feedparser , fetchPypi +, fetchpatch2 , freezegun , ghp-import , hsluv @@ -54,6 +54,14 @@ buildPythonPackage rec { hash = "sha256-VYuhiGLMTHcOZM8/bGZT7Xx5BOHo9gsMPjufYglrBL0="; }; + patches = [ + (fetchpatch2 { + name = "nikola-pytest8-compat.patch"; + url = "https://github.com/getnikola/nikola/commit/5f1003f91cd59f62622d379efe9be5fb19a1ed3e.patch"; + hash = "sha256-2H3125RUnwvN/XgwgfRe1139rhAz/9viMEcUYRGQMPs="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace-fail "--cov nikola --cov-report term-missing" "" @@ -120,6 +128,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static website and blog generator"; + mainProgram = "nikola"; homepage = "https://getnikola.com/"; changelog = "https://github.com/getnikola/nikola/blob/v${version}/CHANGES.txt"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ninebot-ble/default.nix b/pkgs/development/python-modules/ninebot-ble/default.nix index c13d96fe700c..79f00a7e19ff 100644 --- a/pkgs/development/python-modules/ninebot-ble/default.nix +++ b/pkgs/development/python-modules/ninebot-ble/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ninebot scooter BLE client"; + mainProgram = "ninebot-ble"; homepage = "https://github.com/ownbee/ninebot-ble"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/ninja/default.nix b/pkgs/development/python-modules/ninja/default.nix index 808bf9fb8c0e..4bf4c83ad434 100644 --- a/pkgs/development/python-modules/ninja/default.nix +++ b/pkgs/development/python-modules/ninja/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A small build system with a focus on speed"; + mainProgram = "ninja"; longDescription = '' This is a stub of the ninja package on PyPI that uses the ninja program provided by nixpkgs instead of downloading ninja from the web. diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index 63e6989d4dac..1a1813ebb8af 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -1,55 +1,77 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder -, cython -, nose -, matplotlib -, nibabel + +# build-system +, cython_3 +, meson-python +, ninja +, setuptools + +# dependencies , numpy , scipy +, nibabel , sympy -, python +, transforms3d + +# optional-dependencies +, matplotlib + +# tests +, pytestCheckHook }: buildPythonPackage rec { - version = "0.5.0"; - format = "setuptools"; + version = "0.6.0"; pname = "nipy"; - disabled = pythonOlder "2.6"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "a8a2c97ce854fece4aced5a6394b9fdca5846150ad6d2a36b86590924af3c848"; + hash = "sha256-BTn2nV4VMeT8bxTOJTHjRU8I2bxFZCzIZCZVn/QcUrk="; }; - nativeBuildInputs = [ cython ]; - buildInputs = lib.optionals doCheck [ nose ]; - propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ]; - - preBuild = '' - make recythonize + postPatch = '' + patchShebangs nipy/_build_utils/cythoner.py ''; - checkPhase = '' # wants to be run in a different directory - mkdir nosetests - cd nosetests - ${python.interpreter} -c "import nipy; nipy.test()" - rm -rf . - ''; + build-system = [ + cython_3 + meson-python + setuptools + ninja + numpy + ]; + + dependencies = [ + nibabel + numpy + scipy + sympy + transforms3d + ]; + + optional-dependencies.optional = [ + matplotlib + ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.optional; + + doCheck = false; # partial imports … circular dependencies. needs more time to figure out. - # failing test: - # nipy.algorithms.statistics.models.tests.test_olsR.test_results(11.593139639404727, 11.593140144880794, 6) # disagrees by 1 at 6th decimal place - # erroring tests: - # nipy.modalities.fmri.fmristat.tests.test_FIAC.test_altprotocol - # nipy.modalities.fmri.fmristat.tests.test_FIAC.test_agreement - # nipy.tests.test_scripts.test_nipy_4d_realign # because `nipy_4d_realign` script isn't found at test time; works from nix-shell, so could be patched - # nipy.tests.test_scripts.test_nipy_3_4d # ditto re.: `nipy_3_4d` script - doCheck = false; + pythonImportsCheck = [ + "nipy" + "nipy.testing" + "nipy.algorithms" + ]; meta = with lib; { homepage = "https://nipy.org/nipy"; description = "Software for structural and functional neuroimaging analysis"; + downloadPage = "https://github.com/nipy/nipy"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 9386729d30b7..2c6d00517df1 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -106,6 +106,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://nipy.org/nipype/"; description = "Neuroimaging in Python: Pipelines and Interfaces"; + mainProgram = "nipypecli"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; }; diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 3132d1900847..a05c9661e69e 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://nitransforms.readthedocs.io"; description = "Geometric transformations for images and surfaces"; + mainProgram = "nb-transform"; changelog = "https://github.com/nipy/nitransforms/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index 476054384717..1616cfff4637 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -93,6 +93,7 @@ buildPythonPackage rec { meta = with lib; { description = "Common workflows for MRI (anatomical, functional, diffusion, etc.)"; + mainProgram = "niworkflows-boldref"; homepage = "https://github.com/nipreps/niworkflows"; changelog = "https://github.com/nipreps/niworkflows/blob/${src.rev}/CHANGES.rst"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix index 35d6fa16e1d3..28274467efb9 100644 --- a/pkgs/development/python-modules/nkdfu/default.nix +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool for Nitrokeys' firmware update"; + mainProgram = "nkdfu"; homepage = "https://github.com/Nitrokey/nkdfu"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ frogamic ]; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 77ed843d47cd..cfac189b06f5 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Natural Language Processing ToolKit"; + mainProgram = "nltk"; homepage = "http://nltk.org/"; license = licenses.asl20; maintainers = with maintainers; [ lheckemann ]; diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 5a8139288183..9ab5c801da5c 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -23,6 +23,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "nocasedict" ]; diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index 3972833e1069..d5f886ab1a1e 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "nocaselist" ]; diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index 92d3bbb5d4c6..8efd0b492e76 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Node.js virtual environment builder"; + mainProgram = "nodeenv"; homepage = "https://github.com/ekalinin/nodeenv"; changelog = "https://github.com/ekalinin/nodeenv/releases/tag/${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 2b7b4533ee30..d7548d3f8bd8 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Off-grid, resilient mesh communication"; + mainProgram = "nomadnet"; homepage = "https://github.com/markqvist/NomadNet"; changelog = "https://github.com/markqvist/NomadNet/releases/tag/${version}"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index dc9dc51da5b8..d59dd0db6461 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { broken = isPyPy; # missing 2to3 conversion utility description = "A unittest-based testing framework for python that makes writing and running tests easier"; + mainProgram = "nosetests"; homepage = "https://nose.readthedocs.io/"; license = licenses.lgpl3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index de96b74709ed..4d6e6b3e5c83 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/nose-devs/nose2/blob/${version}/docs/changelog.rst"; description = "Test runner for Python"; + mainProgram = "nose2"; homepage = "https://github.com/nose-devs/nose2"; license = licenses.bsd0; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix index 7a63713d2d09..782673d4e498 100644 --- a/pkgs/development/python-modules/nosejs/default.nix +++ b/pkgs/development/python-modules/nosejs/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "NoseJS"; + pname = "nosejs"; version = "0.9.4"; src = fetchPypi { - inherit pname version; + pname = "NoseJS"; + inherit version; sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy"; }; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index f10bbe9dc1fa..2ef7bcec3440 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.0.8"; + version = "7.1.1"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-OVfs2VYFawAUZ3r8dtO7RMLS8pZJ+Hsk0TYG/x0Yk48="; + hash = "sha256-gY50IPoh9ALnJq+58C3388EPKUwC44PtGYUoZsMWEIs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/notedown/default.nix b/pkgs/development/python-modules/notedown/default.nix index 9301fb13dd0d..f272f5cb0d4b 100644 --- a/pkgs/development/python-modules/notedown/default.nix +++ b/pkgs/development/python-modules/notedown/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/aaren/notedown"; description = "Convert IPython Notebooks to markdown (and back)"; + mainProgram = "notedown"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ vcanadi ]; }; diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 61c1c9026e0b..9e4a97238699 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -87,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cross-platform desktop notification library for Python"; + mainProgram = "notifypy"; homepage = "https://github.com/ms7m/notify-py"; changelog = "https://github.com/ms7m/notify-py/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index 0e24bb60ad48..1f9f5f1d65e9 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "notion-client"; - version = "2.1.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ramnes"; repo = "notion-sdk-py"; rev = "refs/tags/${version}"; - hash = "sha256-u10iPSbFPv9RewEYru3V6MpwhhySzmnymmv4CsefGC8="; + hash = "sha256-IEWFrdqrawFbuwA8bUewanmBoGWsjHJ7ucgvHQEaMcA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 0b6067cb1cfb..6fee91c77fce 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nox"; - version = "2023.04.22"; + version = "2024.03.02"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "wntrblm"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WuyNp3jxIktI72zbk+1CK8xflTKrYE5evn/gVdMx+cQ="; + hash = "sha256-P86Jy/5MQnuWHelJFQ4kUCFg86Dwzx0Sm/sRonf0pZk="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ jinja2 tox pytestCheckHook @@ -52,6 +52,11 @@ buildPythonPackage rec { "nox" ]; + disabledTests = [ + # our conda is not available on 3.11 + "test__create_venv_options" + ]; + disabledTestPaths = [ # AttributeError: module 'tox.config' has... "tests/test_tox_to_nox.py" diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index 05bbad2d2180..7e8c3b4cdf8d 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/nicoboss/nsz"; description = "Homebrew compatible NSP/XCI compressor/decompressor"; + mainProgram = "nsz"; changelog = "https://github.com/nicoboss/nsz/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 38927877146a..dc4ba155bedb 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -4,14 +4,16 @@ , pythonOlder , poetry-core , textfsm +, invoke , pytestCheckHook , ruamel-yaml +, toml , yamllint }: buildPythonPackage rec { pname = "ntc-templates"; - version = "4.0.1"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +22,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tenztWqSjVVDJygBvJpdLFbKmz+TPKYu0UhscqJBhLc="; + hash = "sha256-zTJNatg5s5Y9uJ/42uhBltvP69qDsdTRIOCt5OuLwQc="; }; nativeBuildInputs = [ @@ -32,8 +34,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + invoke pytestCheckHook ruamel-yaml + toml yamllint ]; diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index 10529adf74a7..0a492b32f310 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modules to convert numbers to words. 42 --> forty-two"; + mainProgram = "num2words"; homepage = "https://github.com/savoirfairelinux/num2words"; license = licenses.lgpl21; maintainers = with maintainers; [ jonringer ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d25d436d9fdd..b3c80a49798c 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -183,6 +183,7 @@ in buildPythonPackage rec { meta = { changelog = "https://github.com/numpy/numpy/releases/tag/v${version}"; description = "Scientific tools for Python"; + mainProgram = "f2py"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 428ea03ed287..aabc55278e6f 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = { changelog = "https://github.com/numpy/numpydoc/releases/tag/v${version}"; description = "Sphinx extension to support docstrings in Numpy format"; + mainProgram = "validate-docstrings"; homepage = "https://github.com/numpy/numpydoc"; license = lib.licenses.free; }; diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 52a6d1c18259..a0b82d76ff2a 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -45,6 +45,7 @@ meta = with lib; { description = "A UAVCAN DSDL template engine"; + mainProgram = "nnvg"; longDescription = '' It exposes a pydsdl abstract syntax tree to Jinja2 templates allowing authors to generate code, schemas, metadata, documentation, etc. diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 803a4f1c04fd..3447f4deddf3 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "8.4"; + version = "8.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-cwMo3ixTK7UO9sxhcQBN4/gNZNAoBH/xL2tZ1Orh8LE="; + hash = "sha256-vfdb7+jcJ5EuWDoZyRExWEPEWt+lgbzmAL3QhguLtHE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index b375d6111ae0..96288f52e493 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -14,6 +14,9 @@ , structlog , tomli , tornado +, awesomeversion +, packaging +, lxml }: buildPythonPackage rec { @@ -71,6 +74,13 @@ buildPythonPackage rec { "-m 'not needs_net'" ]; + optional-dependencies = { + # vercmp = [ pyalpm ]; + awesomeversion = [ awesomeversion ]; + pypi = [ packaging ]; + htmlparser = [ lxml ]; + }; + meta = with lib; { description = "New version checker for software"; homepage = "https://github.com/lilydjwg/nvchecker"; diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index fb953bce13dd..efbec58b936a 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core , pybluez , pytestCheckHook , pythonOlder @@ -9,8 +10,8 @@ buildPythonPackage rec { pname = "nxt-python"; - version = "3.2.0"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,14 +19,18 @@ buildPythonPackage rec { owner = "schodet"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PWeR8xteLMxlOHcJJCtTI0o8QNzwGJVkUACmvf4tXWY="; + hash = "sha256-v65KEP5DuJsZAifd1Rh46x9lSAgBZgyo+e8PKSDKnhw="; }; - propagatedBuildInputs = [ + build-system = [ + poetry-core + ]; + + dependencies = [ pyusb ]; - passthru.optional-dependencies = { + optional-dependencies = { bluetooth = [ pybluez ]; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index de26b60caac2..45914454052e 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.2.1"; + version = "16.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qJrreq2GhJxrX9keZOYVzjihs0RCymad+MGErW5ecPc="; + hash = "sha256-QMddGJUfafXoBxMCjlx1lH45a4Bab3AP4j8Px7JxYaQ="; }; postPatch = '' @@ -30,11 +30,11 @@ buildPythonPackage rec { --replace-fail " --cov=oauthenticator" "" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jupyterhub ]; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index bd0aa88262df..c0c88870f352 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "objgraph"; - version = "3.6.0"; + version = "3.6.1"; format = "setuptools"; disabled = pythonOlder "3.7" || isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-NpVnw3tPL5KBYLb27e3L6o/H6SmDGHf9EFbHipAMF9M="; + hash = "sha256-/pbHQUe7yq6GZbOW5TiL3MMZfe67pOY4HwUgLuW0U6c="; }; patches = [ diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index f385d5a7c8a5..c57a77771098 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.124.1"; + version = "2.124.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-tiTtBJIohUW80PLMGkdgsC8m4QF0lzmfqErNNb0Ede4="; + hash = "sha256-IYINga1qCCmdu1j6ix2GcZtx6twPwfHCxU8fPOqF4eE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 57750768e4db..ab9f362de4e6 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.3.1"; + version = "3.4.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-+u0whEnzA5XZlqgTpQtGH25/krLLvNPycWXzBUedMRc="; + hash = "sha256-knMxVBibaX3wK7VNBODHeLeAbBOXHKNbyxjItiNcIfw="; }; buildInputs = [ pip ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Alternative parser for bitbake recipes"; homepage = "https://github.com/priv-kweihmann/oelint-parser"; - changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/v${version}"; + changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ otavio ]; }; diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index 8ebac1d06a56..c0c06b1ca91e 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/captin411/ofxclient"; description = "OFX client for dowloading transactions from banks"; + mainProgram = "ofxclient"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index a9306b2dca4b..67bb7ded1042 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/csingley/ofxtools"; description = "Library for working with Open Financial Exchange (OFX) formatted data used by financial institutions"; + mainProgram = "ofxget"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/oldest-supported-numpy/default.nix b/pkgs/development/python-modules/oldest-supported-numpy/default.nix index 7349a63a2c2a..a0ec902984e1 100644 --- a/pkgs/development/python-modules/oldest-supported-numpy/default.nix +++ b/pkgs/development/python-modules/oldest-supported-numpy/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "oldest-supported-numpy"; - version = "2023.10.25"; + version = "2023.12.21"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-dBqJrxLoyCMl9zEmtTORXc4QYNoPnk7GQtpGZoBoYpY="; + hash = "sha256-cdicMbtWeBTkfi4mjrLpK2+Z9c529MPbMIM2JOnvKeA="; }; # The purpose of oldest-supported-numpy is to build a project against the diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index 6bf379aacd90..f0df020d39c3 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "olefile"; - version = "0.46"; + version = "0.47"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964"; + sha256 = "sha256-WZODOBoL89+9kyygymUVrNF07UiHDL9/7hI9aYwZLBw="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix new file mode 100644 index 000000000000..5e46474e1129 --- /dev/null +++ b/pkgs/development/python-modules/ollama/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pillow +, poetry-core +, pytest-asyncio +, pytest-httpserver +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "ollama"; + version = "0.1.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ollama"; + repo = "ollama-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-xNH9kAjSdVXrCI7zkyR7tYxJ/NG8/08ykkDZQJI8Za4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "0.0.0" "${version}" + ''; + + pythonRelaxDeps = [ + "httpx" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + httpx + ]; + + nativeCheckInputs = [ + pillow + pytest-asyncio + pytest-httpserver + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ollama" + ]; + + meta = with lib; { + description = "Ollama Python library"; + homepage = "https://github.com/ollama/ollama-python"; + changelog = "https://github.com/ollama/ollama-python/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index fa038770a093..f7f54671669b 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ome-zarr"; - version = "0.8.0"; + version = "0.8.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ome"; repo = "ome-zarr-py"; rev = "refs/tags/v${version}"; - hash = "sha256-DMBTrDyUmNsrjOsFKrqukJNZ1f/mAjz4aunNUcwVMKg="; + hash = "sha256-JuNXVse/n/lFbNaLwMcir8NBHiRxcbYvtbxePwI6YoY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ondilo/default.nix b/pkgs/development/python-modules/ondilo/default.nix index c766e2cb158d..1c5a25e048f4 100644 --- a/pkgs/development/python-modules/ondilo/default.nix +++ b/pkgs/development/python-modules/ondilo/default.nix @@ -5,23 +5,28 @@ , pythonOlder , requests , requests-oauthlib +, setuptools }: buildPythonPackage rec { pname = "ondilo"; - version = "0.3.0"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "JeromeHXP"; - repo = pname; - rev = version; - hash = "sha256-MI6K+41I/IVi+GRBdmRIHbljULDFLAwpo3W8tdxCOBM="; + repo = "ondilo"; + rev = "refs/tags/${version}"; + hash = "sha256-BieWdPakQts0QxzQzJYlP6a7ieZ40rAyYqhy8zEvU38="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ oauthlib requests requests-oauthlib @@ -37,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to access Ondilo ICO APIs"; homepage = "https://github.com/JeromeHXP/ondilo"; + changelog = "https://github.com/JeromeHXP/ondilo/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/onetimepad/default.nix b/pkgs/development/python-modules/onetimepad/default.nix index cca4a06d6027..a1baab63934a 100644 --- a/pkgs/development/python-modules/onetimepad/default.nix +++ b/pkgs/development/python-modules/onetimepad/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = { description = "A hacky implementation of one-time pad"; + mainProgram = "onetimepad"; homepage = "https://jailuthra.in/onetimepad"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index 066d1d89ce8f..2a54df8e5e8c 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Control Onkyo receivers over ethernet"; + mainProgram = "onkyo"; homepage = "https://github.com/miracle2k/onkyo-eiscp"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/online-judge-api-client/default.nix b/pkgs/development/python-modules/online-judge-api-client/default.nix index 0a1268e5264f..8c17aed69179 100644 --- a/pkgs/development/python-modules/online-judge-api-client/default.nix +++ b/pkgs/development/python-modules/online-judge-api-client/default.nix @@ -54,6 +54,7 @@ in buildPythonPackage rec { meta = with lib; { description = "API client to develop tools for competitive programming"; + mainProgram = "oj-api"; homepage = "https://github.com/online-judge-tools/api-client"; license = licenses.mit; maintainers = with maintainers; [ sei40kr ]; diff --git a/pkgs/development/python-modules/online-judge-tools/default.nix b/pkgs/development/python-modules/online-judge-tools/default.nix index 58d535e6ab78..a86b41145237 100644 --- a/pkgs/development/python-modules/online-judge-tools/default.nix +++ b/pkgs/development/python-modules/online-judge-tools/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for various online judges. Download sample cases, generate additional test cases, test your code, and submit it."; + mainProgram = "oj"; homepage = "https://github.com/online-judge-tools/oj"; license = licenses.mit; maintainers = with maintainers; [ sei40kr ]; diff --git a/pkgs/development/python-modules/onlykey-solo-python/default.nix b/pkgs/development/python-modules/onlykey-solo-python/default.nix index ad01e5b2f820..23e11bc7c307 100644 --- a/pkgs/development/python-modules/onlykey-solo-python/default.nix +++ b/pkgs/development/python-modules/onlykey-solo-python/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/trustcrypto/onlykey-solo-python"; description = "Python library for OnlyKey with Solo FIDO2"; + mainProgram = "solo"; maintainers = with maintainers; [ kalbasit ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/onnx/1.15.0-CVE-2024-27318.patch b/pkgs/development/python-modules/onnx/1.15.0-CVE-2024-27318.patch new file mode 100644 index 000000000000..3b95d1fc588c --- /dev/null +++ b/pkgs/development/python-modules/onnx/1.15.0-CVE-2024-27318.patch @@ -0,0 +1,360 @@ +Based on upstream 66b7fb630903fdcf3e83b6b6d56d82e904264a20, adjusted to +apply to 1.15.0 & avoid implicit inclusion of changes from other +intermediate commits + +diff --git a/onnx/checker.cc b/onnx/checker.cc +index fac56f56..c9fda9b2 100644 +--- a/onnx/checker.cc ++++ b/onnx/checker.cc +@@ -13,7 +13,6 @@ + #include <vector> + + #include "onnx/common/file_utils.h" +-#include "onnx/common/path.h" + #include "onnx/defs/schema.h" + #include "onnx/defs/tensor_proto_util.h" + #include "onnx/proto_utils.h" +@@ -135,85 +134,7 @@ void check_tensor(const TensorProto& tensor, const CheckerContext& ctx) { + for (const StringStringEntryProto& entry : tensor.external_data()) { + if (entry.has_key() && entry.has_value() && entry.key() == "location") { + has_location = true; +-#ifdef _WIN32 +- auto file_path = std::filesystem::path(utf8str_to_wstring(entry.value())); +- if (file_path.is_absolute()) { +- fail_check( +- "Location of external TensorProto ( tensor name: ", +- tensor.name(), +- ") should be a relative path, but it is an absolute path: ", +- entry.value()); +- } +- auto relative_path = file_path.lexically_normal().make_preferred().wstring(); +- // Check that normalized relative path contains ".." on Windows. +- if (relative_path.find(L"..", 0) != std::string::npos) { +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be file inside the ", +- ctx.get_model_dir(), +- ", but the '", +- entry.value(), +- "' points outside the directory"); +- } +- std::wstring data_path = path_join(utf8str_to_wstring(ctx.get_model_dir()), relative_path); +- struct _stat64 buff; +- if (_wstat64(data_path.c_str(), &buff) != 0) { +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be stored in ", +- entry.value(), +- ", but it doesn't exist or is not accessible."); +- } +-#else // POSIX +- if (entry.value().empty()) { +- fail_check("Location of external TensorProto ( tensor name: ", tensor.name(), ") should not be empty."); +- } else if (entry.value()[0] == '/') { +- fail_check( +- "Location of external TensorProto ( tensor name: ", +- tensor.name(), +- ") should be a relative path, but it is an absolute path: ", +- entry.value()); +- } +- std::string relative_path = clean_relative_path(entry.value()); +- // Check that normalized relative path contains ".." on POSIX +- if (relative_path.find("..", 0) != std::string::npos) { +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be file inside the ", +- ctx.get_model_dir(), +- ", but the '", +- entry.value(), +- "' points outside the directory"); +- } +- std::string data_path = path_join(ctx.get_model_dir(), relative_path); +- // use stat64 to check whether the file exists +-#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__) +- struct stat buffer; // APPLE, wasm and non-glic stdlibs do not have stat64 +- if (stat((data_path).c_str(), &buffer) != 0) { +-#else +- struct stat64 buffer; // All POSIX under glibc except APPLE and wasm have stat64 +- if (stat64((data_path).c_str(), &buffer) != 0) { +-#endif +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be stored in ", +- data_path, +- ", but it doesn't exist or is not accessible."); +- } +- // Do not allow symlinks or directories. +- if (!S_ISREG(buffer.st_mode)) { +- fail_check( +- "Data of TensorProto ( tensor name: ", +- tensor.name(), +- ") should be stored in ", +- data_path, +- ", but it is not regular file."); +- } +-#endif ++ resolve_external_data_location(ctx.get_model_dir(), entry.value(), tensor.name()); + } + } + if (!has_location) { +@@ -1054,6 +975,93 @@ void check_model(const ModelProto& model, bool full_check, bool skip_opset_compa + } + } + ++std::string resolve_external_data_location( ++ const std::string& base_dir, ++ const std::string& location, ++ const std::string& tensor_name) { ++#ifdef _WIN32 ++ auto file_path = std::filesystem::path(utf8str_to_wstring(location)); ++ if (file_path.is_absolute()) { ++ fail_check( ++ "Location of external TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be a relative path, but it is an absolute path: ", ++ location); ++ } ++ auto relative_path = file_path.lexically_normal().make_preferred().wstring(); ++ // Check that normalized relative path contains ".." on Windows. ++ if (relative_path.find(L"..", 0) != std::string::npos) { ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be file inside the ", ++ base_dir, ++ ", but the '", ++ location, ++ "' points outside the directory"); ++ } ++ std::wstring data_path = path_join(utf8str_to_wstring(base_dir), relative_path); ++ struct _stat64 buff; ++ if (_wstat64(data_path.c_str(), &buff) != 0) { ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be stored in ", ++ location, ++ ", but it doesn't exist or is not accessible."); ++ } ++ return wstring_to_utf8str(data_path); ++#else // POSIX ++ if (location.empty()) { ++ fail_check("Location of external TensorProto ( tensor name: ", tensor_name, ") should not be empty."); ++ } else if (location[0] == '/') { ++ fail_check( ++ "Location of external TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be a relative path, but it is an absolute path: ", ++ location); ++ } ++ std::string relative_path = clean_relative_path(location); ++ // Check that normalized relative path contains ".." on POSIX ++ if (relative_path.find("..", 0) != std::string::npos) { ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be file inside the ", ++ base_dir, ++ ", but the '", ++ location, ++ "' points outside the directory"); ++ } ++ std::string data_path = path_join(base_dir, relative_path); ++ // use stat64 to check whether the file exists ++#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__) ++ struct stat buffer; // APPLE, wasm and non-glic stdlibs do not have stat64 ++ if (stat((data_path).c_str(), &buffer) != 0) { ++#else ++ struct stat64 buffer; // All POSIX under glibc except APPLE and wasm have stat64 ++ if (stat64((data_path).c_str(), &buffer) != 0) { ++#endif ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be stored in ", ++ data_path, ++ ", but it doesn't exist or is not accessible."); ++ } ++ // Do not allow symlinks or directories. ++ if (!S_ISREG(buffer.st_mode)) { ++ fail_check( ++ "Data of TensorProto ( tensor name: ", ++ tensor_name, ++ ") should be stored in ", ++ data_path, ++ ", but it is not regular file."); ++ } ++ return data_path; ++#endif ++} ++ + std::set<std::string> experimental_ops = { + "ATen", + "Affine", +diff --git a/onnx/checker.h b/onnx/checker.h +index 6796acab..83012213 100644 +--- a/onnx/checker.h ++++ b/onnx/checker.h +@@ -160,7 +160,10 @@ void check_model_local_functions( + + void check_model(const ModelProto& model, bool full_check = false, bool skip_opset_compatibility_check = false); + void check_model(const std::string& model_path, bool full_check = false, bool skip_opset_compatibility_check = false); +- ++std::string resolve_external_data_location( ++ const std::string& base_dir, ++ const std::string& location, ++ const std::string& tensor_name); + bool check_is_experimental_op(const NodeProto& node); + + } // namespace checker +diff --git a/onnx/common/path.h b/onnx/common/path.h +index 6eaf5e67..09212747 100644 +--- a/onnx/common/path.h ++++ b/onnx/common/path.h +@@ -31,11 +31,22 @@ inline std::wstring utf8str_to_wstring(const std::string& utf8str) { + if (utf8str.size() > INT_MAX) { + fail_check("utf8str_to_wstring: string is too long for converting to wstring."); + } +- int size_required = MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), (int)utf8str.size(), NULL, 0); ++ int size_required = MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), static_cast<int>(utf8str.size()), NULL, 0); + std::wstring ws_str(size_required, 0); +- MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), (int)utf8str.size(), &ws_str[0], size_required); ++ MultiByteToWideChar(CP_UTF8, 0, utf8str.c_str(), static_cast<int>(utf8str.size()), &ws_str[0], size_required); + return ws_str; + } ++inline std::string wstring_to_utf8str(const std::wstring& ws_str) { ++ if (ws_str.size() > INT_MAX) { ++ fail_check("wstring_to_utf8str: string is too long for converting to UTF-8."); ++ } ++ int size_required = ++ WideCharToMultiByte(CP_UTF8, 0, ws_str.c_str(), static_cast<int>(ws_str.size()), NULL, 0, NULL, NULL); ++ std::string utf8str(size_required, 0); ++ WideCharToMultiByte( ++ CP_UTF8, 0, ws_str.c_str(), static_cast<int>(ws_str.size()), &utf8str[0], size_required, NULL, NULL); ++ return utf8str; ++} + + #else + std::string path_join(const std::string& origin, const std::string& append); +diff --git a/onnx/cpp2py_export.cc b/onnx/cpp2py_export.cc +index bc2594db..83cea68f 100644 +--- a/onnx/cpp2py_export.cc ++++ b/onnx/cpp2py_export.cc +@@ -545,6 +545,8 @@ PYBIND11_MODULE(onnx_cpp2py_export, onnx_cpp2py_export) { + "full_check"_a = false, + "skip_opset_compatibility_check"_a = false); + ++ checker.def("_resolve_external_data_location", &checker::resolve_external_data_location); ++ + // Submodule `version_converter` + auto version_converter = onnx_cpp2py_export.def_submodule("version_converter"); + version_converter.doc() = "VersionConverter submodule"; +diff --git a/onnx/external_data_helper.py b/onnx/external_data_helper.py +index bbc2717f..05c486c6 100644 +--- a/onnx/external_data_helper.py ++++ b/onnx/external_data_helper.py +@@ -8,6 +8,7 @@ import uuid + from itertools import chain + from typing import Callable, Iterable, Optional + ++import onnx.onnx_cpp2py_export.checker as c_checker + from onnx.onnx_pb import AttributeProto, GraphProto, ModelProto, TensorProto + + +@@ -39,9 +40,9 @@ def load_external_data_for_tensor(tensor: TensorProto, base_dir: str) -> None: + base_dir: directory that contains the external data. + """ + info = ExternalDataInfo(tensor) +- file_location = _sanitize_path(info.location) +- external_data_file_path = os.path.join(base_dir, file_location) +- ++ external_data_file_path = c_checker._resolve_external_data_location( # type: ignore[attr-defined] ++ base_dir, info.location, tensor.name ++ ) + with open(external_data_file_path, "rb") as data_file: + if info.offset: + data_file.seek(info.offset) +@@ -259,14 +260,6 @@ def _get_attribute_tensors(onnx_model_proto: ModelProto) -> Iterable[TensorProto + yield from _get_attribute_tensors_from_graph(onnx_model_proto.graph) + + +-def _sanitize_path(path: str) -> str: +- """Remove path components which would allow traversing up a directory tree from a base path. +- +- Note: This method is currently very basic and should be expanded. +- """ +- return path.lstrip("/.") +- +- + def _is_valid_filename(filename: str) -> bool: + """Utility to check whether the provided filename is valid.""" + exp = re.compile('^[^<>:;,?"*|/]+$') +diff --git a/onnx/test/test_external_data.py b/onnx/test/test_external_data.py +index 63f6b4ef..bb14d279 100644 +--- a/onnx/test/test_external_data.py ++++ b/onnx/test/test_external_data.py +@@ -3,6 +3,7 @@ + # SPDX-License-Identifier: Apache-2.0 + from __future__ import annotations + ++import itertools + import os + import pathlib + import tempfile +@@ -204,6 +205,52 @@ class TestLoadExternalDataSingleFile(TestLoadExternalDataBase): + attribute_tensor = new_model.graph.node[0].attribute[0].t + np.testing.assert_allclose(to_array(attribute_tensor), self.attribute_value) + ++ @parameterized.parameterized.expand(itertools.product((True, False), (True, False))) ++ def test_save_external_invalid_single_file_data_and_check( ++ self, use_absolute_path: bool, use_model_path: bool ++ ) -> None: ++ model = onnx.load_model(self.model_filename, self.serialization_format) ++ ++ model_dir = os.path.join(self.temp_dir, "save_copy") ++ os.mkdir(model_dir) ++ ++ traversal_external_data_dir = os.path.join( ++ self.temp_dir, "invlid_external_data" ++ ) ++ os.mkdir(traversal_external_data_dir) ++ ++ if use_absolute_path: ++ traversal_external_data_location = os.path.join( ++ traversal_external_data_dir, "tensors.bin" ++ ) ++ else: ++ traversal_external_data_location = "../invlid_external_data/tensors.bin" ++ ++ external_data_dir = os.path.join(self.temp_dir, "external_data") ++ os.mkdir(external_data_dir) ++ new_model_filepath = os.path.join(model_dir, "model.onnx") ++ ++ def convert_model_to_external_data_no_check(model: ModelProto, location: str): ++ for tensor in model.graph.initializer: ++ if tensor.HasField("raw_data"): ++ set_external_data(tensor, location) ++ ++ convert_model_to_external_data_no_check( ++ model, ++ location=traversal_external_data_location, ++ ) ++ ++ onnx.save_model(model, new_model_filepath, self.serialization_format) ++ if use_model_path: ++ with self.assertRaises(onnx.checker.ValidationError): ++ _ = onnx.load_model(new_model_filepath, self.serialization_format) ++ else: ++ onnx_model = onnx.load_model( ++ new_model_filepath, self.serialization_format, load_external_data=False ++ ) ++ with self.assertRaises(onnx.checker.ValidationError): ++ load_external_data_for_model(onnx_model, external_data_dir) ++ + + @parameterized.parameterized_class( + [ diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 7d5e27138ecc..bcfd0cf6e3cf 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , cmake , fetchFromGitHub +, fetchpatch , gtest , nbval , numpy @@ -35,6 +36,15 @@ in buildPythonPackage rec { hash = "sha256-Jzga1IiUO5LN5imSUmnbsjYtapRatTihx38EOUjm9Os="; }; + patches = [ + ./1.15.0-CVE-2024-27318.patch + (fetchpatch { + name = "CVE-2024-27319.patch"; + url = "https://github.com/onnx/onnx/commit/08a399ba75a805b7813ab8936b91d0e274b08287.patch"; + hash = "sha256-9X92N9i/hpQjDGe4I/C+FwUcTUTtP2Nf7+pcTA2sXoA="; + }) + ]; + nativeBuildInputs = [ cmake pybind11 diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index 3d70ef77fb86..aacdb41fda1f 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "ONVIF Client Implementation in Python"; + mainProgram = "onvif-cli"; homepage = "https://github.com/hunterjm/python-onvif-zeep-async"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/onvif-zeep/default.nix b/pkgs/development/python-modules/onvif-zeep/default.nix index c1d60fd6bf26..2c2946d53c00 100644 --- a/pkgs/development/python-modules/onvif-zeep/default.nix +++ b/pkgs/development/python-modules/onvif-zeep/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Client for ONVIF Camera"; + mainProgram = "onvif-cli"; homepage = "https://github.com/quatanium/python-onvif"; license = licenses.mit; maintainers = with maintainers; [ fleaz ]; diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 7983abd2e985..26c2bbb0a312 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -78,6 +78,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/openai/whisper/blob/v${version}/CHANGELOG.md"; description = "General-purpose speech recognition model"; + mainProgram = "whisper"; homepage = "https://github.com/openai/whisper"; license = licenses.mit; maintainers = with maintainers; [ hexa MayNiklas ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index fb05e0a18dd3..7c8397dc304f 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -82,6 +82,9 @@ buildPythonPackage rec { # Tests make network requests "test_streaming_response" "test_copy_build_request" + + # Test fails with pytest>=8 + "test_basic_attribute_access_works" ]; disabledTestPaths = [ @@ -91,6 +94,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for the OpenAI API"; + mainProgram = "openai"; homepage = "https://github.com/openai/openai-python"; changelog = "https://github.com/openai/openai-python/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index 639ea62a17f3..0a655030a37d 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/Tigge/openant"; description = "ANT and ANT-FS Python Library"; + mainProgram = "openant"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index a6ddc2f5a61c..59611e1af362 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -1,10 +1,11 @@ { lib , aiohttp +, aioitertools , asgiref , buildPythonPackage , django -, djangorestframework , falcon +, fastapi , fetchFromGitHub , flask , httpx @@ -12,12 +13,14 @@ , jsonschema , jsonschema-spec , more-itertools +, multidict , openapi-schema-validator , openapi-spec-validator , parse , poetry-core , pytest-aiohttp , pytestCheckHook +, pytest_7 , pythonOlder , responses , requests @@ -28,7 +31,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.18.2"; + version = "0.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +40,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-5sNI6ujqDQ5L4afVHYZkm2pKa8yATtHFo7MF3eFF8Ig="; + hash = "sha256-+YYcSNX717JjVHMk4Seb145iq9/rQZEVQn27Ulk1A3E="; }; postPatch = '' @@ -63,6 +66,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { aiohttp = [ aiohttp + multidict ]; django = [ django @@ -70,6 +74,9 @@ buildPythonPackage rec { falcon = [ falcon ]; + fastapi = [ + fastapi + ]; flask = [ flask ]; @@ -77,7 +84,7 @@ buildPythonPackage rec { requests ]; starlette = [ - httpx + aioitertools starlette ]; }; @@ -85,12 +92,17 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ + httpx pytest-aiohttp - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) responses webob ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + disabledTestPaths = [ # Requires secrets and additional configuration "tests/integration/contrib/django/" diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 4c89b6999907..c43439e36ba0 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/p1c2u/openapi-spec-validator/releases/tag/${version}"; description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification"; + mainProgram = "openapi-spec-validator"; homepage = "https://github.com/p1c2u/openapi-spec-validator"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/openllm-client/default.nix b/pkgs/development/python-modules/openllm-client/default.nix index 0b1e74212104..221f0ab8011c 100644 --- a/pkgs/development/python-modules/openllm-client/default.nix +++ b/pkgs/development/python-modules/openllm-client/default.nix @@ -26,7 +26,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "hatchling==1.18.0" "hatchling" \ - --replace-fail "hatch-vcs==0.3.0" "hatch-vcs" + --replace-fail "hatch-vcs==0.3.0" "hatch-vcs" \ + --replace-fail "hatch-fancy-pypi-readme==23.1.0" "hatch-fancy-pypi-readme" ''; build-system = [ diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index f5fb0ad6e6bf..f59d92615cf8 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -44,8 +44,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "hatch-vcs==0.3.0" "hatch-vcs" \ - --replace "hatchling==1.18.0" "hatchling" + --replace-fail "hatch-vcs==0.3.0" "hatch-vcs" \ + --replace-fail "hatchling==1.18.0" "hatchling" \ + --replace-fail "hatch-fancy-pypi-readme==23.1.0" "hatch-fancy-pypi-readme" ''; pythonRelaxDeps = [ @@ -89,7 +90,7 @@ buildPythonPackage rec { full = with optional-dependencies; ( vllm # use absolute path to disambiguate with derivbation argument - ++ passthru.optional-dependencies.bentoml + ++ optional-dependencies.bentoml ++ fine-tune ); }; diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index ea90e089ec34..bf2005d06e5d 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -52,5 +52,6 @@ buildPythonPackage (common // { meta = common.meta // { description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux"; + mainProgram = "openrazer-daemon"; }; }) diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix index 2c9c57500ecb..674ec572e140 100644 --- a/pkgs/development/python-modules/opensfm/default.nix +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -43,12 +43,12 @@ let else ceres-solver; in buildPythonPackage rec { - pname = "OpenSfM"; + pname = "opensfm"; version = "unstable-2023-12-09"; src = fetchFromGitHub { owner = "mapillary"; - repo = pname; + repo = "OpenSfM"; rev = "7f170d0dc352340295ff480378e3ac37d0179f8e"; sha256 = "sha256-l/HTVenC+L+GpMNnDgnSGZ7+Qd2j8b8cuTs3SmORqrg="; }; diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 819bf7508d41..1ac6b6cae546 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -4,6 +4,7 @@ , dulwich , pbr , sphinx +, pythonAtLeast }: buildPythonPackage rec { @@ -11,6 +12,9 @@ buildPythonPackage rec { version = "3.2.0"; format = "setuptools"; + # breaks on import due to distutils import through pbr.packaging + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4="; diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index f6cc42e67f75..94d2c1b7c216 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "An SDK for building applications to work with OpenStack"; + mainProgram = "openstack-inventory"; homepage = "https://github.com/openstack/openstacksdk"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 590bae1823c9..4b323b25669d 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -1,35 +1,43 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib -, writeShellScriptBin -, cmake -, doxygen -, draco -, graphviz-nox -, ninja -, setuptools -, pyqt6 -, pyopengl -, jinja2 -, pyside6 -, boost -, numpy -, git -, tbb -, opensubdiv -, openimageio -, opencolorio -, osl -, ptex -, embree -, alembic -, imath -, flex -, bison -, qt6 -, python -, darwin +{ + alembic, + bison, + boost, + buildPythonPackage, + cmake, + darwin, + doxygen, + draco, + embree, + fetchFromGitHub, + flex, + git, + graphviz-nox, + imath, + jinja2, + lib, + libGL, + libX11, + ninja, + numpy, + opencolorio, + openimageio, + opensubdiv, + osl, + ptex, + pyopengl, + pyqt6, + pyside6, + python, + qt6, + setuptools, + tbb, + withDocs ? false, + withOsl ? true, + withTools ? false, + withUsdView ? false, + writeShellScriptBin, }: + let # Matches the pyside6-uic implementation # https://code.qt.io/cgit/pyside/pyside-setup.git/tree/sources/pyside-tools/pyside_tool.py?id=e501cad66146a49c7a259579c7bb94bc93a67a08#n82 @@ -37,95 +45,112 @@ let exec ${qt6.qtbase}/libexec/uic -g python "$@" ''; in + buildPythonPackage rec { - pname = "OpenUSD"; + pname = "openusd"; version = "23.11"; + src = fetchFromGitHub { owner = "PixarAnimationStudios"; - repo = pname; + repo = "OpenUSD"; rev = "refs/tags/v${version}"; hash = "sha256-5zQrfB14kXs75WbL3s4eyhxELglhLNxU2L2aVXiyVjg="; }; - stdenv = if python.stdenv.isDarwin then - darwin.apple_sdk_11_0.stdenv - else - python.stdenv; + stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; - outputs = ["out" "doc"]; + outputs = [ "out" ] ++ lib.optional withDocs "doc"; format = "other"; - propagatedBuildInputs = [ - setuptools - pyqt6 - pyopengl - jinja2 - pyside6 - pyside-tools-uic - boost - numpy - ]; - cmakeFlags = [ - "-DPXR_BUILD_EXAMPLES=OFF" - "-DPXR_BUILD_TUTORIALS=OFF" - "-DPXR_BUILD_USD_TOOLS=ON" - "-DPXR_BUILD_IMAGING=ON" - "-DPXR_BUILD_USD_IMAGING=ON" - "-DPXR_BUILD_USDVIEW=ON" - "-DPXR_BUILD_DOCUMENTATION=ON" - "-DPXR_BUILD_PYTHON_DOCUMENTATION=ON" - "-DPXR_BUILD_EMBREE_PLUGIN=ON" "-DPXR_BUILD_ALEMBIC_PLUGIN=ON" "-DPXR_BUILD_DRACO_PLUGIN=ON" + "-DPXR_BUILD_EMBREE_PLUGIN=ON" + "-DPXR_BUILD_EXAMPLES=OFF" + "-DPXR_BUILD_IMAGING=ON" "-DPXR_BUILD_MONOLITHIC=ON" # Seems to be commonly linked to monolithically - (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin)) + "-DPXR_BUILD_TESTS=OFF" + "-DPXR_BUILD_TUTORIALS=OFF" + "-DPXR_BUILD_USD_IMAGING=ON" + (lib.cmakeBool "PXR_BUILD_DOCUMENTATION" withDocs) + (lib.cmakeBool "PXR_BUILD_PYTHON_DOCUMENTATION" withDocs) + (lib.cmakeBool "PXR_BUILD_USDVIEW" withUsdView) + (lib.cmakeBool "PXR_BUILD_USD_TOOLS" withTools) + (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin && withOsl)) ]; - nativeBuildInputs = [ - cmake - ninja - git - qt6.wrapQtAppsHook - doxygen - graphviz-nox - ]; - buildInputs = [ - tbb - opensubdiv - openimageio - opencolorio - osl - ptex - embree - alembic.dev - imath - flex - bison - boost - draco - qt6.qtbase - ] - ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Cocoa - ]) - ; + nativeBuildInputs = + [ + cmake + ninja + setuptools + ] + ++ lib.optionals withDocs [ + git + graphviz-nox + doxygen + ] + ++ lib.optionals withUsdView [ qt6.wrapQtAppsHook ]; - pythonImportsCheck = [ "pxr" "pxr.Usd" ]; + buildInputs = + [ + alembic.dev + bison + boost + draco + embree + flex + imath + opencolorio + openimageio + opensubdiv + ptex + tbb + ] + ++ lib.optionals stdenv.isLinux [ + libGL + libX11 + ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) + ++ lib.optionals withOsl [ osl ] + ++ lib.optionals withUsdView [ qt6.qtbase ] + ++ lib.optionals (withUsdView && stdenv.isLinux) [ + qt6.qtbase + qt6.qtwayland + ]; - postInstall = '' - # Make python lib properly accessible - target_dir=$out/${python.sitePackages} - mkdir -p $(dirname $target_dir) - mv $out/lib/python $target_dir + propagatedBuildInputs = + [ + boost + jinja2 + numpy + pyopengl + ] + ++ lib.optionals (withTools || withUsdView) [ + pyside-tools-uic + pyside6 + ] + ++ lib.optionals withUsdView [ pyqt6 ]; - mv $out/docs $doc + pythonImportsCheck = [ + "pxr" + "pxr.Usd" + ]; - rm $out/share -r # only examples - rm $out/tests -r - ''; + postInstall = + '' + # Make python lib properly accessible + target_dir=$out/${python.sitePackages} + mkdir -p $(dirname $target_dir) + mv $out/lib/python $target_dir + '' + + lib.optionalString withDocs '' + mv $out/docs $doc + '' + + '' + rm $out/share -r # only examples + ''; meta = { description = "Universal Scene Description"; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 306f0431bfae..0d25314befdf 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-O+yIxEFqD6hel1H9aUnSz/wJoEhVrg6DDZptNcJVkSw="; + hash = "sha256-PB6t1ltxJs7aYn/OthCORHbyRXqMkTZ6YE2He0k/2mc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/opsdroid-get-image-size/default.nix b/pkgs/development/python-modules/opsdroid-get-image-size/default.nix index edd09d2750e2..777788eeb48d 100644 --- a/pkgs/development/python-modules/opsdroid-get-image-size/default.nix +++ b/pkgs/development/python-modules/opsdroid-get-image-size/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Get image width and height given a file path using minimal dependencies"; + mainProgram = "get-image-size"; license = licenses.mit; homepage = "https://github.com/opsdroid/image_size"; maintainers = with maintainers; [ globin ]; diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index b693afc4771c..dd36a90864f2 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "optax"; - version = "0.1.7"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "deepmind"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zSMJxagPe2rkhrawJ+TWXUzk6V58IY6MhWmEqLVtOoA="; + hash = "sha256-vimsVZV5Z11euLxsu998pMQZ0hG3xl96D3h9iONtl/E="; }; outputs = [ diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 7b6be6027a6e..d30873b91537 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -107,6 +107,7 @@ buildPythonPackage rec { meta = with lib; { description = "Accelerate training and inference of 🤗 Transformers and 🤗 Diffusers with easy to use hardware optimization tools"; + mainProgram = "optimum-cli"; homepage = "https://github.com/huggingface/optimum"; changelog = "https://github.com/huggingface/optimum/releases/tag/${src.rev}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 39b1455b76ba..dd423b87a226 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -43,8 +43,8 @@ buildPythonPackage rec { pname = "optuna"; - version = "3.5.0"; - format = "pyproject"; + version = "3.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "optuna"; repo = "optuna"; rev = "refs/tags/v${version}"; - hash = "sha256-lNurMkZZKpKXXQoqhuRUv8LCbdSi1ryj3kYYioYZPF0="; + hash = "sha256-KYSefIVGBUsN+A7nOWPBJyD4a+Wa+pO9WLyTpg8Cuy4="; }; nativeBuildInputs = [ @@ -124,6 +124,8 @@ buildPythonPackage rec { disabledTestPaths = [ # require unpackaged kaleido and building it is a bit difficult "tests/visualization_tests" + # ImportError: cannot import name 'mock_s3' from 'moto' + "tests/artifacts_tests/test_boto3.py" ]; pythonImportsCheck = [ @@ -133,8 +135,9 @@ buildPythonPackage rec { meta = with lib; { description = "A hyperparameter optimization framework"; homepage = "https://optuna.org/"; - changelog = "https://github.com/optuna/optuna/releases/tag/${src.rev}"; + changelog = "https://github.com/optuna/optuna/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; + mainProgram = "optuna"; }; } diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index 33dc53175f58..2fe7db175ff8 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wSI1qe7xIwOBhOV/O5sUXhSbImVOgkICTPToHNiQ9SM="; + hash = "sha256-HJpEjJhD2zPxC3d9aSD7k5XqsLD9wX8WIPrHw+7NtXo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 37683a999488..592aa2afa509 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.1.35"; + version = "0.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xLCwjeNDx9RqxlNkIWMo0Pcrg7akGuu4Rv9oRDgOK18="; + hash = "sha256-KMEFZkAZkDhuDPpAts+u825p5pFJZbyrsMW/S1AArp4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index 3a1d5cd6e893..95dadbb04d79 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "orange-widget-base"; - version = "4.22.0"; + version = "4.23.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-nV2aBPZzn7K+QECtCVoLLh5smG31zE2G9jFTKlxh9qM="; + hash = "sha256-mz+BcZEdg1p9V0ewYRrw3jKBWLMbL9RR6o4hUEUx9DA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index fe7f77554182..1c4531254ae8 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -4,7 +4,10 @@ , buildPythonPackage , chardet , copyDesktopItems +, pythonRelaxDepsHook , cython +, catboost +, xgboost , fetchFromGitHub , fetchurl , httpx @@ -45,7 +48,7 @@ let self = buildPythonPackage rec { pname = "orange3"; version = "3.36.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -58,15 +61,17 @@ let 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 + --replace-fail 'cython>=3.0' 'cython' + + # disable update checking + echo -e "def check_for_updates():\n\tpass" >> Orange/canvas/__main__.py ''; nativeBuildInputs = [ copyDesktopItems - cython + pythonRelaxDepsHook oldest-supported-numpy + cython qt5.wrapQtAppsHook recommonmark setuptools @@ -76,13 +81,18 @@ let enableParallelBuilding = true; + pythonRelaxDeps = [ "scikit-learn" ]; + propagatedBuildInputs = [ numpy scipy chardet + catboost + xgboost openpyxl opentsne qtconsole + setuptools bottleneck matplotlib joblib @@ -107,6 +117,9 @@ let # FIXME: ImportError: cannot import name '_variable' from partially initialized module 'Orange.data' (most likely due to a circular import) (/build/source/Orange/data/__init__.py) doCheck = false; + # FIXME: pythonRelaxDeps is not relaxing the scikit-learn version constraint, had to disable this + dontCheckRuntimeDeps = true; + pythonImportsCheck = [ "Orange" "Orange.data._variable" ]; desktopItems = [ diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix index c43a92524e01..b1d0c07b0c3c 100644 --- a/pkgs/development/python-modules/oras/default.nix +++ b/pkgs/development/python-modules/oras/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "oras"; - version = "0.1.27"; + version = "0.1.28"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "oras-project"; repo = "oras-py"; rev = "refs/tags/${version}"; - hash = "sha256-T2zuflew91UsEjhPKPjNxPBN+C//S1vWvXKVT602EVI="; + hash = "sha256-yka4TypKqGczW+NugmCGa8PgtaSJeaQ4sPphPsIPLow="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 0f9d467335ce..c1787fe86747 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.5.3"; + version = "0.5.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "orbax_checkpoint"; inherit version; - hash = "sha256-FXKQTLv+hROSfg2A+AtzDg7y9oAzLTwoENhENTKTi0U="; + hash = "sha256-zry5byLxFzah+e52x4yIi6roU3Jox/9mY62cujB2xlU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix new file mode 100644 index 000000000000..67988d5529ff --- /dev/null +++ b/pkgs/development/python-modules/orgparse/default.nix @@ -0,0 +1,22 @@ +{ lib, python3Packages, fetchPypi }: + +python3Packages.buildPythonPackage rec { + pname = "orgparse"; + version = "0.4.20231004"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA="; + }; + + nativeBuildInputs = [ python3Packages.setuptools-scm ]; + + pyproject = true; + + meta = with lib; { + homepage = "https://github.com/karlicoss/orgparse"; + description = "orgparse - Emacs org-mode parser in Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ twitchy0 ]; + }; +} diff --git a/pkgs/development/python-modules/osc-diagram/default.nix b/pkgs/development/python-modules/osc-diagram/default.nix index 6f9b9b68b468..f2802ed08e76 100644 --- a/pkgs/development/python-modules/osc-diagram/default.nix +++ b/pkgs/development/python-modules/osc-diagram/default.nix @@ -32,6 +32,7 @@ buildPythonPackage { meta = with lib; { description = "Build Outscale cloud diagrams"; + mainProgram = "osc-diagram"; homepage = "https://github.com/outscale-mgo/osc-diagram"; license = licenses.free; maintainers = with maintainers; [ nicolas-goudry ]; diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index b2e50a316a37..a51352785f53 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { broken = stdenv.isDarwin; homepage = "https://github.com/openSUSE/osc"; description = "opensuse-commander with svn like handling"; + mainProgram = "osc"; maintainers = [ maintainers.peti ]; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix index a783889e38ab..9ccbedb18060 100644 --- a/pkgs/development/python-modules/oscpy/default.nix +++ b/pkgs/development/python-modules/oscpy/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "A modern implementation of OSC for python2/3"; + mainProgram = "oscli"; license = licenses.mit; homepage = "https://github.com/kivy/oscpy"; maintainers = [ maintainers.yurkobb ]; diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index a42e9950066c..13fbdbcaac64 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { broken = stdenv.isDarwin; description = "Oslo Concurrency library"; + mainProgram = "lockutils-wrapper"; homepage = "https://github.com/openstack/oslo.concurrency"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 11384932218d..f73090cf812a 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "9.2.0"; + version = "9.4.0"; format = "setuptools"; src = fetchPypi { pname = "oslo.config"; inherit version; - hash = "sha256-/+sBymWmA9VSWQXxqIozGb4Jzixqw3bEMSquwoMJWHg="; + hash = "sha256-NbEaZhtgjttQMF2tkeTjCBnZDveUt9fbpb2LLvLrjA0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index 99e22ea54993..814c7dfc0dc1 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "oslo-i18n"; - version = "6.2.0"; + version = "6.3.0"; pyproject = true; src = fetchPypi { pname = "oslo.i18n"; inherit version; - hash = "sha256-cPikzphxKRvGCdB+MeblAyZmVWmS/xrlPnjy7SpavoI="; + hash = "sha256-ZKJR7e+L8bsdTm9403fhSdTxXBqSRd538XIBbaYmdEQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index d8904b0cdefc..ab1084750996 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "oslo.log library"; + mainProgram = "convert-json"; homepage = "https://github.com/openstack/oslo.log"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 196228ce37ce..503143f75d31 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "6.3.0"; + version = "7.1.0"; pyproject = true; src = fetchPypi { pname = "oslo.utils"; inherit version; - hash = "sha256-dY2UWyutW+qBq+2ArTP/6h0deTNIrF61s4Zrp0WxHVU="; + hash = "sha256-XkLzOU0fH5duiZSsSgkYlm0vfq98dzgN1hLEpBSN2Y4="; }; postPatch = '' @@ -67,12 +67,18 @@ buildPythonPackage rec { pyyaml ]; - checkPhase = '' + # disabled tests: + # https://bugs.launchpad.net/oslo.utils/+bug/2054134 + # netaddr default behaviour changed to be stricter + checkPhase ='' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) export LD_PRELOAD=${libredirect}/lib/libredirect.so - stestr run + stestr run -e <(echo " + oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ip + oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ipv4 + ") ''; pythonImportsCheck = [ "oslo_utils" ]; diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index 7d89f5778c73..2f400b0312a1 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "oslotest"; - version = "4.5.0"; + version = "5.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "360ad2c41ba3ad6f059c7c6e7291450d082c2e5dbb0012e839a829978053dfe6"; + sha256 = "sha256-97skDGy+8voLq7lRP/PafQ8ozDja+Y70Oy6ISDZ/vSA="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index f58a3fec14c8..38004632402b 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -8,6 +8,7 @@ , oldest-supported-numpy , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , qdldl , scipy , setuptools-scm @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.3"; + version = "0.6.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A+Rg5oPsLOD4OTU936PEyP+lCauM9qKyr7tYb6RT4YA="; + hash = "sha256-soEK7nviNzrdi2wL5a2ZuBAoh3SrykIXUcsDLWpa7e8="; }; dontUseCmakeConfigure = true; @@ -31,6 +32,11 @@ buildPythonPackage rec { cmake oldest-supported-numpy setuptools-scm + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "scipy" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/overrides/default.nix b/pkgs/development/python-modules/overrides/default.nix index 220f7dcbed14..93dea37791a5 100644 --- a/pkgs/development/python-modules/overrides/default.nix +++ b/pkgs/development/python-modules/overrides/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "overrides"; - version = "7.6.0"; + version = "7.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mkorpela"; repo = "overrides"; rev = "refs/tags/${version}"; - hash = "sha256-UdahbhmRfuxKTxb6Afjny/hMgXX1UuDUrIcLjZ0Jtak="; + hash = "sha256-gQDw5/RpAFNYWFOuxIAArPkCOoBYWUnsDtv1FEFteHo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ovmfvartool/default.nix b/pkgs/development/python-modules/ovmfvartool/default.nix index 8c5f43565617..fd15a3a12a4f 100644 --- a/pkgs/development/python-modules/ovmfvartool/default.nix +++ b/pkgs/development/python-modules/ovmfvartool/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parse and generate OVMF_VARS.fd from Yaml"; + mainProgram = "ovmfvartool"; homepage = "https://github.com/hlandau/ovmfvartool"; license = licenses.gpl3Plus; maintainers = with maintainers; [ baloo raitobezarius ]; diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index a5bed4644e5f..430cd58024dd 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -3,20 +3,25 @@ , fetchPypi , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "packageurl-python"; - version = "0.13.4"; - format = "setuptools"; + version = "0.15.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-brXplQCcxzOHCV4LUHq2XfUTV9Jd3F/OPTVFrW3Lvug="; + hash = "sha256-8hmyzmNIGFonvWpy5v3J+YTmyfoVfv+ny5PjQcSc3MI="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 30d35747ee62..6cb46d6777c9 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -64,7 +64,7 @@ let pandas = buildPythonPackage rec { pname = "pandas"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -73,7 +73,7 @@ let pandas = buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-PMrqniyyFYRnAeFBruPrTrGKzX2dRxMRct8AHeghstA="; + hash = "sha256-eyVUIYG0KCAEJbh/qZiEjGpdXq7A+2Lab+5bp+7t4cw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix index ad2aa6dd43b6..8d5a4694b1ac 100644 --- a/pkgs/development/python-modules/pandoc-xnos/default.nix +++ b/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pandoc filter suite providing facilities for cross-referencing in markdown documents"; + mainProgram = "pandoc-xnos"; homepage = "https://github.com/tomduck/pandoc-xnos"; license = licenses.gpl3Only; maintainers = with maintainers; [ ppenguin ]; diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index 8ddaa9d78a09..b9310fdbae84 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -4,13 +4,13 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; pname = "pandocfilters"; src = fetchPypi { inherit pname version; - sha256 = "0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38"; + sha256 = "sha256-ACtKVV7k68A/i2Ywfih/pJLkp3tOoU0/k0MoKXu0k54="; }; # No tests available diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index dc7892df3228..4a4b93035d73 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "A high level dashboarding library for python visualization libraries"; + mainProgram = "panel"; homepage = "https://github.com/holoviz/panel"; changelog = "https://github.com/holoviz/panel/releases/tag/v${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 28f5c9b6f9e1..6124b14b4b93 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -91,11 +91,20 @@ buildPythonPackage rec { "papermill" ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = lib.optionals stdenv.isDarwin [ # might fail due to the sandbox "test_end2end_autosave_slow_notebook" ]; + disabledTestPaths = [ + # ImportError: cannot import name 'mock_s3' from 'moto' + "papermill/tests/test_s3.py" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 34980fb0c1ad..8617c4ac7365 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -113,6 +113,7 @@ buildPythonPackage rec { meta = with lib; { description = "Powerful command-line document and bibliography manager"; + mainProgram = "papis"; homepage = "https://papis.readthedocs.io/"; changelog = "https://github.com/papis/papis/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 638a3182ca1b..b80f6199ad56 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "param"; - version = "2.0.2"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "holoviz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kVuab6+l4KOtSvj6aI9zsQJ91tfCDJkHrSTcRL9SViY="; + hash = "sha256-9264KfRDuHsvDyIpGKs2VTPcTZOZIFLKe7xuplkfzf4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 278bb0583e35..2b3b6ff2507e 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "paramiko"; - version = "3.3.1"; + version = "3.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ajd3qWGshtvvN1xfW41QAUoaltD9fwVKQ7yIATSw/3c="; + hash = "sha256-qsCPJqMdxN/9koIVJ9FoLZnVL572hRloEUqHKPPCdNM="; }; patches = [ @@ -52,6 +52,10 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTestPaths = [ # disable tests that require pytest-relaxed, which is broken "tests/test_client.py" diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index c30dc40891bd..b6c98c9a2e6c 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "A HTTP and FTP parallel file downloader"; + mainProgram = "parfive"; homepage = "https://parfive.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/parquet/default.nix b/pkgs/development/python-modules/parquet/default.nix index 0e6cd2222f73..85eb41fa51d4 100644 --- a/pkgs/development/python-modules/parquet/default.nix +++ b/pkgs/development/python-modules/parquet/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the parquet columnar file format"; + mainProgram = "parquet"; homepage = "https://github.com/jcrobak/parquet-python"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 9c6272e94a5c..b1aa2baedfac 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.20.0"; + version = "1.20.1"; format = "pyproject"; src = fetchFromGitHub { owner = "r1chardj0n3s"; repo = "parse"; rev = "refs/tags/${version}"; - hash = "sha256-InYOgqTvMvQ/HWIa0WrJ4M2LL4LL87KwBst8yYnt3dk="; + hash = "sha256-FAAs39peR+Ibv0RKLrcnY2w0Z2EjVYyZ8U4HcbjTiew="; }; postPatch = '' diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index ac859c0c825f..a5c59338fcdc 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -40,14 +40,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.6.4"; + version = "8.8.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ibxSp1M85WngQKdjlRC4JvLxn0rEn9oVkid/V4iD6zY="; + hash = "sha256-tK/cxOw50awcDAGRDTQ+Nxb9aJl2+zLZHuJq88xNmXM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/parsley/default.nix b/pkgs/development/python-modules/parsley/default.nix index 17e05b6027f2..f8972ac33805 100644 --- a/pkgs/development/python-modules/parsley/default.nix +++ b/pkgs/development/python-modules/parsley/default.nix @@ -4,10 +4,11 @@ }: buildPythonPackage rec { - pname = "Parsley"; + pname = "parsley"; version = "1.3"; src = fetchPypi { - inherit pname version; + pname = "Parsley"; + inherit version; sha256 = "0hcd41bl07a8sx7nmx12p16xprnblc4phxkawwmmy78n8y6jfi4l"; }; # Tests fail although the package works just fine. Unfortunately diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 3a8ec63f3e9a..9248eca81255 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.7.1"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-xp8FU4MR79/leBSJvSk8J2GdWW32AW2I5i3Y6DsRPLw="; + hash = "sha256-T9VG91Y8hap1nt3FkuCGsv8nglWNlRajvsvljXexH3Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 70094b5aaafb..3d42c40c1230 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pastescript"; - version = "3.4.0"; + version = "3.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PasteScript"; inherit version; - hash = "sha256-k0jvBlr/Is8ViMEt+wIMx1HGSC4hb4o8dRL6QKQ/kNw="; + hash = "sha256-zRtgbNReloT/20SL1tmq70IN0u/n5rYsbTc6Rv9DyDU="; }; propagatedBuildInputs = [ @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "A pluggable command-line frontend, including commands to setup package file layouts"; + mainProgram = "paster"; homepage = "https://github.com/cdent/pastescript/"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index ee0329c4050d..e88a7efd60f5 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -1,30 +1,32 @@ { lib -, appdirs , buildPythonPackage , fetchPypi -, packaging +, more-itertools , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "path"; - version = "16.7.1"; - format = "pyproject"; + version = "16.10.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-K0d/WIcDPzy+oc/YVT7mpqSY6yVAoZ9KoIKCKq3Oowo="; + hash = "sha256-sysit2/oEKje1tE2JozItmmK58R8KblKnqEmI/MFHkY="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; nativeCheckInputs = [ + more-itertools pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pathlib-abc/default.nix b/pkgs/development/python-modules/pathlib-abc/default.nix new file mode 100644 index 000000000000..891b6d348561 --- /dev/null +++ b/pkgs/development/python-modules/pathlib-abc/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, hatchling +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pathlib-abc"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "pathlib_abc"; + inherit version; + hash = "sha256-CE573ZGbD3d0kUqeZM2GobOYYPgfeB3XJCWGMfKRWr4="; + }; + + build-system = [ + hatchling + ]; + + pythonImportsCheck = [ + "pathlib_abc" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python base classes for rich path objects"; + homepage = "https://github.com/barneygale/pathlib-abc"; + changelog = "https://github.com/barneygale/pathlib-abc/blob/${version}/CHANGES.rst"; + license = licenses.psfl; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 5b97cea17b79..dc3c854cfe72 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.11.2"; + version = "0.12.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4NjQrC8S2mGVbrIwa2n5RptC9N6w88tu1HuczpmWztM="; + hash = "sha256-pILVFQOhqzOxxnpsOBOiaVPb3HHDHayu+ag4xOKfVxI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index c5fc0852b868..559a3d71ecfc 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/pkgs/development/python-modules/pathy/default.nix @@ -1,29 +1,42 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch -, google-cloud-storage , mock +, pathlib-abc , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, setuptools , smart-open , typer }: buildPythonPackage rec { pname = "pathy"; - version = "0.10.3"; - format = "setuptools"; + version = "0.11.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-tFGF0G+bGMbTNG06q4gauWh0VT9mHuiMzS5gJG4QPCI="; + hash = "sha256-uz0OawuL92709jxxkeluCvLtZcj9tfoXSI+ch55jcG0="; }; - propagatedBuildInputs = [ - google-cloud-storage + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "smart-open" + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + pathlib-abc smart-open typer ]; @@ -46,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Path interface for local and cloud bucket storage"; + mainProgram = "pathy"; homepage = "https://github.com/justindujardin/pathy"; license = licenses.asl20; maintainers = with maintainers; [ melling ]; diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 00d551885677..d75854a5cfeb 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "C implementation of patiencediff algorithm for Python"; + mainProgram = "patiencediff"; homepage = "https://github.com/breezy-team/patiencediff"; changelog = "https://github.com/breezy-team/patiencediff/releases/tag/v${version}"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index ab4ef91d07a0..a81b25371870 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "portable archive file manager"; + mainProgram = "patool"; homepage = "https://wummel.github.io/patool/"; license = licenses.gpl3; maintainers = with maintainers; [ marius851000 ]; diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index d46d6eaa2934..525d28d34232 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python-based build/distribution/deployment scripting tool"; + mainProgram = "paver"; homepage = "https://github.com/paver/paver"; license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix new file mode 100644 index 000000000000..ed6e60a19044 --- /dev/null +++ b/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pyopenssl +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "paypalrestsdk"; + version = "1.13.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-2sI2SSqawSYKdgAUouVqs4sJ2BQylbXollRTWbYf7dY="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + pyopenssl + requests + six + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "paypalrestsdk" + ]; + + meta = with lib; { + description = "Python APIs to create, process and manage payment"; + homepage = "https://github.com/paypal/PayPal-Python-SDK"; + changelog = "https://github.com/paypal/PayPal-Python-SDK/blob/master/CHANGELOG.md"; + license = { + fullName = "PayPal SDK License"; + url = "https://github.com/paypal/PayPal-Python-SDK/blob/master/LICENSE"; + }; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index dbf6afe6f330..7889471ebf29 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Build Reasonableness"; + mainProgram = "pbr"; homepage = "https://github.com/openstack/pbr"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/pcbnew-transition/default.nix b/pkgs/development/python-modules/pcbnew-transition/default.nix index 2f42e00a0847..bf9c6ae6430f 100644 --- a/pkgs/development/python-modules/pcbnew-transition/default.nix +++ b/pkgs/development/python-modules/pcbnew-transition/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "pcbnewTransition"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M4r6IeARVZq+KO7Q0tbHFD/BMeLN6vmuxfnstmMPgdg="; + hash = "sha256-+mRExuDuEYxSSlrkEjSyPK+RRJZo+YJH7WnUVfjblRQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pcodedmp/default.nix b/pkgs/development/python-modules/pcodedmp/default.nix index c87cebe0f23b..9c9ae3f6f7cb 100644 --- a/pkgs/development/python-modules/pcodedmp/default.nix +++ b/pkgs/development/python-modules/pcodedmp/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python VBA p-code disassembler"; + mainProgram = "pcodedmp"; homepage = "https://github.com/bontchev/pcodedmp"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index e57934f4daf9..683c11332740 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/ned14/pcpp"; description = "A C99 preprocessor written in pure Python"; + mainProgram = "pcpp"; license = licenses.bsd0; maintainers = with maintainers; [ rakesh4g ]; }; diff --git a/pkgs/development/python-modules/pdf2docx/default.nix b/pkgs/development/python-modules/pdf2docx/default.nix index 0b460879e726..88372271aa52 100644 --- a/pkgs/development/python-modules/pdf2docx/default.nix +++ b/pkgs/development/python-modules/pdf2docx/default.nix @@ -16,7 +16,7 @@ , python-docx }: let - version = "0.5.7"; + version = "0.5.8"; in buildPythonPackage { pname = "pdf2docx"; @@ -27,7 +27,7 @@ buildPythonPackage { owner = "dothinking"; repo = "pdf2docx"; rev = "refs/tags/v${version}"; - hash = "sha256-GDftANn+ioaNR28VfRFDuFgdKoy7D4xiy0ezvWJ3zy0="; + hash = "sha256-tMITDm2NkxWS+H/hhd2LlaPbyuI86ZKaALqqHJqb8V0="; }; nativeBuildInputs = [ @@ -68,6 +68,7 @@ buildPythonPackage { meta = with lib; { description = "Convert PDF to DOCX"; + mainProgram = "pdf2docx"; homepage = "https://github.com/dothinking/pdf2docx"; changelog = "https://github.com/dothinking/pdf2docx/releases/tag/v${version}"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index 2138d7181978..80e937d4c48c 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pdfplumber"; - version = "0.10.3"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jsvine"; repo = "pdfplumber"; rev = "refs/tags/v${version}"; - hash = "sha256-fd/4I6jjc0Wz2+XHGXAGg0Am3Dmw9R2ZX7nymIj/UnA="; + hash = "sha256-sjiCxE2WcvBASANCeookNn1n9M+mY0/8QGOCen+pzqM="; }; postPatch = '' @@ -71,6 +71,7 @@ buildPythonPackage rec { meta = with lib; { description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables"; + mainProgram = "pdfplumber"; homepage = "https://github.com/jsvine/pdfplumber"; changelog = "https://github.com/jsvine/pdfplumber/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 8f1049cc18e9..500db4812f2a 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { inherit (src.meta) homepage; description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF"; + mainProgram = "pdfx"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index b87b76afdc04..d1356c9a9940 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { changelog = "https://github.com/mitmproxy/pdoc/blob/${src.rev}/CHANGELOG.md"; homepage = "https://pdoc.dev/"; description = "API Documentation for Python Projects"; + mainProgram = "pdoc"; license = licenses.unlicense; maintainers = with maintainers; [ pbsds ]; }; diff --git a/pkgs/development/python-modules/pebble/default.nix b/pkgs/development/python-modules/pebble/default.nix index 756c7c294690..b576c7d4c1fc 100644 --- a/pkgs/development/python-modules/pebble/default.nix +++ b/pkgs/development/python-modules/pebble/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pebble"; - version = "5.0.6"; + version = "5.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Pebble"; inherit version; - hash = "sha256-5/fs/QEHq3zsnzu0EahWxNfVUiAtTpqLA46aZK4x/Yw="; + hash = "sha256-J4TBR3ZvBjiM6nhAhLFL7JP9uqeTgw8ZgxVaozCipuQ="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index deeccfe69881..d839ad705ea7 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.17.0"; + version = "3.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QbbwC55q/BjMGtm3fH8HPd0aETMzLAFwVYFvOS/4dqA="; + hash = "sha256-Gob2qBPPxAeIO/I7+9r4dBIxhvKnnZWD2nYcrMANM8U="; }; buildInputs = [ @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python ORM with support for various database implementation"; + mainProgram = "pwiz.py"; homepage = "http://peewee-orm.com"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 71682cd62c41..23e0ae1aff94 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -126,7 +126,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static site generator that requires no database or server-side logic"; homepage = "https://getpelican.com/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ offline prikhi ]; }; } diff --git a/pkgs/development/python-modules/pendulum/3.nix b/pkgs/development/python-modules/pendulum/3.nix deleted file mode 100644 index 31e15af6de52..000000000000 --- a/pkgs/development/python-modules/pendulum/3.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, isPyPy - -# build-system -, poetry-core -, rustPlatform - -# native dependencies -, iconv - -# dependencies -, backports-zoneinfo -, importlib-resources -, python-dateutil -, time-machine -, tzdata - -# tests -, pytestCheckHook -, pytz -}: - -buildPythonPackage rec { - pname = "pendulum"; - version = "3.0.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "sdispater"; - repo = "pendulum"; - rev = "refs/tags/${version}"; - hash = "sha256-v0kp8dklvDeC7zdTDOpIbpuj13aGub+oCaYz2ytkEpI="; - }; - - postPatch = '' - substituteInPlace rust/Cargo.lock \ - --replace "3.0.0-beta-1" "3.0.0" - ''; - - cargoRoot = "rust"; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - sourceRoot = "${src.name}/rust"; - name = "${pname}-${version}"; - hash = "sha256-6fw0KgnPIMfdseWcunsGjvjVB+lJNoG3pLDqkORPJ0I="; - postPatch = '' - substituteInPlace Cargo.lock \ - --replace "3.0.0-beta-1" "3.0.0" - ''; - }; - - nativeBuildInputs = [ - poetry-core - rustPlatform.maturinBuildHook - rustPlatform.cargoSetupHook - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - iconv - ]; - - propagatedBuildInputs = [ - python-dateutil - tzdata - ] ++ lib.optional (!isPyPy) [ - time-machine - ] ++ lib.optionals (pythonOlder "3.9") [ - backports-zoneinfo - importlib-resources - ]; - - pythonImportsCheck = [ - "pendulum" - ]; - - nativeCheckInputs = [ - pytestCheckHook - pytz - ]; - - disabledTestPaths = [ - "tests/benchmarks" - ] ++ lib.optionals stdenv.isDarwin [ - # PermissionError: [Errno 1] Operation not permitted: '/etc/localtime' - "tests/testing/test_time_travel.py" - ]; - - meta = with lib; { - description = "Python datetimes made easy"; - homepage = "https://github.com/sdispater/pendulum"; - changelog = "https://github.com/sdispater/pendulum/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 631494a1d9a3..78e9c675ea8d 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -1,36 +1,99 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder -, python-dateutil -, importlib-metadata +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, isPyPy + +# build-system , poetry-core -, pytzdata -, typing +, rustPlatform + +# native dependencies +, iconv + +# dependencies +, backports-zoneinfo +, importlib-resources +, python-dateutil +, time-machine +, tzdata + +# tests +, pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "pendulum"; - version = "2.1.2"; - format = "pyproject"; + version = "3.0.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "b06a0ca1bfe41c990bbf0c029f0b6501a7f2ec4e38bfec730712015e8860f207"; + src = fetchFromGitHub { + owner = "sdispater"; + repo = "pendulum"; + rev = "refs/tags/${version}"; + hash = "sha256-v0kp8dklvDeC7zdTDOpIbpuj13aGub+oCaYz2ytkEpI="; }; - preBuild = '' - export HOME=$TMPDIR + postPatch = '' + substituteInPlace rust/Cargo.lock \ + --replace "3.0.0-beta-1" "3.0.0" ''; - build-system = [ poetry-core ]; - dependencies = [ python-dateutil pytzdata ] - ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + cargoRoot = "rust"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "source/rust"; + name = "${pname}-${version}"; + hash = "sha256-6fw0KgnPIMfdseWcunsGjvjVB+lJNoG3pLDqkORPJ0I="; + postPatch = '' + substituteInPlace Cargo.lock \ + --replace "3.0.0-beta-1" "3.0.0" + ''; + }; + + nativeBuildInputs = [ + poetry-core + rustPlatform.maturinBuildHook + rustPlatform.cargoSetupHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + iconv + ]; + + propagatedBuildInputs = [ + python-dateutil + tzdata + ] ++ lib.optional (!isPyPy) [ + time-machine + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + importlib-resources + ]; + + pythonImportsCheck = [ + "pendulum" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytz + ]; - # No tests - doCheck = false; + disabledTestPaths = [ + "tests/benchmarks" + ] ++ lib.optionals stdenv.isDarwin [ + # PermissionError: [Errno 1] Operation not permitted: '/etc/localtime' + "tests/testing/test_time_travel.py" + ]; meta = with lib; { description = "Python datetimes made easy"; homepage = "https://github.com/sdispater/pendulum"; + changelog = "https://github.com/sdispater/pendulum/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix index 0faa3c324b37..e083bb622b87 100644 --- a/pkgs/development/python-modules/pep440/default.nix +++ b/pkgs/development/python-modules/pep440/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to check whether versions number match PEP 440"; + mainProgram = "pep440"; homepage = "https://github.com/Carreau/pep440"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix index 74bf420452b9..425ad42e787c 100644 --- a/pkgs/development/python-modules/pep8/default.nix +++ b/pkgs/development/python-modules/pep8/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://pep8.readthedocs.org/"; description = "Python style guide checker"; + mainProgram = "pep8"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix index a1061d8310d4..2a58aa4f8678 100644 --- a/pkgs/development/python-modules/percol/default.nix +++ b/pkgs/development/python-modules/percol/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/mooz/percol"; description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; + mainProgram = "percol"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/periodiq/default.nix b/pkgs/development/python-modules/periodiq/default.nix index 5ed6a028aa38..478168de30d0 100644 --- a/pkgs/development/python-modules/periodiq/default.nix +++ b/pkgs/development/python-modules/periodiq/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple Scheduler for Dramatiq Task Queue"; + mainProgram = "periodiq"; homepage = "https://pypi.org/project/periodiq/"; license = licenses.lgpl3Only; maintainers = with maintainers; [ traxys ]; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 12144a0bb8d2..3bd937c6d492 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.30.3"; + version = "1.30.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Tnx1dHpDpJwVYj+SWDu24dAj6ubq8sLh5t5Nf7f6QE8="; + hash = "sha256-By960AzXI2lcsun8AsHfuEx4FFXpe43m9MQoHuoIB4w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index aff6d3d2149b..f60a5fd9dae5 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command-line interface for PostgreSQL"; + mainProgram = "pgcli"; longDescription = '' Rich command-line interface for PostgreSQL with auto-completion and syntax highlighting. diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index 510d5e66bdbb..ea133ad8c200 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/markdrago/pgsanity"; description = "Checks the syntax of Postgresql SQL files"; + mainProgram = "pgsanity"; longDescription = '' PgSanity checks the syntax of Postgresql SQL files by taking a file that has a list of bare SQL in it, diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix index e943afa3caef..0dc423883c4b 100644 --- a/pkgs/development/python-modules/phe/default.nix +++ b/pkgs/development/python-modules/phe/default.nix @@ -24,6 +24,7 @@ buildPythonPackage { meta = with lib; { description = "A library for Partially Homomorphic Encryption in Python"; + mainProgram = "pheutil"; homepage = "https://github.com/n1analytics/python-paillier"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index bbc26de99cf7..b2dae6f29b1e 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "phik"; - version = "0.12.3"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "KaveIO"; repo = "PhiK"; rev = "refs/tags/v${version}"; - hash = "sha256-9o3EDhgmne2J1QfzjjNQc1mUcyCzoVrCnWXqjWkiZU0="; + hash = "sha256-YsH7vVn6gzejunUjUY/RIcvWtaQ/W1gbciJWKi5LDTk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 2e8dcb85570b..26a95b1d5847 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { homepage = "https://github.com/bootphon/phonemizer"; changelog = "https://github.com/bootphon/phonemizer/blob/v${version}/CHANGELOG.md"; description = "Simple text to phones converter for multiple languages"; + mainProgram = "phonemize"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 6370a8fa72cc..b2bb4cbfd01d 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.26"; + version = "8.13.31"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k31wrs6zF/WDHf7CjehVpgJg70qdVRlkvsjnp9DPgc0="; + hash = "sha256-J0IHHJ0K8JJ0yKWyom2aNqy/LqXLYpQ8ws6ttcDIdkE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 6afa9e1f5ff6..fc39ba10083f 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.21.2"; + version = "2.22.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3DCfMI41J/H9RjKj0376NnADp2VzHKnGcvgYoLnluTY="; + hash = "sha256-9opygqCRxKGNQo52cS7BiUYdmknIk9ygubPgpylcy8o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/picosvg/default.nix b/pkgs/development/python-modules/picosvg/default.nix index 87f3eccfdb0e..74a6b408f6a8 100644 --- a/pkgs/development/python-modules/picosvg/default.nix +++ b/pkgs/development/python-modules/picosvg/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to simplify SVGs"; + mainProgram = "picosvg"; homepage = "https://github.com/googlefonts/picosvg"; license = licenses.asl20; maintainers = with maintainers; [ _999eagle ]; diff --git a/pkgs/development/python-modules/pijuice/default.nix b/pkgs/development/python-modules/pijuice/default.nix index a42c7ad8c1ed..ecbe9343008b 100644 --- a/pkgs/development/python-modules/pijuice/default.nix +++ b/pkgs/development/python-modules/pijuice/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library and resources for PiJuice HAT for Raspberry Pi"; + mainProgram = "pijuice_cli"; homepage = "https://github.com/PiSupply/PiJuice"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hexagonal-sun ]; diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index e846109a31de..10edc6edb8bd 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -75,7 +75,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # Time based + "test_decode_threads" + ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/bigcat88/pillow_heif/issues/89 # not reproducible in nixpkgs "test_opencv_crash" diff --git a/pkgs/development/python-modules/pinboard/default.nix b/pkgs/development/python-modules/pinboard/default.nix index 83fe4a330c3d..b7dab8e44fc8 100644 --- a/pkgs/development/python-modules/pinboard/default.nix +++ b/pkgs/development/python-modules/pinboard/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python wrapper for Pinboard.in"; + mainProgram = "pinboard"; maintainers = with maintainers; [ djanatyn ]; license = licenses.asl20; homepage = "https://github.com/lionheart/pinboard.py"; diff --git a/pkgs/development/python-modules/ping3/default.nix b/pkgs/development/python-modules/ping3/default.nix index 133775eb7915..998904bd9875 100644 --- a/pkgs/development/python-modules/ping3/default.nix +++ b/pkgs/development/python-modules/ping3/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A pure python3 version of ICMP ping implementation using raw socket"; + mainProgram = "ping3"; homepage = "https://pypi.org/project/ping3"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 3dfe10c8d9bc..99e8da4cdd30 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/hgrecco/pint/blob/${version}/CHANGES"; description = "Physical quantities module"; + mainProgram = "pint-convert"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; maintainers = with maintainers; [ doronbehar ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 154a9c712c5a..8052c574d336 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "7.3.0"; + version = "7.4.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-jpyZEn/gJMAltGoLLRXHvUfxjzMibPczDTVJNmP8HR0="; + hash = "sha256-hkgm9Qc4ZEUOJNvuuFzjkgzfsJhIo9aev1N7Uh8UvMk="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index f597887ddd2c..72b7eb88df72 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pip"; - version = "23.3.1"; + version = "24.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mJesZxFyZkGTR1s8/C88eWprW6WVGlwORXoKXc6NnoM="; + hash = "sha256-yojk2T5wuPkS1OKusilj253AT+xyKwXCWKBNUEH2Mgo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 172401620a59..41aaf498d917 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "pip update helpers"; + mainProgram = "pipdate"; homepage = "https://github.com/nschloe/pipdate"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 3537c151e6f4..d4d289e07888 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command line utility to show dependency tree of packages"; + mainProgram = "pipdeptree"; homepage = "https://github.com/tox-dev/pipdeptree"; changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 6cfaf7eccb73..31a182de17ad 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is simple migration script, migrate pipenv to poetry"; + mainProgram = "pipenv-poetry-migrate"; homepage = "https://github.com/yhino/pipenv-poetry-migrate"; changelog = "https://github.com/yhino/pipenv-poetry-migrate/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 330abf560fb7..8d11aa835422 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , hatchling +, hatch-vcs , importlib-metadata , packaging , pip @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "1.3.1"; + version = "1.4.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,11 +25,12 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JZt4I0zw/Kmdgpd5tw6c+fHrHuxkN6jvN3fDmk0//vc="; + hash = "sha256-NxXOeVXwBhGqi4DUABV8UV+cDER0ROBFdgiyYTzdvuo="; }; nativeBuildInputs = [ hatchling + hatch-vcs ]; propagatedBuildInputs = [ @@ -79,6 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "Install and run Python applications in isolated environments"; + mainProgram = "pipx"; homepage = "https://github.com/pipxproject/pipx"; changelog = "https://github.com/pypa/pipx/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pixcat/default.nix b/pkgs/development/python-modules/pixcat/default.nix index b5629cebb937..e316e2c51630 100644 --- a/pkgs/development/python-modules/pixcat/default.nix +++ b/pkgs/development/python-modules/pixcat/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Display images on a kitty terminal with optional resizing"; + mainProgram = "pixcat"; homepage = "https://github.com/mirukan/pixcat"; license = licenses.lgpl3; maintainers = [ maintainers.tilcreator ]; diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index d541cd00dc5a..bd67a88905f7 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pixel-font-builder"; - version = "0.0.10"; + version = "0.0.15"; disabled = pythonOlder "3.11"; src = fetchPypi { pname = "pixel_font_builder"; inherit version; - hash = "sha256-evLsNRSC9sPZfhNc8tYbZ/bIrBxSbLuiGRD3ld7Jkbo="; + hash = "sha256-2QnbnJk3onwxmjZ6aUgXFGsx6GtqJDV9Bgs3p5Czvns="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/pixel-ring/default.nix b/pkgs/development/python-modules/pixel-ring/default.nix index c88715270bd7..b0a7e3527328 100644 --- a/pkgs/development/python-modules/pixel-ring/default.nix +++ b/pkgs/development/python-modules/pixel-ring/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "RGB LED library for ReSpeaker 4 Mic Array, ReSpeaker V2 & ReSpeaker USB 6+1 Mic Array"; + mainProgram = "pixel_ring_check"; homepage = "https://github.com/respeaker/pixel_ring/tree/master"; license = licenses.gpl2Only; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 9fd8fa40dc79..3a79cdbbf012 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.9.6"; + version = "1.10.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-j9WJbocYpDcvDqnMnZb2QXybmG4jpNEW3aJrYswp0EY="; + hash = "sha256-Xfc4NTmNENt5+O7NXNhrH20pMXWJ6nB5aZTUk5mvYpc="; }; nativeCheckInputs = [ @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Query metadatdata from sdists, bdists or installed packages"; + mainProgram = "pkginfo"; homepage = "https://pythonhosted.org/pkginfo/"; longDescription = '' This package provides an API for querying the distutils metadata diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix index 0c841adf406a..74d05de7ad97 100644 --- a/pkgs/development/python-modules/pkginfo2/default.nix +++ b/pkgs/development/python-modules/pkginfo2/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Query metadatdata from sdists, bdists or installed packages"; + mainProgram = "pkginfo2"; homepage = "https://github.com/nexB/pkginfo2"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 70a57168b12a..bc00253aafde 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parsing the Command Line the Easy Way"; + mainProgram = "plac_runner.py"; homepage = "https://github.com/micheles/plac"; license = licenses.bsdOriginal; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 6cf9822c5e41..7c45f33cb598 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "4.0.0"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-27Cy8VEmbrO96G2mVStxkoWSRXlwZLWirI3tH6kBsus="; + hash = "sha256-DjRqOIkyhkA3Z1gl2o78R4kp23qJBj+pRmDBld8AbDI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/playwright-stealth/default.nix b/pkgs/development/python-modules/playwright-stealth/default.nix new file mode 100644 index 000000000000..a805d36f432f --- /dev/null +++ b/pkgs/development/python-modules/playwright-stealth/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, playwright +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "playwright-stealth"; + version = "1.0.6-unstable-2023-09-11"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "AtuboDad"; + repo = "playwright_stealth"; + # https://github.com/AtuboDad/playwright_stealth/issues/25 + rev = "43f7433057906945b1648179304d7dbd8eb10874"; + hash = "sha256-ZWmuVwjEgrPmfxjvws3TdocW6tyNH++fyRfKQ0oJ6bo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + playwright + ]; + + # Tests require Chromium binary + doCheck = false; + + pythonImportsCheck = [ + "playwright_stealth" + ]; + + meta = with lib; { + description = "Playwright stealth"; + homepage = "https://github.com/AtuboDad/playwright_stealth"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 31ded41872f1..ff22cdf0cb8d 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -20,7 +20,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.40.0"; + version = "1.42.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+gq/aFq/rQpl04LbaZXGxL35iIX1Wi/motYg5jwv91I="; + hash = "sha256-GfaZ6wMbJShyTTcV9uulmsL8OI/OA+YDMvS2s3ePnjs="; }; patches = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { --replace "wheel==0.41.2" "wheel" substituteInPlace pyproject.toml \ - --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.0.4", "wheel==0.41.2", "auditwheel==5.4.0"]' \ + --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.0.4", "wheel==0.42.0", "auditwheel==5.4.0"]' \ 'requires = ["setuptools", "setuptools-scm", "wheel"]' # Skip trying to download and extract the driver. @@ -106,6 +106,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python version of the Playwright testing and automation library"; + mainProgram = "playwright"; homepage = "https://github.com/microsoft/playwright-python"; license = licenses.asl20; maintainers = with maintainers; [ techknowlogick yrd ]; diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix new file mode 100644 index 000000000000..40fb7397c70a --- /dev/null +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -0,0 +1,82 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, dateparser +, fetchFromGitHub +, playwright +, playwright-stealth +, poetry-core +, puremagic +, pydub +, pythonOlder +, pythonRelaxDepsHook +, pytz +, requests +, setuptools +, speechrecognition +, tzdata +, w3lib +}: + +buildPythonPackage rec { + pname = "playwrightcapture"; + version = "1.23.13"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Lookyloo"; + repo = "PlaywrightCapture"; + rev = "refs/tags/v${version}"; + hash = "sha256-jNTVdGrUQaYHgTxz6zYTdxNQoXEfy/zshherC/gGmng="; + }; + + pythonRelaxDeps = [ + "beautifulsoup4" + "playwright" + "setuptools" + "tzdata" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + dateparser + playwright + playwright-stealth + puremagic + pytz + requests + setuptools + tzdata + w3lib + ]; + + passthru.optional-dependencies = { + recaptcha = [ + speechrecognition + pydub + requests + ]; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "playwrightcapture" + ]; + + meta = with lib; { + description = "Capture a URL with Playwright"; + homepage = "https://github.com/Lookyloo/PlaywrightCapture"; + changelog = "https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pleroma-bot/default.nix b/pkgs/development/python-modules/pleroma-bot/default.nix index 65dd403c21da..773b9bccdf5f 100644 --- a/pkgs/development/python-modules/pleroma-bot/default.nix +++ b/pkgs/development/python-modules/pleroma-bot/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bot for mirroring one or multiple Twitter accounts in Pleroma/Mastodon"; + mainProgram = "pleroma-bot"; homepage = "https://robertoszek.github.io/pleroma-bot/"; license = licenses.mit; maintainers = with maintainers; [ robertoszek ]; diff --git a/pkgs/development/python-modules/plotext/default.nix b/pkgs/development/python-modules/plotext/default.nix index 8c6d0b39985c..7342067b8ead 100644 --- a/pkgs/development/python-modules/plotext/default.nix +++ b/pkgs/development/python-modules/plotext/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Plotting directly in the terminal"; + mainProgram = "plotext"; homepage = "https://github.com/piccolomo/plotext"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 13d9334fd950..3a076ac6fde4 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.18.0"; + version = "5.19.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Ngox5vu0nRKwBwNutpKVITQ9a+4iNvhFmRWCG676LLs="; + hash = "sha256-XqkaVlcSkq3j47yb9xLroLlaH7CpQTddl4zHlDLgVfQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index af402da40045..cc446f300bf1 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-VgR7T8pDrVMBYqtvTfRmFwW61IREYiRCMXbpCOj/a4Q="; + hash = "sha256-GgkaFiRRVpr0TreAetpaiOjpsyLV2wfGQWvUdHJN2mg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix new file mode 100644 index 000000000000..51f73a7381c6 --- /dev/null +++ b/pkgs/development/python-modules/pluthon/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, setuptools +, pythonOlder +# Python deps +, uplc +, graphlib-backport +, ordered-set +}: + +buildPythonPackage rec { + pname = "pluthon"; + version = "0.4.6"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "OpShin"; + repo = "pluthon"; + rev = version; + hash = "sha256-ZmBkbglSbBfVhA4yP0tJdwpJiFpJ7vX0A321ldQF0lA="; + }; + + propagatedBuildInputs = [ + setuptools + uplc + ordered-set + ] ++ lib.optionals (pythonOlder "3.9") graphlib-backport; + + pythonImportsCheck = [ "pluthon" ]; + + meta = with lib; { + description = "Pluto-like programming language for Cardano Smart Contracts in Python"; + homepage = "https://github.com/OpShin/pluthon"; + license = licenses.mit; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/development/python-modules/plyplus/default.nix b/pkgs/development/python-modules/plyplus/default.nix index 4b9f1a9a0841..209985815ffc 100644 --- a/pkgs/development/python-modules/plyplus/default.nix +++ b/pkgs/development/python-modules/plyplus/default.nix @@ -1,10 +1,11 @@ { lib, fetchPypi, buildPythonPackage, ply, isPy3k }: buildPythonPackage rec { - pname = "PlyPlus"; + pname = "plyplus"; version = "0.7.5"; src = fetchPypi { - inherit pname version; + pname = "PlyPlus"; + inherit version; sha256 = "0g3flgfm3jpb2d8v9z0qmbwca5gxdqr10cs3zvlfhv5cs06ahpnp"; }; diff --git a/pkgs/development/python-modules/pmdarima/default.nix b/pkgs/development/python-modules/pmdarima/default.nix index 2ddb03b8afe1..3223d071bdec 100644 --- a/pkgs/development/python-modules/pmdarima/default.nix +++ b/pkgs/development/python-modules/pmdarima/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cython , joblib +, matplotlib , numpy , pandas , scikit-learn @@ -46,7 +47,15 @@ buildPythonPackage rec { cd $out/${python.sitePackages} ''; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + matplotlib + pytestCheckHook + ]; + + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests= [ # touches internet "test_load_from_web" diff --git a/pkgs/development/python-modules/pnglatex/default.nix b/pkgs/development/python-modules/pnglatex/default.nix index d953678942bf..05b36b224839 100644 --- a/pkgs/development/python-modules/pnglatex/default.nix +++ b/pkgs/development/python-modules/pnglatex/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/MaT1g3R/pnglatex"; description = "a small program that converts LaTeX snippets to png"; + mainProgram = "pnglatex"; license = licenses.gpl3Plus; maintainers = with maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index ba4778123ae9..e1cb4a05a784 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = { description = "Application that generates RSS feeds for podcast episodes from local audio files"; + mainProgram = "podcats"; homepage = "https://github.com/jakubroztocil/podcats"; license = lib.licenses.bsd2; }; diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index e3174a0a93ac..92a73abb4538 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "podman"; - version = "4.9.0"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,10 +24,10 @@ buildPythonPackage rec { owner = "containers"; repo = "podman-py"; rev = "refs/tags/v${version}"; - hash = "sha256-fLuWOfv4kW5a9h658s8pBgXsBfcYdkXNp9+bWtgKHv8="; + hash = "sha256-3tbhTg060/K4ejT/xjItSu9zf05LR/d0vkg4XDsspEE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 9b3174a3b3bd..c7010ef0432c 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , build , git @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.8.1"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +23,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-RnCJ67jaL2knwv+Uo7p0zOejHAT73f40weaJnfqOYoM="; + hash = "sha256-vvwKbzGlvv2LTbXfJxQVM3nUXFGntgJxsku6cbRxCzw="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 052cb9c4d7d6..6e375def3c65 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Plugin for Poetry to enable dynamic versioning based on VCS tags"; + mainProgram = "poetry-dynamic-versioning"; homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning"; changelog = "https://github.com/mtkennerly/poetry-dynamic-versioning/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 26db669e94ba..19cfbf29192c 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for generating IAM least privilege policies"; + mainProgram = "policy_sentry"; homepage = "https://github.com/salesforce/policy_sentry"; changelog = "https://github.com/salesforce/policy_sentry/releases/tag/${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index f1477f5b2424..8716316d5779 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.3.1"; + version = "24.3.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; rev = "refs/tags/v${version}"; - hash = "sha256-EYfhbIFD2p6ZZ4i6NCA22LS6mAZoJCJSYlTmRExWgw4="; + hash = "sha256-DXZDXipYBClqSdlTJsaPWaKr3qTiJ3osm3hHPp/MPow="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 6c3e28cd9b4c..63228be0d9dc 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.8.0"; + version = "1.8.1"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-9ZmB/VubXQMtzej0oR6qSSwqxjQ/rjWWov2uNfxUsKA="; + hash = "sha256-J+9jCX3ZpuT50mlPXPvy8KXe+kT8yv7AjWAecx10YnA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index fffca3cccaae..b40f93b04af5 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -6,7 +6,9 @@ , hatchling , jsonschema , pytest-asyncio +, pytest-httpbin , pytestCheckHook +, pytest_7 , pythonOlder , requests , xmltodict @@ -14,7 +16,7 @@ buildPythonPackage rec { pname = "pook"; - version = "1.3.0"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +25,7 @@ buildPythonPackage rec { owner = "h2non"; repo = "pook"; rev = "refs/tags/v${version}"; - hash = "sha256-0sS2QJcshMuxxCGlrcVHeIQnVMZbBoJfLsRIxpvl7pM="; + hash = "sha256-sdfkMvPSlVK7EoDUEuJbiuocOjGJygqiCiftrsjnDhU="; }; nativeBuildInputs = [ @@ -40,7 +42,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio - pytestCheckHook + pytest-httpbin + (pytestCheckHook.override { pytest = pytest_7; }) ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/port-for/default.nix b/pkgs/development/python-modules/port-for/default.nix index 9efcd9acfaff..ae3c00e6d435 100644 --- a/pkgs/development/python-modules/port-for/default.nix +++ b/pkgs/development/python-modules/port-for/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/kmike/port-for"; description = "Command-line utility and library that helps with TCP port managment"; + mainProgram = "port-for"; changelog = "https://github.com/kmike/port-for/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index 2595e20622d9..65c4059b4fc2 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to choose unique available network ports"; + mainProgram = "portserver.py"; homepage = "https://github.com/google/python_portpicker"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index fd2303197b83..e3926ed045b0 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities for filesystem exploration and automated builds"; + mainProgram = "pox"; homepage = "https://pox.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 3c721320d995..d72fe679c226 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed and parallel Python"; + mainProgram = "ppserver"; homepage = "https://ppft.readthedocs.io/"; changelog = "https://github.com/uqfoundation/ppft/releases/tag/${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix index b72eeeebce47..c0f98eca75e1 100644 --- a/pkgs/development/python-modules/pprintpp/default.nix +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A drop-in replacement for pprint that's actually pretty"; + mainProgram = "pypprint"; homepage = "https://github.com/wolever/pprintpp"; changelog = "https://github.com/wolever/pprintpp/blob/${version}/CHANGELOG.txt"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pproxy/default.nix b/pkgs/development/python-modules/pproxy/default.nix index e37c43baf34b..a7028757b0ba 100644 --- a/pkgs/development/python-modules/pproxy/default.nix +++ b/pkgs/development/python-modules/pproxy/default.nix @@ -1,33 +1,45 @@ { lib -, isPy27 , buildPythonPackage , fetchFromGitHub , pycryptodome , uvloop +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "pproxy"; - version = "2.3.7"; - format = "setuptools"; + version = "2.7.9"; + pyproject = true; - disabled = isPy27; + disabled = pythonOlder "3.6"; - # doesn't use tagged releases. Tests not in PyPi versioned releases src = fetchFromGitHub { owner = "qwj"; repo = "python-proxy"; rev = "7fccf8dd62204f34b0aa3a70fc568fd6ddff7728"; - sha256 = "1sl2i0kymnbsk49ina81yjnkxjy09541f7pmic8r6rwsv1s87skc"; + sha256 = "sha256-bOqDdNiaZ5MRi/UeF0hJwMs+rfQBKRsTmXrZ6ieIguo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pycryptodome uvloop ]; - pythonImportsCheck = [ "pproxy" ]; - disabledTests = [ "api_server" "api_client" ]; # try to connect to outside Internet, so disabled + pythonImportsCheck = [ + "pproxy" + ]; + + disabledTests = [ + # Tests try to connect to outside Internet, so disabled + "api_server" + "api_client" + ]; + # test suite doesn't use test runner. so need to run ``python ./tests/*`` checkPhase = '' shopt -s extglob @@ -39,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Proxy server that can tunnel among remote servers by regex rules"; + mainProgram = "pproxy"; homepage = "https://github.com/qwj/python-proxy"; license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 33ad076f9338..b479451e065c 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -75,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/RonnyPfannschmidt/prance/blob/${src.rev}/CHANGES.rst"; description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; + mainProgram = "prance"; homepage = "https://github.com/RonnyPfannschmidt/prance"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/prayer-times-calculator/default.nix b/pkgs/development/python-modules/prayer-times-calculator/default.nix index e60bc33383d3..88699a077bbe 100644 --- a/pkgs/development/python-modules/prayer-times-calculator/default.nix +++ b/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -3,22 +3,27 @@ , fetchFromGitHub , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "prayer-times-calculator"; - version = "0.0.10"; - format = "setuptools"; + version = "0.0.12"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "uchagani"; - repo = pname; + repo = "prayer-times-calculator"; rev = "refs/tags/${version}"; - hash = "sha256-T+rXJy+9haepF6TKSoOjb6o75YQwQnzAaWRtLMwfGOw="; + hash = "sha256-HeGUnApQZ12aieaV/UBbJqqpEn4i/ZZKw41H/Yx3+cY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix index dc571f076fe3..22d3936b248e 100644 --- a/pkgs/development/python-modules/preprocess-cancellation/default.nix +++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "preprocess-cancellation"; - version = "0.2.0"; + version = "0.2.1"; disabled = pythonOlder "3.6"; # >= 3.6 format = "pyproject"; @@ -18,14 +18,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kageurufu"; repo = "cancelobject-preprocessor"; - rev = version; - hash = "sha256-mn3/etXA5dkL+IsyxwD4/XjU/t4/roYFVyqQxlLOoOI="; + rev = "refs/tags/${version}"; + hash = "sha256-MJ4mwOFswLYHhg2LNZ+/ZwDvSjoxElVxlaWjArHV2NY="; }; - patches = [ - ./pep-621.patch - ]; - postPatch = '' sed -i "/^addopts/d" pyproject.toml diff --git a/pkgs/development/python-modules/preprocess-cancellation/pep-621.patch b/pkgs/development/python-modules/preprocess-cancellation/pep-621.patch deleted file mode 100644 index 48d8db33d465..000000000000 --- a/pkgs/development/python-modules/preprocess-cancellation/pep-621.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index da1376e..88298a7 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,11 +1,11 @@ --[tool.poetry] -+[project] - name = "preprocess_cancellation" - version = "0.2.0" - description = "GCode processor to add klipper cancel-object markers" - readme = "README.md" --authors = ["Franklyn Tackitt <im@frank.af>"] --repository = "https://github.com/kageurufu/cancelobject-preprocessor" --license = "GPL-3.0-only" -+authors = [ { name = "Franklyn Tackitt", email = "im@frank.af" } ] -+urls.repository = "https://github.com/kageurufu/cancelobject-preprocessor" -+license.text = "GPL-3.0-only" - - [tool.poetry.urls] - "Bug Tracker" = "https://github.com/kageurufu/cancelobject-preprocessor/issues" diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index e0d37c51a2b1..557045649425 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "preshed"; - version = "3.0.9"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-chhjxSRP/NJlGtCSiVGix8d7EC9OEaJRrYXTfudiFmA="; + hash = "sha256-XisLKgfdGo3uqtZhIBmEXGAu4kkH9pNuqvF6q9VuVEw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix index 7d1a74a7f5b9..ac0b85d0ad54 100644 --- a/pkgs/development/python-modules/prisma/default.nix +++ b/pkgs/development/python-modules/prisma/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "prisma"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,14 +26,14 @@ buildPythonPackage rec { owner = "RobertCraigie"; repo = "prisma-client-py"; rev = "refs/tags/v${version}"; - hash = "sha256-vmcYBUPDhFbxgWyrF+AjoXwAAH2R/tJYttFD+41bPbA="; + hash = "sha256-j9HJZTt4VTq29Q+nynYmRWKx02GVdyA+iZzxZwspXn8="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ click httpx jinja2 diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 349757bcffb0..082cff10b8a8 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,33 +1,42 @@ { lib , buildPythonPackage , fetchPypi +, dill , freezegun , pytestCheckHook , python-utils , pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "progressbar2"; - version = "4.2.0"; - format = "setuptools"; + version = "4.4.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E5OSL8tkWYlErUV1afvrSzrBie9Qta25zvMoTofjlM4="; + hash = "sha256-P9ouDGBpNgCmWFp4TJ07xOHaxX6Z4TP4wPXIzz3zdKI="; }; postPatch = '' sed -i "/-cov/d" pytest.ini ''; + build-system = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ python-utils ]; nativeCheckInputs = [ + dill freezegun pytestCheckHook ]; diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 4c4c2338445a..e81613a7062b 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -1,29 +1,40 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, twisted , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "prometheus-client"; - version = "0.19.0"; - format = "setuptools"; + version = "0.20.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "prometheus"; repo = "client_python"; rev = "refs/tags/v${version}"; - hash = "sha256-7mVqfzK0E8RQAlQyQD8/DIcPJZ52V13JqU22tsQJp+Q="; + hash = "sha256-IMw0mpOUzjXBy4bMTeSFMc5pdibI5lGxZHKiufjPLbM="; }; + build-system = [ + setuptools + ]; + + optional-dependencies.twisted = [ + twisted + ]; + __darwinAllowLocalNetworking = true; nativeCheckInputs = [ pytestCheckHook - ]; + ] + ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "prometheus_client" diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 034203068baa..faadc19f7a6e 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.41"; + version = "3.0.43"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-lBNn2X/IFVSIIqomwqJp/cTrIensBfxdRHzwm61ddfA="; + hash = "sha256-NSe3ryYQbLxloEC8yEg5o1ZuwbBRuwv+lTYx5wSw/30="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/propka/default.nix b/pkgs/development/python-modules/propka/default.nix index 08a85586411c..2e29476774d1 100644 --- a/pkgs/development/python-modules/propka/default.nix +++ b/pkgs/development/python-modules/propka/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A predictor of the pKa values of ionizable groups in proteins and protein-ligand complexes based in the 3D structure"; + mainProgram = "propka3"; homepage = "https://github.com/jensengroup/propka"; changelog = "https://github.com/jensengroup/propka/releases/tag/v${version}"; license = licenses.lgpl21Only; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index a6c49c51b722..e7997e71b7a8 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.22.3"; + version = "1.23.0"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-/c0JcTy9QkgHQNL+KcmQ9/vYhaZ+/DKKqL5u4+n3ams="; + hash = "sha256-iQdRce8RmIs/oVf129i5zwnWX//ul+Kc5APNje+6GdI="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 2c1818434ac4..7d4b65db3dda 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "ProtonVPN NetworkManager Library intended for every ProtonVPN service user"; + mainProgram = "protonvpn_reconnector.py"; homepage = "https://github.com/ProtonVPN/protonvpn-nm-lib"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/development/python-modules/proxy-db/default.nix b/pkgs/development/python-modules/proxy-db/default.nix index 1a6781b763f9..a4a6fef11188 100644 --- a/pkgs/development/python-modules/proxy-db/default.nix +++ b/pkgs/development/python-modules/proxy-db/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to manage proxies in a local database"; + mainProgram = "proxy-db"; homepage = "https://github.com/Nekmo/proxy-db/"; changelog = "https://github.com/Nekmo/proxy-db/blob/v${version}/HISTORY.rst"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index efa364a09de0..f9a59e620d90 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.28"; + version = "1.9.31"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+oxXuZaHkLPuMIsiFOkvW6VLuGxpV7YKs6Gxp/lexVQ="; + hash = "sha256-HUFJ2FP9WGcG9pkukS2LHIgPYFRAXAneiVK6VfYQ+zU="; }; nativeBuildInputs = [ @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for reading Adobe Photoshop PSD files"; + mainProgram = "psd-tools"; homepage = "https://github.com/kmike/psd-tools"; changelog = "https://github.com/psd-tools/psd-tools/blob/v${version}/CHANGES.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 3563aa2ecc89..84161d1a8781 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -206,6 +206,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o" "cache_dir=$TMPDIR" "-m" "'not refcount and not timing'" + # pytest.PytestRemovedIn9Warning: Marks applied to fixtures have no effect + "-W" "ignore::pytest.PytestRemovedIn9Warning" ]; postCheck = '' diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 890d397c532f..701834561673 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "psygnal"; - version = "0.9.5"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eDfGWmTKJrkkzRy1I3wl3WYPCxtPHSRzqAoOiO7QQ9Y="; + hash = "sha256-RckzvOclV2UUZLYq3buLeLLBN/Q/CmCAqmGmjzYPqbM="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index 7a3980ceb9b9..8589ed16277f 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -22,6 +22,7 @@ buildPythonPackage { meta = with lib; { homepage = "https://github.com/kxxoling/PTable"; description = "A simple Python library designed to make it quick and easy to represent tabular data in visually appealing ASCII tables"; + mainProgram = "ptable"; license = licenses.bsd3; maintainers = [ maintainers.mmahut ]; }; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 9db2e9c1d2c0..437608956649 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.23"; + version = "3.0.26"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-n8m+wsxRvEAAwSJNjFYkHOikBrPUnsjcJm94zTzQS6Q="; + hash = "sha256-yPsUBlAtw0nZnFfq8G5xFvOy3qyU8C80K65ocIkJ90M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index b0682b5e8a43..6d0e49bcb3e3 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Public Suffix List parser implementation"; + mainProgram = "publicsuffixlist-download"; homepage = "https://github.com/ko-zu/psl"; license = licenses.mpl20; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 160e74d5c7b6..2ab448e77f1c 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "A full-screen, console-based Python debugger"; + mainProgram = "pudb"; homepage = "https://github.com/inducer/pudb"; changelog = "https://github.com/inducer/pudb/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index ab55157ed207..8e318822f086 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to generate MPS or LP files"; + mainProgram = "pulptest"; homepage = "https://github.com/coin-or/pulp"; license = licenses.mit; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pulsar-client/default.nix b/pkgs/development/python-modules/pulsar-client/default.nix index 65ce904eed4b..075fe4b99d84 100644 --- a/pkgs/development/python-modules/pulsar-client/default.nix +++ b/pkgs/development/python-modules/pulsar-client/default.nix @@ -108,7 +108,8 @@ in buildPythonPackage { format = "wheel"; - src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}"; + src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}" + or (throw "Unsupported '${pythonVersion}-${stdenv.hostPlatform.system}' target"); meta = with lib; { description = "Client for pulsar"; diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index a0c0e144c3ba..1255e4b9b7aa 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/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.13.0"; + version = "6.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-K1Ov8yp6cD7h2kAXNRfcoJp24WA9VpO/y0Aga+9BHz4="; + hash = "sha256-RtJIl90rTMFv4mLrDd2SxLYYLf0yKS//7+sxVBdNX8g="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix index 29cdf21cf3dc..2a7082049703 100644 --- a/pkgs/development/python-modules/pure-protobuf/default.nix +++ b/pkgs/development/python-modules/pure-protobuf/default.nix @@ -2,17 +2,17 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, setuptools-scm -, toml +, poetry-core +, poetry-dynamic-versioning +, pydantic , pytestCheckHook , pytest-benchmark -, hatch-vcs -, hatchling +, typing-extensions }: buildPythonPackage rec { pname = "pure-protobuf"; - version = "2.3.0"; # Komikku not launching w/ 3.0.0, #280551 + version = "3.0.1"; # Komikku not launching w/ 3.0.0, #280551 format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,19 +21,32 @@ buildPythonPackage rec { owner = "eigenein"; repo = "protobuf"; rev = "refs/tags/${version}"; - hash = "sha256-nJ3F8dUrqMeWqTV9ErGqrMvofJwBKwNUDfxWIqFh4nY="; + hash = "sha256-sGKnta+agrpJkQB0twFkqRreD5WB2O/06g75N0ic4mc="; }; - nativeBuildInputs = [ - hatch-vcs - hatchling + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ + pydantic pytestCheckHook pytest-benchmark ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; + pythonImportsCheck = [ "pure_protobuf" ]; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 2c8894cbb11f..986fd4ed8b4d 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.10.3"; - format = "pyproject"; + version = "0.10.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi{ inherit pname version; - hash = "sha256-AkobUj1zpjMyNhLn8xWhcJzwbR/UP/CCGQH2akBostk="; + hash = "sha256-DF+ov+ixSjmjC/7+WmzwFksuvYKikSbbPZBqhNk5+HI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 6cf165d8b093..714cd613fcea 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Exports Air Quality Metrics to Prometheus"; + mainProgram = "py-air-control-exporter"; homepage = "https://github.com/urbas/py-air-control-exporter"; license = licenses.mit; maintainers = with maintainers; [ urbas ]; diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index 68301c0e499f..ed6bdab5cfa4 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Get CPU info with pure Python"; + mainProgram = "cpuinfo"; longDescription = '' Py-cpuinfo gets CPU info with pure Python and should work without any extra programs or libraries, beyond what your OS provides. It does not diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index 7cb4ab94761c..9289ae14f69a 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-b18PY5LCU2NOSmzOHh0NBFQFCJ2N9oAhusn6QTdlb7o="; + hash = "sha256-BPap4f9ro269K50qpVlTiEPNyyMCvBHCr2obuSfuNos="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-radix-sr/default.nix b/pkgs/development/python-modules/py-radix-sr/default.nix index da14d8a95799..26a9d2f555de 100644 --- a/pkgs/development/python-modules/py-radix-sr/default.nix +++ b/pkgs/development/python-modules/py-radix-sr/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { @@ -19,12 +20,21 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "name='py-radix'" "name='py-radix-sr'" + + substituteInPlace tests/test_{compat,regression}.py \ + --replace-fail assertEquals assertEqual \ + --replace-warn assertNotEquals assertNotEqual ''; pythonImportsCheck = [ "radix" ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # test does not complete on 3.12+ + "test_000_check_incref" + ]; + meta = with lib; { description = "Python radix tree for IPv4 and IPv6 prefix matching"; homepage = "https://github.com/SEKOIA-IO/py-radix"; diff --git a/pkgs/development/python-modules/py-scrypt/default.nix b/pkgs/development/python-modules/py-scrypt/default.nix index 5525c62b4e16..a997bc11ef0d 100644 --- a/pkgs/development/python-modules/py-scrypt/default.nix +++ b/pkgs/development/python-modules/py-scrypt/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "py-scrypt"; - version = "0.8.20"; + version = "0.8.24"; src = fetchPypi { pname = "scrypt"; inherit version; - hash = "sha256-DSJsHGdE+y4wizkUEGabHfXP6CY3/8te1Im/grLS63g="; + hash = "sha256-mP/eReSpVGHXPe1UunomhXZ5kg1Pj/Mg9vet5uKVMb0="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/python-modules/py-sneakers/default.nix b/pkgs/development/python-modules/py-sneakers/default.nix index 62174c3dfc26..b69516d47a77 100644 --- a/pkgs/development/python-modules/py-sneakers/default.nix +++ b/pkgs/development/python-modules/py-sneakers/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to emulate the Sneakers movie effect"; + mainProgram = "py-sneakers"; homepage = "https://github.com/aenima-x/py-sneakers"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/py-stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix index b5bdffca7590..305451aeb165 100644 --- a/pkgs/development/python-modules/py-stringmatching/default.nix +++ b/pkgs/development/python-modules/py-stringmatching/default.nix @@ -10,15 +10,14 @@ buildPythonPackage rec { pname = "py-stringmatching"; - version = "0.4.3"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "py_stringmatching"; - inherit version; - hash = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4="; + inherit pname version; + hash = "sha256-2XuhtWKtmO/8lGaHxdqwdMF6UVEUqw3PUCIC1c7J8rU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index a8019318e538..26a101389eb7 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for Synology DSM"; + mainProgram = "synologydsm-api"; homepage = "https://github.com/mib1185/py-synologydsm-api"; changelog = "https://github.com/mib1185/py-synologydsm-api/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/py-tree-sitter/default.nix b/pkgs/development/python-modules/py-tree-sitter/default.nix deleted file mode 100644 index 9358a0fbca88..000000000000 --- a/pkgs/development/python-modules/py-tree-sitter/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, setuptools -}: - -buildPythonPackage rec { - pname = "py-tree-sitter"; - version = "0.20.4"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "tree-sitter"; - repo = "py-tree-sitter"; - rev = "refs/tags/v${version}"; - hash = "sha256-R97WcsHQMcuEOCg/QQ9YbGTRD30G9PRv0xAbxuoFyC4="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - setuptools - ]; - - pythonImportsCheck = [ "tree_sitter" ]; - - meta = with lib; { - homepage = "https://github.com/tree-sitter/py-tree-sitter"; - description = "Python bindings for tree-sitter"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index 25dd99816d0f..89b7a045d0c1 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for VAPID header generation"; + mainProgram = "vapid"; homepage = "https://github.com/mozilla-services/vapid"; license = licenses.mpl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/py3langid/default.nix b/pkgs/development/python-modules/py3langid/default.nix index 02631320c4af..84e758bfc5ef 100644 --- a/pkgs/development/python-modules/py3langid/default.nix +++ b/pkgs/development/python-modules/py3langid/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fork of the language identification tool langid.py, featuring a modernized codebase and faster execution times"; + mainProgram = "langid"; homepage = "https://github.com/adbar/py3langid"; changelog = "https://github.com/adbar/py3langid/blob/v${version}/HISTORY.rst"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/py3nvml/default.nix b/pkgs/development/python-modules/py3nvml/default.nix index 3cd3b122d867..e551298e69fe 100644 --- a/pkgs/development/python-modules/py3nvml/default.nix +++ b/pkgs/development/python-modules/py3nvml/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python 3 Bindings for the NVIDIA Management Library"; + mainProgram = "py3smi"; homepage = "https://pypi.org/project/py3nvml/"; license = with licenses; [ bsd3 bsd2 ]; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/python-modules/py65/default.nix b/pkgs/development/python-modules/py65/default.nix index 5748b8c16938..3c06f5932f00 100644 --- a/pkgs/development/python-modules/py65/default.nix +++ b/pkgs/development/python-modules/py65/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = { homepage = "https://py65.readthedocs.io/"; description = "Emulate 6502-based microcomputer systems in Python"; + mainProgram = "py65mon"; longDescription = '' Py65 includes a program called Py65Mon that functions as a machine language monitor. This kind of program is sometimes also called a diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index 4180edaebde3..6c33a2d9ca24 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyamg"; - version = "5.0.1"; - format = "setuptools"; + version = "5.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-XwSKAXQzQ64NTIYjBgBzhs+5sURTxHrf2tJ363mkbVA="; + hash = "sha256-+Q+d55W04pWJ7dLrRG0R3bRmZ46+gj7TKfzzV1nqOQw="; }; nativeBuildInputs = [ @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyamg/pyamg"; changelog = "https://github.com/pyamg/pyamg/blob/v${version}/changelog.md"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 825568da73a8..7a52c601ef35 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; + mainProgram = "pyaml"; homepage = "https://github.com/mk-fg/pretty-yaml"; license = licenses.wtfpl; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index 053844d71fe9..abf751e88afd 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Auto-generate PEP-484 annotations"; + mainProgram = "pyannotate"; homepage = "https://github.com/dropbox/pyannotate"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pyannote-database/default.nix b/pkgs/development/python-modules/pyannote-database/default.nix index 0b90e9ce224b..e3e3ac56ca70 100644 --- a/pkgs/development/python-modules/pyannote-database/default.nix +++ b/pkgs/development/python-modules/pyannote-database/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reproducible experimental protocols for multimedia (audio, video, text) database"; + mainProgram = "pyannote-database"; homepage = "https://github.com/pyannote/pyannote-database"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix index e5c26d3d410a..1ab1a9668160 100644 --- a/pkgs/development/python-modules/pyannote-metrics/default.nix +++ b/pkgs/development/python-modules/pyannote-metrics/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems"; + mainProgram = "pyannote-metrics"; homepage = "https://github.com/pyannote/pyannote-metrics"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix index 52e96b05ed14..00b7eab6344a 100644 --- a/pkgs/development/python-modules/pyannote-pipeline/default.nix +++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tunable pipelines"; + mainProgram = "pyannote-pipeline"; homepage = "https://github.com/pyannote/pyannote-pipeline"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 5c7930601745..369131a06433 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -5,8 +5,8 @@ , fastparquet , fetchPypi , fsspec +, hatchling , pandas -, poetry-core , pyarrow , pythonOlder , sqlalchemy @@ -15,18 +15,18 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.1.0"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-cOTkKKeNzHcqRDfZaXR0CrL75SgH5102H89tuF4L9M4="; + hash = "sha256-3S5iQembhaQ1McxAJyZEgG0z60S5UhEWGv7BtJbkPTc="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatome/default.nix b/pkgs/development/python-modules/pyatome/default.nix index efc0a8ba554b..2022260d4817 100644 --- a/pkgs/development/python-modules/pyatome/default.nix +++ b/pkgs/development/python-modules/pyatome/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get energy consumption data from Atome"; + mainProgram = "pyatome"; homepage = "https://github.com/baqs/pyAtome"; license = licenses.asl20; maintainers = with maintainers; [ uvnikita ]; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index e3826a9a3698..818ea47fc497 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; + mainProgram = "apkinfo"; homepage = "https://github.com/appknox/pyaxmlparser"; # Files from Androguard are licensed ASL 2.0 license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 944247e1fac9..fdc65a0abe72 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast Base64 encoding/decoding"; + mainProgram = "pybase64"; homepage = "https://github.com/mayeut/pybase64"; changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index f6f5a8fc18ed..d702b4d509d3 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; + mainProgram = "pybids"; homepage = "https://github.com/bids-standard/pybids"; changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 223c505df146..cfb7d42a6f46 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -115,6 +115,7 @@ in buildPythonPackage rec { homepage = "https://github.com/pybind/pybind11"; changelog = "https://github.com/pybind/pybind11/blob/${src.rev}/docs/changelog.rst"; description = "Seamless operability between C++11 and Python"; + mainProgram = "pybind11-config"; longDescription = '' Pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 628853a89ce0..a2b865e7b71c 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.25.1"; + version = "1.26.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - hash = "sha256-HH4BjdSkdL8lI8L/Z2ltuuWWOkfetfgv4WQm6PIoEa0="; + hash = "sha256-AUnMPsGFkCgVKUdQfym35ZqrA48wq31BNsvc2puoCl8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index c6d65db362ae..3384ad516b5f 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.4"; + version = "2.2.5"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pbs"; repo = "pycaption"; rev = "refs/tags/${version}"; - hash = "sha256-aUhNvqeSNtbnRVp4yxsk4q3szNfR0m1zo0MpkBOCokY="; + hash = "sha256-zI5zRjvtsVgiIgWsQQgBQHhbYSGRBB6RLYgpbZWJQHs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix index 118e4ed66b5e..75bef6723d5d 100644 --- a/pkgs/development/python-modules/pycardano/default.nix +++ b/pkgs/development/python-modules/pycardano/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonRelaxDepsHook # Python deps , blockfrost-python , cachetools @@ -41,6 +42,10 @@ in buildPythonPackage rec { hash = "sha256-LP/W8IC2del476fGFq10VMWwMrbAoCCcZOngA8unBM0="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ blockfrost-python cachetools @@ -58,6 +63,8 @@ in buildPythonPackage rec { websocket-client ]; + pythonRelaxDeps = [ "typeguard" ]; + pythonImportsCheck = [ "pycardano" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix index 58da1c55b934..831b12efa987 100644 --- a/pkgs/development/python-modules/pycec/default.nix +++ b/pkgs/development/python-modules/pycec/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python modules to access HDMI CEC devices"; + mainProgram = "pycec"; homepage = "https://github.com/konikvranik/pycec/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pycflow2dot/default.nix b/pkgs/development/python-modules/pycflow2dot/default.nix index 34ea15664c4b..7bcd95e30d90 100644 --- a/pkgs/development/python-modules/pycflow2dot/default.nix +++ b/pkgs/development/python-modules/pycflow2dot/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Layout C call graphs from cflow using GraphViz dot"; + mainProgram = "cflow2dot"; homepage = "https://github.com/johnyf/pycflow2dot"; license = licenses.gpl3Plus; maintainers = with maintainers; [ evils ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index f5e6029e8560..5e4e971432ed 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "14.0.0"; + version = "14.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - hash = "sha256-3E+LBS52CpeNqbJWi3kCDLea9gigJkZfB1RM/+Q5c88="; + hash = "sha256-4W4Kf5SIMZGRuLT6IcoL60vxLu2lyb9kAkEYjyvqCj4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index c9819b523ad9..88fd8db0419e 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = { broken = stdenv.isDarwin; description = "Cross-platform clipboard utilities supporting both binary and text data"; + mainProgram = "pyclip"; homepage = "https://github.com/spyoungtech/pyclip"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mcaju ]; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 761e9c0562a4..f17001efdda1 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/PyCQA/pycodestyle/blob/${version}/CHANGES.txt"; description = "Python style guide checker"; + mainProgram = "pycodestyle"; homepage = "https://pycodestyle.pycqa.org/"; license = licenses.mit; maintainers = with maintainers; [ diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index aa503a379cf1..e0f4e1d190a7 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -7,15 +7,15 @@ , freezegun , mock , moto +, pyjwt , pytestCheckHook -, python-jose , requests , requests-mock }: buildPythonPackage rec { pname = "pycognito"; - version = "2023.5.0"; + version = "2024.2.0"; format = "setuptools"; disabled = isPy27; @@ -23,15 +23,16 @@ buildPythonPackage rec { owner = "pvizeli"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2Aqid2bd5BAnWQ+Wtji0zXjLAmSpyJNGqJ0VroGi6lY="; + hash = "sha256-VYko5KcJvnhPUceTll2BBJWb88SYnSL7S3mZ7XSLPSQ="; }; propagatedBuildInputs = [ boto3 envs - python-jose + pyjwt requests - ]; + ] + ++ pyjwt.optional-dependencies.crypto; nativeCheckInputs = [ freezegun @@ -39,7 +40,8 @@ buildPythonPackage rec { moto pytestCheckHook requests-mock - ]; + ] + ++ moto.optional-dependencies.cognitoidp; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 2a90bef72567..bc17546643d5 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -2,11 +2,12 @@ , nose, pyparsing, decorator, six, future }: buildPythonPackage rec { - pname = "PyContracts"; + pname = "pycontracts"; version = "1.8.14"; src = fetchPypi { - inherit pname version; + pname = "PyContracts"; + inherit version; sha256 = "03q5m595ysjrc9h57m7prrca6b9l4yrzvdijnzxnhd61p7jzbh49"; }; diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 49a1ad025000..75287c6cbf6b 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -1,22 +1,41 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, pythonOlder +, fetchFromGitHub +, fetchpatch2 +, poetry-core , pytestCheckHook }: buildPythonPackage rec { pname = "pycountry"; - version = "22.3.5"; - format = "setuptools"; + version = "23.12.11"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-shY6JGxYWJTYCPGHg+GRN8twoMGPs2dI3AH8bxCcFkY="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pycountry"; + repo = "pycountry"; + rev = "refs/tags/${version}"; + hash = "sha256-B6kphZZZgK0YuPSmkiQNbEqEfqOQb+WZGnO2UeEqQN4="; }; - propagatedBuildInputs = [ - setuptools + patches = [ + (fetchpatch2 { + name = "fix-usage-of-importlib_metadata.patch"; + url = "https://github.com/pycountry/pycountry/commit/824d2535833d061c04a1f1b6b964f42bb53bced2.patch"; + excludes = [ "HISTORY.txt" "poetry.lock" "pyproject.toml" ]; + hash = "sha256-U4fbZP++d6YfTJkVG3k2rBC8nOF9NflM6+ONlwBNu+g="; + }) + ]; + + postPatch = '' + sed -i "/addopts/d" pytest.ini + ''; + + nativeBuildInputs = [ + poetry-core ]; nativeCheckInputs = [ @@ -27,11 +46,11 @@ buildPythonPackage rec { "pycountry" ]; - meta = with lib; { - homepage = "https://github.com/flyingcircusio/pycountry"; + meta = { + homepage = "https://github.com/pycountry/pycountry"; + changelog = "https://github.com/pycountry/pycountry/blob/${src.rev}/HISTORY.txt"; description = "ISO country, subdivision, language, currency and script definitions and their translations"; - license = licenses.lgpl2; - maintainers = with maintainers; [ ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ dotlambda ]; }; - } diff --git a/pkgs/development/python-modules/pycrc/default.nix b/pkgs/development/python-modules/pycrc/default.nix index ca65f784038a..71404dd4d5ad 100644 --- a/pkgs/development/python-modules/pycrc/default.nix +++ b/pkgs/development/python-modules/pycrc/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "PyCRC"; + pname = "pycrc"; version = "1.21"; src = fetchPypi { - inherit pname version; + pname = "PyCRC"; + inherit version; sha256 = "d3b0e788b501f48ae2ff6eeb34652343c9095e4356a65df217ed29b51e4045b6"; }; diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index 4ed22901637e..74e34811279f 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.12.6"; + version = "0.12.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jupyter-server"; repo = "pycrdt-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-VYD1OrerqwzjaT1Eb6q+kryf15iHCMSHJZbon225bio="; + hash = "sha256-e4VEEudsdtfC2ek8wODxxoFuaOwl4GKS1cX3QeshuD8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index d638e9082b3b..ac98cbf0d09f 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -3,6 +3,12 @@ version = 3 [[package]] +name = "arc-swap" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" + +[[package]] name = "atomic_refcell" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -22,9 +28,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "cfg-if" @@ -33,10 +39,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +dependencies = [ + "getrandom", +] + +[[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -46,10 +61,16 @@ dependencies = [ ] [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "indoc" -version = "1.0.9" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "itoa" @@ -59,18 +80,18 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "lock_api" @@ -84,9 +105,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memoffset" @@ -127,23 +148,23 @@ dependencies = [ ] [[package]] -name = "ppv-lite86" -version = "0.2.17" +name = "portable-atomic" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.8.2" +version = "0.8.13" dependencies = [ "pyo3", "yrs", @@ -151,15 +172,16 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", "parking_lot", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -168,9 +190,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" dependencies = [ "once_cell", "target-lexicon", @@ -178,9 +200,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" dependencies = [ "libc", "pyo3-build-config", @@ -188,78 +210,39 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "pyo3-macros-backend" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" dependencies = [ + "heck", "proc-macro2", + "pyo3-build-config", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -270,9 +253,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "scopeguard" @@ -282,29 +265,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -322,26 +305,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "syn" -version = "1.0.109" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" -version = "2.0.43" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -350,28 +322,28 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "thiserror" -version = "1.0.52" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.52" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] @@ -382,21 +354,21 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -404,24 +376,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -429,22 +401,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "windows-targets" @@ -505,12 +477,13 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "yrs" -version = "0.17.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68aea14c6c33f2edd8a5ff9415360cfa5b98d90cce30c5ee3be59a8419fb15a9" +checksum = "5ad19cd99f9c036345d66331db64c7b2c823ca1ac2c30c5ca26eed149c6b4672" dependencies = [ + "arc-swap", "atomic_refcell", - "rand", + "fastrand", "serde", "serde_json", "smallstr", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index d33a8622733c..c77c360516a0 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.8.2"; + version = "0.8.13"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; rev = "refs/tags/v${version}"; - hash = "sha256-RY0ndkMW4a2KxkebkoSEAzCgdUyHujglHJCzkoFCJZA="; + hash = "sha256-puYJ0mR1JpwD823P6JrXmNjFvqZUPqEj2T4Wk81oBMU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycritty/default.nix b/pkgs/development/python-modules/pycritty/default.nix index 18101f057587..1044d2e72e77 100644 --- a/pkgs/development/python-modules/pycritty/default.nix +++ b/pkgs/development/python-modules/pycritty/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A CLI tool for changing your alacritty configuration on the fly"; + mainProgram = "pycritty"; homepage = "https://github.com/antoniosarosi/pycritty"; license = licenses.mit; maintainers = with maintainers; [ jperras ]; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 444d673100bb..358348d865d8 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -10,14 +10,14 @@ let in buildPythonPackage rec { pname = "pycryptodome"; - version = "3.19.1"; + version = "3.20.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; rev = "refs/tags/v${version}"; - hash = "sha256-+m0gF47l3c9gZ9dLdOUNW0I2W1O+OGrmsdysu7QdjvI="; + hash = "sha256-RPaBUj/BJCO+10maGDmugeEXxaIrlk2UHIvkbrQVM8c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycryptodome/vectors.nix b/pkgs/development/python-modules/pycryptodome/vectors.nix index 89df4507867e..3b6e2844df4c 100644 --- a/pkgs/development/python-modules/pycryptodome/vectors.nix +++ b/pkgs/development/python-modules/pycryptodome/vectors.nix @@ -1,19 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "pycryptodome-test-vectors"; - version = "1.0.10"; - format = "setuptools"; + version = "1.0.14"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-oqgHWAw0Xrc22eAuY6+Q/H90tL9Acz6V0EJp060hH2Q="; + hash = "sha256-1De0SjXcr8BibDVhv7G1BqG3x0RcxfudNuI3QWG8mjc="; extension = "zip"; }; + nativeBuildInputs = [ + setuptools + ]; + # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index 1aed69b85fe6..4897a7e54917 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "ClI for Python common tasks for users"; + mainProgram = "pyct"; homepage = "https://github.com/pyviz/pyct"; changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 80a9458e32c6..3e966057bb24 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.45.2"; + version = "7.45.3"; format = "setuptools"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - hash = "sha256-VzBZC+AnE2Slvd2eJFycwPtxDEy6y92VJkoxItIyJMo="; + hash = "sha256-jCRxr5B5rXmOFkXsCw09QiPbaHN50X3TanBjdEn4HWs="; }; preConfigure = '' @@ -74,6 +74,8 @@ buildPythonPackage rec { "test_multi_socket_action" # https://github.com/pycurl/pycurl/issues/822 "test_request_with_verifypeer" + # https://github.com/pycurl/pycurl/issues/836 + "test_proxy_tlsauth" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Fatal Python error: Segmentation fault "cadata_test" diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index eb1029837435..d669efbffbeb 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Daikin HVAC appliances interface"; + mainProgram = "pydaikin"; homepage = "https://bitbucket.org/mustang51/pydaikin"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 8efa37dd65fa..6242c205ea70 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -17,14 +17,14 @@ let pydantic-core = buildPythonPackage rec { pname = "pydantic-core"; - version = "2.14.6"; - format = "pyproject"; + version = "2.16.3"; + pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; rev = "refs/tags/v${version}"; - hash = "sha256-Y3RdDqFrH5C8Jt45FV6jLRV8G9odkqM1fBz6axeXF+4="; + hash = "sha256-RXytujvx/23Z24TWpvnHdjJ4/dXqjs5uiavUmukaD9A="; }; patches = [ @@ -34,14 +34,17 @@ let cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-tx8eS+MciP1C6U8FrKdTgelHb/yxU2eSdSydIMKh4rs="; + hash = "sha256-wj9u6s/3E3EWfQydkLrwHbJBvm8DwcGCoQQpSw1+q7U="; }; nativeBuildInputs = [ cargo rustPlatform.cargoSetupHook - rustPlatform.maturinBuildHook rustc + ]; + + build-system = [ + rustPlatform.maturinBuildHook typing-extensions ]; @@ -49,7 +52,7 @@ let libiconv ]; - propagatedBuildInputs = [ + dependencies = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix index 539873a1a4be..7595ac0b1d57 100644 --- a/pkgs/development/python-modules/pydantic-extra-types/default.nix +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -3,21 +3,23 @@ , fetchFromGitHub , hatchling , pydantic +, pendulum , phonenumbers , pycountry +, python-ulid , pytestCheckHook }: buildPythonPackage rec { pname = "pydantic-extra-types"; - version = "2.1.0"; - format = "pyproject"; + version = "2.6.0"; + pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-extra-types"; - rev = "v${version}"; - hash = "sha256-QPBOHIssTsWQlEg2WRpLRKrB6zmae43EExnPn5P4oAY="; + rev = "refs/tags/v${version}"; + hash = "sha256-XLVhoZ3+TfVYEuk/5fORaGpCBaB5NcuskWhHgt+llS0="; }; nativeBuildInputs = [ @@ -30,8 +32,10 @@ buildPythonPackage rec { passthru.optional-dependencies = { all = [ + pendulum phonenumbers pycountry + python-ulid ]; }; @@ -41,11 +45,8 @@ buildPythonPackage rec { pytestCheckHook ] ++ passthru.optional-dependencies.all; - pytestFlagsArray = [ - "-W" "ignore::DeprecationWarning" - ]; - meta = with lib; { + changelog = "https://github.com/pydantic/pydantic-extra-types/blob/${src.rev}/HISTORY.md"; description = "Extra Pydantic types"; homepage = "https://github.com/pydantic/pydantic-extra-types"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index 000f0dd52a17..250c1b875630 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -12,7 +12,7 @@ let self = buildPythonPackage rec { pname = "pydantic-settings"; - version = "2.1.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ let self = buildPythonPackage rec { src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-settings"; - rev = "v${version}"; - hash = "sha256-hU7u/AzaqCHKSUDHybsgXTW8IWi9hzBttPYDmMqdZbI="; + rev = "refs/tags/v${version}"; + hash = "sha256-4o8LlIFVizoxb484lVT67e24jhtUl49otr1lX/2zZ4M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index 42ce2745d727..6a1f5c52116c 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , pytest-mock , pytestCheckHook +, pytest_7 , python-dotenv , pythonAtLeast , pythonOlder @@ -51,7 +52,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mock - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index c81b46a20586..bb0a4bedde49 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder # build-system @@ -26,28 +27,37 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.5.3"; + version = "2.6.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic"; rev = "refs/tags/v${version}"; - hash = "sha256-YTNV67uKGRag6ICkNjjY9YrOiKFB1hSZkKcUXjSrhwM="; + hash = "sha256-neTdG/IcXopCmevzFY5/XDlhPHmOb6dhyAnzaobmeG8="; }; + patches = [ + (fetchpatch { + # https://github.com/pydantic/pydantic/pull/8678 + name = "fix-pytest8-compatibility.patch"; + url = "https://github.com/pydantic/pydantic/commit/825a6920e177a3b65836c13c7f37d82b810ce482.patch"; + hash = "sha256-Dap5DtDzHw0jS/QUo5CRI9sLDJ719GRyC4ZNDWEdzus="; + }) + ]; + buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatchling ]; - propagatedBuildInputs = [ + dependencies = [ annotated-types pydantic-core typing-extensions @@ -76,6 +86,17 @@ buildPythonPackage rec { --replace "'--benchmark-disable'," "" ''; + pytestFlagsArray = [ + # suppress warnings with pytest>=8 + "-Wignore::pydantic.warnings.PydanticDeprecatedSince20" + "-Wignore::pydantic.json_schema.PydanticJsonSchemaWarning" + ]; + + disabledTests = [ + # disable failing test with pytest>=8 + "test_assert_raises_validation_error" + ]; + disabledTestPaths = [ "tests/benchmarks" diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index f64913c32d33..f9de6f4ad880 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library wrapping the Deconz REST API"; + mainProgram = "pydeconz"; homepage = "https://github.com/Kane610/deconz"; changelog = "https://github.com/Kane610/deconz/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 9da4ff12b771..0488e35a1be8 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.19"; + version = "1.12.20"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = "pydeps"; rev = "refs/tags/v${version}"; - hash = "sha256-3z/7pkeP6R8GsWvSaCChcf0DZPrC3KdwLeGdNm4m6Jc="; + hash = "sha256-d6EeeNem+HfuipKF5ZOI48c11j0ozGrBP4XlqTx+fJ4="; }; nativeBuildInputs = [ @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module dependency visualization"; + mainProgram = "pydeps"; homepage = "https://github.com/thebjorn/pydeps"; changelog = "https://github.com/thebjorn/pydeps/releases/tag/v${version}"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index df840a24db8f..25ca54297f25 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"; + mainProgram = "pydevd"; homepage = "https://github.com/fabioz/PyDev.Debugger"; license = licenses.epl10; maintainers = with maintainers; [ onny ]; diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 48824469b230..6bcb0c42fa58 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -82,6 +82,7 @@ buildPythonPackage { meta = with lib; { description = "Python package for working with DICOM files"; + mainProgram = "pydicom"; homepage = "https://pydicom.github.io"; changelog = "https://github.com/pydicom/pydicom/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix index f897509c182e..faffa9e619ee 100644 --- a/pkgs/development/python-modules/pydiscourse/default.nix +++ b/pkgs/development/python-modules/pydiscourse/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for working with Discourse"; + mainProgram = "pydiscoursecli"; homepage = "https://github.com/pydiscourse/pydiscourse"; changelog = "https://github.com/pydiscourse/pydiscourse/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index d77caf7e4ad0..3cf1f14f70e2 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -2,57 +2,68 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, setuptools , future , matplotlib , numpy , pytestCheckHook +, pytest-mock , pythonOlder , scipy , ezyrb }: -buildPythonPackage rec { - pname = "pydmd"; - version = "0.4.0.post2302"; - format = "setuptools"; +let + self = buildPythonPackage rec { + pname = "pydmd"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = "mathLab"; - repo = "PyDMD"; - rev = "refs/tags/v${version}"; - hash = "sha256-EYVmaxwOxje3KVrNbvsjwRqQBD7Rje/JK+qB1F7EqA0="; - }; + src = fetchFromGitHub { + owner = "PyDMD"; + repo = "PyDMD"; + rev = "refs/tags/v${version}"; + hash = "sha256-vprvq3sl/eNtu4cqg0A4XV96dzUt0nOtPmfwEv0h+PI="; + }; - propagatedBuildInputs = [ - future - matplotlib - numpy - scipy - ezyrb + build-system = [ + setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + propagatedBuildInputs = [ + future + matplotlib + numpy + scipy + ezyrb + ]; - pytestFlagsArray = [ - # test suite takes over 100 vCPU hours, just run small subset of it. - # TODO: Add a passthru.tests with all tests - "tests/test_dmdbase.py" - ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; - pythonImportsCheck = [ - "pydmd" - ]; + pytestFlagsArray = [ + "tests/test_dmdbase.py" + ]; + + pythonImportsCheck = [ + "pydmd" + ]; + + passthru.tests = self.overrideAttrs (old: { + pytestFlagsArray = []; + }); - meta = with lib; { - description = "Python Dynamic Mode Decomposition"; - homepage = "https://mathlab.github.io/PyDMD/"; - changelog = "https://github.com/mathLab/PyDMD/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ yl3dy ]; - broken = stdenv.hostPlatform.isAarch64; + meta = with lib; { + description = "Python Dynamic Mode Decomposition"; + homepage = "https://pydmd.github.io/PyDMD/"; + changelog = "https://github.com/PyDMD/PyDMD/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ yl3dy ]; + broken = stdenv.hostPlatform.isAarch64; + }; }; -} +in self diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 62905e2a0865..d8207e37b600 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch2 , poetry-core , snowballstemmer , tomli @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "pydocstyle"; version = "6.3.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -22,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-MjRrnWu18f75OjsYIlOLJK437X3eXnlW8WkkX7vdS6k="; }; + patches = [ + # https://github.com/PyCQA/pydocstyle/pull/656 + (fetchpatch2 { + name = "python312-compat.patch"; + url = "https://github.com/PyCQA/pydocstyle/commit/306c7c8f2d863bdc098a65d2dadbd4703b9b16d5.patch"; + hash = "sha256-bqnoLz1owzDpFqlZn8z4Z+RzKCYBsI0PqqeOtjLxnMo="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -51,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python docstring style checker"; + mainProgram = "pydocstyle"; homepage = "https://github.com/PyCQA/pydocstyle"; changelog = "https://github.com/PyCQA/pydocstyle/blob/${version}/docs/release_notes.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pydoe/default.nix b/pkgs/development/python-modules/pydoe/default.nix index e361d09ced3b..5767442bef25 100644 --- a/pkgs/development/python-modules/pydoe/default.nix +++ b/pkgs/development/python-modules/pydoe/default.nix @@ -8,12 +8,13 @@ }: buildPythonPackage rec { - pname = "pyDOE"; + pname = "pydoe"; version = "0.3.8"; pyproject = true; src = fetchPypi { - inherit pname version; + pname = "pyDOE"; + inherit version; hash = "sha256-y9bxSuJtPJ9zYBMgX1PqEZGt1FZwM8Pud7fdNWVmxLY="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index ac965f8404e0..94494842a9d0 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydot"; - version = "1.4.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d"; + sha256 = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; }; propagatedBuildInputs = [ @@ -53,9 +53,8 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_exception_msg" - # Hash mismatch - "test_my_regression_tests" + # broken, fixed after 2.0.0 + "test_graph_with_shapefiles" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch b/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch index e862f1e7c2c3..29c3265f4335 100644 --- a/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch +++ b/pkgs/development/python-modules/pydot/hardcode-graphviz-path.patch @@ -1,13 +1,13 @@ -diff --git a/pydot.py b/pydot.py -index 3c7da4d..582c5bc 100644 ---- a/pydot.py -+++ b/pydot.py -@@ -124,7 +124,7 @@ def call_graphviz(program, arguments, working_dir, **kwargs): - 'LD_LIBRARY_PATH': os.environ.get('LD_LIBRARY_PATH', ''), +diff --git a/src/pydot/core.py b/src/pydot/core.py +index 26f526b..78c27f5 100644 +--- a/src/pydot/core.py ++++ b/src/pydot/core.py +@@ -209,7 +209,7 @@ def call_graphviz(program, arguments, working_dir, **kwargs): + "SYSTEMROOT": os.environ.get("SYSTEMROOT", ""), } -- program_with_args = [program, ] + arguments -+ program_with_args = ['@graphviz@/bin/' + program, ] + arguments +- program_with_args = [program] + arguments ++ program_with_args = [f"@graphviz@/bin/{program}"] + arguments process = subprocess.Popen( program_with_args, diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 206062b5316f..84cdda65f1f9 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for analyzing ELF files and DWARF debugging information"; + mainProgram = "readelf.py"; homepage = "https://github.com/eliben/pyelftools"; changelog = "https://github.com/eliben/pyelftools/blob/v${version}/CHANGES"; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/pyemvue/default.nix b/pkgs/development/python-modules/pyemvue/default.nix index d8502aaf4333..22e7e667929d 100644 --- a/pkgs/development/python-modules/pyemvue/default.nix +++ b/pkgs/development/python-modules/pyemvue/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pyemvue"; - version = "0.18.0"; + version = "0.18.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-s1Uuoiog3OkqOb6PSTqh79vgyLDGFIuZMCyQKH+qG3g="; + hash = "sha256-PTRVabYbT7Xwjkm+Oz56YjNb5Xwcgxn+IvXeazKsHyY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 53add2582f9e..549d0b8e8263 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.19.2"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,19 +27,19 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-opzoIYNsFERS5R40vm64o92PYz4+1e3ACFv3W6+EYsc="; + hash = "sha256-/TyQ6oSA361at1VSr6dLefOOmbZP4otBgb/JDA2sNWo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=pyenphase --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=pyenphase --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ awesomeversion envoy-utils httpx diff --git a/pkgs/development/python-modules/pyevmasm/default.nix b/pkgs/development/python-modules/pyevmasm/default.nix index 3b544036ce5a..581825f0d16b 100644 --- a/pkgs/development/python-modules/pyevmasm/default.nix +++ b/pkgs/development/python-modules/pyevmasm/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ethereum Virtual Machine (EVM) assembler and disassembler"; + mainProgram = "evmasm"; homepage = "https://github.com/crytic/pyevmasm"; changelog = "https://github.com/crytic/pyevmasm/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 5ef572c48175..1f3f6662f386 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for for Ezviz cameras"; + mainProgram = "pyezviz"; homepage = "https://github.com/baqs/pyEzviz/"; changelog = "https://github.com/BaQs/pyEzviz/releases/tag/${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index ed7997a842ae..4999b1dcddf9 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/mdshw5/pyfaidx"; description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; + mainProgram = "faidx"; license = licenses.bsd3; maintainers = with maintainers; [ jbedo ]; }; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index fdd7982a7898..c588607f5c12 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -9,18 +9,19 @@ # tests , pytestCheckHook +, undefined }: buildPythonPackage rec { pname = "pyfakefs"; - version = "5.3.2"; + version = "5.3.5"; pyproject = true; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-qDd2o8EEbU0QPy9TACmqbN/18Dht/9WcFe4WkmE1STw="; + hash = "sha256-fNxQCzWiFMt6YU4ZQFQ6zGZQ5pqUrHbjDzPJNzvZz5A="; }; postPatch = '' @@ -46,12 +47,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + undefined ]; - # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) - #disabledTests = [ "test_open_existing_pipe" ]; - - meta = with lib; { description = "Fake file system that mocks the Python file system modules"; homepage = "http://pyfakefs.org/"; diff --git a/pkgs/development/python-modules/pyfido/default.nix b/pkgs/development/python-modules/pyfido/default.nix index b07c8d1a5e11..8a092e7e934d 100644 --- a/pkgs/development/python-modules/pyfido/default.nix +++ b/pkgs/development/python-modules/pyfido/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client to get fido account data"; + mainProgram = "pyfido"; homepage = "https://github.com/titilambert/pyfido"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index a434ed3351eb..4226fca32f7f 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "FIGlet in pure Python"; + mainProgram = "pyfiglet"; license = licenses.gpl2Plus; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index c0ef2f45f2b7..fab3c7d789b2 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { homepage = "https://github.com/PyCQA/pyflakes"; changelog = "https://github.com/PyCQA/pyflakes/blob/${src.rev}/NEWS.rst"; description = "A simple program which checks Python source files for errors"; + mainProgram = "pyflakes"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyfluidsynth/default.nix b/pkgs/development/python-modules/pyfluidsynth/default.nix index 1e837b67129a..f037b3c4bada 100644 --- a/pkgs/development/python-modules/pyfluidsynth/default.nix +++ b/pkgs/development/python-modules/pyfluidsynth/default.nix @@ -6,30 +6,19 @@ , numpy , fluidsynth , stdenv -, fetchpatch }: buildPythonPackage rec { pname = "pyfluidsynth"; - version = "1.3.2"; + version = "1.3.3"; format = "pyproject"; src = fetchPypi { pname = "pyFluidSynth"; inherit version; - hash = "sha256-+i5oOXV4UG6z4rQGuguOP0mHo7V7fJZZRwOnJKB1VfQ="; + hash = "sha256-1Q1LVQc+dYCyo8pHCZK2xRwnnbocVRLchRNVlfQtaIE="; }; - patches = [ - # fixes error: Unknown integer parameter 'synth.sample-rate' - # https://github.com/nwhitehead/pyfluidsynth/pull/44 - (fetchpatch { - name = "add-fluid-synth-get-status-and-fix-some-typing-bugs.patch"; - url = "https://github.com/nwhitehead/pyfluidsynth/commit/1b31ca6ab00930dbb515c4cc00bb31a65578b7c0.patch"; - hash = "sha256-ZCqy7aIv5iAAJrWOD7e538xltj11gy5fakIXnAbUsu8="; - }) - ]; - nativeBuildInputs = [ setuptools wheel diff --git a/pkgs/development/python-modules/pyformlang/default.nix b/pkgs/development/python-modules/pyformlang/default.nix index 9a76ec2a1dfa..ce3923e0f8a6 100644 --- a/pkgs/development/python-modules/pyformlang/default.nix +++ b/pkgs/development/python-modules/pyformlang/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pyformlang"; - version = "1.0.7"; + version = "1.0.9"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-i4ib18Ktyc9pRu4P+tQIHoZ/IbAOk8Dn0MXJoxw8gAA="; + hash = "sha256-oCwYM4yQ1KYZpC7vVpeHSIDH2Q930JAuTDq9mds9zoc="; }; nativeBuildInputs = [ @@ -34,11 +34,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pyformlang" ]; + pythonImportsCheck = [ + "pyformlang" + ]; meta = with lib; { description = "A python framework for formal grammars"; - homepage = "https://pypi.org/project/pyformlang/"; + homepage = "https://github.com/Aunsiels/pyformlang"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 982e9b1509d6..32450e254ea1 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Library to access AVM FRITZ!Box homeautomation"; + mainProgram = "fritzhome"; homepage = "https://github.com/hthiery/python-fritzhome"; changelog = "https://github.com/hthiery/python-fritzhome/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 2ada48a2be0d..5ff81a268f2e 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous FTP server library"; + mainProgram = "ftpbench"; homepage = "https://github.com/giampaolo/pyftpdlib/"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix index 8b3687928121..e630fe2c4150 100644 --- a/pkgs/development/python-modules/pyfttt/default.nix +++ b/pkgs/development/python-modules/pyfttt/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Package for sending events to the IFTTT Webhooks Channel"; + mainProgram = "pyfttt"; homepage = "https://github.com/briandconnelly/pyfttt"; maintainers = with maintainers; [ peterhoeg ]; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 0df1538c9ced..39794d592103 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyfxa"; - version = "0.7.7"; + version = "0.7.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyFxA"; inherit version; - hash = "sha256-bIXNCM8F9xON7hzyqKHWj9Qot7WtSIkXxwoqdj1lHNs="; + hash = "sha256-DMFZl1hbYNaScOTWkAbK2nKti6wD5SS5A30q7TW5vO4="; }; propagatedBuildInputs = [ @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Firefox Accounts client library"; + mainProgram = "fxa-client"; homepage = "https://github.com/mozilla/PyFxA"; license = licenses.mpl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 4b6de769859b..6defbca5e5df 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { changelog = "https://github.com/Kozea/pygal/blob/${version}/docs/changelog.rst"; downloadPage = "https://github.com/Kozea/pygal"; description = "Sexy and simple python charting"; + mainProgram = "pygal_gen.py"; homepage = "http://www.pygal.org"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pygetwindow/default.nix b/pkgs/development/python-modules/pygetwindow/default.nix index 3ffd83ee0026..2969fe850d48 100644 --- a/pkgs/development/python-modules/pygetwindow/default.nix +++ b/pkgs/development/python-modules/pygetwindow/default.nix @@ -4,11 +4,12 @@ , pyrect }: buildPythonPackage rec { - pname = "PyGetWindow"; + pname = "pygetwindow"; version = "0.0.9"; src = fetchPypi { - inherit pname version; + pname = "PyGetWindow"; + inherit version; hash = "sha256-F4lDVefSswXNgy1xdwg4QBfBaYqQziT29/vwJC3Qpog="; }; diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix index 1efcb940f1a4..c207ef8b12a1 100644 --- a/pkgs/development/python-modules/pygithub/default.nix +++ b/pkgs/development/python-modules/pygithub/default.nix @@ -5,16 +5,17 @@ , pynacl , typing-extensions , pyjwt -, python-dateutil , pythonOlder , requests +, setuptools , setuptools-scm +, urllib3 }: buildPythonPackage rec { pname = "pygithub"; - version = "2.1.1"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,20 +23,21 @@ buildPythonPackage rec { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - hash = "sha256-ysa1RAWuFFQCF6bYwAUVFou7nxCKHLZbUtrUtXiSpPk="; + hash = "sha256-RNv/6Rs7NapP/XOdBFIWPg+/BmaK1+OY0+bP/i2YKaA="; }; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ deprecated pyjwt pynacl - python-dateutil requests typing-extensions + urllib3 ] ++ pyjwt.optional-dependencies.crypto; # Test suite makes REST calls against github.com diff --git a/pkgs/development/python-modules/pygnmi/default.nix b/pkgs/development/python-modules/pygnmi/default.nix index aa0607a4c023..a83aaabfc575 100644 --- a/pkgs/development/python-modules/pygnmi/default.nix +++ b/pkgs/development/python-modules/pygnmi/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python gNMI client to manage network functions and collect telemetry"; + mainProgram = "pygnmicli"; homepage = "https://github.com/akarneliuk/pygnmi"; changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/v${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix index 6239ac9dd841..4b1236428836 100644 --- a/pkgs/development/python-modules/pygount/default.nix +++ b/pkgs/development/python-modules/pygount/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Count lines of code for hundreds of languages using pygments"; + mainProgram = "pygount"; homepage = "https://github.com/roskakori/pygount"; changelog = "https://github.com/roskakori/pygount/blob/${src.rev}/CHANGES.md"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix index d6e7206ae6c6..02f0dce14b59 100644 --- a/pkgs/development/python-modules/pygtail/default.nix +++ b/pkgs/development/python-modules/pygtail/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library for reading log file lines that have not been read"; + mainProgram = "pygtail"; license = licenses.gpl2Plus; homepage = "https://github.com/bgreenlee/pygtail"; }; diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix index aeb65d92556d..cabb211d484c 100644 --- a/pkgs/development/python-modules/pygtfs/default.nix +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for GTFS"; + mainProgram = "gtfs2db"; homepage = "https://github.com/jarondl/pygtfs"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index 89864ebd6261..68d777bd1b28 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -139,6 +139,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sign and stamp PDF files"; + mainProgram = "pyhanko"; homepage = "https://github.com/MatthiasValvekens/pyHanko"; changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/v${version}/docs/changelog.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index da522b98cec2..efa9bed66613 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "HCL is a configuration language. pyhcl is a python parser for it"; + mainProgram = "hcltool"; homepage = "https://github.com/virtuald/pyhcl"; license = licenses.mpl20; maintainers = with maintainers; [ diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index 3d560076865e..a7c2bb2b6576 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "HOCON parser for Python"; + mainProgram = "pyhocon"; homepage = "https://github.com/chimpler/pyhocon/"; longDescription = '' A HOCON parser for Python. It additionally provides a tool (pyhocon) to convert diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 2765f457991b..daa442a57305 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyiCloud is a module which allows pythonistas to interact with iCloud webservices"; + mainProgram = "icloud"; homepage = "https://github.com/picklepete/pyicloud"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index d21fcddc42ee..1a32aa2ac6fb 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.8"; + version = "2.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,18 +28,9 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BYd2UYQJD/HsmpnlQjZvjfg17ShPuA3j4rtv6fTQK/A="; + hash = "sha256-lzbFwAg1aLCfBnSnqq4oVteArpkRBa7hU8V3vB5ODa8="; }; - patches = [ - # https://github.com/Fizzadar/pyinfra/pull/1018 - (fetchpatch { - name = "bump-paramiko-major-version.patch"; - url = "https://github.com/Fizzadar/pyinfra/commit/62a8f081279779c4f1eed246139f615cf5fed642.patch"; - hash = "sha256-aT9SeSqXOD76LFzf6R/MWTtavcW6fZT7chkVg9aXiBg="; - }) - ]; - propagatedBuildInputs = [ click colorama @@ -69,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-based infrastructure automation"; + mainProgram = "pyinfra"; longDescription = '' pyinfra automates/provisions/manages/deploys infrastructure. It can be used for ad-hoc command execution, service deployment, configuration management and more. diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix index 85ab4112e5ea..b198bae9ec15 100644 --- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix +++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = { description = "Create a windows version-file from a simple YAML file that can be used by PyInstaller."; + mainProgram = "create-version-file"; homepage = "https://pypi.org/project/pyinstaller-versionfile/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 9a6e1b54ec36..e2e25aa18dcd 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -8,6 +8,7 @@ , pyserial , pyserial-asyncio , pytestCheckHook +, pythonAtLeast , pythonOlder , setuptools , voluptuous @@ -47,12 +48,29 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # AssertionError: Failed test 'read_eeprom_response' with argument 'group' value X vs expected value Z + "test_async_send" + "test_nak_response" + "test_no_direct_ack" + "test_on_level" + "test_on_level_group" + "test_on_level_nak" + # AssertionError: Failed test 'read_eeprom_response' with argument 'target' value X vs expected value Y + "test_other_status" + "test_status_command" + "test_status_request_hub" + # stuck in epoll + "test_read_all_peek" + ]; + pythonImportsCheck = [ "pyinsteon" ]; meta = with lib; { description = "Python library to support Insteon home automation projects"; + mainProgram = "insteon_tools"; longDescription = '' This is a Python package to interface with an Insteon Modem. It has been tested to work with most USB or RS-232 serial based devices such as the diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix index 58fcc8c515ce..1646fcd1d115 100644 --- a/pkgs/development/python-modules/pyinstrument/default.nix +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Call stack profiler for Python"; + mainProgram = "pyinstrument"; homepage = "https://github.com/joerick/pyinstrument"; changelog = "https://github.com/joerick/pyinstrument/releases/tag/v${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyixapi/default.nix b/pkgs/development/python-modules/pyixapi/default.nix index ce5a265ba263..e452224d9e4f 100644 --- a/pkgs/development/python-modules/pyixapi/default.nix +++ b/pkgs/development/python-modules/pyixapi/default.nix @@ -1,24 +1,25 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm +, poetry-core , requests , pyjwt }: buildPythonPackage rec { pname = "pyixapi"; - version = "0.2.1"; - format = "setuptools"; + version = "0.2.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-c5a8Ldbzgh8gXuCDYbKk9zR6AoiBF3Y/VQvGlSwXpR4="; + hash = "sha256-qkgPBIYv9xzGa29RiPAU3zNhcyutTUX1Vkmpd9YdeJU="; }; nativeBuildInputs = [ - setuptools-scm + poetry-core ]; + propagatedBuildInputs = [ requests pyjwt diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 76e2711ee18c..79ce3eeca8f4 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python converter for Japanese Kana-kanji sentences into Kana-Roman"; + mainProgram = "kakasi"; homepage = "https://github.com/miurahr/pykakasi"; changelog = "https://github.com/miurahr/pykakasi/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix index af2645006e18..eac53807b5d4 100644 --- a/pkgs/development/python-modules/pykaleidescape/default.nix +++ b/pkgs/development/python-modules/pykaleidescape/default.nix @@ -7,22 +7,27 @@ , pytestCheckHook , pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pykaleidescape"; - version = "2022.2.3"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SteveEasley"; - repo = pname; + repo = "pykaleidescape"; rev = "refs/tags/v${version}"; - hash = "sha256-h5G7wV4Z+sf8Qq4GNFsp8DVDSgQgS0dLGf+DzK/egYM="; + hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp dnspython diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index 46e4b24ceef6..b81bba27f1a4 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.10"; + version = "1.3.11"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QefF1mnK3CGIrMS7tLC03K9JLYRRLx5lF6erLRIskR0="; + hash = "sha256-bBI8e65SE68iPFKai0FhwH64VKb+QDizaVK62iEx68s="; }; nativeBuildInputs = [ @@ -40,7 +40,8 @@ buildPythonPackage rec { preCheck = '' # make sure we don't import pykdtree from the source tree - mv pykdtree tests + mv pykdtree/test_tree.py . + rm -rf pykdtree ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index 363b078cad32..18f6fb7a9ee8 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get data from Atome Key"; + mainProgram = "pykeyatome"; homepage = "https://github.com/jugla/pyKeyAtome"; changelog = "https://github.com/jugla/pyKeyAtome/releases/tag/V${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index a8930149b1bb..6078562a9714 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python REST client API for Kostal Plenticore Inverters"; + mainProgram = "pykoplenti"; homepage = "https://github.com/stegm/pykoplenti/"; changelog = "https://github.com/stegm/pykoplenti/releases/tag/v${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix index 6c1d9bf00fae..a748191ba9d1 100644 --- a/pkgs/development/python-modules/pykulersky/default.nix +++ b/pkgs/development/python-modules/pykulersky/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to control Brightech Kuler Sky Bluetooth LED devices"; + mainProgram = "pykulersky"; homepage = "https://github.com/emlove/pykulersky"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix index a49967ee6c3e..991e822d42a2 100644 --- a/pkgs/development/python-modules/pykwalify/default.nix +++ b/pkgs/development/python-modules/pykwalify/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/Grokzen/pykwalify"; description = "YAML/JSON validation library"; + mainProgram = "pykwalify"; longDescription = '' This framework is a port with a lot of added functionality of the Java version of the framework kwalify that can be found at diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index f247f42e975b..f173d8569646 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , mock -, nose +, pynose , pyserial , pytestCheckHook , pythonOlder @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - nose + pynose pytestCheckHook ]; @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Jeelink LaCrosse"; + mainProgram = "pylacrosse"; homepage = "https://github.com/hthiery/python-lacrosse"; license = with licenses; [ lgpl2Plus ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix new file mode 100644 index 000000000000..1f2790ad2031 --- /dev/null +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pylacus"; + version = "1.8.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ail-project"; + repo = "PyLacus"; + rev = "refs/tags/v${version}"; + hash = "sha256-wXdQe/4Xw/D0MRFqNfSKimJ99aCE7M7k1neT/+t7ixY="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + requests + ]; + + # Tests require network access + doCheck = false; + + pythonImportsCheck = [ + "pylacus" + ]; + + meta = with lib; { + description = "Module to enqueue and query a remote Lacus instance"; + homepage = "https://github.com/ail-project/PyLacus"; + changelog = "https://github.com/ail-project/PyLacus/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index e62d356f70ee..5e379cefac63 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -75,6 +75,7 @@ let pylama = buildPythonPackage rec { meta = with lib; { description = "Code audit tool for python"; + mainProgram = "pylama"; homepage = "https://github.com/klen/pylama"; changelog = "https://github.com/klen/pylama/blob/${version}/Changelog"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix index d228c1a39ec9..dc0ca98f186c 100644 --- a/pkgs/development/python-modules/pylddwrap/default.nix +++ b/pkgs/development/python-modules/pylddwrap/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper around ldd *nix utility to determine shared libraries of a program"; + mainProgram = "pylddwrap"; homepage = "https://github.com/Parquery/pylddwrap"; changelog = "https://github.com/Parquery/pylddwrap/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 948b2afc5a15..2d46d041df47 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "3.0.3"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; rev = "refs/tags/v${version}"; - hash = "sha256-JwSzit4oDxAqrQFlvTNF7lrirhaHbJ15MRKbl7c7bEg="; + hash = "sha256-JHtMaZNwl+yLwEDD4Nl0vOt9NQ9DO7iIy5LR/9ta1Pw="; }; nativeBuildInputs = [ @@ -96,6 +96,8 @@ buildPythonPackage rec { "test_save_and_load_not_a_linter_stats" # Truncated string expectation mismatch "test_truncated_compare" + # Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483 + "test_functional" # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] "test_functional_relation_extraction" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/pylnk3/default.nix b/pkgs/development/python-modules/pylnk3/default.nix index 8a48fb731b85..819c7d6c5a23 100644 --- a/pkgs/development/python-modules/pylnk3/default.nix +++ b/pkgs/development/python-modules/pylnk3/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for reading and writing Windows shortcut files (.lnk)"; + mainProgram = "pylnk3"; homepage = "https://github.com/strayge/pylnk"; license = with licenses; [ lgpl3Only ]; maintainers = with maintainers; [ fedx-sudo ]; diff --git a/pkgs/development/python-modules/pylsp-rope/default.nix b/pkgs/development/python-modules/pylsp-rope/default.nix index fd4d1f9ba5f5..22776d4dc6af 100644 --- a/pkgs/development/python-modules/pylsp-rope/default.nix +++ b/pkgs/development/python-modules/pylsp-rope/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pylsp-rope"; - version = "0.1.15"; + version = "0.1.16"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0f0WzJcVOfH1abJnvZCLM5/W1JfVxSDAH+Z1ADA6kUQ="; + hash = "sha256-1oC2iMYKQCV6iELsgIpuDeFZakelMA8irs/caVVQIKc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index d9387a62bec9..d760b9cd0dd4 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -44,14 +44,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.7"; + version = "10.7.1"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-jeU3mXaARToN1NZ+pcogCu70foGc5xAmijLUSfd9k9U="; + hash = "sha256-P2MkGD0B9mn34ia3Kd4MQej1XryNVXWVMF4JHaPTS0M="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyment/default.nix b/pkgs/development/python-modules/pyment/default.nix index 768bc459b5b5..f3077acdd2ce 100644 --- a/pkgs/development/python-modules/pyment/default.nix +++ b/pkgs/development/python-modules/pyment/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/dadadel/pyment"; description = "Create, update or convert docstrings in existing Python files, managing several styles"; + mainProgram = "pyment"; license = licenses.gpl3; maintainers = with maintainers; [ jethro ]; }; diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index f8371a4db057..70bf0a4f8142 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A command-line tool to show the weather report by a given station ID"; + mainProgram = "pymetar"; homepage = "https://github.com/klausman/pymetar"; license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ]; diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index c044b58920ba..4229d30c022d 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Modbus protocol"; + mainProgram = "pymodbus.simulator"; longDescription = '' Pymodbus is a full Modbus protocol implementation using twisted, torndo or asyncio for its asynchronous communications core. It can diff --git a/pkgs/development/python-modules/pymongo-inmemory/default.nix b/pkgs/development/python-modules/pymongo-inmemory/default.nix index f0930c8c54c0..604f0c1c3cd3 100644 --- a/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pymongo-inmemory"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "kaizendorks"; repo = "pymongo_inmemory"; rev = "refs/tags/v${version}"; - hash = "sha256-h6/yKvAHqvw0L3Z1+PUQi36Ja6yvFiaX7Cn5Ypcg1Zs="; + hash = "sha256-vYWVMSawk+03ie3PtqOyzd6wxiviq+IzyQ8bvEHNHfc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 6d69cc3556c4..13fbc9ebe768 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.6.1"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Mdqx8+HQzdV+jfAbZF9S1DzBtlPtOv1TXSiR9PxPlxI="; + hash = "sha256-q30BrIMqFmPa1ZLMvZK7Dwd1vI+YoZI8Xhp9f+rUla8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymorphy2/default.nix b/pkgs/development/python-modules/pymorphy2/default.nix index 300a9230d2e1..57b843e54590 100644 --- a/pkgs/development/python-modules/pymorphy2/default.nix +++ b/pkgs/development/python-modules/pymorphy2/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Morphological analyzer/inflection engine for Russian and Ukrainian"; + mainProgram = "pymorphy"; homepage = "https://github.com/kmike/pymorphy2"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix index 4c071939740e..eea5aa474634 100644 --- a/pkgs/development/python-modules/pymorphy3/default.nix +++ b/pkgs/development/python-modules/pymorphy3/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , buildPythonPackage +, click , dawg-python , docopt , pytestCheckHook @@ -10,14 +11,14 @@ buildPythonPackage rec { pname = "pymorphy3"; - version = "1.2.1"; + version = "2.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "no-plagiarism"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JTRG+UtNXnS9GFUrgHNVCktb3HdH98wDFgzDPp6oVcQ="; + hash = "sha256-AIAccIxv3lCZcTKHfE/s2n3A5fUWqon+dk0SvczritY="; }; propagatedBuildInputs = [ @@ -27,14 +28,19 @@ buildPythonPackage rec { pymorphy3-dicts-uk ]; + optional-dependencies.CLI = [ + click + ]; + nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ optional-dependencies.CLI; pythonImportsCheck = [ "pymorphy3" ]; meta = with lib; { description = "Morphological analyzer/inflection engine for Russian and Ukrainian"; + mainProgram = "pymorphy"; homepage = "https://github.com/no-plagiarism/pymorphy3"; license = licenses.mit; maintainers = with maintainers; [ jboy ]; diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix index a04923c18140..c05533638e65 100644 --- a/pkgs/development/python-modules/pymsgbox/default.nix +++ b/pkgs/development/python-modules/pymsgbox/default.nix @@ -1,11 +1,12 @@ { lib, fetchPypi, buildPythonPackage, tkinter }: buildPythonPackage rec { - pname = "PyMsgBox"; + pname = "pymsgbox"; version = "1.0.9"; src = fetchPypi { - inherit pname version; + pname = "PyMsgBox"; + inherit version; hash = "sha256-IZQifei/96PW2lQYSHBaFV3LsqBu4SDZ8oCh1/USY/8="; }; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index fb9603c18d5f..bf40f44732d3 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -33,7 +33,7 @@ let mupdf-cxx = mupdf.override { enableOcr = true; enableCxx = true; enablePython = true; python3 = python; }; in buildPythonPackage rec { pname = "pymupdf"; - version = "1.23.7"; + version = "1.23.26"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ in buildPythonPackage rec { owner = "pymupdf"; repo = "PyMuPDF"; rev = "refs/tags/${version}"; - hash = "sha256-XVf9nKbcTS/rxRCD2u5u8ecCf0bWZ3FXXN/YulI9etU="; + hash = "sha256-m2zq04+PDnlzFuqeSt27UhdHXTHxpHdMPIg5RQl/5bQ="; }; # swig is not wrapped as python package @@ -107,7 +107,7 @@ in buildPythonPackage rec { pythonImportsCheck = [ "fitz" - "fitz_new" + "fitz_old" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index 58bdf10ab5b1..ee8c5be2a60a 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for talking to a MySensors gateway"; + mainProgram = "pymysensors"; homepage = "https://github.com/theolind/pymysensors"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 8f75abea64fd..d22ed78e02d1 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -3,17 +3,17 @@ , botocore , buildPythonPackage , fetchFromGitHub +, pytest-env , pytest-mock , pytestCheckHook -, python-dateutil , pythonOlder -, requests +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "pynamodb"; - version = "5.5.1"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,26 +22,30 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - hash = "sha256-VZHEXAuHGn10EMkyd8hibipu6tw5JvOP4XwdB+xdjN8="; + hash = "sha256-Ag/ivZ2SDYX0kwXbExt3kE/pMJgfoGc6gWoy+Rr6GTw="; }; - propagatedBuildInputs = [ - python-dateutil + build-system = [ + setuptools + ]; + + dependencies = [ botocore - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { signal = [ blinker ]; }; nativeCheckInputs = [ + pytest-env pytest-mock pytestCheckHook - ] ++ passthru.optional-dependencies.signal; + ] ++ optional-dependencies.signal; pythonImportsCheck = [ "pynamodb" @@ -57,6 +61,9 @@ buildPythonPackage rec { "test_sign_request" "test_table_integration" "test_transact" + # require a local dynamodb instance + "test_create_table" + "test_create_table__incompatible_indexes" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pynello/default.nix b/pkgs/development/python-modules/pynello/default.nix index a7a75d7c5ddd..4435bb7ec30e 100644 --- a/pkgs/development/python-modules/pynello/default.nix +++ b/pkgs/development/python-modules/pynello/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for nello.io intercoms"; + mainProgram = "nello"; homepage = "https://github.com/pschmitt/pynello"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix index a52a09166c5e..ab2cce0b5652 100644 --- a/pkgs/development/python-modules/pyngo/default.nix +++ b/pkgs/development/python-modules/pyngo/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pydantic" + "typing-extensions" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynose/default.nix b/pkgs/development/python-modules/pynose/default.nix index 12730465b7a1..e58681cbe966 100644 --- a/pkgs/development/python-modules/pynose/default.nix +++ b/pkgs/development/python-modules/pynose/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pynose"; - version = "1.4.8"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "mdmintz"; repo = "pynose"; - rev = "v${version}"; - hash = "sha256-V6jZBEkEAKzClA/3s+Lyfm9xExgCEJbLCNnIHmZ94E4="; + rev = "refs/tags/v${version}"; + hash = "sha256-Oi+vwInqgsdZfr5abJUa4zkTktpEuG0m89d1O8Oot0Q="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyoctoprintapi/default.nix b/pkgs/development/python-modules/pyoctoprintapi/default.nix index 59db986ad44f..8dfd9cdf57f3 100644 --- a/pkgs/development/python-modules/pyoctoprintapi/default.nix +++ b/pkgs/development/python-modules/pyoctoprintapi/default.nix @@ -14,7 +14,7 @@ let pname = "pyoctoprintapi"; - version = "0.1.12"; + version = "0.1.14"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "rfleming71"; repo = "pyoctoprintapi"; rev = "refs/tags/v${version}"; - hash = "sha256-Jf/zYnBHVl3TYxFy9Chy6qNH/eCroZkmUOEWfd62RIo="; + hash = "sha256-DKqkT0Wyxf4grXBqei9IYBGMOgPxjzuo955M/nHDLo8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index b20d4618167d..da48d0d828ae 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "5.0.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - hash = "sha256-A9fQsE1akVYJnOjQPpLzlWeDdG+pI0629bXPwStkUBE="; + hash = "sha256-OX/u5EVhplgL4IztvphkNoWVY/S7N49IIkZVyOmH6mA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 8667ed08fe76..35ab0ecec509 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Optimization Modeling Objects"; + mainProgram = "pyomo"; homepage = "http://pyomo.org"; changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 79623f749b40..99d9a3038b16 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -27,22 +27,14 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2023.1.4"; + version = "2024.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-IgF078qQDp1d5a7yqht3pvJVBQHekrA1qRATrq5NTF4="; + hash = "sha256-7NVy7pQK2L2hY5w6e+tog0/JqYrX6z9uAarE99nUusE="; }; - patches = [ - (fetchpatch { - name = "fix-conditions-for-CL_UNORM_INT24-availability.patch"; - url = "https://github.com/inducer/pyopencl/pull/706.patch"; - hash = "sha256-31aiqYlhbEw3F2k/x3W2rbOX0A90cHwIlfXMivFucMA="; - }) - ]; - nativeBuildInputs = [ oldest-supported-numpy setuptools diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 611666e851d3..31e9e810c9ed 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , openssl +, setuptools , cryptography , pytestCheckHook , pretend @@ -13,13 +14,13 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "23.3.0"; - format = "setuptools"; + version = "24.0.0"; + pyproject = true; src = fetchPypi { pname = "pyOpenSSL"; inherit version; - hash = "sha256-ayy6XMRugidQ7D5age4SgZhQsRMDYw1XXpgQigecKxI="; + hash = "sha256-aqMwOak//6RWPmVbYdETZNASZL6My0mQYQHgKjNFML8="; }; outputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ openssl + setuptools sphinxHook sphinx-rtd-theme ]; diff --git a/pkgs/development/python-modules/pyoppleio/default.nix b/pkgs/development/python-modules/pyoppleio/default.nix index f0d11d86c7c2..4487647ca81d 100644 --- a/pkgs/development/python-modules/pyoppleio/default.nix +++ b/pkgs/development/python-modules/pyoppleio/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for interacting with OPPLE lights"; + mainProgram = "oppleio"; homepage = "https://github.com/jedmeng/python-oppleio"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 9fbf388e7d2d..05d2586ff18d 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyparsing"; - version = "3.1.1"; + version = "3.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-54XMw5ahMZH4cevTFg2GXhgSu0QX1mfITWFezWirt1E="; + hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 73a261d07a21..7e609cbe1ccd 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -77,6 +77,7 @@ buildPythonPackage rec { meta = with lib; { broken = stdenv.isDarwin; description = "Password manager pass in Python"; + mainProgram = "pypass"; homepage = "https://github.com/aviau/python-pass"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/python-modules/pypca/default.nix b/pkgs/development/python-modules/pypca/default.nix index 28e958e4b626..7ca099f2d865 100644 --- a/pkgs/development/python-modules/pypca/default.nix +++ b/pkgs/development/python-modules/pypca/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the PCA 301 smart plugs"; + mainProgram = "pypca"; homepage = "https://github.com/majuss/pypca"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 3eef4a86ce8f..c4819b9a012a 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -2,18 +2,16 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "pypck"; - version = "0.7.17"; + version = "0.7.19"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,21 +20,15 @@ buildPythonPackage rec { owner = "alengwenus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Vlt4+fRULb9mB0ceRmc7MJ50DnF9DAJPHA8iCbNVvcE="; + hash = "sha256-D4uUR8A1mrT+mxUswS34hSRczjRkRro/pz9NbMUCPjM="; }; - patches = [ - # https://github.com/alengwenus/pypck/pull/109 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/alengwenus/pypck/commit/17023ebe8082120b1eec086842ca809ec6e9df2b.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; + postPatch = '' + echo "${version}" > VERSION + ''; nativeBuildInputs = [ setuptools - wheel ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 5ff98d82eb3c..5e48ca58781c 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch2 , pythonOlder # build-system @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "3.17.4"; + version = "4.1.0"; format = "pyproject"; src = fetchFromGitHub { @@ -35,9 +36,20 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-2FKTBN1VZX0LGiDEghix4DBt1gO9NRNB/lAUefu5EUA="; + hash = "sha256-Z3flDC102FwEaNtef0YAfmAFSxpimQNyxt9tRfpKueg="; }; + patches = [ + (fetchpatch2 { + # add missing test marker on networked test + url = "https://github.com/py-pdf/pypdf/commit/f43268734a529d4098e6258bf346148fd24c54f0.patch"; + includes = [ + "tests/test_generic.py" + ]; + hash = "sha256-Ow32UB4crs3OgT+AmA9TNmcO5Y9SoSahybzD3AmWmVk="; + }) + ]; + outputs = [ "out" "doc" diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 567f54e1712e..76065f353171 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to generate and modify perf"; + mainProgram = "pyperf"; homepage = "https://pyperf.readthedocs.io/"; changelog = "https://github.com/psf/pyperf/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyphotonfile/default.nix b/pkgs/development/python-modules/pyphotonfile/default.nix index 9d7a30213869..c18d8c60d478 100644 --- a/pkgs/development/python-modules/pyphotonfile/default.nix +++ b/pkgs/development/python-modules/pyphotonfile/default.nix @@ -5,26 +5,28 @@ , numpy }: let - version = "0.2.1"; - format = "setuptools"; + version = "0.2.1+"; in buildPythonPackage { pname = "pyphotonfile"; + format = "setuptools"; inherit version; + + dontUseSetuptoolsCheck = true; propagatedBuildInputs = [ pillow numpy ]; src = fetchFromGitHub { - owner = "fookatchu"; + owner = "cab404"; repo = "pyphotonfile"; - rev = "v${version}"; - sha256 = "1hh1fcn7q3kyk2413pjs18xnxvzrchrisbpj2cd59jrdp0qzgv2s"; + rev = "b7ee92a0071007bb1d6a5984262651beec26543d"; + sha256 = "iB5ky4fPX8ZnvXlDpggqS/345k2x/mPC4cIgb9M0f/c="; }; meta = with lib; { maintainers = [ maintainers.cab404 ]; license = licenses.gpl3Plus; description = "Library for reading and writing files for the Anycubic Photon 3D-Printer"; - homepage = "https://github.com/fookatchu/pyphotonfile"; + homepage = "https://github.com/cab404/pyphotonfile"; }; } diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index a109612fd75e..882e62505e92 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Chinese Characters to Pinyin - 汉字转拼音"; + mainProgram = "pypinyin"; homepage = "https://github.com/mozillazg/python-pinyin"; changelog = "https://github.com/mozillazg/python-pinyin/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index f598eb4df90a..83cf132ed5c6 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -83,6 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Minimal PyPI server for use with pip/easy_install"; + mainProgram = "pypi-server"; homepage = "https://github.com/pypiserver/pypiserver"; changelog = "https://github.com/pypiserver/pypiserver/releases/tag/v${version}"; license = with licenses; [ mit zlib ]; diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix index b0276c77bc05..186d3828f4ca 100644 --- a/pkgs/development/python-modules/pyppeteer/default.nix +++ b/pkgs/development/python-modules/pyppeteer/default.nix @@ -89,6 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "Headless chrome/chromium automation library (unofficial port of puppeteer)"; + mainProgram = "pyppeteer-install"; homepage = "https://github.com/pyppeteer/pyppeteer"; changelog = "https://github.com/pyppeteer/pyppeteer/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index c0f71dc8b64f..db979ae4297e 100644 --- a/pkgs/development/python-modules/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Help visualize profiling data from cProfile with kcachegrind and qcachegrind"; + mainProgram = "pyprof2calltree"; homepage = "https://github.com/pwaller/pyprof2calltree"; changelog = "https://github.com/pwaller/pyprof2calltree/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 11ec1ef47ad4..bb98e96e02a1 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -106,6 +106,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to PROJ library"; + mainProgram = "pyproj"; homepage = "https://github.com/pyproj4/pyproj"; changelog = "https://github.com/pyproj4/pyproj/blob/${src.rev}/docs/history.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyprosegur/default.nix b/pkgs/development/python-modules/pyprosegur/default.nix index 3eba1a1df3b8..f1be9de65abb 100644 --- a/pkgs/development/python-modules/pyprosegur/default.nix +++ b/pkgs/development/python-modules/pyprosegur/default.nix @@ -6,22 +6,27 @@ , click , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyprosegur"; - version = "0.0.9"; - format = "setuptools"; + version = "0.0.10"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dgomes"; - repo = pname; + repo = "pyprosegur"; rev = "refs/tags/${version}"; - hash = "sha256-FTCQ2noxodFKN7qXdc7DG3Zt4j/pR6DeuWIs0GtGRy8="; + hash = "sha256-OHFJhufymD181FODHlIu+O5xh9dfKwEIVQX/zTOC6ks="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp @@ -42,5 +47,6 @@ buildPythonPackage rec { changelog = "https://github.com/dgomes/pyprosegur/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "pyprosegur"; }; } diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix index 0356f899594b..7e8a924c96c7 100644 --- a/pkgs/development/python-modules/pyprusalink/default.nix +++ b/pkgs/development/python-modules/pyprusalink/default.nix @@ -1,14 +1,14 @@ { lib -, aiohttp , buildPythonPackage , fetchFromGitHub +, httpx , pythonOlder , setuptools }: buildPythonPackage rec { pname = "pyprusalink"; - version = "2.0.1"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wwH4LE8wi8eb7QwT7N1mNtVleoWscDEOu2vrXKDktwU="; + hash = "sha256-Opip696hXV1gqFC1cWfrSCkrsldl7M7XZAqUaVkDy7M="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aiohttp + httpx ]; # Module doesn't have tests diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index 9b8ebad61eeb..6f8bf6c67a25 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates"; + mainProgram = "pypugjs"; homepage = "https://github.com/kakulukia/pypugjs"; license = licenses.mit; maintainers = with maintainers; [ lopsided98 ]; diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index 4a93fb19c1f6..84d92530f9c5 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mimikatz implementation in Python"; + mainProgram = "pypykatz"; homepage = "https://github.com/skelsec/pypykatz"; changelog = "https://github.com/skelsec/pypykatz/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 9e8a876213e8..e3e96571b1e8 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -20,14 +20,14 @@ let in buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.13.3"; + version = "0.13.4"; format = "pyproject"; src = fetchFromGitHub { owner = "pyqtgraph"; repo = "pyqtgraph"; rev = "refs/tags/pyqtgraph-${version}"; - hash = "sha256-kFTNhv8pgIRSJX0ePmp1I0+MGfCaW8b86baIYZ2bZQM="; + hash = "sha256-KVgsfvaVbR3eMRNqhJSBO4Hfk7KJgMdsZjKffx6vt84="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 9acc287798d2..bbc45f49cc37 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -15,7 +15,6 @@ , pytest-asyncio , pytest-mock , pytestCheckHook -, pythonAtLeast , pythonOlder , pythonRelaxDepsHook , qcs-sdk-python @@ -31,7 +30,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "4.6.1"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,13 +39,9 @@ buildPythonPackage rec { owner = "rigetti"; repo = "pyquil"; rev = "refs/tags/v${version}"; - hash = "sha256-93dHujgGEh9/r9epAiUcUCiFCG7SFTAFoQbjQwwKhN0="; + hash = "sha256-jzQv9XBJSxdpSWDEEPuHwYfIemelpmVKJUigpz6NWdo="; }; - patches = [ - ./pydantic.patch - ]; - pythonRelaxDeps = [ "lark" "networkx" diff --git a/pkgs/development/python-modules/pyquil/pydantic.patch b/pkgs/development/python-modules/pyquil/pydantic.patch deleted file mode 100644 index 689e87d65f74..000000000000 --- a/pkgs/development/python-modules/pyquil/pydantic.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 2677758..5bbe863 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -30,7 +30,7 @@ scipy = [ - ] - lark = "^0.11.1" - rpcq = "^3.10.0" --pydantic = "^1.10.7" -+pydantic = ">=1.10.7" - networkx = ">=2.5" - importlib-metadata = { version = ">=3.7.3,<5", python = "<3.8" } - qcs-sdk-python = "0.14.3" -diff --git a/pyquil/external/rpcq.py b/pyquil/external/rpcq.py -index 719eca1..d814d7b 100644 ---- a/pyquil/external/rpcq.py -+++ b/pyquil/external/rpcq.py -@@ -1,6 +1,9 @@ - from typing import Dict, List, Union, Optional, Any - from typing_extensions import Literal --from pydantic import BaseModel, Field -+try: -+ from pydantic.v1 import BaseModel, Field -+except ImportError: -+ from pydantic import BaseModel, Field - from rpcq.messages import TargetDevice as TargetQuantumProcessor - - diff --git a/pkgs/development/python-modules/pyradiomics/default.nix b/pkgs/development/python-modules/pyradiomics/default.nix index 606f542f8f96..2d77f8f1df0b 100644 --- a/pkgs/development/python-modules/pyradiomics/default.nix +++ b/pkgs/development/python-modules/pyradiomics/default.nix @@ -64,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://pyradiomics.readthedocs.io"; description = "Extraction of Radiomics features from 2D and 3D images and binary masks"; + mainProgram = "pyradiomics"; changelog = "https://github.com/AIM-Harvard/pyradiomics/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix index 3aa0d42e2d50..8dc1c5c9426a 100644 --- a/pkgs/development/python-modules/pyrate-limiter/default.nix +++ b/pkgs/development/python-modules/pyrate-limiter/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { "pyrate_limiter" ]; + # The only consumer of this is Lutris (via python-moddb), and it requires 2.x, + # so don't auto-update it and break Lutris every python-updates. + # FIXME: remove when python-moddb updates. + passthru.skipBulkUpdate = true; + meta = with lib; { description = "Python Rate-Limiter using Leaky-Bucket Algorimth Family"; homepage = "https://github.com/vutran1710/PyrateLimiter"; diff --git a/pkgs/development/python-modules/pyrdfa3/default.nix b/pkgs/development/python-modules/pyrdfa3/default.nix index 51f6411cb4fb..6526824fd9ae 100644 --- a/pkgs/development/python-modules/pyrdfa3/default.nix +++ b/pkgs/development/python-modules/pyrdfa3/default.nix @@ -1,16 +1,16 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , html5lib , pythonOlder , rdflib +, requests , setuptools }: buildPythonPackage rec { pname = "pyrdfa3"; - version = "3.5.3"; + version = "3.6.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,27 +18,9 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pyRdfa3"; - hash = "sha256-FXZjqSuH3zRbb2m94jXf9feXiRYI4S/h5PqNrWhxMa4="; + hash = "sha256-c2gdq5V/YJAWlnZziLlWpXaccwvEUdpv+y8ONvGDFMI="; }; - patches = [ - (fetchpatch { - # https://github.com/RDFLib/pyrdfa3/pull/40 - name = "CVE-2022-4396.patch"; - url = "https://github.com/RDFLib/pyrdfa3/commit/ffd1d62dd50d5f4190013b39cedcdfbd81f3ce3e.patch"; - hash = "sha256-prRrOwylYcEqKLr/8LIpyJ5Yyt+6+HTUqH5sQXU8tqc="; - }) - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "'html = pyRdfa.rdflibparsers:StructuredDataParser'" "'html = pyRdfa.rdflibparsers:StructuredDataParser'," \ - --replace "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'" "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'," - # https://github.com/RDFLib/pyrdfa3/issues/31 - substituteInPlace pyRdfa/utils.py \ - --replace "imp," "" - ''; - nativeBuildInputs = [ setuptools ]; @@ -46,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ rdflib html5lib + requests ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index 99fb8bec5f09..51816799034f 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test your project's packaging friendliness"; + mainProgram = "pyroma"; homepage = "https://github.com/regebro/pyroma"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; diff --git a/pkgs/development/python-modules/pyscaffold/default.nix b/pkgs/development/python-modules/pyscaffold/default.nix index ae7d7d5fff9c..c394f9550fdc 100644 --- a/pkgs/development/python-modules/pyscaffold/default.nix +++ b/pkgs/development/python-modules/pyscaffold/default.nix @@ -101,6 +101,7 @@ buildPythonPackage rec { meta = with lib; { description = "Template tool for putting up the scaffold of a Python project"; + mainProgram = "putup"; homepage = "https://pypi.org/project/PyScaffold/"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 6e7a1ec29cbe..b2a0256415d1 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -16,7 +16,7 @@ let in buildPythonPackage rec { - version = "2.0.7"; + version = "2.0.8"; pname = "pyscard"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "LudovicRousseau"; repo = "pyscard"; rev = "refs/tags/${version}"; - hash = "sha256-nkDI1OPQ4SsNhWkg53ZTsG7j0+mvpkJI7dsyaOl1a/8="; + hash = "sha256-UpTSbq4mf42tcSWL8wR54MQDZ+z2YjrTW0Ud2F5/J2E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 779af5e7f4f8..7b60a47c44c3 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyscf"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pyscf"; repo = pname; - rev = "v${version}"; - hash = "sha256-+dZsXiLqqyRWr1eOEVSHZ1KMM760hrDaT07ylZUcGmo="; + rev = "refs/tags/v${version}"; + hash = "sha256-UCchzoYsqeIGViewPf4KedmhYktXLmp5Me4lzb1i8p0="; }; # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. diff --git a/pkgs/development/python-modules/pyscreeze/default.nix b/pkgs/development/python-modules/pyscreeze/default.nix index 4d09929bf0e6..d5261471c8f1 100644 --- a/pkgs/development/python-modules/pyscreeze/default.nix +++ b/pkgs/development/python-modules/pyscreeze/default.nix @@ -7,7 +7,7 @@ , scrot }: buildPythonPackage rec { - pname = "PyScreeze"; + pname = "pyscreeze"; version = "0.1.26"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pysecuritas/default.nix b/pkgs/development/python-modules/pysecuritas/default.nix index 7579e014b69c..0c777bca224d 100644 --- a/pkgs/development/python-modules/pysecuritas/default.nix +++ b/pkgs/development/python-modules/pysecuritas/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client to access Securitas Direct Mobile API"; + mainProgram = "pysecuritas"; homepage = "https://github.com/Cebeerre/pysecuritas"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix index 4da347ad8969..c5a7cdae56a5 100644 --- a/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -8,6 +8,7 @@ , pytest-asyncio , pytest-cases , pytestCheckHook +, pytest_7 , pytz }: @@ -43,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-cases - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix index c5c71810a938..30e5de7abd8d 100644 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysimplegui"; - version = "4.60.5"; + version = "5.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - hash = "sha256-MQFNHMXu8Tc9fpNWT/JgRmJkXMd0qTmx8BqiU+f514s="; + hash = "sha256-bnjPVGMVfma/tn8oCg6FLMI1W+9rtHMKNdarbNg61GM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index c960cfedfdde..b910da5b69e2 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "23.2.2"; + version = "23.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyslurm"; owner = "PySlurm"; rev = "refs/tags/v${version}"; - hash = "sha256-M8seh5pkw2OTiDU4O96D0Lg3+FrlB2w4ehy53kSxyoU="; + hash = "sha256-Qi0XftneKj7hdDiLY2hoRONRrPv49mfQlvlNkudH54Y="; }; patches = [ (fetchpatch { diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix index 6a08234312ab..61283ce4ad3b 100644 --- a/pkgs/development/python-modules/pysmt/default.nix +++ b/pkgs/development/python-modules/pysmt/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for SMT formulae manipulation and solving"; + mainProgram = "pysmt-install"; homepage = "https://github.com/pysmt/pysmt"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pysnmp-lextudio/default.nix b/pkgs/development/python-modules/pysnmp-lextudio/default.nix index 89df55d5fd70..ef50f244a430 100644 --- a/pkgs/development/python-modules/pysnmp-lextudio/default.nix +++ b/pkgs/development/python-modules/pysnmp-lextudio/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pysnmp-lextudio"; - version = "6.0.6"; + version = "6.0.11"; pyproject = true; src = fetchFromGitHub { owner = "lextudio"; repo = "pysnmp"; - rev = "v${version}"; - hash = "sha256-Mbzpe2wVoW4m7hnfsdcSO/8uOgWl5f1sLLqvdpQP2gU="; + rev = "refs/tags/v${version}"; + hash = "sha256-h/FxiGjBZqO82omkVqz+fws398Iz1EkHbZPMYIzG+t0="; }; nativeBuildInputs = [ @@ -57,6 +57,8 @@ buildPythonPackage rec { # pysnmp.smi.error.MibNotFoundError "test_send_v3_trap_notification" "test_addAsn1MibSource" + "test_v1_walk" + "test_v2_walk" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix index 88c38fc59827..f2837b93568e 100644 --- a/pkgs/development/python-modules/pysol-cards/default.nix +++ b/pkgs/development/python-modules/pysol-cards/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generates Solitaire deals"; + mainProgram = "pysol_cards"; homepage = "https://github.com/shlomif/pysol_cards"; license = licenses.mit; maintainers = with maintainers; [ mwolfe ]; diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 1eab58761440..891856f35b8c 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; rev = "refs/tags/v${version}"; - hash = "sha256-jLhM47o6LvkPux0kusOrRk4TDS6VLWE0QMEiQxlBCwo="; + hash = "sha256-JzGrE6zKj16Uzm3EC8ysMbgP5ouA00Gact7NYXbEkXI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index ae1d4f2d1beb..dca383ce6d9c 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/jborean93/pyspnego/blob/v${version}/CHANGELOG.md"; description = "Python SPNEGO authentication library"; + mainProgram = "pyspnego-parse"; homepage = "https://github.com/jborean93/pyspnego"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index 17122d24089e..3c62043d9e7f 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -28,5 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/byroot/pysrt"; license = licenses.gpl3; description = "Python library used to edit or create SubRip files"; + mainProgram = "srt"; }; } diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index 820400e9e4ec..e7632e67905c 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for computing Structured Similarity Image Metric (SSIM) in Python"; + mainProgram = "pyssim"; homepage = "https://github.com/jterrace/pyssim"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix index 3ae2de440750..bd17cd369535 100644 --- a/pkgs/development/python-modules/pysubs2/default.nix +++ b/pkgs/development/python-modules/pysubs2/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/tkarabela/pysubs2"; description = "A Python library for editing subtitle files"; + mainProgram = "pysubs2"; license = licenses.mit; maintainers = with maintainers; [ Benjamin-L ]; }; diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix index a8f8774256b7..8af1c7ff006b 100644 --- a/pkgs/development/python-modules/pysuez/default.nix +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to get water consumption data from Suez"; + mainProgram = "pysuez"; homepage = "https://github.com/ooii/pySuez"; changelog = "https://github.com/ooii/pySuez/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix index d5623fff6313..3909f1626dc3 100644 --- a/pkgs/development/python-modules/pysyncobj/default.nix +++ b/pkgs/development/python-modules/pysyncobj/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for replicating your class"; + mainProgram = "syncobj_admin"; homepage = "https://github.com/bakwc/PySyncObj"; changelog = "https://github.com/bakwc/PySyncObj/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 7b7f23cda452..8a9a3f4cf2fa 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python binding for Tado web API"; + mainProgram = "pytado"; homepage = "https://github.com/wmalgadey/PyTado"; changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index a3fd95133a66..e31ea59c546d 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for the Taglib audio metadata library"; + mainProgram = "pyprinttags"; homepage = "https://github.com/supermihi/pytaglib"; changelog = "https://github.com/supermihi/pytaglib/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index d0f7f79c5636..d369ace859f6 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.18"; + version = "3.3.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CiLZ+FUmawZaKQxkDxYCv0Qs/djFuIVSyQ0eSi41HDg="; + hash = "sha256-Zm/ll6vOFW05euRgJN+SghVmMkSGQc9CVZkRu3h6AQQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix index a5f7b2549185..cdb89a843c13 100644 --- a/pkgs/development/python-modules/pytedee-async/default.nix +++ b/pkgs/development/python-modules/pytedee-async/default.nix @@ -1,14 +1,14 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, setuptools , pythonOlder -, aiohttp +, setuptools }: buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.16"; + version = "0.2.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; rev = "refs/tags/v${version}"; - hash = "sha256-MoAh5YYaZLF99fTFgErXunaLGT9hgInaZTjlDJcpSEw="; + hash = "sha256-5mCHCzoDJ6+ao2guhAtVjvPaAS6Hutn+NwaQIjWDlgo="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 2810332d42bb..0bf5ef3de39f 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.20"; + version = "1.4.21"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-NiAv0zNITpKIQ2TarNoU4HwKuHm22LTu8pJUi0SDlfE="; + hash = "sha256-+P+6EmKpR+qlvLMgeg6iIxSx7jtC995v2eijkjJdc70="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index e8e8056ab811..849006e1f18e 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -93,6 +93,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; + mainProgram = "pytensor-cache"; homepage = "https://github.com/pymc-devs/pytensor"; changelog = "https://github.com/pymc-devs/pytensor/releases"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 77dd73e30155..f6a220c02eba 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/pytesseract/"; license = licenses.asl20; description = "A Python wrapper for Google Tesseract"; + mainProgram = "pytesseract"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index fd81aab3838a..8b74f5314930 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.23.5"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "0.23.5.post1"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = "pytest-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-sA9ix69oywr1D6ByAxzAFWrAPHJOuq4C8UMiMNkmGJs="; + hash = "sha256-k+EmbUptZB2ZLiygwY9WwFA4PNJA+9fEAZYu0xaPZSQ="; }; outputs = [ diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix index a6aa15890b85..1d8a3cb6396a 100644 --- a/pkgs/development/python-modules/pytest-base-url/default.nix +++ b/pkgs/development/python-modules/pytest-base-url/default.nix @@ -1,9 +1,11 @@ { lib , fetchFromGitHub , buildPythonPackage -, poetry-core +, hatchling +, hatch-vcs , pytest , pytest-localserver +, pytest-metadata , requests , pytestCheckHook , pythonOlder @@ -11,20 +13,21 @@ buildPythonPackage rec { pname = "pytest-base-url"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytest-dev"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-v6pLejWNeb9Do6x2EJqmLKj8DNqcMtmYIs+7iDYsbjk="; + repo = "pytest-base-url"; + rev = "refs/tags/${version}"; + hash = "sha256-3P3Uk3QoznAtNODLjXFbeNn3AOfp9owWU2jqkxTEAa4="; }; nativeBuildInputs = [ - poetry-core + hatchling + hatch-vcs ]; buildInputs = [ @@ -40,6 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-localserver + pytest-metadata ]; pytestFlagsArray = [ @@ -58,7 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "pytest plugin for URL based tests"; homepage = "https://github.com/pytest-dev/pytest-base-url"; - changelog = "https://github.com/pytest-dev/pytest-base-url/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/pytest-dev/pytest-base-url/blob/${src.rev}/CHANGES.rst"; license = licenses.mpl20; maintainers = with maintainers; [ sephi ]; }; diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index b5b558a0faf5..3660dc709f31 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "BDD library for the pytest"; + mainProgram = "pytest-bdd"; homepage = "https://github.com/pytest-dev/pytest-bdd"; license = licenses.mit; maintainers = with maintainers; [ jm2dev ]; diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 6bb6463d0088..e49f02ce30dc 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,38 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pytest +, pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "pytest-dependency"; - version = "0.5.1"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wqiSkGGSZj+FAwpquRME5QjlRs3f5VfWktYexXodlGs="; + hash = "sha256-k0sOajnZWZUGLBk/fq7tio/6Bv8bzvS2Kw3HSnCLrME="; }; - patches = [ - # Fix build with pytest >= 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51 - (fetchpatch { - url = "https://github.com/RKrahl/pytest-dependency/commit/0930889a13e2b9baa7617f05dc9b55abede5209d.patch"; - hash = "sha256-xRreoIz8+yW0mAUb4FvKVlPjALzMAZDmdpbmDKRISE0="; - }) + nativeBuildInputs = [ + setuptools ]; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "pytest_dependency" + ]; meta = with lib; { homepage = "https://github.com/RKrahl/pytest-dependency"; + changelog = "https://github.com/RKrahl/pytest-dependency/blob/${version}/CHANGES.rst"; description = "Manage dependencies of tests"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 531ad08dec46..af7169bffc60 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "4.7.0"; + version = "4.8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ktb9RrHXm1T7awYLuzlCgHM5bOxxfV8uEiqZDUtqpeg="; + hash = "sha256-XQVP4BHFbzsQ+Xj0Go77Llrfx+aA7zb7VxraHyR3nZA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index d4f5a3c5c5ab..c54179d9b690 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, gitMinimal , numpy , packaging , pytest @@ -12,16 +13,21 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "1.0.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9lBEDcrt4T7W19pzv7SsWF1AqAREujVC0+buzbJ11J8="; + hash = "sha256-xa12Oi+uXu5bZ4jPVedU1AQOxJsOIoj8ncmgFe+buTI="; }; + postPatch = '' + substituteInPlace pytest_doctestplus/plugin.py \ + --replace-fail '"git"' '"${lib.getExe gitMinimal}"' + ''; + nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 054170408be6..af173182f313 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-filter-subpackage"; - version = "0.1.2"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-H66jZxeAPlJFiNbBCdJtINOzRCLo1qloEnWJd9ygF4I="; + hash = "sha256-P0aPGzZRgSiGm5Xeq2YbpF7WKThUMp/vFNpMjKx4r1Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 2aa92cc3e21f..c7ed502e7a41 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -1,7 +1,10 @@ { lib +, stdenv , buildPythonPackage , pythonOlder +, pythonAtLeast , fetchFromGitHub +, fetchpatch2 , setuptools , setuptools-scm , wheel @@ -25,6 +28,15 @@ buildPythonPackage rec { hash = "sha256-owkGwF5WQ17/CXwTsIYJ2AgktekRB4qhtsDxR0LCI/k="; }; + patches = [ + (fetchpatch2 { + # https://github.com/pytest-dev/pytest-forked/actions + name = "pytest8-compat.patch"; + url = "https://github.com/pytest-dev/pytest-forked/commit/b2742322d39ebda97d5170922520f3bb9c73f614.patch"; + hash = "sha256-tTRW0p3tOotQMtjjJ6RUKdynsAnKRz0RAV8gAUHiNNA="; + }) + ]; + nativeBuildInputs = [ setuptools setuptools-scm @@ -44,6 +56,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = if (pythonAtLeast "3.12" && stdenv.isDarwin && stdenv.isx86_64) then [ + # non reproducible test failure on hydra, works on community builder + # https://hydra.nixos.org/build/252537267 + "test_xfail" + ] else null; + setupHook = ./setup-hook.sh; meta = { diff --git a/pkgs/development/python-modules/pytest-harvest/default.nix b/pkgs/development/python-modules/pytest-harvest/default.nix index 32c195171934..3cfcd6635997 100644 --- a/pkgs/development/python-modules/pytest-harvest/default.nix +++ b/pkgs/development/python-modules/pytest-harvest/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pytest-harvest"; - version = "1.10.4"; + version = "1.10.5"; pyproject = true; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "smarie"; repo = "python-pytest-harvest"; rev = "refs/tags/${version}"; - hash = "sha256-ebzE63d7zt9G9HgbLHaE/USZZpUd3y3vd0kNdT/wWw0="; + hash = "sha256-s8QiuUFRTTRhSpLa0DHScKFC9xdu+w2rssWCg8sIjsg="; }; # create file, that is created by setuptools_scm diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 2c825897edb1..5759f180ff70 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.8"; - format = "pyproject"; + version = "1.0.10"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "csernazs"; - repo = pname; + repo = "pytest-httpserver"; rev = "refs/tags/${version}"; - hash = "sha256-hbhS1kL5VNiGjvnYkDI1LwgkqqfBMqgcao3zy716q+A="; + hash = "sha256-KCsZs4MGENByF/wB+aj3yvMp7lssHNVKx8jLhDQ1u4k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix index 1b49ea4ce8e5..b4006b700783 100644 --- a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix +++ b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix @@ -1,26 +1,41 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-lazy-fixture"; version = "0.6.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "1b0hmnsxw4s2wf9pks8dg6dfy5cx3zcbzs8517lfccxsfizhqz8f"; }; + patches = [ + # fix build with pytest>=8 + # https://github.com/TvoroG/pytest-lazy-fixture/issues/65#issuecomment-1915829980 + ./pytest-8-compatible.patch + ]; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ + "pytest_lazyfixture" + ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Helps to use fixtures in pytest.mark.parametrize"; - homepage = "https://github.com/pytest-dev/pytest-repeat"; + homepage = "https://github.com/tvorog/pytest-lazy-fixture"; license = licenses.mit; maintainers = with maintainers; [ tobim ]; }; diff --git a/pkgs/development/python-modules/pytest-lazy-fixture/pytest-8-compatible.patch b/pkgs/development/python-modules/pytest-lazy-fixture/pytest-8-compatible.patch new file mode 100644 index 000000000000..26fcd7716667 --- /dev/null +++ b/pkgs/development/python-modules/pytest-lazy-fixture/pytest-8-compatible.patch @@ -0,0 +1,66 @@ +diff --git a/pytest_lazyfixture.py b/pytest_lazyfixture.py +index abf5db5..df83ce7 100644 +--- a/pytest_lazyfixture.py ++++ b/pytest_lazyfixture.py +@@ -71,14 +71,13 @@ def pytest_make_parametrize_id(config, val, argname): + def pytest_generate_tests(metafunc): + yield + +- normalize_metafunc_calls(metafunc, 'funcargs') +- normalize_metafunc_calls(metafunc, 'params') ++ normalize_metafunc_calls(metafunc) + + +-def normalize_metafunc_calls(metafunc, valtype, used_keys=None): ++def normalize_metafunc_calls(metafunc, used_keys=None): + newcalls = [] + for callspec in metafunc._calls: +- calls = normalize_call(callspec, metafunc, valtype, used_keys) ++ calls = normalize_call(callspec, metafunc, used_keys) + newcalls.extend(calls) + metafunc._calls = newcalls + +@@ -98,17 +97,21 @@ def copy_metafunc(metafunc): + return copied + + +-def normalize_call(callspec, metafunc, valtype, used_keys): ++def normalize_call(callspec, metafunc, used_keys): + fm = metafunc.config.pluginmanager.get_plugin('funcmanage') + + used_keys = used_keys or set() +- valtype_keys = set(getattr(callspec, valtype).keys()) - used_keys ++ keys = set(callspec.params.keys()) - used_keys ++ print(used_keys, keys) + +- for arg in valtype_keys: +- val = getattr(callspec, valtype)[arg] ++ for arg in keys: ++ val = callspec.params[arg] + if is_lazy_fixture(val): + try: +- _, fixturenames_closure, arg2fixturedefs = fm.getfixtureclosure([val.name], metafunc.definition.parent) ++ if pytest.version_tuple >= (8, 0, 0): ++ fixturenames_closure, arg2fixturedefs = fm.getfixtureclosure(metafunc.definition.parent, [val.name], {}) ++ else: ++ _, fixturenames_closure, arg2fixturedefs = fm.getfixtureclosure([val.name], metafunc.definition.parent) + except ValueError: + # 3.6.0 <= pytest < 3.7.0; `FixtureManager.getfixtureclosure` returns 2 values + fixturenames_closure, arg2fixturedefs = fm.getfixtureclosure([val.name], metafunc.definition.parent) +@@ -117,14 +120,14 @@ def normalize_call(callspec, metafunc, valtype, used_keys): + fixturenames_closure, arg2fixturedefs = fm.getfixtureclosure([val.name], current_node) + + extra_fixturenames = [fname for fname in fixturenames_closure +- if fname not in callspec.params and fname not in callspec.funcargs] ++ if fname not in callspec.params]# and fname not in callspec.funcargs] + + newmetafunc = copy_metafunc(metafunc) + newmetafunc.fixturenames = extra_fixturenames + newmetafunc._arg2fixturedefs.update(arg2fixturedefs) + newmetafunc._calls = [callspec] + fm.pytest_generate_tests(newmetafunc) +- normalize_metafunc_calls(newmetafunc, valtype, used_keys | set([arg])) ++ normalize_metafunc_calls(newmetafunc, used_keys | set([arg])) + return newmetafunc._calls + + used_keys.add(arg) diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 7b4a285e3552..d4eb108053b1 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-metadata"; - version = "3.0.0"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_metadata"; inherit version; - hash = "sha256-dpqcZdKIS9WDvGJrCs53rRXb4C3ZGpEG1H/UbZwlaco="; + hash = "sha256-0qKbA1X7wD8WiqltQf+IsaO0SjsCrL5JGAHJigSAF8g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-plt/default.nix b/pkgs/development/python-modules/pytest-plt/default.nix index c1163516500e..55051359d7e4 100644 --- a/pkgs/development/python-modules/pytest-plt/default.nix +++ b/pkgs/development/python-modules/pytest-plt/default.nix @@ -7,14 +7,18 @@ buildPythonPackage rec { pname = "pytest-plt"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-IkTNlierFXIG9WSVUfVoirfQ6z7JOYlCaa5NhnBSuxc="; + hash = "sha256-TOuyVH2wKKruy7SBNW3z62yzpmBT6l6RcKhoO1XUFhE="; }; + postPatch = '' + sed -i '/addopts =/d' setup.cfg + ''; + nativeCheckInputs = [ pytestCheckHook matplotlib diff --git a/pkgs/development/python-modules/pytest-runner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix index ddea7f405bcf..f0c7acda466a 100644 --- a/pkgs/development/python-modules/pytest-runner/default.nix +++ b/pkgs/development/python-modules/pytest-runner/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "6.0.0"; + version = "6.0.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-tNhTYu0ptMNIZ43nl99Djw8FCUl924xkcJbAKm2HtoU="; + hash = "sha256-cNRzlYWnAI83v0kzwBP9sye4h4paafy7MxbIiILw9Js="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index b0b5e8bfb98a..29f26251b022 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.7.0"; + version = "1.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "07vdv3y89qzv89ws0y48h92yplqsx208b9cizx80w644dazb398g"; + sha256 = "sha256-xecz0gqNDnc8pRPjYOS6JkeVLqlCj6K9BVFsYoHqPOc="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index f8f207c64b6a..60b81487a987 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -5,6 +5,7 @@ , pytest , setuptools-scm , pytestCheckHook +, pytest_7 , pythonOlder }: @@ -35,7 +36,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + # https://github.com/joseph-roitman/pytest-snapshot/issues/71 + (pytestCheckHook.override { pytest = pytest_7; }) ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix index 67ee191b85cb..9a420c1a0986 100644 --- a/pkgs/development/python-modules/pytest-socket/default.nix +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "pytest-socket"; - version = "0.6.0"; - format = "pyproject"; + version = "0.7.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "miketheman"; - repo = pname; + repo = "pytest-socket"; rev = "refs/tags/${version}"; - hash = "sha256-RPHpqknjpuAMXYg4nFOtLp8CXh10/w0RuO/bseTBN5o="; + hash = "sha256-19YF3q85maCVdVg2HOOPbN45RNjBf6kiFAhLut8B2tQ="; }; nativeBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest Plugin to disable socket calls during tests"; homepage = "https://github.com/miketheman/pytest-socket"; + changelog = "https://github.com/miketheman/pytest-socket/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index eb292e61537d..d9afd5f0c9a9 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.11.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UYZciEV1RfUftyARlC8KPGkB7p4ky/ttG53BNIuvvjc="; + hash = "sha256-1mBdy4hkfgt8GInQJ/jvHBfXosYJJ+v9wJx7DYEgR20="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index e916e0e00516..8076c639e7d4 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-sugar"; - version = "0.9.7"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8edMGr+lX3JBz3CIAytuN4Vm8WuTjz8IkF4s9ElO3UY="; + hash = "sha256-ZCLoMlj1sMBM58YyF2x3Msq1/bkJyznMpckTn4EnbAo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index c0a97dd414ac..3ea96b52634c 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "2.2.0"; + version = "2.3.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-OwuV2r88tQusnvXKkS+gz8KGUmrxevyAaCTfIML3LJA="; + hash = "sha256-Ejl3KRJcbsvaygEDW55SOdTblzUjIK8VWz9d4bpRZdk="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index 198d21083e27..37aaf0038052 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-twisted"; - version = "1.14.0"; + version = "1.14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IJv1pkUs+/th3o8BWQLBTsgSZACRFQcHS7LuTOjf4xM="; + sha256 = "sha256-qbGLyfykfSiG+O/j/SeHmoHxwLtJ8cVgZmyedkSRtjI="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix index b47536983e6a..b14a1e12ada5 100644 --- a/pkgs/development/python-modules/pytest-unordered/default.nix +++ b/pkgs/development/python-modules/pytest-unordered/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest +, pytest_7 , pytestCheckHook }: @@ -22,7 +23,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + # https://github.com/utapyngo/pytest-unordered/issues/15 + (pytestCheckHook.override { pytest = pytest_7; }) ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix new file mode 100644 index 000000000000..835e8ff42b3c --- /dev/null +++ b/pkgs/development/python-modules/pytest/7.nix @@ -0,0 +1,116 @@ +{ lib +, buildPythonPackage +, callPackage +, pythonOlder +, fetchPypi +, writeText + +# build-system +, setuptools +, setuptools-scm + +# dependencies +, attrs +, exceptiongroup +, iniconfig +, packaging +, pluggy +, tomli + +# optional-dependencies +, argcomplete +, hypothesis +, mock +, nose +, pygments +, requests +, xmlschema +}: + +let self = buildPythonPackage rec { + pname = "pytest"; + version = "7.4.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LPAAWSLGrOSj4uyLQIDrDZdT/ckxB0FTMvUM6eeZQoA="; + }; + + outputs = [ + "out" + "testout" + ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + iniconfig + packaging + pluggy + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + tomli + ]; + + passthru.optional-dependencies = { + testing = [ + argcomplete + attrs + hypothesis + mock + nose + pygments + requests + setuptools + xmlschema + ]; + }; + + postInstall = '' + mkdir $testout + cp -R testing $testout/testing + ''; + + doCheck = false; + passthru.tests.pytest = callPackage ./tests.nix { + pytest = self; + }; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + preDistPhases+=" pytestcachePhase" + + # pytest generates it's own bytecode files to improve assertion messages. + # These files similar to cpython's bytecode files but are never laoded + # by python interpreter directly. We remove them for a few reasons: + # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292 + # (file headers are generatedt by pytest directly and contain timestamps) + # - files are not needed after tests are finished + pytestRemoveBytecodePhase () { + # suffix is defined at: + # https://github.com/pytest-dev/pytest/blob/7.2.1/src/_pytest/assertion/rewrite.py#L51-L53 + find $out -name "*-pytest-*.py[co]" -delete + } + preDistPhases+=" pytestRemoveBytecodePhase" + ''; + + pythonImportsCheck = [ + "pytest" + ]; + + meta = with lib; { + description = "Framework for writing tests"; + homepage = "https://docs.pytest.org"; + changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + }; +}; +in self diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 88398d5ab438..86dc3f8f9aef 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.4.4"; + version = "8.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LPAAWSLGrOSj4uyLQIDrDZdT/ckxB0FTMvUM6eeZQoA="; + hash = "sha256-1AUdYjouC35RlgupYxk7Cc5trrl1mkUYRKIeTd7fwb0="; }; outputs = [ diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix index 1e56b59c1fd4..4c4d9b367993 100644 --- a/pkgs/development/python-modules/python-barcode/default.nix +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Create standard barcodes with Python"; + mainProgram = "python-barcode"; homepage = "https://github.com/WhyNotHugo/python-barcode"; changelog = "https://github.com/WhyNotHugo/python-barcode/blob/v${version}/docs/changelog.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index ea180de55d56..c88a2de6a177 100644 --- a/pkgs/development/python-modules/python-bidi/default.nix +++ b/pkgs/development/python-modules/python-bidi/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/MeirKriheli/python-bidi"; description = "Pure python implementation of the BiDi layout algorithm"; + mainProgram = "pybidi"; platforms = platforms.unix; maintainers = with maintainers; [ freezeboy ]; }; diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index baff1ddce3fe..037d93adb4a6 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "OpenStack Block Storage API Client Library"; + mainProgram = "cinder"; homepage = "https://github.com/openstack/python-cinderclient"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/python-dateutil/default.nix index fb7280fd2a16..dd7cc0f2ea1a 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/python-dateutil/default.nix @@ -1,28 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , setuptools-scm , six }: buildPythonPackage rec { pname = "python-dateutil"; - version = "2.8.2"; + version = "2.9.0.post0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY="; + hash = "sha256-N91UII2n4c2HU4ghfV4A69QXkkn5D7ckN+kaNUWaCtM="; }; - patches = [ - # https://github.com/dateutil/dateutil/pull/1285 - (fetchpatch { - url = "https://github.com/dateutil/dateutil/commit/f2293200747fb03d56c6c5997bfebeabe703576f.patch"; - relative = "src"; - hash = "sha256-BVEFGV/WGUz9H/8q+l62jnyN9VDnoSR71DdL+LIkb0o="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools_scm<8.0" "setuptools_scm" + ''; nativeBuildInputs = [ setuptools-scm ]; @@ -42,6 +38,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/dateutil/dateutil/blob/${version}/NEWS"; description = "Powerful extensions to the standard datetime module"; homepage = "https://github.com/dateutil/dateutil/"; license = with licenses; [ asl20 bsd3 ]; diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 7d296d4be06d..2a676f72832e 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -20,14 +20,14 @@ let ''; in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.29.1"; + version = "0.31.1"; format = "setuptools"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sfvVLPTSTXjwyB0a2NyDIONv01FXZ40nHZwwo3oqI90="; + hash = "sha256-DdV78o089Jkc7mSsGvlJgVpv8kPpMILo7lC6EbLxkxg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index 316f55e4a89d..364f40f7ce26 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2024.2"; + version = "2024.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "python"; repo = "python-docs-theme"; rev = "refs/tags/${version}"; - hash = "sha256-5qn/bROc3wekTyYq+e7rLpJjeI8IBByKvrOE4Kw0fjQ="; + hash = "sha256-caQqoXKdKA0W5qLphYbTxrP8Qx5teJD5+MSyaifyf/A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 0854d354c2fe..5a860279bc46 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Add .env support to your django/flask apps in development and deployments"; + mainProgram = "dotenv"; homepage = "https://github.com/theskumar/python-dotenv"; license = licenses.bsdOriginal; maintainers = with maintainers; [ erikarvstedt ]; diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 5a347071f620..c1c433ddd2db 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.13.1"; + version = "0.14.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = "python-fsutil"; rev = "refs/tags/${version}"; - hash = "sha256-yY8hhw6uNKqrcj0geoQeGN/JCDJVja7pCPUHwoViL64="; + hash = "sha256-Cs78zpf3W5UZJkkUBEP6l6fi2J4OtJXGvqqQ8PWKx+8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix index d505e0a19654..8e7de3b6a336 100644 --- a/pkgs/development/python-modules/python-fx/default.nix +++ b/pkgs/development/python-modules/python-fx/default.nix @@ -92,6 +92,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to view JSON in a TUI"; + mainProgram = "pyfx"; homepage = "https://github.com/cielong/pyfx"; changelog = "https://github.com/cielong/pyfx/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 6931a0d4ee45..3703843091d2 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interact with GitLab API"; + mainProgram = "gitlab"; homepage = "https://github.com/python-gitlab/python-gitlab"; changelog = "https://github.com/python-gitlab/python-gitlab/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index de8c5d000163..9fd1f21a083d 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "python-glanceclient"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ejZuH/Zr23bmJ+7PfNQFO9lPNfo83GkNKa/0fpduBTI="; + hash = "sha256-ZGTE1be+S/4Tbhw6Px+9qMgkNTZgoDn6lnAJhNvVYuA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 03290d2e99c5..95ebc2b954e8 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-VnS61Ok4dsCw0xl+MU1/lC05AYvzHiuDP2eIpoE8P7g="; + hash = "sha256-AdgBOTHJ+j9Fgku+pwVMA9bhHyWKcufghuFo28uRhUw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index 2319ecda0bfe..d29b07a94e50 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -65,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Heat built on the Heat orchestration API"; + mainProgram = "heat"; homepage = "https://github.com/openstack/python-heatclient"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/python-hl7/default.nix b/pkgs/development/python-modules/python-hl7/default.nix index 98a73c8252ba..1c2b05860869 100644 --- a/pkgs/development/python-modules/python-hl7/default.nix +++ b/pkgs/development/python-modules/python-hl7/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple library for parsing messages of Health Level 7 (HL7) version 2.x into Python objects"; + mainProgram = "mllp_send"; homepage = "https://python-hl7.readthedocs.org"; changelog = "https://python-hl7.readthedocs.io/en/latest/changelog.html"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/python-hpilo/default.nix b/pkgs/development/python-modules/python-hpilo/default.nix index 8ee2dafc47b2..6fdfc5d14031 100644 --- a/pkgs/development/python-modules/python-hpilo/default.nix +++ b/pkgs/development/python-modules/python-hpilo/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to access the HP iLO XML interface"; + mainProgram = "hpilo_cli"; homepage = "https://seveas.github.io/python-hpilo/"; license = with licenses; [ asl20 gpl3Plus ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/python-idzip/default.nix b/pkgs/development/python-modules/python-idzip/default.nix index 6c64bb6c257e..c754bb144554 100644 --- a/pkgs/development/python-modules/python-idzip/default.nix +++ b/pkgs/development/python-modules/python-idzip/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Seekable, gzip compatible, compression format"; + mainProgram = "idzip"; homepage = "https://github.com/bauman/python-idzip"; changelog = "https://github.com/bauman/python-idzip/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index b6ded2ff8c2c..4cb05be7257b 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python IPMI Library"; + mainProgram = "ipmitool.py"; homepage = "https://github.com/kontron/python-ipmi"; license = with licenses; [ lgpl2Plus ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 5839498bbe96..7e9a3b4ee7c2 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "A client for OpenStack bare metal provisioning API, includes a Python module (ironicclient) and CLI (baremetal)."; + mainProgram = "baremetal"; homepage = "https://github.com/openstack/python-ironicclient"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 2c5262a47ec1..807d5d5af9a7 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for TP-Link Kasa Smarthome products"; + mainProgram = "kasa"; homepage = "https://python-kasa.readthedocs.io/"; changelog = "https://github.com/python-kasa/python-kasa/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/python-linux-procfs/default.nix b/pkgs/development/python-modules/python-linux-procfs/default.nix index f6593574a7f2..e72b2e362098 100644 --- a/pkgs/development/python-modules/python-linux-procfs/default.nix +++ b/pkgs/development/python-modules/python-linux-procfs/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python classes to extract information from the Linux kernel /proc files"; + mainProgram = "pflags"; homepage = "https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ elohmeier ]; diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix index c6161735d435..b9f264755991 100644 --- a/pkgs/development/python-modules/python-louvain/default.nix +++ b/pkgs/development/python-modules/python-louvain/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/taynaud/python-louvain"; description = "Louvain Community Detection"; + mainProgram = "community"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index 59b4cdaa76f0..6387e833b7fc 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -7,6 +7,7 @@ , python-lsp-server , setuptools , tomli +, fetchpatch }: buildPythonPackage rec { @@ -22,6 +23,17 @@ buildPythonPackage rec { hash = "sha256-nV6mePSWzfPW2RwXg/mxgzfT9wD95mmTuPnPEro1kEY="; }; + patches = + /** fix test failure with black<24.2.0; + remove this patch once python-lsp-black>2.0.0 */ + lib.optional + (with lib; (versionOlder version "2.0.1") && (versionAtLeast black.version "24.2.0")) + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/python-lsp/python-lsp-black/pull/56.patch"; + hash = "sha256-38bYU27+xtA8Kq3appXTkNnkG5/XgrUJ2nQ5+yuSU2U="; + }) + ++ [ ]; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 9d5630a22360..881e7e33d91b 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.10.0"; + version = "1.10.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dh33m7wgOwUETjdNqqDKZnpTgbrYCg9/XXC296tHm4w="; + hash = "sha256-tY+BE8DAajZKwlZ2D7uCr9LC7D61ULkhV8Z9EpRu6j0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 4a79b823ef05..b2fbfef19f8c 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library for OpenStack Manila API"; + mainProgram = "manila"; homepage = "https://github.com/openstack/python-manilaclient"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index a451aed79092..034a90844508 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -129,6 +129,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/home-assistant-libs/python-matter-server/releases/tag/${version}"; description = "Python server to interact with Matter"; + mainProgram = "matter-server"; homepage = "https://github.com/home-assistant-libs/python-matter-server"; license = licenses.asl20; maintainers = teams.home-assistant.members; diff --git a/pkgs/development/python-modules/python-mystrom/default.nix b/pkgs/development/python-modules/python-mystrom/default.nix index 2d663e71ff89..5b2f76d2571e 100644 --- a/pkgs/development/python-modules/python-mystrom/default.nix +++ b/pkgs/development/python-modules/python-mystrom/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API client for interacting with myStrom devices"; + mainProgram = "mystrom"; longDescription = '' Asynchronous Python API client for interacting with myStrom devices. There is support for bulbs, motion sensors, plugs and buttons. diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index 866e4cb097ec..8ce053cab37c 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "18.5.0"; + version = "18.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4j7kQMDI6uK1OvqIHTCsrsBof8660kY5HsKblsVDA40="; + hash = "sha256-VzwQqkILCJjTX7FG7di7AFgGv/8BMa4rWjDKIqyJR3s="; }; propagatedBuildInputs = [ @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library for OpenStack Compute API"; + mainProgram = "nova"; homepage = "https://github.com/openstack/python-novaclient"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/python-nvd3/default.nix b/pkgs/development/python-modules/python-nvd3/default.nix index 7abdfd1ab3d5..3674cb9bf568 100644 --- a/pkgs/development/python-modules/python-nvd3/default.nix +++ b/pkgs/development/python-modules/python-nvd3/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/areski/python-nvd3"; description = "Python Wrapper for NVD3 - It's time for beautiful charts"; + mainProgram = "nvd3"; license = licenses.mit; maintainers = [ maintainers.ivan-tkatchev ]; }; diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix index 791bf2545051..3cd8f85e6a40 100644 --- a/pkgs/development/python-modules/python-on-whales/default.nix +++ b/pkgs/development/python-modules/python-on-whales/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-on-whales"; - version = "0.68.0"; + version = "0.69.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gabrieldemarmiesse"; repo = "python-on-whales"; rev = "refs/tags/v${version}"; - hash = "sha256-S9IfCCGMVXo7IPyOtu7TIeWRovE1fLQ9pjRO6tVJ4bU="; + hash = "sha256-2ZrbiHvcYwerhGQmtC/903W/WpuqgYqapRzLpu30sRs="; }; nativeBuildInputs = [ setuptools ]; @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Docker client for Python, designed to be fun and intuitive"; + mainProgram = "python-on-whales"; homepage = "https://github.com/gabrieldemarmiesse/python-on-whales"; changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 79306e4d11ab..9663fce022f1 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "6.5.0"; + version = "6.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-EvwZNH9rGb/iw28Rx6GEH0FaLufxi5WUE8ISGZe4SVE="; + hash = "sha256-u+8e00gpxBBSsuyiZIDinKH3K+BY0UMNpTQexExPKVw="; }; nativeBuildInputs = [ @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "OpenStack Command-line Client"; + mainProgram = "openstack"; homepage = "https://github.com/openstack/python-openstackclient"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 790f1e58c295..496987c94e4a 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -1,27 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, six +, setuptools }: buildPythonPackage rec { pname = "python-ptrace"; - version = "0.9.8"; - format = "setuptools"; + version = "0.9.9"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1e3bc6223f626aaacde8a7979732691c11b13012e702fee9ae16c87f71633eaa"; + hash = "sha256-Vrv+9E6vOne+SBOMyldnzfRx6CeP4Umfm3LxUZB/Jc8="; }; + nativeBuildInputs = [ + setuptools + ]; + # requires distorm, which is optionally doCheck = false; - propagatedBuildInputs = [ six ]; - meta = with lib; { description = "Python binding of ptrace library"; homepage = "https://github.com/vstinner/python-ptrace"; + changelog = "https://github.com/vstinner/python-ptrace/blob/${version}/doc/changelog.rst"; license = licenses.gpl2; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index ec103fc421a4..d874ec9c2a7a 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.40.0"; + version = "0.41.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,12 +28,12 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-H4xwgulNLs3R1Q5GhvQffpAZ1CWXZUJAja8BskW+YJk="; + hash = "sha256-Kh7u1UWqmfmxY6yWaBaUpe20Xc/DTryoymKgIYg/kiM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "poetry-core==1.7.1" "poetry-core" + --replace "poetry-core==1.8.0" "poetry-core" ''; pythonRelaxDeps = [ @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library & console tool for controlling Roborock vacuum"; + mainProgram = "roborock"; homepage = "https://github.com/humbertogontijo/python-roborock"; changelog = "https://github.com/humbertogontijo/python-roborock/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix new file mode 100644 index 000000000000..d5becf5d8626 --- /dev/null +++ b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, python3 +, pkg-config +}: + +python3.pkgs.buildPythonPackage { + pname = "python-secp256k1-cardano"; + version = "0.2.3"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "OpShin"; + repo = "python-secp256k1"; + rev = "5a8f761a4b9a1594653cc4deebadc3398b07533c"; # No tags in repo + hash = "sha256-6bE4/G2gW2F8h5FWtI3TZ6FtijsB/slvFT/SIVv7VIY="; + }; + + nativeBuildInputs = [ pkg-config ]; + + propagatedBuildInputs = with python3.pkgs; [ cffi secp256k1 ]; + + nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; + + # Tests expect .so files and are failing + doCheck = false; + + preConfigure = '' + cp -r ${python3.pkgs.secp256k1.src} libsecp256k1 + export INCLUDE_DIR=${python3.pkgs.secp256k1}/include + export LIB_DIR=${python3.pkgs.secp256k1}/lib + ''; + + meta = { + homepage = "https://github.com/OpShin/python-secp256k1"; + description = "A fork of python-secp256k1, fixing the commit hash of libsecp256k1 to a Cardano compatible version"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 6ad8a1dc9a54..39ce7b39baca 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Slugify application that handles Unicode"; + mainProgram = "slugify"; homepage = "https://github.com/un33k/python-slugify"; changelog = "https://github.com/un33k/python-slugify/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index 069b57bd8c89..d33bdc77f8b0 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the snap7 PLC communication library"; + mainProgram = "snap7-server"; homepage = "https://github.com/gijzelaerr/python-snap7"; license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index 05fcdda421dc..1dfb5b83a6b5 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -1,31 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy +, cramjam +, setuptools , snappy -, cffi , unittestCheckHook }: buildPythonPackage rec { pname = "python-snappy"; - version = "0.6.1"; - format = "setuptools"; + version = "0.7.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tqEHqwYgasxTWdTFYyvZsi1EhwKnmzFpsMYuD7gIuyo="; + hash = "sha256-G8KdNiEdRLufBPPXzPuurrvC9ittQPT8Tt0fsWvFLBM="; }; + build-system = [ + cramjam + setuptools + ]; + buildInputs = [ snappy ]; - propagatedBuildInputs = lib.optional isPyPy cffi; + dependencies = [ + cramjam + ]; nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Python library for the snappy compression library from Google"; - homepage = "https://github.com/andrix/python-snappy"; + homepage = "https://github.com/intake/python-snappy"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 77f694dbb249..3bf501791b30 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.4.3"; + version = "2.4.4"; format = "setuptools"; disabled = pythonOlder "3.6.2"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-go8MH/ZW+W4aBOqscvcGim8KOW249sSCrmvCMLrQ5HU="; + hash = "sha256-c1fjSHi7LvaOeZwTOTSY/ZVr27/j03CdAra1PSa9Jt0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix index 916288860fb5..0a8e0abafff4 100644 --- a/pkgs/development/python-modules/python-songpal/default.nix +++ b/pkgs/development/python-modules/python-songpal/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interfacing with Sony's Songpal devices"; + mainProgram = "songpal"; homepage = "https://github.com/rytilahti/python-songpal"; changelog = "https://github.com/rytilahti/python-songpal/blob/release/${version}/CHANGELOG.md"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index f251b47c6086..d8bdc0574dc9 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -3,26 +3,31 @@ , fetchPypi , pytestCheckHook , pythonOlder +, setuptools , zeep }: buildPythonPackage rec { pname = "python-stdnum"; - version = "1.19"; - format = "setuptools"; + version = "1.20"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ez7IL1Y5DqdMGQVp6Y8vsUuGmAix1UeFcI8i0P6tiz8="; + hash = "sha256-rSos8usCXeQIIQI182tK4xJS3jGGJAzKqBJuEXy4JpA="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace " --cov=stdnum --cov-report=term-missing:skip-covered --cov-report=html" "" + --replace-fail " --cov=stdnum --cov-report=term-missing:skip-covered --cov-report=html" "" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index 8c0239e2bc50..4e7c02371071 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/openstack/python-swiftclient"; description = "Python bindings to the OpenStack Object Storage API"; + mainProgram = "swift"; license = licenses.asl20; maintainers = teams.openstack.members; }; diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index acfd14d7d5ef..a273b33a2084 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python binding for Tado web API. Pythonize your central heating!"; + mainProgram = "pytado"; homepage = "https://github.com/wmalgadey/PyTado"; changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 9ac37aa4f596..238f5742ccc8 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "20.8"; + version = "21.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-FvVUl0bV95IDPbG+6N9b3ZIsnLAUwVcdS4cu0I1aNDw="; + hash = "sha256-jyDEfHkbB95fzFkRFKgV4y46AxT+yUPwfq1DJ3sF//I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ulid/default.nix b/pkgs/development/python-modules/python-ulid/default.nix index e70c1004ecf7..af437c8f23fe 100644 --- a/pkgs/development/python-modules/python-ulid/default.nix +++ b/pkgs/development/python-modules/python-ulid/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "ULID implementation for Python"; + mainProgram = "ulid"; homepage = "https://github.com/mdomke/python-ulid"; changelog = "https://github.com/mdomke/python-ulid/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index 24eefdce0fe6..7455408f0bc6 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A free software implementation of Symantec's VIP Access application and protocol"; + mainProgram = "vipaccess"; homepage = "https://github.com/dlenski/python-vipaccess"; license = licenses.asl20; maintainers = with maintainers; [ aw ]; diff --git a/pkgs/development/python-modules/python-yate/default.nix b/pkgs/development/python-modules/python-yate/default.nix index a35773f298de..a6cc7ac6575f 100644 --- a/pkgs/development/python-modules/python-yate/default.nix +++ b/pkgs/development/python-modules/python-yate/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the yate telephony engine"; + mainProgram = "yate_callgen"; homepage = "https://github.com/eventphone/python-yate"; changelog = "https://github.com/eventphone/python-yate/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix index 4d85b26875cd..a7c28b2992d4 100644 --- a/pkgs/development/python-modules/python-zbar/default.nix +++ b/pkgs/development/python-modules/python-zbar/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-zbar"; - version = "0.23.90"; + version = "0.23.93"; format = "setuptools"; src = fetchFromGitHub { owner = "mchehab"; repo = "zbar"; - rev = version; - hash = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; + rev = "refs/tags/${version}"; + hash = "sha256-6gOqMsmlYy6TK+iYPIBsCPAk8tYDliZYMYeTOidl4XQ="; }; patches = [ diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index c9e0ca669c9a..37535e49f998 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pythonfinder"; - version = "2.0.6"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "sarugaku"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-C/Em8Vmv7q030hmH3jU/apBRSSC9QFK9mbBWjBjJHXg="; + hash = "sha256-CbaKXD7Sde8euRqvc/IHoXoSMF+dNd7vT9LkLWq4/IU="; }; patches = [ @@ -75,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cross platform search tool for finding Python"; + mainProgram = "pyfinder"; homepage = "https://github.com/sarugaku/pythonfinder"; changelog = "https://github.com/sarugaku/pythonfinder/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index f18402db6bb0..e0c55bf0e9e9 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.28.2"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-vi5f4V0nPb9K3nwdmwMDoNE85Or6haOWjMY4d/2Fj2s="; + hash = "sha256-rj/uIgIDjmEGD6muUllTb0PdLkedarMgVq38qqNoMI4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index b3fa77915ea2..7689e40c5b8e 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pytools"; - version = "2023.1.1"; + version = "2024.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-gGN4c9IG9rzt9820atk+horLTqIlbbBS38yocr3QMh8="; + hash = "sha256-LIjt+pkMjjJRZ8N2WfseEKPBEz3691K719hFZAK43P8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index fad1ff1d13fd..2e3455b677e4 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.7.4"; + version = "0.7.6"; pyproject = true; src = fetchFromGitHub { owner = "pfnet"; repo = "pytorch-pfn-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-X7N2RQS8he9FJPfEjPJH6GdxkAPV6uxOIfRVOnJId0U="; + hash = "sha256-vSon/0GxQfaRtSPsQbYAvE3s/F0HEN59VpzE3w1PnVE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix index ef54cf77b4f2..5a191bf800fe 100644 --- a/pkgs/development/python-modules/pytrydan/default.nix +++ b/pkgs/development/python-modules/pytrydan/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interface with V2C EVSE Trydan"; + mainProgram = "pytrydan"; homepage = "https://github.com/dgomes/pytrydan"; changelog = "https://github.com/dgomes/pytrydan/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index 2c8f714e500e..2e173e5f482b 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python 3 library for downloading YouTube Videos"; + mainProgram = "pytube"; homepage = "https://github.com/nficano/pytube"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 79b940d5be1d..9cf0773b0cb5 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.23.4"; + version = "5.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-sBdu4XJkEtHf6dlHgJKFQvONp1x89NiS2EgxMiJFX7A="; + hash = "sha256-bZjfpatw4lcOgMCqung/DMfRijxwtuIht6QusIYaCQ0="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -102,6 +102,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for interacting with the Unifi Protect API"; + mainProgram = "unifi-protect"; homepage = "https://github.com/briis/pyunifiprotect"; changelog = "https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 8d5bc83ed165..04ccee1bc757 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to automatically upgrade syntax for newer versions of the language"; + mainProgram = "pyupgrade"; homepage = "https://github.com/asottile/pyupgrade"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index fad27ac9a574..3259d3133d87 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.84"; + version = "9.2.93"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-asTvaSwoT1yD6nqHTr6vICeukynMq1WRRn3gEvvnoVA="; + hash = "sha256-44F1EE8TRsmYRnMNQakxIaFdAuZKpHIDsq+M1cK/pQk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 6f6e909f1a56..3c1d7d2982e2 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.43.3"; + version = "0.43.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yJEggiWK73zzUPvOsPucpalmSMxywinE9t2e2dqBM9M="; + hash = "sha256-nesI3rYGPCih+rckT6E6pyy6kZdfxBOjpfwvzKt8c6I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvizio/default.nix b/pkgs/development/python-modules/pyvizio/default.nix index 41b42b85b0d9..930e6e77bfa9 100644 --- a/pkgs/development/python-modules/pyvizio/default.nix +++ b/pkgs/development/python-modules/pyvizio/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for Vizio SmartCast"; + mainProgram = "pyvizio"; homepage = "https://github.com/vkorn/pyvizio"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index 2f73d23eb70a..a37a52f14663 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3"; + mainProgram = "wal"; homepage = "https://github.com/dylanaraps/pywal"; license = licenses.mit; maintainers = with maintainers; [ Fresheyeball ]; diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index 013ca015df94..b4448ecdbe1d 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pywatchman"; - version = "1.4.1"; + version = "2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1yf2gm20wc3djpb5larxii3l55xxby0il2ns3q0v1byyfnr7w16h"; + sha256 = "sha256-JTVNnjZH+UQRpME+UQyDoc7swXl3sFJbpBsW5wGceww="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index 6930f4ba374d..97e75684e8f4 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/flacjacket/pywayland"; description = "Python bindings to wayland using cffi"; + mainProgram = "pywayland-scanner"; license = licenses.ncsa; maintainers = with maintainers; [ chvp ]; }; diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix index e3b8ab0bded4..70734fd59da3 100644 --- a/pkgs/development/python-modules/pywaze/default.nix +++ b/pkgs/development/python-modules/pywaze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pywaze"; - version = "0.5.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "eifinger"; repo = "pywaze"; rev = "refs/tags/v${version}"; - hash = "sha256-r7ROEdgHdjXkveVUbuALHtwCX4IO0lwx9Zo3u6R9I58="; + hash = "sha256-n5W8TdZZJmT7SECXE8k6WK2lmCcucA6eLm+LZpojERo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index 38d605317a60..903ad646b8b5 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Webpush Data encryption library for Python"; + mainProgram = "pywebpush"; homepage = "https://github.com/web-push-libs/pywebpush"; license = licenses.mpl20; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 93b881435cb5..b2d832275221 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "4.4.1"; + version = "5.0.5"; pyproject = true; disabled = pythonOlder "3.5"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-uanv6v/xwi4COY0WjoyxG4khK1kAucBmpr/plCKYxkQ="; + hash = "sha256-Mep4r5OujsefXFQA09OospqnzgQ3xn8HHdZFKNo3oM4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index a7e7976a1019..e3fb6770f365 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for PowerSploit's PowerView support"; + mainProgram = "pywerview"; homepage = "https://github.com/the-useless-one/pywerview"; changelog = "https://github.com/the-useless-one/pywerview/releases/tag/v${version}"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index e6ce3013515d..860ce91d7144 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python connector for WiZ light bulbs"; + mainProgram = "wizlight"; homepage = "https://github.com/sbidy/pywizlight"; changelog = "https://github.com/sbidy/pywizlight/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index 80b26e7080fc..6fc74602a8a8 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://pyxnat.github.io/pyxnat"; description = "Python API to XNAT"; + mainProgram = "sessionmirror.py"; changelog = "https://github.com/pyxnat/pyxnat/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix index b5eb54916717..6270b26bb718 100644 --- a/pkgs/development/python-modules/pyzerproc/default.nix +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to control Zerproc Bluetooth LED smart string lights"; + mainProgram = "pyzerproc"; homepage = "https://github.com/emlove/pyzerproc"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 442577fcc5e3..0493381718c1 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "25.1.1"; + version = "25.1.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JZwiSFtxq6zfqL95cgzXvPS50SizDqVU8BrnH9v9qiM="; + hash = "sha256-k/GqMR6LuRLjTwBM8YZAek6Q7sTw7MDv0mBWv37aAiY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index 7ca619efa38d..71418c1607d0 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -1,11 +1,12 @@ { lib, fetchPypi, python, buildPythonPackage, nose, future, coverage }: buildPythonPackage rec { - pname = "PyZufall"; + pname = "pyzufall"; version = "0.13.2"; src = fetchPypi { - inherit pname version; + pname = "PyZufall"; + inherit version; sha256 = "1jffhi20m82fdf78bjhncbdxkfzcskrlipxlrqq9741xdvrn14b5"; }; diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index c1464c233a93..7c572c98ea76 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Quantum chemistry program executor and IO standardizer (QCSchema) for quantum chemistry"; + mainProgram = "qcengine"; homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/"; license = licenses.bsd3; maintainers = with maintainers; [ sheepforce ]; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index c8c6883342f6..6f6f42f8fd76 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.13.1"; + version = "0.13.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = "refs/tags/${version}"; - hash = "sha256-GxQgqCUDwalgM9m+XeRiZCRL93KrCSUPoLvDgHJJGCQ="; + hash = "sha256-xE5P4o6/I8Y/trK0e8GQ0oAOAyMvYWfzyuVvAoZExwk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 115a3dd9e5fc..62584bb17165 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-finance"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-V0o3U2Tn8OXTe2n84tqAhQql4sQ3UBZ8bLNt8S9Iz9w="; + hash = "sha256-zYhYhojCzlENzgYSenwewjeVHUBX2X6eQbbzc9znBsk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 16ed373894e9..1ad1b138af87 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qTHacEUTp0RY2piplE6XoYKpJyeFswTPBvjfQ9Gvwt0="; + hash = "sha256-EBjWWoNRuIZFWQkrjf9IyZZ648rP5d7MZkjeIYifgGk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 660762f2d2fd..483f9f67cc42 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RspjHEFYdu1k6azmifbpd57tH+SxPeepw5EQzWP/Yc8="; + hash = "sha256-SVzg3McB885RMyAp90Kr6/iVKw3Su9ucTob2jBckBo0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index f377a2b9caba..3e1d6b3e49e0 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-optimization"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vVSFvLVjptSgGocGR6i1Fp0BSRaT3uBBxf0OrFaF9EQ="; + hash = "sha256-kzEuICajlV8mgD0YLhwFJaDQVxYZo9jv3sr/r/P0VG0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index b7c0a2677bf6..0977a1944e93 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.45.1"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = "refs/tags/${version}"; - hash = "sha256-XAAQc6oX9zy9MFze1UQbalUBfhbkY5u/0xOmc5J66kM="; + hash = "sha256-Cjfn+9h8W08FcAlVC7b7O8Z+VGx5UeHosSgYJin/evE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 0b8f69889c33..b5c3d2aec6b3 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python QR Code image generator"; + mainProgram = "qr"; homepage = "https://github.com/lincolnloop/python-qrcode"; changelog = "https://github.com/lincolnloop/python-qrcode/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index a00a4683d08e..e1bd21ba0054 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Iconic fonts in PyQt and PySide applications"; + mainProgram = "qta-browser"; homepage = "https://github.com/spyder-ide/qtawesome"; changelog = "https://github.com/spyder-ide/qtawesome/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 101239257853..6228fc088af0 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyter Qt console"; + mainProgram = "jupyter-qtconsole"; homepage = "https://qtconsole.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 43e6cb00bfe2..09a0c21a1f88 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -95,6 +95,7 @@ buildPythonPackage rec { homepage = "http://www.qtile.org/"; license = licenses.mit; description = "A small, flexible, scriptable tiling window manager written in Python"; + mainProgram = "qtile"; platforms = platforms.linux; maintainers = with maintainers; [ kamilchm arjan-s ]; }; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 59e03f836899..8ffe6bb91a58 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction layer for PyQt5/PyQt6/PySide2/PySide6"; + mainProgram = "qtpy"; homepage = "https://github.com/spyder-ide/qtpy"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/quantulum3/default.nix b/pkgs/development/python-modules/quantulum3/default.nix index 259871b4ef0c..ae35505d8648 100644 --- a/pkgs/development/python-modules/quantulum3/default.nix +++ b/pkgs/development/python-modules/quantulum3/default.nix @@ -48,6 +48,7 @@ buildPythonPackage { meta = with lib; { description = "Library for unit extraction - fork of quantulum for python3"; + mainProgram = "quantulum3-training"; homepage = "https://github.com/nielstron/quantulum3"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix index 1effbadf3b67..5a79054e8951 100644 --- a/pkgs/development/python-modules/quart/default.nix +++ b/pkgs/development/python-modules/quart/default.nix @@ -79,8 +79,14 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + meta = with lib; { description = "An async Python micro framework for building web applications"; + mainProgram = "quart"; homepage = "https://github.com/pallets/quart/"; changelog = "https://github.com/pallets/quart/blob/${src.rev}/CHANGES.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/quaternion/default.nix b/pkgs/development/python-modules/quaternion/default.nix index 3b3e6a1ea790..6307334edfdf 100644 --- a/pkgs/development/python-modules/quaternion/default.nix +++ b/pkgs/development/python-modules/quaternion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "quaternion"; - version = "2023.0.2"; + version = "2023.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "moble"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-G5Xbo6Ns98oqtY/AKz9CE7nt8j2b6+Hv14ZoKtlDCMQ="; + hash = "sha256-vSkFHYXcT14aW3OTfqYymVQbpWnKFEVkhh3IQTi5xS4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index a1b0a4309554..820e10a40934 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "A 21 century R console"; + mainProgram = "radian"; homepage = "https://github.com/randy3k/radian"; changelog = "https://github.com/randy3k/radian/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/radicale-infcloud/default.nix b/pkgs/development/python-modules/radicale-infcloud/default.nix index 214c1dcffe87..a59b8221f5d8 100644 --- a/pkgs/development/python-modules/radicale-infcloud/default.nix +++ b/pkgs/development/python-modules/radicale-infcloud/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { meta = with lib; { homepage = "https://github.com/Unrud/RadicaleInfCloud/"; description = "Integrate InfCloud into Radicale's web interface"; - license = with licenses; [ agpl3 gpl3 ]; + license = with licenses; [ agpl3Plus gpl3 ]; maintainers = with maintainers; [ erictapen ]; }; } diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix index 73630f59fd3a..5831579f7df5 100644 --- a/pkgs/development/python-modules/radios/default.nix +++ b/pkgs/development/python-modules/radios/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , poetry-core +, pythonRelaxDepsHook , aiodns , aiohttp , awesomeversion @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "radios"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-radios"; rev = "v${version}"; - hash = "sha256-bzo+SA8kqc2GcxSV0TiIJyPVG+JshdsMoXSUhZYSphU="; + hash = "sha256-c0zfpfEdZvjvKtwGcNLLgEkBihhtz/wouHuYRLCxtBY="; }; postPatch = '' @@ -40,6 +41,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pycountry" ]; propagatedBuildInputs = [ @@ -65,6 +71,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/frenck/python-radios/releases/tag/v${version}"; description = "Asynchronous Python client for the Radio Browser API"; homepage = "https://github.com/frenck/python-radios"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index 9d20fa6a09f6..5f2f4c5904c5 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -74,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "Streaming command-line twitter client"; + mainProgram = "rainbowstream"; homepage = "https://github.com/orakaro/rainbowstream"; license = licenses.mit; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 3c2be0da4792..e58cbeeb7947 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -5,16 +5,17 @@ buildPythonPackage rec { pname = "ramlfications"; - version = "0.1.9"; + version = "0.2.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0xvnna7kaq4nm5nfnwcwbr5bcm2s532hgyp7kq4v9iivn48rrf3v"; + sha256 = "sha256-wcQd5j74y7d0xFeWlwlhceZj95ixUmv5upnv/6Rl1ew="; }; meta = with lib; { description = "A Python RAML parser."; + mainProgram = "ramlfications"; homepage = "https://ramlfications.readthedocs.org"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix index 867f432a6d52..f50537524cbf 100644 --- a/pkgs/development/python-modules/rapidgzip/default.nix +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "rapidgzip"; - version = "0.12.1"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-s4MLxhwoGS7Zvx6k5qh1PWpyTRBUBGVIkPW9q94u+2Q="; + hash = "sha256-MwT4+wzlNXfDLT/o/oT1iy9cVlFIIXc18r7dg+x5SXY="; }; nativeBuildInputs = [ nasm ]; @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for parallel decompression and seeking within compressed gzip files"; + mainProgram = "rapidgzip"; homepage = "https://github.com/mxmlnkn/rapidgzip"; changelog = "https://github.com/mxmlnkn/rapidgzip/blob/rapidgzip-v${version}/python/rapidgzip/CHANGELOG.md"; license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952 diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 324c65849433..eef18524c217 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -119,6 +119,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to read and write geospatial raster data"; + mainProgram = "rio"; homepage = "https://rasterio.readthedocs.io/"; changelog = "https://github.com/rasterio/rasterio/blob/${version}/CHANGES.txt"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index cc235710a689..21bd26c45c86 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mounts archives as read-only file systems by way of indexing"; + mainProgram = "ratarmount"; homepage = "https://github.com/mxmlnkn/ratarmount"; license = licenses.mit; maintainers = with lib.maintainers; [ mxmlnkn ]; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index dec666782d12..f49230494e48 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = { description = "Legacy Python client for Sentry (getsentry.com) — replaced by sentry-python"; + mainProgram = "raven"; homepage = "https://github.com/getsentry/raven-python"; license = [ lib.licenses.bsd3 ]; maintainers = with lib.maintainers; [ primeos ]; diff --git a/pkgs/development/python-modules/razdel/default.nix b/pkgs/development/python-modules/razdel/default.nix index 66c2f4fae5e2..0c9ade3931f8 100644 --- a/pkgs/development/python-modules/razdel/default.nix +++ b/pkgs/development/python-modules/razdel/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rule-based system for Russian sentence and word tokenization"; + mainProgram = "razdel-ctl"; homepage = "https://github.com/natasha/razdel"; license = licenses.mit; maintainers = with maintainers; [ npatsakula ]; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 470a8051020f..57887196cbae 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://www.reviewboard.org/docs/rbtools/dev/"; description = "RBTools is a set of command line tools for working with Review Board and RBCommons"; + mainProgram = "rbt"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 04f5206b96a5..cef9ea902bb6 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -24,6 +24,7 @@ , pip , pytest-cov , pytestCheckHook +, pytest_7 , setuptools }: @@ -67,7 +68,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pip pytest-cov - pytestCheckHook + # Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted. + (pytestCheckHook.override { pytest = pytest_7; }) setuptools ] ++ passthru.optional-dependencies.networkx diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix index 0bf33623cb86..e97b238ac599 100644 --- a/pkgs/development/python-modules/readabilipy/default.nix +++ b/pkgs/development/python-modules/readabilipy/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTML content extractor"; + mainProgram = "readabilipy"; homepage = "https://github.com/alan-turing-institute/ReadabiliPy"; changelog = "https://github.com/alan-turing-institute/ReadabiliPy/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index aab318a38178..115e0c284a2a 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "readchar"; - version = "4.0.5"; + version = "4.0.6"; pyproject = true; # Don't use wheels on PyPI @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "magmax"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-Ru18lh+9tXtvttypnob0HNPKBiGF7E9HDL21l1AAGa8="; + hash = "sha256-XowLJ9YAHhP9nInFVYtoLEOmlWBRWQX259vwm9SVVZU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/readmdict/default.nix b/pkgs/development/python-modules/readmdict/default.nix index d6ef1447a7b8..5ce332df5504 100644 --- a/pkgs/development/python-modules/readmdict/default.nix +++ b/pkgs/development/python-modules/readmdict/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read mdx/mdd files (repacking of readmdict from mdict-analysis)"; + mainProgram = "readmdict"; homepage = "https://github.com/ffreemt/readmdict"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/readme-renderer/default.nix b/pkgs/development/python-modules/readme-renderer/default.nix index 983de37f3932..13a8074a5690 100644 --- a/pkgs/development/python-modules/readme-renderer/default.nix +++ b/pkgs/development/python-modules/readme-renderer/default.nix @@ -4,41 +4,44 @@ , cmarkgfm , docutils , fetchPypi -, mock +, nh3 , pygments , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "readme-renderer"; - version = "37.3"; - format = "setuptools"; + version = "43.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "readme_renderer"; inherit version; - hash = "sha256-zWUxht/HMFVlbwkPIn9csioEbX9xqEHfowX1XJpRMnM="; + hash = "sha256-GBjdKBQIE1Ce7tjWJof3zU97rZDU21hgAcXcCdT94xE="; }; - propagatedBuildInputs = [ - bleach - cmarkgfm + build-system = [ + setuptools + ]; + + dependencies = [ docutils + nh3 pygments ]; - nativeCheckInputs = [ - mock - pytestCheckHook + optional-dependencies.md = [ + cmarkgfm ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "cmarkgfm>=0.5.0,<0.7.0" "cmarkgfm>=0.5.0,<1" - ''; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ optional-dependencies.md; disabledTests = [ # https://github.com/pypa/readme_renderer/issues/221 diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 3490b6a914b9..7d114a5fe23e 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.2.3"; + version = "2.2.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZYPCZ5GlhT7p5Xzp24ZOL7BoCLpHD4BddNU/xQgR4BI="; + hash = "sha256-7l/VuZ258MGAsjlsvOUoqjZnGVG5UmuwJy2/zlUXvSc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 8903d0134646..b4f5df6e42da 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.1.2"; + version = "2.1.3"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-6qFUw5xfZvDuM/UBEGtoiHON15/6oq1S8H0Z1qk3k8s="; + hash = "sha256-K2pflwHpzuYDMNUB7YQu6NX21O0aOwRChBgjdiwFQ+Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/red-black-tree-mod/default.nix b/pkgs/development/python-modules/red-black-tree-mod/default.nix new file mode 100644 index 000000000000..dd17a45bc8ea --- /dev/null +++ b/pkgs/development/python-modules/red-black-tree-mod/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "red-black-tree-mod"; + version = "1.22"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OONlKQOiv5Y3nCfCCCygt7kFFYZi3X7wyX9P2TqaqQg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + # Module has no test + doCheck = false; + + pythonImportsCheck = [ + "red_black_dict_mod" + ]; + + meta = with lib; { + description = "Flexible python implementation of red black trees"; + homepage = "https://stromberg.dnsalias.org/~strombrg/red-black-tree-mod/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index df49fd470d1e..551a251bc174 100644 --- a/pkgs/development/python-modules/redis-om/default.nix +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -84,6 +84,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object mapping, and more, for Redis and Python"; + mainProgram = "migrate"; homepage = "https://github.com/redis/redis-om-python"; changelog = "https://github.com/redis/redis-om-python/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index 8de065b054f2..0113f23e4742 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.31.1"; + version = "0.33.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ let repo = "referencing"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-6Kol8TdOxImRq0aff+aAR/jbDrkHX/EPrIv1ZEMRWZU="; + hash = "sha256-QP/F6UNiKHGNMhGphDJgEFZnpGU5izExcI/A9WJjA5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 66bb26fb6007..0ada0fe50ba2 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2023.10.3"; + version = "2023.12.25"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-P+9PhE0ikO4LpXrdzsF+7J499z8QonSEhd/Wo6GIzA8="; + hash = "sha256-KRcaoSjaaa/fS95BLVvtwzXyyo/P5EiQOFd9BfFhgeU="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 05a18ff34eee..14460fb9b17b 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { homepage = "https://relatorio.tryton.org/"; changelog = "https://hg.tryton.org/relatorio/file/${version}/CHANGELOG"; description = "A templating library able to output odt and pdf files"; + mainProgram = "relatorio-render"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 32916774ee36..0d8829201afc 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonRelaxDepsHook # build deps , poetry-core @@ -30,6 +31,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pytest" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix index e7ed4b1c356d..ec81726cd243 100644 --- a/pkgs/development/python-modules/remotezip/default.nix +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to access single members of a zip archive without downloading the full content"; + mainProgram = "remotezip"; homepage = "https://github.com/gtsystem/python-remotezip"; license = licenses.mit; maintainers = with maintainers; [ nickcao ]; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 6310d70d2cc6..c28ef79f6d21 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interact with the Renault API"; + mainProgram = "renault-api"; homepage = "https://github.com/hacf-fr/renault-api"; changelog = "https://github.com/hacf-fr/renault-api/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix index e3af1cb11cc5..b00896c801f0 100644 --- a/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for automatically reordering python imports"; + mainProgram = "reorder-python-imports"; homepage = "https://github.com/asottile/reorder_python_imports"; license = licenses.mit; maintainers = with maintainers; [ gador ]; diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix index 0fbfbbb25269..9b73dabf027e 100644 --- a/pkgs/development/python-modules/repocheck/default.nix +++ b/pkgs/development/python-modules/repocheck/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { inherit (src.meta) homepage; description = "Check the status of code repositories under a root directory"; + mainProgram = "repocheck"; license = licenses.gpl3Plus; }; diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 9da827f9253b..d31cbc667510 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -109,6 +109,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to do automated pentest reporting with SysReptor"; + mainProgram = "reptor"; homepage = "https://github.com/Syslifters/reptor"; changelog = "https://github.com/Syslifters/reptor/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index f3a37488a225..0a13af92ee51 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for ReqIF format"; + mainProgram = "reqif"; homepage = "https://github.com/strictdoc-project/reqif"; changelog = "https://github.com/strictdoc-project/reqif/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index de7a94c75aa0..294c3c76d872 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -1,24 +1,29 @@ { lib , fetchPypi , buildPythonPackage +, setuptools +, setuptools-scm , pytestCheckHook , requests -, six }: buildPythonPackage rec { pname = "requests-file"; - version = "1.5.1"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-B9dCCNM4nQHDirie9AOvDP7GOVfVOgCB2OynONAkfY4="; + hash = "sha256-IMWTFinFWP2lZsrMEM/izVAkM+Yo9WjDTIDZagzJWXI="; }; + build-system = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ requests - six ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/requests-gssapi/default.nix b/pkgs/development/python-modules/requests-gssapi/default.nix new file mode 100644 index 000000000000..ac762c7c20b3 --- /dev/null +++ b/pkgs/development/python-modules/requests-gssapi/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, gssapi +, pytestCheckHook +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "requests-gssapi"; + version = "1.2.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-IHhFCJgUAfcVPJM+7QlTOJM6QIGNplolnb8tgNzLFQ4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + gssapi + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportCheck = [ + "requests_gssapi" + ]; + + meta = with lib; { + description = "A GSSAPI authentication handler for python-requests"; + homepage = "https://github.com/pythongssapi/requests-gssapi"; + changelog = "https://github.com/pythongssapi/requests-gssapi/blob/v${version}/HISTORY.rst"; + license = licenses.isc; + maintainers = with maintainers; [ javimerino ]; + }; +} diff --git a/pkgs/development/python-modules/requirements-detector/default.nix b/pkgs/development/python-modules/requirements-detector/default.nix index e679937dbd4c..aab180853d5a 100644 --- a/pkgs/development/python-modules/requirements-detector/default.nix +++ b/pkgs/development/python-modules/requirements-detector/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool to find and list requirements of a Python project"; + mainProgram = "detect-requirements"; homepage = "https://github.com/landscapeio/requirements-detector"; changelog = "https://github.com/landscapeio/requirements-detector/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index f9827dca48d6..84ded2238993 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resampy"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bmcfee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t5I7NJmIeV0uucPyvR+UJ24NK7fIzYlNJ8bECkbvdjI="; + hash = "sha256-LOWpOPAEK+ga7c3bR15QvnHmON6ARS1Qee/7U/VMlTY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 37294dba1e21..5a9960cbac59 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch2 , pytest-asyncio , pytest-httpserver , pytestCheckHook @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "responses"; - version = "0.24.1"; + version = "0.25.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,9 +29,17 @@ buildPythonPackage rec { owner = "getsentry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fvfEHJioyjQoEvIgZZKt9/AKtzTgo0APGUK7lDrbahs="; + hash = "sha256-FHtuZ6NUmCveAJOXEajfTLRMR8W1Jz/pjFKdE6PHW2g="; }; + patches = [ + (fetchpatch2 { + # adds missing pytest asyncio markers + url = "https://github.com/getsentry/responses/commit/d5e7402f1782692d04742562370abaca8d54a972.patch"; + hash = "sha256-A/DYSKvuangolkcQX4k/uom//AQ9in7BsTmVtlCqmXQ="; + }) + ]; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 169e28773b42..64dbb3016829 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "7.0"; + version = "7.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-U3BK+7w1D9yPskVEE2e+Zxyfg4CGkgGy6EUudPzj2xQ="; + hash = "sha256-h1rrUcE51440zvhgXcZTCbRJFoBg3QhVGh/p7bR8uaU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 88004743d73b..e5694e92137d 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "ReStructuredText viewer"; + mainProgram = "restview"; homepage = "https://mg.pov.lt/restview/"; changelog = "https://github.com/mgedmin/restview/blob/${version}/CHANGES.rst"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 202494659d5b..e10c6b496a9f 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to format click help output nicely with rich"; + mainProgram = "rich-click"; homepage = "https://github.com/ewels/rich-click"; changelog = "https://github.com/ewels/rich-click/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 0fb67ed8a805..518be3f4e2fe 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "rich"; - version = "13.7.0"; + version = "13.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L72an7vHC+aBj8NlLOjofDrQGvmFxJpdbfiEubfg0GM="; + hash = "sha256-7LvmPrCpHfPEfJ1r8IFnQhYkBstvtIrWYhGwcchlc0s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index 82a24a3b3f41..9949789c3c49 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.8.7"; + version = "0.8.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-Awi0Wa/ayzhpecTCKWRt+2bQvvvDxbjN+bIKAdorETs="; + hash = "sha256-Rz12Qpawi4/u14ywJGt9Yw7IqjYP4bg6zNr9oN3iQxQ="; }; nativeBuildInputs = [ @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to communicate with Ring Door Bell"; + mainProgram = "ring-doorbell"; homepage = "https://github.com/tchellomello/python-ring-doorbell"; changelog = "https://github.com/tchellomello/python-ring-doorbell/releases/tag/${version}"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 6e847e483636..c71d9f0a03fd 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-UuxI1bA6H8s2D9xWVwCecXEHkCV0rhkxuoooaer/a8A="; + hash = "sha256-J5ctOvGtmg/e2ls7fN59LR4AbHedC9gKk6f8jIDIoFI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/riscof/default.nix b/pkgs/development/python-modules/riscof/default.nix index fc5874e39e33..eabaf0ded530 100644 --- a/pkgs/development/python-modules/riscof/default.nix +++ b/pkgs/development/python-modules/riscof/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "RISC-V Architectural Test Framework"; + mainProgram = "riscof"; homepage = "https://github.com/riscv-software-src/riscof"; changelog = "https://github.com/riscv-software-src/riscof/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ genericnerdyusername ]; diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix index 6cc0471b854b..7cd0399dafcd 100644 --- a/pkgs/development/python-modules/riscv-config/default.nix +++ b/pkgs/development/python-modules/riscv-config/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "RISC-V configuration validator"; + mainProgram = "riscv-config"; homepage = "https://github.com/riscv/riscv-config"; changelog = "https://github.com/riscv-software-src/riscv-config/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ genericnerdyusername ]; diff --git a/pkgs/development/python-modules/riscv-isac/default.nix b/pkgs/development/python-modules/riscv-isac/default.nix index 651c27be676a..19a6eea71319 100644 --- a/pkgs/development/python-modules/riscv-isac/default.nix +++ b/pkgs/development/python-modules/riscv-isac/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "An ISA coverage extraction tool"; + mainProgram = "riscv_isac"; homepage = "https://github.com/riscv/riscv-isac"; changelog = "https://github.com/riscv-software-src/riscv-isac/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/rmsd/default.nix b/pkgs/development/python-modules/rmsd/default.nix index 1def479816f6..caa13ff5299f 100644 --- a/pkgs/development/python-modules/rmsd/default.nix +++ b/pkgs/development/python-modules/rmsd/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Calculate root-mean-square deviation (RMSD) between two sets of cartesian coordinates"; + mainProgram = "calculate_rmsd"; homepage = "https://github.com/charnley/rmsd"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/rnc2rng/default.nix b/pkgs/development/python-modules/rnc2rng/default.nix index e6abf4f189f0..bece0219a1c7 100644 --- a/pkgs/development/python-modules/rnc2rng/default.nix +++ b/pkgs/development/python-modules/rnc2rng/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/djc/rnc2rng"; description = "Compact to regular syntax conversion library for RELAX NG schemata"; + mainProgram = "rnc2rng"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix new file mode 100644 index 000000000000..303024a90f52 --- /dev/null +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -0,0 +1,46 @@ +{ lib +, adal +, buildPythonPackage +, fetchPypi +, pyjwt +, pythonOlder +, setuptools +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "roadlib"; + version = "0.23.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0hDiuF0dBRyR2B9dp4c7/jsC6li8uOduQBbhs6fFLfU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + adal + pyjwt + sqlalchemy + ]; + + # Module has no test + doCheck = false; + + pythonImportsCheck = [ + "roadtools.roadlib" + ]; + + meta = with lib; { + description = "ROADtools common components library"; + homepage = "https://pypi.org/project/roadlib/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix new file mode 100644 index 000000000000..0f1f412919b2 --- /dev/null +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -0,0 +1,63 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, flask +, flask-cors +, flask-marshmallow +, flask-sqlalchemy +, marshmallow +, marshmallow-sqlalchemy +, openpyxl +, pythonOlder +, pythonRelaxDepsHook +, roadlib +, setuptools +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "roadrecon"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OEftVwU30tLP091Z5CIl67hkjjcqY+Qo04/wHZlbuFc="; + }; + + pythonRelaxDeps = [ + "flask" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + flask + flask-cors + flask-marshmallow + flask-sqlalchemy + marshmallow + marshmallow-sqlalchemy + openpyxl + roadlib + sqlalchemy + ]; + + pythonImportsCheck = [ + "roadtools.roadrecon" + ]; + + meta = with lib; { + description = "Azure AD recon"; + homepage = "https://pypi.org/project/roadrecon/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/roadtools/default.nix b/pkgs/development/python-modules/roadtools/default.nix new file mode 100644 index 000000000000..6ea6bc5138b2 --- /dev/null +++ b/pkgs/development/python-modules/roadtools/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, roadrecon +, roadlib +, roadtx +}: + +buildPythonPackage rec { + pname = "roadtools"; + version = "0.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Cqcd+bKkfYXCeJBXu6peMjBoA6gve2XBPdCAAuTKGEE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + roadrecon + roadlib + roadtx + ]; + + pythonImportsCheck = [ + "roadtools" + ]; + + meta = with lib; { + description = "Azure AD tooling framework"; + homepage = "https://github.com/dirkjanm/ROADtools"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix new file mode 100644 index 000000000000..4ea50269cd76 --- /dev/null +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pycryptodomex +, pyotp +, pythonOlder +, requests +, roadlib +, selenium +, selenium-wire +, setuptools +, signxml +}: + +buildPythonPackage rec { + pname = "roadtx"; + version = "1.7.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qnumJbuBH+ajzfG+bLTrYPvB5uNnL8dJsTZoT2vo6g0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pycryptodomex + pyotp + requests + roadlib + selenium + selenium-wire + signxml + ]; + + pythonImportsCheck = [ + "roadtools.roadtx" + ]; + + meta = with lib; { + description = "ROADtools Token eXchange"; + homepage = "https://pypi.org/project/roadtx/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 39b45d5816bd..e60162ea38d2 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "robotframework-databaselibrary"; - version = "1.4.1"; + version = "1.4.4"; pyproject = true; src = fetchFromGitHub { owner = "MarketSquare"; repo = "Robotframework-Database-Library"; rev = "refs/tags/v${version}"; - hash = "sha256-BCVXmlrYOaG+Dh67OytUfQnJ9Ak3MtHR3swOXdAN/HU="; + hash = "sha256-WTcB1jEfBm8tOuQgsGUhYD4FDqpEEKA4UOmbHS/hac0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix index d5caebf899b0..26edb9046504 100644 --- a/pkgs/development/python-modules/rollbar/default.nix +++ b/pkgs/development/python-modules/rollbar/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Error tracking and logging from Python to Rollbar"; + mainProgram = "rollbar"; homepage = "https://github.com/rollbar/pyrollbar"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index bef8114aa3cf..81841aadebee 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "roombapy"; - version = "1.6.13"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-5TFuOk3fj4kg5MyWz7HQ/zWdvceFa3mWnFx+Yuq2III="; + hash = "sha256-vB6+cGqeHFthCbz4q75EwsHb8w1H2vPSaKdtvquh5Kc="; }; nativeBuildInputs = [ @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python program and library to control Wi-Fi enabled iRobot Roombas"; + mainProgram = "roombapy"; homepage = "https://github.com/pschmitt/roombapy"; changelog = "https://github.com/pschmitt/roombapy/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index 04c934b4ed11..d0ae5b7aeec0 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to search for gadgets in binaries to facilitate ROP exploitation"; + mainProgram = "ROPgadget"; homepage = "http://shell-storm.org/project/ROPgadget/"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs ]; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 1bc393fd44ee..973b11de4728 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Show information about files in different file formats"; + mainProgram = "ropper"; homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs ]; diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index f9467f63e48c..a04262e40173 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.4.0"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-bwRfu3SM/+Y9B06vjwqOjd9YmmO+EwBVvhWSdHTaRAk="; + hash = "sha256-CCz/va5oydgU1JRDHKooRezbDbeGZHtD8Zy6fWJ2uRg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index b86ed00e3594..76798ccfc397 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.10.6"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-TOWnCNZajb83SNJHS1gNYGsbn5G1xqsqMW4LDPekulA="; + hash = "sha256-AhCyZo8kwHgwcmC/iL2snW8Qk2Nd9RI3ib/uTY1/yOc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-8bXCTrZErdE7JhuoudU/4dDndCMwvjy2a+2IY0DWDzg="; + hash = "sha256-sFutrKLa2ISxtUN7hmw2P02nl4SM6Hn4yj1kkXrNWmI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rplcd/default.nix b/pkgs/development/python-modules/rplcd/default.nix index 1022f40141c7..e521523ba697 100644 --- a/pkgs/development/python-modules/rplcd/default.nix +++ b/pkgs/development/python-modules/rplcd/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { description = '' Raspberry Pi LCD library for the widely used Hitachi HD44780 controller ''; + mainProgram = "rplcd-tests"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix index 2b4d718fc3d4..89401e4ac607 100644 --- a/pkgs/development/python-modules/rpmfile/default.nix +++ b/pkgs/development/python-modules/rpmfile/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read rpm archive files"; + mainProgram = "rpmfile"; homepage = "https://github.com/srossross/rpmfile"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 027083232650..c10b23414b42 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchPypi +, fetchpatch , isPyPy , R , rWrapper @@ -38,6 +39,12 @@ buildPythonPackage rec { # R_LIBS_SITE is used by the nix r package to point to the installed R libraries. # This patch sets R_LIBS_SITE when rpy2 is imported. ./rpy2-3.x-r-libs-site.patch + + # https://github.com/rpy2/rpy2/pull/1094 + (fetchpatch { + url = "https://github.com/rpy2/rpy2/commit/026d069a008163a62d12567bcb938410d0f9bf7a.diff"; + hash = "sha256-x778upSY3zab5EiRyOcsbDpPj7vN/7XzefEs+wvkNg0="; + }) ]; postPatch = '' @@ -82,10 +89,6 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - # newlines in environment variables are a problem due to - # https://github.com/rpy2/rpy2/issues/1066 - preCheck = "unset postPatch"; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 0d02b9b3d93a..7c9a13fc4d17 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rpyc"; - version = "5.3.1"; + version = "6.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tomerfiliba"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2b6ryqDqZPs5VniLhCwA1/c9+3CT+JJrr3VwP3G6tpY="; + hash = "sha256-BvXEXZlVbOmKBwnSBCDksUkbT7JPcMX48KZe/Gd5Y8Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rpyc4/default.nix b/pkgs/development/python-modules/rpyc4/default.nix index c883ebef4dc6..1c543166d38a 100644 --- a/pkgs/development/python-modules/rpyc4/default.nix +++ b/pkgs/development/python-modules/rpyc4/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "rpyc4"; # Pinned version for linien, see also: # https://github.com/linien-org/pyrp3/pull/10#discussion_r1302816237 - version = "4.1.5"; + version = "6.0.0"; format = "pyproject"; # Since this is an outdated version, upstream might have fixed the @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomerfiliba"; repo = "rpyc"; - rev = version; - hash = "sha256-8NOcXZDR3w0TNj1+LZ7lzQAt7yDgspjOp2zk1bsbVls="; + rev = "refs/tags/${version}"; + hash = "sha256-BvXEXZlVbOmKBwnSBCDksUkbT7JPcMX48KZe/Gd5Y8Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index b8e19d46f790..36ddd4d95b34 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,15 +1,27 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , pythonOlder + +# build-system +, hatchling + +# dependencies , click , redis + +# tests +, psutil +, pytestCheckHook +, redis-server +, sentry-sdk }: buildPythonPackage rec { pname = "rq"; - version = "1.15.1"; - format = "setuptools"; + version = "1.16.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,16 +29,33 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-cymNXFI+6YEVw2Pc7u6+vroC0428oW7BTLxyBgPqLng="; + hash = "sha256-1E7jPTSQCjuKZVFL4uZqL1WZHnxWSLTNcnpyvfHz7oY="; }; - propagatedBuildInputs = [ + build-system = [ + hatchling + ]; + + dependencies = [ click redis ]; - # Tests require a running Redis rerver - doCheck = false; + nativeCheckInputs = [ + psutil + pytestCheckHook + sentry-sdk + ]; + + preCheck = lib.optionalString stdenv.isLinux '' + PATH=$out/bin:$PATH + ${redis-server}/bin/redis-server & + REDIS_PID=$! + ''; + + postCheck = lib.optionalString stdenv.isLinux '' + kill $REDIS_PID + ''; pythonImportsCheck = [ "rq" diff --git a/pkgs/development/python-modules/rst2ansi/default.nix b/pkgs/development/python-modules/rst2ansi/default.nix index 763a3913bd60..4f1ca27137a2 100644 --- a/pkgs/development/python-modules/rst2ansi/default.nix +++ b/pkgs/development/python-modules/rst2ansi/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A rst converter to ansi-decorated console output"; + mainProgram = "rst2ansi"; homepage = "https://github.com/Snaipe/python-rst-to-ansi"; license = licenses.mit; maintainers = with maintainers; [ vojta001 ]; diff --git a/pkgs/development/python-modules/rst2pdf/default.nix b/pkgs/development/python-modules/rst2pdf/default.nix index 6fb44840f5b2..b2531886eaa8 100644 --- a/pkgs/development/python-modules/rst2pdf/default.nix +++ b/pkgs/development/python-modules/rst2pdf/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert reStructured Text to PDF via ReportLab"; + mainProgram = "rst2pdf"; homepage = "https://rst2pdf.org/"; changelog = "https://github.com/rst2pdf/rst2pdf/blob/${version}/CHANGES.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 22f160000830..3e648e792b20 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks syntax of reStructuredText and code blocks nested within it"; + mainProgram = "rstcheck"; homepage = "https://github.com/myint/rstcheck"; changelog = "https://github.com/rstcheck/rstcheck/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/rtfde/default.nix b/pkgs/development/python-modules/rtfde/default.nix new file mode 100644 index 000000000000..c986d7b0c5e3 --- /dev/null +++ b/pkgs/development/python-modules/rtfde/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lark +, lxml +, oletools +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "rtfde"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "seamustuohy"; + repo = "RTFDE"; + rev = "refs/tags/${version}"; + hash = "sha256-ai9JQ3gphY/IievBNdHiblIpc0IPS9wp7CVvBIRzG/4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + lark + oletools + ]; + + nativeCheckInputs = [ + lxml + pytestCheckHook + ]; + + pythonImportsCheck = [ + "RTFDE" + ]; + + meta = with lib; { + description = "Library for extracting encapsulated HTML and plain text content from the RTF bodies"; + homepage = "https://github.com/seamustuohy/RTFDE"; + changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${version}"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index d43065300fee..968a33607d92 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python object API for managing the Linux LIO kernel target"; + mainProgram = "targetctl"; homepage = "https://github.com/open-iscsi/rtslib-fb"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index e06aaff73dc8..4ac0d552ebdf 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.18.5"; + version = "0.18.6"; pyproject = true; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - hash = "sha256-YZF+OjWlacETOo93LhImlhv1oRmL6n4j8GoIQd6hqw4="; + hash = "sha256-iyfmohfnhsb75WNNjz8RvGPg+A9qWJDyiGPZxFqsMRs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/runs/default.nix b/pkgs/development/python-modules/runs/default.nix new file mode 100644 index 000000000000..ec751bfd7f4b --- /dev/null +++ b/pkgs/development/python-modules/runs/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, xmod +, pytestCheckHook +, tdir +}: + +buildPythonPackage rec { + pname = "runs"; + version = "1.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rec"; + repo = "runs"; + rev = "v${version}"; + hash = "sha256-aEamhXr3C+jYDzQGzcmGFyl5oEtovxlNacFM08y0ZEk="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + xmod + ]; + + nativeCheckInputs = [ + pytestCheckHook + tdir + ]; + + disabledTests = [ + # requires .git directory + "test_many" + ]; + + pythonImportsCheck = [ + "runs" + ]; + + meta = with lib; { + description = "Run a block of text as a subprocess"; + homepage = "https://github.com/rec/runs"; + changelog = "https://github.com/rec/runs/blob/${src.rev}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix index 458f21618caf..71bc5d4f4438 100644 --- a/pkgs/development/python-modules/s3-credentials/default.nix +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python CLI utility for creating credentials for accessing S3 buckets"; + mainProgram = "s3-credentials"; homepage = "https://github.com/simonw/s3-credentials"; license = licenses.asl20; maintainers = with maintainers; [ techknowlogick ]; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 2cc6bb9d7950..510c95fff9b6 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2024.2.0"; + version = "2024.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+AZPUirQiLVrBDBHyCVzSEfAJp3xnyYTyVbUwg3hW2I="; + hash = "sha256-pmMjXIrbfmu8RadSksk5Ww+9WAuzlK3EztnorUvYZNo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sacrebleu/default.nix b/pkgs/development/python-modules/sacrebleu/default.nix index 411426eaa34d..7a0540b82c73 100644 --- a/pkgs/development/python-modules/sacrebleu/default.nix +++ b/pkgs/development/python-modules/sacrebleu/default.nix @@ -60,6 +60,7 @@ buildPythonPackage { meta = with lib; { description = "Hassle-free computation of shareable, comparable, and reproducible BLEU, chrF, and TER scores"; + mainProgram = "sacrebleu"; homepage = "https://github.com/mjpost/sacrebleu"; changelog = "https://github.com/mjpost/sacrebleu/blob/v{version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index 63584a043778..c08589b66e25 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/alvations/sacremoses"; description = "Python port of Moses tokenizer, truecaser and normalizer"; + mainProgram = "sacremoses"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ pashashocky ]; diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index dee37f85eeb4..529ed4d8d4c2 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -97,6 +97,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks installed dependencies for known vulnerabilities"; + mainProgram = "safety"; homepage = "https://github.com/pyupio/safety"; changelog = "https://github.com/pyupio/safety/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 1d85fb9bed9f..4eaa44f0db38 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.212.0"; + version = "2.213.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-JZX/k8AJSQrCrPAsDfEc78mAouBWFQlmRG0ZA1yBGJY="; + hash = "sha256-3V4boilVpqvwRBBuZv/AKEks+BH9PFnigfq6Z5kFhqQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 60b745a38455..4b821da0fe6c 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { broken = stdenv.isDarwin; homepage = "https://salmon-mail.readthedocs.org/"; description = "Pythonic mail application server"; + mainProgram = "salmon"; license = licenses.gpl3Only; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index 665c740b4f63..f4f3653d94e9 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Remote control Samsung televisions via a TCP/IP connection"; + mainProgram = "samsungctl"; homepage = "https://github.com/Ape/samsungctl"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix index 813df37a84e5..23b38820ff22 100644 --- a/pkgs/development/python-modules/sanic-auth/default.nix +++ b/pkgs/development/python-modules/sanic-auth/default.nix @@ -7,12 +7,13 @@ }: buildPythonPackage rec { - pname = "Sanic-Auth"; + pname = "sanic-auth"; version = "0.3.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "Sanic-Auth"; + inherit version; sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198"; }; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index fb1d5aba58db..c8cb16ecc137 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "sanic"; - version = "23.6.0"; + version = "23.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -47,18 +47,9 @@ buildPythonPackage rec { owner = "sanic-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ffw92mlYNV+ikb6299uw24EI1XPpl3Ju2st1Yt/YHKw="; + hash = "sha256-TizjibqoLNMX0m5oPyncKgFnltXOLZUIPSzVIeKU25w="; }; - patches = [ - # https://github.com/sanic-org/sanic/pull/2801 - (fetchpatch { - name = "fix-test-one-cpu.patch"; - url = "https://github.com/sanic-org/sanic/commit/a1df2a6de1c9c88a85d166e7e2636d26f7925852.patch"; - hash = "sha256-vljGuoP/Q9HrP+/AOoI1iUpbDQ4/1Pn7AURP1dncI00="; - }) - ]; - nativeBuildInputs = [ setuptools wheel @@ -171,6 +162,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web server and web framework"; + mainProgram = "sanic"; homepage = "https://github.com/sanic-org/sanic/"; changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 472bbe084319..970d355fff06 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python-based network packet manipulation program and library"; + mainProgram = "scapy"; longDescription = '' Scapy is a powerful Python-based interactive packet manipulation program and library. diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 494cfa1a7606..0e4734d4a53b 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.8.0"; + version = "0.8.2"; pyproject = true; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-WAW/iYSXOemY/BuupG5WVVZi8cnZfEF8PgOHAtZTr+M="; + hash = "sha256-UOwkuVaMmqbicjPe6yl4kyvHmFYhKzBXXL+kBJZVxDY="; }; postPatch = lib.optionalString (pythonOlder "3.11") '' diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 7ced95754fe5..acaf74e10953 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch2 , hatch-fancy-pypi-readme , hatch-vcs , hatchling @@ -14,7 +15,6 @@ , cmake , cython , git -, path , pytestCheckHook , pytest-mock , requests @@ -38,6 +38,13 @@ buildPythonPackage rec { # https://github.com/scikit-build/scikit-build/pull/1032 # https://github.com/scikit-build/scikit-build/issues/1047 ./python312-compatibility.patch + + (fetchpatch2 { + # https://github.com/scikit-build/scikit-build/pull/1073 + name = "skbuild-suppress-permissionerror.patch"; + url = "https://github.com/scikit-build/scikit-build/commit/41183413e4f5ef29cf3d21e470a2cfa2305733f8.patch"; + hash = "sha256-M5Sbt4CBuiAeGgN0D/toglVi1V2GlA9hPIOMzcqOwdo="; + }) ]; # This line in the filterwarnings section of the pytest configuration leads to this error: diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix index 354c27f01915..5ed9d994c0e0 100644 --- a/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -47,6 +47,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ networkx numpy scipy ]; nativeCheckInputs = [ matplotlib nose pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "skfuzzy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 94531f8a2213..58e8ceadd0d4 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.39"; + version = "0.4.42"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tcKEJrqB7cblcmH4PtSmx0heUew2+aDE4+mk2v9cUuo="; + hash = "sha256-2zUo/uGIQl0wSFWWxoTmttzUNq9rFGJRYr95PQJH/I8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 4b33027fb99b..b6c703d7870d 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -4,12 +4,12 @@ , fetchPypi # build-system -, cython +, cython_3 , gfortran , numpy -, oldest-supported-numpy , scipy , setuptools +, wheel # native dependencies , glibcLocales @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.4.0"; + version = "1.4.1.post1"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-1Dc8mE66IOOTIW7dUaPj7t5Wy+k9QkdRbSBWQ8O5MSE="; + hash = "sha256-k9PUlv8ZZUcPmXfQXl7DN2+x5jsQ5P2l450jwtiWmjA="; }; buildInputs = [ @@ -42,18 +42,24 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython gfortran + ]; + + build-system = [ + cython_3 numpy - oldest-supported-numpy scipy setuptools + wheel ]; propagatedBuildInputs = [ + numpy.blas + ]; + + dependencies = [ joblib numpy - numpy.blas scipy threadpoolctl ]; @@ -69,18 +75,12 @@ buildPythonPackage rec { export SKLEARN_BUILD_PARALLEL=$NIX_BUILD_CORES ''; - doCheck = !stdenv.isAarch64; + # PermissionError: [Errno 1] Operation not permitted: '/nix/nix-installer' + doCheck = !stdenv.isDarwin; disabledTests = [ # Skip test_feature_importance_regression - does web fetch "test_feature_importance_regression" - - # failing on macos - "check_regressors_train" - "check_classifiers_train" - "xfail_ignored_in_check_estimator" - ] ++ lib.optionals (stdenv.isDarwin) [ - "test_graphical_lasso" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix index 17f0c2a1764e..e8f3933299a7 100644 --- a/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "scikit-posthocs"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "maximtrp"; repo = "scikit-posthocs"; rev = "refs/tags/v${version}"; - hash = "sha256-ojXVrsZsvX7UytldcWkhOndix4by1uBeVpG7nQrcvmA="; + hash = "sha256-sRop5DKakrZEBswzTvumn68wKqU15zM5aCLfZ/PdsFg="; }; patches = [ diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index bde55615e7bf..aa49911009eb 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "0.31.0"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,8 +40,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-rf"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-MSFlajXdNZ/BfTLuegy+T9iNFdXk/TWN8J3TcYbYLbI="; + rev = "refs/tags/v.${version}"; + hash = "sha256-J7V4nQ8OxW4w75OyiMdUal8k5oXSn96g4w6k1+KV1Dw="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index b2a58d71c0b1..2870e5ec3bbd 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -13,10 +13,10 @@ , pkg-config , pythran , wheel -, nose , setuptools , hypothesis , pytestCheckHook +, pytest_7 , pytest-xdist , numpy , pybind11 @@ -115,9 +115,9 @@ in buildPythonPackage { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - nose hypothesis - pytestCheckHook + # Failed: DID NOT WARN. No warnings of type (<class 'DeprecationWarning'>, <class 'PendingDeprecationWarning'>, <class 'FutureWarning'>) were emitted. + (pytestCheckHook.override { pytest = pytest_7; }) pytest-xdist ]; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 611949ae6515..e902cac51101 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -19,24 +19,24 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "2.1.1"; - format = "pyproject"; + version = "3.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "scmrepo"; rev = "refs/tags/${version}"; - hash = "sha256-KG7Y+1qqsgDwgRYsb3XbZnF6FduHJCAEizfuugBi0Go="; + hash = "sha256-swv5uWsyM4mEXlurizUewnbdAOtjWgvzCO9IPfz2ZPE="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asyncssh dulwich dvc-http diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index 6140fd13323c..869a1a589501 100644 --- a/pkgs/development/python-modules/scooby/default.nix +++ b/pkgs/development/python-modules/scooby/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/banesullivan/scooby/releases/tag/v${version}"; description = "A lightweight tool for reporting Python package versions and hardware resources"; + mainProgram = "scooby"; homepage = "https://github.com/banesullivan/scooby"; license = licenses.mit; maintainers = with maintainers; [ wegank ]; diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index 66f0613fc5f7..2b757d4dc3a2 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "An SVG Optimizer / Cleaner "; + mainProgram = "scour"; homepage = "https://github.com/scour-project/scour"; license = licenses.asl20; maintainers = with maintainers; [ worldofpeace ]; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 9548f9136e8c..09ed93f8481f 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -142,6 +142,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-level web crawling and web scraping framework"; + mainProgram = "scrapy"; longDescription = '' Scrapy is a fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages. It can be used for a wide diff --git a/pkgs/development/python-modules/screed/default.nix b/pkgs/development/python-modules/screed/default.nix index cc1b80153d3a..dd5a637e87c1 100644 --- a/pkgs/development/python-modules/screed/default.nix +++ b/pkgs/development/python-modules/screed/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple read-only sequence database, designed for short reads"; + mainProgram = "screed"; homepage = "https://pypi.org/project/screed/"; maintainers = with maintainers; [ luizirber ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index ad36d8d3347c..9245c427e15b 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for Pentair Screenlogic devices"; + mainProgram = "screenlogicpy"; homepage = "https://github.com/dieselrabbit/screenlogicpy"; changelog = "https://github.com/dieselrabbit/screenlogicpy/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; diff --git a/pkgs/development/python-modules/sdkmanager/default.nix b/pkgs/development/python-modules/sdkmanager/default.nix index 7063adf94e18..2900c012cf79 100644 --- a/pkgs/development/python-modules/sdkmanager/default.nix +++ b/pkgs/development/python-modules/sdkmanager/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://gitlab.com/fdroid/sdkmanager"; description = "A drop-in replacement for sdkmanager from the Android SDK written in Python"; + mainProgram = "sdkmanager"; license = licenses.agpl3Plus; maintainers = with maintainers; [ linsui ]; }; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 78750d84b24f..24aa665bccfc 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "seabreeze"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "ap--"; repo = "python-seabreeze"; rev = "refs/tags/v${version}"; - hash = "sha256-25rFGpfwJKj9lLDO/ZsqJ2NfCsgSSJghLZxffjX/+7w="; + hash = "sha256-Ead9G4i8/mFwPqL2PGsndtmX93Njld3nvTTr6ROJTac="; leaveDotGit = true; }; diff --git a/pkgs/development/python-modules/seedir/default.nix b/pkgs/development/python-modules/seedir/default.nix index 46fca2c568f6..6c5e5bc899f2 100644 --- a/pkgs/development/python-modules/seedir/default.nix +++ b/pkgs/development/python-modules/seedir/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for for creating, editing, and reading folder tree diagrams"; + mainProgram = "seedir"; homepage = "https://github.com/earnestt1234/seedir"; changelog = "https://github.com/earnestt1234/seedir/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 10d50ed59233..e55eb4c49bad 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/cldf/segments/blob/${src.rev}/CHANGES.md"; description = "Unicode Standard tokenization routines and orthography profile segmentation"; + mainProgram = "segments"; homepage = "https://github.com/cldf/segments"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/segno/default.nix b/pkgs/development/python-modules/segno/default.nix index 98c332af7389..21a10677c5e1 100644 --- a/pkgs/development/python-modules/segno/default.nix +++ b/pkgs/development/python-modules/segno/default.nix @@ -4,7 +4,7 @@ , pythonOlder # build-system -, setuptools +, flit-core # dependencies , importlib-metadata @@ -17,18 +17,18 @@ buildPythonPackage rec { pname = "segno"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "heuer"; repo = "segno"; rev = "refs/tags/${version}"; - hash = "sha256-lgitNnVHvvPLKtDqJvc/zsVlFu9Gw0D3S4lt/20TlhE="; + hash = "sha256-5CDrQhbgUydz1ORp4ktZwhcgbJxQq1snKIAA0v4mZ00="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/heuer/segno/releases/tag/${version}"; description = "QR Code and Micro QR Code encoder"; + mainProgram = "segno"; homepage = "https://github.com/heuer/segno/"; license = licenses.bsd3; maintainers = with maintainers; [ phaer ]; diff --git a/pkgs/development/python-modules/selenium-wire/default.nix b/pkgs/development/python-modules/selenium-wire/default.nix new file mode 100644 index 000000000000..bbc98666394b --- /dev/null +++ b/pkgs/development/python-modules/selenium-wire/default.nix @@ -0,0 +1,80 @@ +{ lib +, blinker +, brotli +, buildPythonPackage +, certifi +, fetchFromGitHub +, h2 +, hyperframe +, kaitaistruct +, pyasn1 +, httpbin +, pyopenssl +, pyparsing +, pysocks +, gunicorn +, pytestCheckHook +, pythonOlder +, selenium +, setuptools +, wsproto +, zstandard +}: + +buildPythonPackage rec { + pname = "selenium-wire"; + version = "5.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wkeeling"; + repo = "selenium-wire"; + rev = "refs/tags/${version}"; + hash = "sha256-KgaDxHS0dAK6CT53L1qqx1aORMmkeaiXAUtGC82hiIQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + blinker + brotli + certifi + h2 + hyperframe + kaitaistruct + pyasn1 + pyopenssl + pyparsing + pysocks + selenium + wsproto + zstandard + ]; + + nativeCheckInputs = [ + gunicorn + httpbin + pytestCheckHook + ]; + + pythonImportsCheck = [ + "seleniumwire" + ]; + + disabledTestPaths = [ + # Don't run End2End tests + "tests/end2end/test_end2end.py" + ]; + + meta = with lib; { + description = "Extends Selenium's Python bindings to give you the ability to inspect requests made by the browser"; + homepage = "https://github.com/wkeeling/selenium-wire"; + changelog = "https://github.com/wkeeling/selenium-wire/blob/${version}/HISTORY.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 09ddebebe240..9f8336201eb9 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -1,12 +1,13 @@ { lib , fetchFromGitHub , buildPythonPackage +, selenium-manager , certifi -, geckodriver , pytestCheckHook , pythonOlder , trio , trio-websocket +, typing-extensions , urllib3 , pytest-trio , nixosTests @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.15.0"; + version = "4.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +27,7 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-AacpHZw6N6RruuBO+bZ3/cxOODe9VPGblKmIm1ffqrc="; + hash = "sha256-1C9Epsk9rFlShxHGGzbWl6smrMzPn2h3yCWlzUIMpY8="; }; preConfigure = '' @@ -44,10 +45,10 @@ buildPythonPackage rec { cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json '' + lib.optionalString stdenv.isDarwin '' mkdir -p $DST_PREFIX/common/macos - cp ../common/manager/macos/selenium-manager $DST_PREFIX/common/macos + ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/macos/ '' + lib.optionalString stdenv.isLinux '' mkdir -p $DST_PREFIX/common/linux/ - cp ../common/manager/linux/selenium-manager $DST_PREFIX/common/linux/ + ln -s ${lib.getExe selenium-manager} $DST_PREFIX/common/linux/ ''; propagatedBuildInputs = [ @@ -55,6 +56,7 @@ buildPythonPackage rec { trio trio-websocket urllib3 + typing-extensions ] ++ urllib3.optional-dependencies.socks; nativeCheckInputs = [ @@ -62,6 +64,8 @@ buildPythonPackage rec { pytest-trio ]; + __darwinAllowLocalNetworking = true; + passthru.tests = { testing-vaultwarden = nixosTests.vaultwarden; }; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 3c752df0a62a..7260baa5aa10 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; + mainProgram = "pysemver"; homepage = "https://python-semver.readthedocs.io/"; changelog = "https://github.com/python-semver/python-semver/releases/tag/3.0.0"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 0fab032f93a1..62bbea264e72 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Send file to trash natively under macOS, Windows and Linux"; + mainProgram = "send2trash"; homepage = "https://github.com/hsoft/send2trash"; changelog = "https://github.com/arsenetar/send2trash/blob/${version}/CHANGES.rst"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 9c439149964d..3803dc4d29c6 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "2.2.2"; + version = "2.5.1"; format = "setuptools"; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; - rev = "v${version}"; - hash = "sha256-hEYpDAL0lliaS1j+c5vaZ0q1hw802jfTUurx/FvgY9w="; + rev = "refs/tags/v${version}"; + hash = "sha256-HIOizBf8YnPAj95cG1HopO9B/bhAmT0u3q5CM6POEjQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index f15096a8e430..f225853368b5 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.41.0"; + version = "1.42.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-eoHoUW3cXxdGeWpo/0kBIfVkLECrnKA2wtobe3GeU2Q="; + hash = "sha256-LZn7oWwKdHi/KScitFnNDX7pI92mNkC6niGP+BixjtA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index d2a61dcbb7ff..bbf7cca1293a 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; + mainProgram = "seqdiag"; homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index b90ab00a4789..327a278eff93 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Serve files from shell via a small HTTP server"; + mainProgram = "servefile"; homepage = "https://github.com/sebageek/servefile"; license = licenses.gpl3Plus; maintainers = with maintainers; [ samuela ]; diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix index aff7572d3f62..394f4c4693fa 100644 --- a/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "setuptools-gettext"; - version = "0.1.7"; + version = "0.1.11"; 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-R1zgE1Ai2r23bve+sKo27XkUcIAmlWSreHZNt5yh2DY="; + hash = "sha256-yLKn4wwGgRdlsISAT71lD2vkIefsTJRB+OEA030adZY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix index b280650436b4..ea287302392c 100644 --- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix +++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "setuptools-git-versioning"; - version = "1.13.5"; + version = "1.13.6"; format = "pyproject"; src = fetchFromGitHub { owner = "dolfinus"; repo = "setuptools-git-versioning"; rev = "refs/tags/v${version}"; - hash = "sha256-MAHB6hMAcMo1+HCc6g7xQUD2sG+TLjM/6Oa/BKuXpRc="; + hash = "sha256-YUIh+dK4Sj85vhvI7u15a734tbQsox5VZ2WEAB/mpgc="; }; nativeBuildInputs = [ @@ -65,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use git repo data (latest tag, current commit hash, etc) for building a version number according PEP-440"; + mainProgram = "setuptools-git-versioning"; homepage = "https://github.com/dolfinus/setuptools-git-versioning"; changelog = "https://github.com/dolfinus/setuptools-git-versioning/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/setuptools-odoo/default.nix b/pkgs/development/python-modules/setuptools-odoo/default.nix index 5a6a9ac88819..cc2e767d2520 100644 --- a/pkgs/development/python-modules/setuptools-odoo/default.nix +++ b/pkgs/development/python-modules/setuptools-odoo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "setuptools-odoo"; - version = "3.2.1"; + version = "3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "acsone"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aS2a1G9lssgGk3uqWgPPWpOpEnqUkCUzWsqPLQfU55k="; + hash = "sha256-38YlkDH/PuJ1yvQ43OYmdnRd1SGJULv6fC/+fitLDJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index ddfcdcb4f67b..a4aae0742824 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.8.1"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lLHdXVMIsxONW5M8OitV5taSfRoiYy5Qn86p3dD35IY="; + hash = "sha256-cE3wlI8uTMYMJZatboQOpnn09D5Y7UrQwYV4ByQOq5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 7cacc0ca5a4d..0185f2ca24d2 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "69.0.3"; + version = "69.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-38csULki+SBcg7StScj0/09A+JZesm8iwOBjSgXyXMA="; + hash = "sha256-TWW8kW7ZjRsl5Y0CEVHqhIVJsiRixSSYe/ctSO1c/78="; }; patches = [ diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 7d620eeda34e..c1939e70a7e4 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for the SFR Box API"; + mainProgram = "sfrbox-api"; homepage = "https://github.com/hacf-fr/sfrbox-api"; changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 9a5d5fe57a7a..8d8a5f535b77 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reference implementation of SLIP-0039"; + mainProgram = "shamir"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index cd51a145b67e..049074cbc18d 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -22,16 +22,16 @@ , scipy , sentencepiece , setuptools +, setuptools-scm , slicer , tqdm , transformers , xgboost -, wheel }: buildPythonPackage rec { pname = "shap"; - version = "0.43.0"; + version = "0.44.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,13 +40,13 @@ buildPythonPackage rec { owner = "slundberg"; repo = "shap"; rev = "refs/tags/v${version}"; - hash = "sha256-ylkpXhaLXsQiu6YMC3pUtlicptQmtjITzW+ydinB4ls="; + hash = "sha256-pC201Q/i3UAuJPZw0H+giebhJKVTmmKfxhFdonmkxtI="; }; nativeBuildInputs = [ oldest-supported-numpy setuptools - wheel + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shaperglot/default.nix b/pkgs/development/python-modules/shaperglot/default.nix index f1ea7e5a723a..c00f66394dda 100644 --- a/pkgs/development/python-modules/shaperglot/default.nix +++ b/pkgs/development/python-modules/shaperglot/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "shaperglot"; - version = "0.3.1"; + version = "0.5.0"; # PyPI source tarballs omit tests, fetch from Github instead src = fetchFromGitHub { owner = "googlefonts"; repo = "shaperglot"; - rev = "v${version}"; - hash = "sha256-29MzD42rgh+7n/0kjqKGDxXPnUEvj/xxEIKWZg03pxw="; + rev = "refs/tags/v${version}"; + hash = "sha256-jmYB1tsMMpFs0X/FW3z9el2nFr8De2jR1dO658w7U4Q="; }; pyproject = true; @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to test OpenType fonts for language support"; + mainProgram = "shaperglot"; homepage = "https://github.com/googlefonts/shaperglot"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index 7190c1e2c0ae..e96776e60b8a 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "shazamio"; - version = "0.4.0.1"; + version = "0.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "dotX12"; repo = "ShazamIO"; - rev = version; - hash = "sha256-dfrdfbGkLYNjlS6Qv9Rnywv6nqiKrNXCICLSuAXpQBU="; + rev = "refs/tags/${version}"; + hash = "sha256-nzKvEoh1DrZegoRNqOCh9Qm+7B7uQ9dEH75mVueGxZI="; }; patches = [ diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 593a7b7d82ea..45eecc6faebf 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Generator for the PySide2 Qt bindings"; + mainProgram = "shiboken2"; license = with licenses; [ gpl2 lgpl21 ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 29fc4789d177..43ea7bdba8a7 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library and command-line utility for Shodan"; + mainProgram = "shodan"; homepage = "https://github.com/achillean/shodan-python"; changelog = "https://github.com/achillean/shodan-python/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index fda1e1896a50..627f0af39a75 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, poetry-core , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "shortuuid"; - version = "1.0.11"; - format = "setuptools"; + version = "1.0.12"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/HXyYVkUgVqOTLFQGzpRN0XLZu8P1fxvufjD+jSB94k="; + hash = "sha256-w58bNIs8HpsRWpVLM7dsjFItLRd6nSCs27INJPrDzP0="; }; + build-system = [ + poetry-core + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -27,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to generate concise, unambiguous and URL-safe UUIDs"; + mainProgram = "shortuuid"; homepage = "https://github.com/stochastic-technologies/shortuuid/"; changelog = "https://github.com/skorokithakis/shortuuid/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/show-in-file-manager/default.nix b/pkgs/development/python-modules/show-in-file-manager/default.nix index c77d547bf6f8..e48268c7ef66 100644 --- a/pkgs/development/python-modules/show-in-file-manager/default.nix +++ b/pkgs/development/python-modules/show-in-file-manager/default.nix @@ -2,31 +2,36 @@ , stdenv , buildPythonPackage , fetchPypi -, pythonOlder -, importlib-metadata +, argparse-manpage +, setuptools , packaging , pyxdg }: buildPythonPackage rec { pname = "show-in-file-manager"; - version = "1.1.4"; - format = "setuptools"; + version = "1.1.5"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FdFuSodbniF7A40C8CnDgAxKatZF4/c8nhB+omurOts="; + hash = "sha256-7ROhgKHUj9iP3UxYv7yzhgJoZBo4gFGSyBTUE4cZLYQ="; }; + nativeBuildInputs = [ + argparse-manpage + setuptools + ]; + propagatedBuildInputs = [ packaging ] - ++ lib.optional (stdenv.isLinux) pyxdg - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ++ lib.optional (stdenv.isLinux) pyxdg; meta = with lib; { homepage = "https://github.com/damonlynch/showinfilemanager"; description = "Open the system file manager and select files in it"; + mainProgram = "showinfilemanager"; longDescription = '' Show in File Manager is a Python package to open the system file manager and optionally select files in it. The point is not to diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index 37b3e1ca4c24..7ec98fce432b 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "shtab"; rev = "refs/tags/v${version}"; - hash = "sha256-b2XXDyO/2AnlxViC6sEEYUGviF6+FGXBnBcdQOuTViY="; + hash = "sha256-8bAwLSdJCzFw5Vf9CKBrH5zOoojeXds7aIRncl+sLBI="; }; postPatch = '' @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for shell tab completion of Python CLI applications"; + mainProgram = "shtab"; homepage = "https://docs.iterative.ai/shtab/"; changelog = "https://github.com/iterative/shtab/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/signify/default.nix b/pkgs/development/python-modules/signify/default.nix index a1924902fe8e..1c7f503d33c1 100644 --- a/pkgs/development/python-modules/signify/default.nix +++ b/pkgs/development/python-modules/signify/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , certvalidator , fetchFromGitHub -, fetchpatch2 , mscerts , oscrypto , pyasn1 @@ -11,30 +10,23 @@ , pytestCheckHook , pythonOlder , setuptools +, typing-extensions }: buildPythonPackage rec { pname = "signify"; - version = "0.5.2"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ralphje"; repo = "signify"; rev = "refs/tags/v${version}"; - hash = "sha256-+UhZF+QYuv8pq/sTu7GDPUrlPNNixFgVZL+L0ulj/ko="; + hash = "sha256-29SyzqtZ1cI+1xrSPLFr63vwB5st/9i5b3FYtJn6eok="; }; - patches = [ - # https://github.com/ralphje/signify/pull/42 - (fetchpatch2 { - url = "https://github.com/ralphje/signify/commit/38cad57bf86f7498259b47bfef1354aec27c0955.patch"; - hash = "sha256-dLmHSlj2Cj6jbbrZStgK2Rh/H5vOaIbi5lut5RAbd+s="; - }) - ]; - nativeBuildInputs = [ setuptools ]; @@ -46,6 +38,7 @@ buildPythonPackage rec { oscrypto pyasn1 pyasn1-modules + typing-extensions ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix new file mode 100644 index 000000000000..c6c6ccea9b15 --- /dev/null +++ b/pkgs/development/python-modules/signxml/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, certifi +, cryptography +, fetchFromGitHub +, lxml +, pyopenssl +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "signxml"; + version = "3.2.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "XML-Security"; + repo = "signxml"; + rev = "refs/tags/v${version}"; + hash = "sha256-TlOIHYvx1o46nr/3qq45pgeOqmuyWaaTGvOS0Jwz1zs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + certifi + cryptography + lxml + pyopenssl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "signxml" + ]; + + pytestFlagsArray = [ + "test/test.py" + ]; + + meta = with lib; { + description = "Python XML Signature and XAdES library"; + homepage = "https://github.com/XML-Security/signxml"; + changelog = "https://github.com/XML-Security/signxml/blob/${src.rev}/Changes.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix index be58c8b5f4cd..5e89670edef6 100644 --- a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix +++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sigstore-protobuf-specs"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sigstore_protobuf_specs"; inherit version; - hash = "sha256-wFwedHioCvDH3qnMLRHwR4JuTAKVc9VkE394jhE3c5E="; + hash = "sha256-MyKttzmSvKDz3G1MLDi6wpCGoR0mMamDrbJ5jljjKlQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix index a58595ed19a9..b7d96f9ed10e 100644 --- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix +++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sigstore-rekor-types"; - version = "0.0.11"; + version = "0.0.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "sigstore-rekor-types"; rev = "refs/tags/v${version}"; - hash = "sha256-oOFdRiDp9USc3A+aaPExprEO2i/RERNahiyi2kVpkns="; + hash = "sha256-B6u2YbtZtgjYJoWL2DfgP7LL20onNaaTTFbC6JIA4bE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index 24322a18723e..144b1daac21c 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -82,6 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "A codesigning tool for Python packages"; + mainProgram = "sigstore"; homepage = "https://github.com/sigstore/sigstore-python"; changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 10d5f64385a0..e42d569b45e8 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -11,12 +11,13 @@ , requests , responses , setuptools +, typing-extensions , zeep }: buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.12.5"; + version = "1.12.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "simple-salesforce"; repo = "simple-salesforce"; rev = "refs/tags/v${version}"; - hash = "sha256-mj7lbBGEybsEzWo4TYmPrN3mBXItdo/JomVIYmzIDAY="; + hash = "sha256-nrfIyXftS2X2HuuLFRZpWLz/IbRasqUzv+r/HvhxfAw="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { pendulum pyjwt requests + typing-extensions zeep ]; diff --git a/pkgs/development/python-modules/simple-term-menu/default.nix b/pkgs/development/python-modules/simple-term-menu/default.nix index 9f21c327da97..7a348b1f602d 100644 --- a/pkgs/development/python-modules/simple-term-menu/default.nix +++ b/pkgs/development/python-modules/simple-term-menu/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python package which creates simple interactive menus on the command line"; + mainProgram = "simple-term-menu"; homepage = "https://github.com/IngoMeyer441/simple-term-menu"; license = licenses.mit; changelog = "https://github.com/IngoMeyer441/simple-term-menu/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index 879dc6cd125a..9c89a01797e7 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Creates C++ bindings for Python modules"; + mainProgram = "sip"; homepage = "https://riverbankcomputing.com/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 sander ]; diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix index 568134d94d15..454876d16e8b 100644 --- a/pkgs/development/python-modules/sipyco/default.nix +++ b/pkgs/development/python-modules/sipyco/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple Python Communications - used by the ARTIQ experimental control package"; + mainProgram = "sipyco_rpctool"; homepage = "https://github.com/m-labs/sipyco"; changelog = "https://github.com/m-labs/sipyco/releases/tag/v${version}"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index d21b21542e4c..ff0884330b39 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://jcristharif.com/skein"; description = "A tool and library for easily deploying applications on Apache YARN"; + mainProgram = "skein"; license = licenses.bsd3; maintainers = with maintainers; [ alexbiehl illustris ]; # https://github.com/NixOS/nixpkgs/issues/48663#issuecomment-1083031627 diff --git a/pkgs/development/python-modules/skidl/default.nix b/pkgs/development/python-modules/skidl/default.nix index 5afcc931ac54..2203dee0ca3f 100644 --- a/pkgs/development/python-modules/skidl/default.nix +++ b/pkgs/development/python-modules/skidl/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module that extends Python with the ability to design electronic circuits"; + mainProgram = "netlist_to_skidl"; homepage = "https://xess.com/skidl/docs/_site/"; license = licenses.mit; maintainers = with maintainers; [ matthuszagh ]; diff --git a/pkgs/development/python-modules/skybellpy/default.nix b/pkgs/development/python-modules/skybellpy/default.nix index d09939ea853c..69837c5d6853 100644 --- a/pkgs/development/python-modules/skybellpy/default.nix +++ b/pkgs/development/python-modules/skybellpy/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the Skybell alarm API"; + mainProgram = "skybellpy"; homepage = "https://github.com/MisterWil/skybellpy"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 5e60c73de699..483e2749b5c7 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/SkyTemple/skytemple-files"; description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; + mainProgram = "skytemple_export_maps"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xfix marius851000 ]; broken = stdenv.isDarwin; # pyobjc is missing diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index 5e5d0c8d7951..da873a37dc51 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/SkyTemple/skytemple-ssb-debugger"; description = "Script Engine Debugger for Pokémon Mystery Dungeon Explorers of Sky"; + mainProgram = "skytemple-ssb-debugger"; license = licenses.gpl3Plus; maintainers = with maintainers; [ marius851000 xfix ]; }; diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index eb96fb50928c..680bb0f6a5be 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to access sliced imaging data"; + mainProgram = "slicedimage"; homepage = "https://github.com/spacetx/slicedimage"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix index 1166db2639c4..40b4f0ca67b0 100644 --- a/pkgs/development/python-modules/slimit/default.nix +++ b/pkgs/development/python-modules/slimit/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "SlimIt - a JavaScript minifier/parser in Python"; + mainProgram = "slimit"; homepage = "https://github.com/rspivak/slimit"; changelog = "https://github.com/rspivak/slimit/blob/${src.rev}/CHANGES"; license = licenses.mit; diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index a615192aa7be..38b0c9d92bfd 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -30,6 +30,7 @@ buildPythonPackage { meta = with lib; { homepage = "https://github.com/itkach/slob/"; description = "Reference implementation of the slob (sorted list of blobs) format"; + mainProgram = "slob"; license = licenses.gpl3Only; }; } diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index df0cbdc8a01c..53aa2d76f6aa 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -12,23 +12,34 @@ , paramiko , pytestCheckHook , responses +, setuptools +, wrapt +, zstandard }: buildPythonPackage rec { pname = "smart-open"; - version = "6.4.0"; - format = "setuptools"; + version = "7.0.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "refs/tags/v${version}"; - hash = "sha256-fciNaVw603FAcgrSrND+LEycJffmnFQij2ZpatYZ/e4="; + hash = "sha256-yGy4xNoHCE+LclBBTMVtTKP6GYZ5w09NJ0OmsUPnir4="; }; - passthru.optional-dependencies = { + build-system = [ + setuptools + ]; + + dependencies = [ + wrapt + ]; + + optional-dependencies = { s3 = [ boto3 ]; @@ -49,6 +60,9 @@ buildPythonPackage rec { ssh = [ paramiko ]; + zst = [ + zstandard + ]; }; pythonImportsCheck = [ @@ -59,7 +73,7 @@ buildPythonPackage rec { moto pytestCheckHook responses - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "smart_open" diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index d2ca5f297322..3d0fd5ba6e2c 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python with the SmartyPants"; + mainProgram = "smartypants"; homepage = "https://github.com/leohemsted/smartypants.py"; license = licenses.bsd3; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix index 898ba52a4eee..a5a1addf81b0 100644 --- a/pkgs/development/python-modules/snakebite/default.nix +++ b/pkgs/development/python-modules/snakebite/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python HDFS client"; + mainProgram = "snakebite"; homepage = "https://github.com/spotify/snakebite"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index 1b8c1c81183b..6e3cc6244799 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Browser based viewer for profiling data"; + mainProgram = "snakeviz"; homepage = "https://jiffyclub.github.io/snakeviz"; changelog = "https://github.com/jiffyclub/snakeviz/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 0fa0e03b030b..89a2b814bedb 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.3.5"; + version = "2.3.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "happyleavesaoc"; repo = "python-snapcast"; rev = "refs/tags/${version}"; - hash = "sha256-5TbwenEe3vMJovwKYfkvkXMRex0KgaXpsd4iCEk7uWE="; + hash = "sha256-gn+X0DZnox4mkJwDVgwNXae63iGbiqPIO15UV5pDwuY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index b16cebd557d8..9496f0cb081e 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -1,24 +1,30 @@ { buildPythonPackage , lib , fetchPypi +, setuptools +, setuptools-scm , glibcLocales , isPy3k -, pythonOlder , pytestCheckHook , curio }: buildPythonPackage rec { pname = "sniffio"; - version = "1.3.0"; - format = "setuptools"; + version = "1.3.1"; + pyproject = true; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-5gMFxeXTFPU4klm38iqqM9j33uSXYxGSNK83VcVbkQE="; + hash = "sha256-9DJO3GcKD0l1CoG4lfNcOtuEPMpG8FMPefwbq7I3idw="; }; - disabled = !isPy3k; + build-system = [ + setuptools + setuptools-scm + ]; buildInputs = [ glibcLocales diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index b0fe11d9f9bb..10df69781826 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -41,7 +41,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # AssertionError: Expected 'fileno' to not have been called. Called 1 times. + "test_client_stop_no_wait" + ] ++ lib.optionals stdenv.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 # port binding conflicts "test_snitun_single_runner_timeout" diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index cb39e27373a7..e834fc3226ff 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "A social networking service scraper"; + mainProgram = "snscrape"; homepage = "https://github.com/JustAnotherArchivist/snscrape"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ivan ]; diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix index 7a6cc52e3514..430cc1f5a725 100644 --- a/pkgs/development/python-modules/socialscan/default.nix +++ b/pkgs/development/python-modules/socialscan/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library and CLI for accurately querying username and email usage on online platforms"; + mainProgram = "socialscan"; homepage = "https://github.com/iojw/socialscan"; changelog = "https://github.com/iojw/socialscan/releases/tag/v${version}"; license = with licenses; [ mpl20 ]; diff --git a/pkgs/development/python-modules/socid-extractor/default.nix b/pkgs/development/python-modules/socid-extractor/default.nix index 2c163aa7b34b..6346d808127b 100644 --- a/pkgs/development/python-modules/socid-extractor/default.nix +++ b/pkgs/development/python-modules/socid-extractor/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract details from personal pages"; + mainProgram = "socid_extractor"; homepage = "https://github.com/soxoj/socid-extractor"; changelog = "https://github.com/soxoj/socid-extractor/blob/v${version}/CHANGELOG.md"; license = with licenses; [ gpl3Only ]; diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/pkgs/development/python-modules/socksipy-branch/default.nix index abfee3718b53..e9266bb27fe6 100644 --- a/pkgs/development/python-modules/socksipy-branch/default.nix +++ b/pkgs/development/python-modules/socksipy-branch/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "SocksiPy-branch"; + pname = "socksipy-branch"; version = "1.01"; src = fetchPypi { - inherit pname version; + pname = "SocksiPy-branch"; + inherit version; sha256 = "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p"; }; diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 02c716e0142a..2401bb9264a8 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tokenizer and sentence splitter for German and English web texts"; + mainProgram = "somajo-tokenizer"; homepage = "https://github.com/tsproisl/SoMaJo"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index 573d1a108027..a5c6a4faa5d3 100644 --- a/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -3,19 +3,27 @@ , fetchPypi , dacite , python-dateutil +, pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "soundcloud-v2"; - version = "1.3.1"; - format = "setuptools"; + version = "1.3.7"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9a9c12aa22e71566e2ca6015267cabc1856afd79fa458f0fc43c44872c184741"; + sha256 = "sha256-DiaCnIEXKSxyE4+MCq0KwdKWUGfWO3LAVwsMNEkOmqc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dacite python-dateutil diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index ac879c12886a..2a9dc470f145 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly search, compare, and analyze genomic and metagenomic data sets"; + mainProgram = "sourmash"; homepage = "https://sourmash.bio"; changelog = "https://github.com/sourmash-bio/sourmash/releases/tag/v${version}"; maintainers = with maintainers; [ luizirber ]; diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index b5d01a5ddbb2..b000900d3a7b 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "soxr"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchFromGitHub { @@ -27,9 +27,14 @@ buildPythonPackage rec { repo = "python-soxr"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-H2sueQq32o/9EHENANKVoiWlFoSF88P0LZ7DfEh/Esg="; + hash = "sha256-HGtoMfMQ5/2iEIFtik7mCrSxFnLXkSSx2W8wBul0+jk="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "SYS_LIBSOXR = False" "SYS_LIBSOXR = True" + ''; + nativeBuildInputs = [ cython_3 gnutar @@ -39,6 +44,10 @@ buildPythonPackage rec { setuptools-scm ]; + buildInputs = [ + libsoxr + ]; + pythonImportsCheck = [ "soxr" ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 3fb467475fb7..1055f45f55b7 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -129,6 +129,7 @@ buildPythonPackage rec { meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP)"; + mainProgram = "spacy"; homepage = "https://github.com/explosion/spaCy"; changelog = "https://github.com/explosion/spaCy/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/spark-parser/default.nix b/pkgs/development/python-modules/spark-parser/default.nix index 2dabd3cc1003..690d9a295de4 100644 --- a/pkgs/development/python-modules/spark-parser/default.nix +++ b/pkgs/development/python-modules/spark-parser/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "An Early-Algorithm Context-free grammar Parser"; + mainProgram = "spark-parser-coverage"; homepage = "https://github.com/rocky/python-spark"; license = licenses.mit; maintainers = with maintainers; [raskin]; diff --git a/pkgs/development/python-modules/sparklines/default.nix b/pkgs/development/python-modules/sparklines/default.nix index a41b8af8418d..d5d4e3312793 100644 --- a/pkgs/development/python-modules/sparklines/default.nix +++ b/pkgs/development/python-modules/sparklines/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "This Python package implements Edward Tufte's concept of sparklines, but limited to text only"; + mainProgram = "sparklines"; homepage = "https://github.com/deeplook/sparklines"; maintainers = with maintainers; [ rhoriguchi ]; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index f3b85e5b0bec..1abea197499d 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format"; + mainProgram = "rqw"; homepage = "http://rdflib.github.io/sparqlwrapper"; license = licenses.w3c; }; diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 9b02a1c222f4..1ecf340e975e 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , dask -, fetchpatch , fetchPypi , numba , numpy @@ -12,25 +11,16 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.14.0"; + version = "0.15.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-X1gno39s1vZzClQfmUyVxgo64jKeAfS6Ic7VM5rqAJg="; + hash = "sha256-lzrcuIqNuOPYBHlTMx4m0/ZKVlf5tGprhZxHZjw+75k="; }; - patches = [ - # https://github.com/pydata/sparse/issues/594 - (fetchpatch { - name = "fix-test.patch"; - url = "https://github.com/pydata/sparse/commit/a55651d630efaea6fd2758d083c6d02333b0eebe.patch"; - hash = "sha256-Vrx7MDlKtA8fOuFZenEkvgA70Hzm+p/4SPZuCvwtLuo="; - }) - ]; - propagatedBuildInputs = [ numba numpy diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix new file mode 100644 index 000000000000..4e50e8260a0f --- /dev/null +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +, pythonOlder +, torch +, requests +, setuptools +, soundfile +, typing-extensions +}: + +buildPythonPackage rec { + pname = "speechrecognition"; + version = "3.10.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Uberi"; + repo = "speech_recognition"; + rev = "refs/tags/${version}"; + hash = "sha256-lO1CW4j5aBnPtemNGsW8cytSa/H+Tb4Jpbfh4Z/0WHk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + typing-extensions + ]; + + nativeCheckInputs = [ + numpy + pytestCheckHook + torch + soundfile + ]; + + pythonImportsCheck = [ + "speech_recognition" + ]; + + disabledTests = [ + # Test files are missing in source + "test_flac" + # Attribute error + "test_whisper" + # PocketSphinx is not available in Nixpkgs + "test_sphinx" + ]; + + meta = with lib; { + description = "Speech recognition module for Python, supporting several engines and APIs, online and offline"; + homepage = "https://github.com/Uberi/speech_recognition"; + license = with licenses; [ gpl2Only bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index b7d172c93cfd..2939ab51989c 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -8,6 +8,7 @@ , pathspec , ninja , pyproject-metadata +, setuptools-scm # dependencies , numpy @@ -19,12 +20,12 @@ buildPythonPackage rec { pname = "spglib"; - version = "2.2.0"; + version = "2.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Snxx9q24YMvhSs39bKQ9zSns2a7T84wCzXbagP+l0Bw="; + hash = "sha256-c24l7GfCIMsg+rcBfE/mOC7t7iIwdtV/QEc0KxvGjOM="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { pathspec ninja pyproject-metadata + setuptools-scm ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index d090d2b8b56a..d4ad4cedab8c 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , colorama , sphinx , livereload @@ -8,15 +9,20 @@ buildPythonPackage rec { pname = "sphinx-autobuild"; - version = "2021.3.14"; - format = "setuptools"; + version = "2024.2.4"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05"; + pname = "sphinx_autobuild"; + inherit version; + hash = "sha256-y50hIaF21i1FRxYkhyr8X613Va1mJzir5ADs9KeVQwM="; }; - propagatedBuildInputs = [ + build-system = [ + flit-core + ]; + + dependencies = [ colorama sphinx livereload @@ -29,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Rebuild Sphinx documentation on changes, with live-reload in the browser"; - homepage = "https://github.com/executablebooks/sphinx-autobuild"; + mainProgram = "sphinx-autobuild"; + homepage = "https://github.com/sphinx-doc/sphinx-autobuild"; license = with licenses; [ mit ]; maintainers = with maintainers; [holgerpeters]; }; diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 7fff4b80debd..e5bba673e4ce 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.25.2"; + version = "2.0.0"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-PKvCU34XmJsvkuZKOZQlxMi/Vh7XPwh7x0FKUANhalA="; + hash = "sha256-fyzawucP2Xh5Jrbp5UHNTe0eg40rRv2iobsKdexbfzo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix index bc74fae5491e..e8e888204113 100644 --- a/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "sphinx-automodapi"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "astropy"; repo = pname; - rev = "v${version}"; - hash = "sha256-ecOwBtJBkGsBShMG5fK22V1EHLe6pCmOdHPrS/k6rno="; + rev = "refs/tags/v${version}"; + hash = "sha256-Suu81pWUIwIgp/iTaYambuYRTkC7njP6n5RWZscugnk="; leaveDotGit = true; }; diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index 9812768a5de8..724877795f3e 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A sphinx extension that allows the site-map to be defined in a single YAML file"; + mainProgram = "sphinx-etoc"; homepage = "https://github.com/executablebooks/sphinx-external-toc"; changelog = "https://github.com/executablebooks/sphinx-external-toc/raw/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sphinx-serve/default.nix b/pkgs/development/python-modules/sphinx-serve/default.nix index 1f1c7b0e071d..729118dd5096 100644 --- a/pkgs/development/python-modules/sphinx-serve/default.nix +++ b/pkgs/development/python-modules/sphinx-serve/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Spawns a simple HTTP server to preview your sphinx documents"; + mainProgram = "sphinx-serve"; homepage = "https://github.com/tlatsas/sphinx-serve"; maintainers = with maintainers; [ FlorianFranzen ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index ddf9237918af..56c626d4591d 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -31,6 +31,7 @@ , filelock , html5lib , pytestCheckHook +, pytest-xdist }: buildPythonPackage rec { @@ -86,6 +87,7 @@ buildPythonPackage rec { filelock html5lib pytestCheckHook + pytest-xdist ]; preCheck = '' @@ -100,6 +102,12 @@ buildPythonPackage rec { "test_check_link_response_only" "test_anchors_ignored_for_url" "test_autodoc_default_options" + # racy with pytest-xdist + "test_domain_cpp_build_semicolon" + "test_class_alias" + "test_class_alias_having_doccomment" + "test_class_alias_for_imported_object_having_doccomment" + "test_decorators" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 8a47fc39c5d7..b5b52c92912e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; - version = "1.0.7"; + version = "1.0.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_applehelp"; inherit version; - hash = "sha256-Of3I12LTOwGn2PAmo7fXFWPqO3J4fV8ArYRlvZ1t+/o="; + hash = "sha256-xApPlvN3bEOT2TNBIFOWL6wrhPTJmnmCukLglXanBhk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 6b282371f22b..4db4049a378b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Confluence builder for sphinx"; + mainProgram = "sphinx-build-confluence"; homepage = "https://github.com/sphinx-contrib/confluencebuilder"; license = licenses.bsd1; maintainers = with maintainers; [ graysonhead ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 8d326fe1e0f9..5e37386e5510 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-devhelp"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_devhelp"; inherit version; - hash = "sha256-Y7QeDTggfKQOu+q89NjlH3bAPnjNYavhGM9ENcc9QhI="; + hash = "sha256-mJP9P5BQa8S5e9uXfOuPvYI5ifQxayjDhB7BKFRDctM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 5a6b90fd3454..c49e3c49da31 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "2.0.4"; + version = "2.0.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_htmlhelp"; inherit version; - hash = "sha256-bCahGKBbdgAHOEKbckoFaNveW3I5GmiFd9oI8RiRCSo="; + hash = "sha256-Dch2N9XeU91e7DpqAXU7HM+ZSUvXVqr+zXS0+p5ykBU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 3cba5c5011da..6cfc2dc3d4c6 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.8.3"; + version = "0.8.4"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-nGIRdUC1J2AGrHrUrzRpbQKvJ4r6KZcSdAw2gKmp3mw="; + hash = "sha256-34g4CKW15LQROtaXGFxDo/Qt89znBFOveLpwdpB+miA="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index e098f7c919bd..607060e2931d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_qthelp"; inherit version; - hash = "sha256-YrnRoYarf17jNW2Qb2SMrLemvblNIB7nrfJttVCSmC0="; + hash = "sha256-BT3tw4gjqApyCagIYLFrci6eAgnjL+qYyQ5OZiRYjtY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 0f06dce774c5..c2f09769d1ac 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; - version = "1.1.9"; + version = "1.1.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_serializinghtml"; inherit version; - hash = "sha256-DGT/iYM54frCmr0r9fEQePPsQTz+nARtMSDXymVTC1Q="; + hash = "sha256-k/P13EWLkbGS/hDDl+Mk8mLPFj158ygsFY6ENqLEUR8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index fec28e068154..7371d8abdea8 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.2.6"; + version = "1.2.7"; format = "pyproject"; src = fetchPypi { pname = "sphinxcontrib_websupport"; inherit version; - hash = "sha256-1ZK+jhEmG7vGRmjyWO/E/ULJOrYXQRFDtSRf4wxjPYw="; + hash = "sha256-4yKALr/V/nk2jv2GSuuHsGNWauYZEdzLJxTiikXtdWE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 47010b63a7c1..fb28f0bf6207 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.5.1"; + version = "5.5.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+z8Jj0eA/mYH1r8ZQUyYUFMk7h1mBxjoTD5YZk0cH0k="; + hash = "sha256-i3OEKbiELfEmgff3EQfr6xGc74f1kMx1e+PbbXprkis="; }; patches = [ @@ -123,6 +123,7 @@ buildPythonPackage rec { meta = with lib; { description = "Scientific python development environment"; + mainProgram = "spyder"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development environment for the Python language with advanced editing, interactive diff --git a/pkgs/development/python-modules/spython/default.nix b/pkgs/development/python-modules/spython/default.nix index e5a2fdf161c8..4339a3ccfec2 100644 --- a/pkgs/development/python-modules/spython/default.nix +++ b/pkgs/development/python-modules/spython/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Streamlined singularity python client (spython) for singularity"; + mainProgram = "spython"; homepage = "https://github.com/singularityhub/singularity-cli"; changelog = "https://github.com/singularityhub/singularity-cli/blob/${version}/CHANGELOG.md"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index fa0d3ad6cade..7801b029e1f2 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "sqlalchemy-continuum"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SQLAlchemy-Continuum"; inherit version; - hash = "sha256-Rk+aWxBjUrXuRPE5MSyzWMWS0l7qrjU3wOrHLC+vteU="; + hash = "sha256-4BZGzfv9azGiGwrrprv/ZhJY1b6Ed8dQDKs6HHSEjm4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 565ab218dd91..0d3ac845f608 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.27"; + version = "2.0.28"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-6R+A7rVq1olRXj1wMolHhEq418bpr5rsmH8RjxajmmQ="; + hash = "sha256-Xl3w9v97tyOpL4vUYzlovGrUGIZtIZsAhbE5/FhqFiM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index c103599b8b26..cd93626f08eb 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python CLI utility and library for manipulating SQLite databases"; + mainProgram = "sqlite-utils"; homepage = "https://github.com/simonw/sqlite-utils"; changelog = "https://github.com/simonw/sqlite-utils/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 8c4e09082622..0bb9375ebe44 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatic SQL injection and database takeover tool"; + mainProgram = "sqlmap"; homepage = "https://sqlmap.org"; changelog = "https://github.com/sqlmapproject/sqlmap/releases/tag/${version}"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 795647098caf..c0afa5eeb7c1 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Non-validating SQL parser for Python"; + mainProgram = "sqlformat"; longDescription = '' Provides support for parsing, splitting and formatting SQL statements. ''; diff --git a/pkgs/development/python-modules/sre-yield/default.nix b/pkgs/development/python-modules/sre-yield/default.nix index 33b64d38d629..68d8c43ebb13 100644 --- a/pkgs/development/python-modules/sre-yield/default.nix +++ b/pkgs/development/python-modules/sre-yield/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to efficiently generate all values that can match a given regular expression"; + mainProgram = "demo_sre_yield"; homepage = "https://github.com/sre-yield/sre-yield"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 9c80f4dbc90b..801980b9214d 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to implement Secure Remote Password (SRP) authentication"; + mainProgram = "srptools"; homepage = "https://github.com/idlesign/srptools"; changelog = "https://github.com/idlesign/srptools/blob/v${version}/CHANGELOG"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index cc7c4e5667df..87e4181c9b63 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)"; + mainProgram = "ssdp"; homepage = "https://github.com/codingjoe/ssdp"; changelog = "https://github.com/codingjoe/ssdp/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index c9550c57715b..37eb7a94e11f 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "sshfs"; version = "2023.10.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "fsspec"; - repo = pname; + repo = "sshfs"; rev = "refs/tags/${version}"; hash = "sha256-6MueDHR+jZFDZg4zufEVhBtSwcgDd7KnW9gJp2hDu0A="; }; diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 905ecc9258f0..dff398addf8a 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure python SSH tunnels"; + mainProgram = "sshtunnel"; homepage = "https://github.com/pahaz/sshtunnel"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 4f248044cc7f..6ea82d9b02a2 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchPypi # build-system , hatchling @@ -17,6 +18,7 @@ , httpx # tests +, pytest , pytestCheckHook , pythonOlder , trio @@ -27,16 +29,16 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.35.1"; + version = "0.37.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "encode"; - repo = pname; + repo = "starlette"; rev = "refs/tags/${version}"; - hash = "sha256-ynT1KowVJ1QdKLSOXYWVe5Q/PrYEWQDUbj395ebfk6Y="; + hash = "sha256-SJdBss1WKC30oulVTYUwUAJ8WM0KF5xbn/gvV97WM2g="; }; nativeBuildInputs = [ @@ -58,7 +60,18 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + (pytestCheckHook.override { + # pytest 8 changes warning message + # see https://github.com/encode/starlette/commit/8da52c2243b8855426c40c16ae24b27734824078 + pytest = pytest.overridePythonAttrs (old: rec { + version = "8.1.0"; + src = fetchPypi { + pname = "pytest"; + inherit version; + hash = "sha256-+PoEq4+Y0YUROuYOptecIvgUOxS8HK7O1EoKuESSgyM="; + }; + }); + }) trio typing-extensions ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); @@ -77,7 +90,7 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/encode/starlette/releases/tag/${version}"; + changelog = "https://www.starlette.io/release-notes/#${lib.replaceStrings [ "." ] [ "" ] version}"; downloadPage = "https://github.com/encode/starlette"; homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix index 9156ea6d6089..cf0c6c8e30f4 100644 --- a/pkgs/development/python-modules/static3/default.nix +++ b/pkgs/development/python-modules/static3/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/rmohr/static3/releases/tag/v${version}"; description = "A really simple WSGI way to serve static (or mixed) content"; + mainProgram = "static"; homepage = "https://github.com/rmohr/static3"; license = licenses.lgpl21Only; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 54a93398e1ff..a0e6659d0d25 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library and cli tool that makes it easy to build static sites using Jinja2"; + mainProgram = "staticjinja"; homepage = "https://staticjinja.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index 6ddd9830bedc..0970b8f882dc 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Applies STAT information from a Stylespace to a variable font"; + mainProgram = "statmake"; homepage = "https://github.com/daltonmaag/statmake"; changelog = "https://github.com/daltonmaag/statmake/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 7df922863174..bab094f39eef 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -1,53 +1,47 @@ { lib , buildPythonPackage , cython -, fetchpatch , fetchPypi -, matplotlib , numpy , oldest-supported-numpy +, packaging , pandas , patsy +, pythonAtLeast , pythonOlder , scipy +, setuptools , setuptools-scm -, wheel }: buildPythonPackage rec { pname = "statsmodels"; - version = "0.14.0"; - format = "pyproject"; + version = "0.14.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-aHXH1onpZtlI8V64FqtWFvSShwaxgM9HD9WQerb2R6Q="; + hash = "sha256-ImDv3B74nznGcKC9gVGx0IQ1Z3gbyv7GzaBTTrR6lPY="; }; - patches = [ - # https://github.com/statsmodels/statsmodels/pull/8969 - (fetchpatch { - name = "unpin-setuptools-scm.patch"; - url = "https://github.com/statsmodels/statsmodels/commit/cfad8d81166e9b1392ba99763b95983afdb6d61b.patch"; - hash = "sha256-l7cQHodkPm399a+3qIVmXPk/Ca+CqJDyWXWgjb062nM="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ cython oldest-supported-numpy + scipy + setuptools setuptools-scm - wheel + ] ++ lib.optionals (pythonAtLeast "3.12") [ + numpy ]; - propagatedBuildInputs = [ + dependencies = [ numpy - scipy + packaging pandas patsy - matplotlib + scipy ]; # Huge test suites with several test failures diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix index e11e26acc286..bc265fea72a3 100644 --- a/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "0.0.54"; + version = "0.0.55"; pyproject = true; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-FVKnB3v/T7eV6IQkaKQ8CFumIMc3PPlAgNOFNohQf9Q="; + hash = "sha256-kHP1anfkTQWD+2ZFw35KZAo08iolXQDjeTzT8w2limg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index 3501f9f4d85e..dc39e50aebcd 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.33"; + version = "2.17.34"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-hvvXg+V/VKTWWdqXM7Q1K5awemkGhSz64gV7HeRBXfg="; + hash = "sha256-U9SA2Dvepl9BjrvhH+8bVBNjby8IWu5UE+/oor7YWzI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix index 1dcaa22def4d..7d9dc7564a09 100644 --- a/pkgs/development/python-modules/stem/default.nix +++ b/pkgs/development/python-modules/stem/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/torproject/stem/blob/${src.rev}/docs/change_log.rst"; description = "Controller library that allows applications to interact with Tor"; + mainProgram = "tor-prompt"; downloadPage = "https://github.com/torproject/stem"; homepage = "https://stem.torproject.org/"; license = licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix index 8f23b1006051..723188d6c5ee 100644 --- a/pkgs/development/python-modules/stestr/default.nix +++ b/pkgs/development/python-modules/stestr/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "A parallel Python test runner built around subunit"; + mainProgram = "stestr"; homepage = "https://github.com/mtreinish/stestr"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index b2328f8d9ff4..3e7d9dfab324 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "stevedore"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pUU0rPm4m8ftJkgHATtQW/B/dNvkvPo30yvQY4cLCHw="; + hash = "sha256-Rrk8pA4RFM6pPXOKbB42U5aYG7a7eMJwRbdYfJRzVE0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stickytape/default.nix b/pkgs/development/python-modules/stickytape/default.nix index c3c9d4423fd0..99e63ebd3dfb 100644 --- a/pkgs/development/python-modules/stickytape/default.nix +++ b/pkgs/development/python-modules/stickytape/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to convert Python packages into a single script"; + mainProgram = "stickytape"; homepage = "https://github.com/mwilliamson/stickytape"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix index 0e779f3850a4..46aba99fb178 100644 --- a/pkgs/development/python-modules/stim/default.nix +++ b/pkgs/development/python-modules/stim/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool for high performance simulation and analysis of quantum stabilizer circuits, especially quantum error correction (QEC) circuits"; + mainProgram = "stim"; homepage = "https://github.com/quantumlib/stim"; changelog = "https://github.com/quantumlib/Stim/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix index 3817a96fe99c..b291e2cd7242 100644 --- a/pkgs/development/python-modules/stix2-patterns/default.nix +++ b/pkgs/development/python-modules/stix2-patterns/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Validate patterns used to express cyber observable content in STIX Indicators"; + mainProgram = "validate-patterns"; homepage = "https://github.com/oasis-open/cti-pattern-validator"; changelog = "https://github.com/oasis-open/cti-pattern-validator/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 00de51ea66f5..fec3eb6b56e6 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flash firmware to STM32 microcontrollers in Python"; + mainProgram = "stm32loader"; homepage = "https://github.com/florisla/stm32loader"; changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index a0d07fa51542..888c98cd6279 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Official Api Spec Language for Dropbox"; + mainProgram = "stone"; homepage = "https://github.com/dropbox/stone"; changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 8cdffc96759f..40ae06c91c8f 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.217.1"; + version = "0.219.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-Rorbqh/YwBlrkVgS7rV5vb4n773V/EmGAMGP0fuF6V4="; + hash = "sha256-uIUETjzuDnlQp6wM7uxyLRSMT5uyrXFrI9NilcjP0BU="; }; patches = [ @@ -186,6 +186,7 @@ buildPythonPackage rec { meta = with lib; { description = "A GraphQL library for Python that leverages type annotations"; + mainProgram = "strawberry"; homepage = "https://strawberry.rocks"; changelog = "https://github.com/strawberry-graphql/strawberry/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 851a613d8740..94144c92ab08 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.32.1"; + version = "1.32.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7GQASW9niFIUPLwjxMQ4ifeLbJPC4nVv2OBgzM3kuP0="; + hash = "sha256-Eli5y8P/lXv30Jsb/IXO3DCPEGWzB0hUUpWpr41Vd6s="; }; nativeBuildInputs = [ @@ -89,6 +89,7 @@ buildPythonPackage rec { homepage = "https://streamlit.io/"; changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}"; description = "The fastest way to build custom ML tools"; + mainProgram = "streamlit"; maintainers = with maintainers; [ natsukium yrashk ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 6fb53df48063..c4ea849251b7 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "7.11.0"; + version = "8.6.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vf8IJ/jZNopMXoOIdv+dwdXhYVsFrJirRQyB6589MDU="; + hash = "sha256-zz27JZGwSpLfxhbQ/gYqTTk+2Ca6ZkErmpLbu1fc3+A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 95814c1c0603..d7024ef130de 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { changelog = "https://github.com/joshy/striprtf/blob/v${version}/CHANGELOG.md"; homepage = "https://github.com/joshy/striprtf"; description = "A simple library to convert rtf to text"; + mainProgram = "striprtf"; maintainers = with maintainers; [ aanderse ]; license = with licenses; [ bsd3 ]; }; diff --git a/pkgs/development/python-modules/stupidartnet/default.nix b/pkgs/development/python-modules/stupidartnet/default.nix index 6092682d2afe..6ed5783f13d2 100644 --- a/pkgs/development/python-modules/stupidartnet/default.nix +++ b/pkgs/development/python-modules/stupidartnet/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "stupidartnet"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cpvalente"; repo = "stupidArtnet"; rev = "refs/tags/${version}"; - hash = "sha256-2LfK63FJcdnXfDLuUzYNlspj1jmtw00S6el49cH+RRM="; + hash = "sha256-6vEzInt1ofVVjTZAOH0Zw3BdwpX//1ZWwJqWPP5fIC8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 293d39cee3e2..1cff8ae459ff 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with STARLINK-enabled vehicle"; + mainProgram = "subarulink"; homepage = "https://github.com/G-Two/subarulink"; changelog = "https://github.com/G-Two/subarulink/releases/tag/v${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/subzerod/default.nix b/pkgs/development/python-modules/subzerod/default.nix index 5a3632336511..3739e595e00c 100644 --- a/pkgs/development/python-modules/subzerod/default.nix +++ b/pkgs/development/python-modules/subzerod/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to help with the enumeration of subdomains"; + mainProgram = "subzerod"; homepage = "https://github.com/sanderfoobar/subzerod"; license = with licenses; [ wtfpl ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index 0ddabc8c4554..74d369acefc1 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "succulent"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "succulent"; rev = "refs/tags/${version}"; - hash = "sha256-2WiKrIQkgFIjmZkEA8veXcKCY4X0aygqoP7R3UCCljQ="; + hash = "sha256-+S4ekvaQvbBxjUQkG+Bd9lYdZwHB3oq7Ay9kWquCcyE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 732828e908ac..17aa79c34020 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-C5UnKp0EqzxSHTokdSJmfIOMBI6yXpWSazTxcSLOIvI="; + hash = "sha256-k2fsmvKjl/zVljiyAHII1O6vntJOPo3CWWwmsYlsLh8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix index bd5a9cf31581..c662a01868ed 100644 --- a/pkgs/development/python-modules/sunweg/default.nix +++ b/pkgs/development/python-modules/sunweg/default.nix @@ -4,22 +4,27 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "sunweg"; - version = "2.1.0"; - format = "setuptools"; + version = "2.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rokam"; - repo = pname; + repo = "sunweg"; rev = "refs/tags/${version}"; - hash = "sha256-E5dwFfFzOMyYLAqoTdp22/qIS3+IXD6jkVUVZIumk6Y="; + hash = "sha256-fgNtxCBIuNulCfuDaEsM7kL1WpwNE9O+JQ1DMZrz5jA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index aaa7cba6494e..9d16cd48af4c 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility belt for automated testing"; + mainProgram = "sure"; homepage = "https://sure.readthedocs.io/"; changelog = "https://github.com/gabrielfalcao/sure/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index 41e83ccd5519..d590681fd7fc 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -64,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interact with the Sure Petcare API"; + mainProgram = "surepy"; homepage = "https://github.com/benleb/surepy"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index 2ce5a49b8d14..10373a9ecfa3 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "survey"; - version = "4.5.4"; + version = "5.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wjpO1+9AXi75uPXOTE5/owEiZgtffkkMAaZ+gDO0t5I="; + hash = "sha256-Hr7sYn6V2iw4r3P8mXhYVyUD8JpU2zGq4nG6hHM7gxU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index 59841b4cecfd..61ac8a625656 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "A pure-Python library for reading and converting SVG"; + mainProgram = "svg2pdf"; homepage = "https://github.com/deeplook/svglib"; changelog = "https://github.com/deeplook/svglib/blob/v${version}/CHANGELOG.rst"; license = licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 568c2dc67801..045c5f97501c 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "sybil"; - version = "5.0.0"; - format = "setuptools"; + version = "6.0.3"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "simplistix"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FeyamQDm/EqOWrRlxA8iIQniHI5xag+zUVfRGRHmslE="; + hash = "sha256-SqAP+hj+pivsuGxx9/TvmfVrfrLSWQRYIjKh0ui0AVc="; }; + build-system = [ + setuptools + ]; + # Circular dependency with testfixtures doCheck = false; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index cf250568b609..d2a10492153e 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for symbolic mathematics"; + mainProgram = "isympy"; homepage = "https://www.sympy.org/"; license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ] ++ teams.sage.members; diff --git a/pkgs/development/python-modules/symspellpy/default.nix b/pkgs/development/python-modules/symspellpy/default.nix new file mode 100644 index 000000000000..ad3b732209ef --- /dev/null +++ b/pkgs/development/python-modules/symspellpy/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + +, pythonOlder + +, pytestCheckHook + +, setuptools + + # for testing +, numpy +, importlib-resources + + # requirements +, editdistpy +}: + +buildPythonPackage rec { + pname = "symspellpy"; + version = "6.7.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + patches = [ + # patch for fix tests + # https://github.com/mammothb/symspellpy/pull/151 + (fetchpatch { + name = "fix-pkg-resources-deprecation-warning.patch"; + url = "https://github.com/mammothb/symspellpy/commit/b0298f4936f28a79612f5509612210868548793f.patch"; + hash = "sha256-mdUJMrcPv5zczIRP+8u5vicz2IE1AUN3YP0+zg3jqZg="; + }) + (fetchpatch { + name = "fix-error-message-checking-py312.patch"; + url = "https://github.com/mammothb/symspellpy/commit/f6f91e18316bed717036306c33d2ee82a922563a.patch"; + hash = "sha256-a5KsESIEIzlbcEPq8sTB2+XkuT/vP81U8StZhaL0MbA="; + }) + ]; + + src = fetchFromGitHub { + owner = "mammothb"; + repo = "symspellpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-D8xdMCy4fSff3nuS2sD2QHWk0869AlFDE+lFRvayYDQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + editdistpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + numpy + importlib-resources + ]; + + pythonImportsCheck = [ + "symspellpy" + "symspellpy.symspellpy" + ]; + + meta = with lib; + { + description = "Python port of SymSpell v6.7.1, which provides much higher speed and lower memory consumption"; + homepage = "https://github.com/mammothb/symspellpy"; + changelog = "https://github.com/mammothb/symspellpy/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index f0e4fb97c6ba..a53740b37253 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,10 +20,10 @@ buildPythonPackage rec { owner = "rtcq"; repo = "syncedlyrics"; rev = "refs/tags/v${version}"; - hash = "sha256-ro9HzI8N7Ry4xh91mO1Vyy3CScEi3FifweOO01/Ti0w="; + hash = "sha256-Q0Hu403Hxr4iDuZfGQjgTSuNMVgsqd9zLRl9Vc1YzyQ="; }; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { "rapidfuzz" ]; - propagatedBuildInputs = [ + dependencies = [ requests rapidfuzz beautifulsoup4 @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to get LRC format (synchronized) lyrics"; + mainProgram = "syncedlyrics"; homepage = "https://github.com/rtcq/syncedlyrics"; changelog = "https://github.com/rtcq/syncedlyrics/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/synologydsm-api/default.nix b/pkgs/development/python-modules/synologydsm-api/default.nix index 52dc544acb4d..8be0564de4d7 100644 --- a/pkgs/development/python-modules/synologydsm-api/default.nix +++ b/pkgs/development/python-modules/synologydsm-api/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for communication with Synology DSM"; + mainProgram = "synologydsm-api"; homepage = "https://github.com/hacf-fr/synologydsm-api"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 84bc944317e1..c5b860e84050 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.6.0"; + version = "4.6.1"; format = "pyproject"; disabled = lib.versionOlder python.version "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-FjDGwSOKvDWx+LwUCNGEOBKV3rFG+09gtFpLLi0xgD4="; + hash = "sha256-NBJJqQsZqqKHOdqGa/j/2KQvlenLCEJBqlfdjtFK00U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix index f5bb1e63136b..04132ffe081a 100644 --- a/pkgs/development/python-modules/systembridgeconnector/default.nix +++ b/pkgs/development/python-modules/systembridgeconnector/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "systembridgeconnector"; - version = "4.0.3"; + version = "4.0.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,20 +23,21 @@ buildPythonPackage rec { owner = "timmo001"; repo = "system-bridge-connector"; rev = "refs/tags/${version}"; - hash = "sha256-AjdWDEotz5AUo+auxBqXu7EMv/Kt97DZ6vOrFunZ2Fw="; + hash = "sha256-Guh9qbRLp+b2SuFgBx7jf16vRShuHJBi3WOVn9Akce8="; }; patches = [ (fetchpatch2 { - url = "https://github.com/timmo001/system-bridge-connector/commit/a9030cf175ab4b51d77010de89e83cbb426448c2.patch"; - hash = "sha256-0N8knoaEvymSvC92BxDKR0j52oasvOzWosFtHMI2Qmc="; - }) - (fetchpatch2 { url = "https://github.com/timmo001/system-bridge-connector/commit/25aa172775ee983dc4a29b8dda880aefbad70040.patch"; hash = "sha256-PedW1S1gZmWkS4sJBqSAx3aoA1KppYS5Xlhoaxqkcd4="; }) ]; + postPatch = '' + substituteInPlace systembridgeconnector/_version.py \ + --replace-fail ", dev=0" "" + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix index 37bbef1c3b71..ee7945ee20b9 100644 --- a/pkgs/development/python-modules/systembridgemodels/default.nix +++ b/pkgs/development/python-modules/systembridgemodels/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch2 , setuptools , incremental , pytestCheckHook @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "systembridgemodels"; - version = "4.0.1"; + version = "4.0.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,15 +18,13 @@ buildPythonPackage rec { owner = "timmo001"; repo = "system-bridge-models"; rev = "refs/tags/${version}"; - hash = "sha256-9k85tqJO/YtkYncfNQBelmDkd3SYtf6SHURfumvqUo0="; + hash = "sha256-5rbj58E8iDu2Rjf0k9Y1UoF3hbN7ntkx6dm20HYpw6I="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/timmo001/system-bridge-models/commit/82fcee37cb302bc77384165b2ce10f2234c2a14a.patch"; - hash = "sha256-tZSaWVUPCJmuzkae9LBTdyZ3UINMvrSMbdS5AvbId8Q="; - }) - ]; + postPatch = '' + substituteInPlace systembridgemodels/_version.py \ + --replace-fail ", dev=0" "" + ''; nativeBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index 3958ace5aacf..2f7574a32f95 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tabcmd"; - version = "2.0.12"; + version = "2.0.13"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nsQJWDzSzSc1WRk5TBl/E7Mpfk8wGD1CsETAWILKxCM="; + hash = "sha256-f9zoYeb4RzcCtgcCYYvvuCuFrjqpP3Fhv38bUWH24+g="; }; pythonRelaxDeps = [ @@ -90,6 +90,7 @@ buildPythonPackage rec { meta = with lib; { description = "A command line client for working with Tableau Server."; + mainProgram = "tabcmd"; homepage = "https://github.com/tableau/tabcmd"; changelog = "https://github.com/tableau/tabcmd/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index f857585c9b23..87644ba51923 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = { description = "Pretty-print tabular data"; + mainProgram = "tabulate"; homepage = "https://github.com/astanin/python-tabulate"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/tabview/default.nix b/pkgs/development/python-modules/tabview/default.nix index 62eaf512357b..8d83fe4ef9ad 100644 --- a/pkgs/development/python-modules/tabview/default.nix +++ b/pkgs/development/python-modules/tabview/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python curses command line CSV and tabular data viewer"; + mainProgram = "tabview"; homepage = "https://github.com/TabViewer/tabview"; changelog = "https://github.com/TabViewer/tabview/blob/main/CHANGELOG.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tagoio-sdk/default.nix b/pkgs/development/python-modules/tagoio-sdk/default.nix index b5bcc619eed8..626872794e03 100644 --- a/pkgs/development/python-modules/tagoio-sdk/default.nix +++ b/pkgs/development/python-modules/tagoio-sdk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tagoio-sdk"; - version = "4.2.1"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tago-io"; repo = "sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-R7qJIgL8/zejIuT6YMnC3bdm8lKLBTK5eVjVDEjvRKs="; + hash = "sha256-37/fg2vbwYPhYPvSJ2YxWAPrfspqTE3thIL/VR1+AkI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/tailer/default.nix b/pkgs/development/python-modules/tailer/default.nix index 8079d7d2c614..ffc7e3da17c8 100644 --- a/pkgs/development/python-modules/tailer/default.nix +++ b/pkgs/development/python-modules/tailer/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation implementation of GNU tail and head"; + mainProgram = "pytail"; homepage = "https://github.com/six8/pytailer"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/tank-utility/default.nix b/pkgs/development/python-modules/tank-utility/default.nix index 358ebbb0d82c..d9783789df7c 100644 --- a/pkgs/development/python-modules/tank-utility/default.nix +++ b/pkgs/development/python-modules/tank-utility/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the Tank Utility API"; + mainProgram = "tank-utility"; homepage = "https://github.com/krismolendyke/tank-utility"; changelog = "https://github.com/krismolendyke/tank-utility/blob/${version}/HISTORY.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 7769c3b298a4..69b17a826fb5 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.11.3"; + version = "5.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - hash = "sha256-5tVvElM7pZF3rZJMMk0IIZBhiv+9J8KBLjfoVTPF198="; + hash = "sha256-55sTUqNwfWg5h9msByq2RuVx/z23ST7p7pA/ZsIeYr8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index beda64f22eb5..98d998f92a40 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/sephii/taxi/"; description = "Timesheeting made easy"; + mainProgram = "taxi"; license = licenses.wtfpl; maintainers = with maintainers; [ jocelynthode ]; }; diff --git a/pkgs/development/python-modules/tdir/default.nix b/pkgs/development/python-modules/tdir/default.nix new file mode 100644 index 000000000000..644adda75ff0 --- /dev/null +++ b/pkgs/development/python-modules/tdir/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, dek +, xmod +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tdir"; + version = "1.8.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rec"; + repo = "tdir"; + rev = "v${version}"; + hash = "sha256-YYQ33Blhqk/CbocqkB9Nh6qbzMjQT07fmzx+fDTvdw8="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + dek + xmod + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tdir" + ]; + + meta = with lib; { + description = "Create, fill a temporary directory"; + homepage = "https://github.com/rec/tdir"; + changelog = "https://github.com/rec/tdir/blob/${src.rev}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index 787824d50388..f2f403765006 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Symbol hash for ELF files"; + mainProgram = "telfhash"; homepage = "https://github.com/trendmicro/telfhash"; license = licenses.asl20; maintainers = [ ]; diff --git a/pkgs/development/python-modules/tellduslive/default.nix b/pkgs/development/python-modules/tellduslive/default.nix index f933553dcdbe..b367c5d4417e 100644 --- a/pkgs/development/python-modules/tellduslive/default.nix +++ b/pkgs/development/python-modules/tellduslive/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to communicate with Telldus Live"; + mainProgram = "tellduslive"; homepage = "https://github.com/molobrakos/tellduslive"; license = with licenses; [ unlicense ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/templateflow/default.nix b/pkgs/development/python-modules/templateflow/default.nix index c879b7064d0f..8bdabc162a07 100644 --- a/pkgs/development/python-modules/templateflow/default.nix +++ b/pkgs/development/python-modules/templateflow/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "templateflow"; - version = "23.1.0"; + version = "24.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "templateflow"; repo = "python-client"; rev = "refs/tags/${version}"; - hash = "sha256-8AdXC1IFGfYZ5cvCAyBz0tD3zia+KBILX0tL9IcO2NA="; + hash = "sha256-UxYJnKOqIIf10UW5xJ7MrFHtZY5WNVi5oZgdozj65Z8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 591cf9e3555f..b33d72b99b79 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tempora"; - version = "5.5.0"; + version = "5.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-E+T8yZfQUJwzBtaEHwPpOBt+Xkayvr+ukVGvkAhfDCY="; + hash = "sha256-ortR4hIZdtkxNHs+QzkXw2S4P91fZO8nM2yGW/H7D3U="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Objects and routines pertaining to date and time"; + mainProgram = "calc-prorate"; homepage = "https://github.com/jaraco/tempora"; changelog = "https://github.com/jaraco/tempora/blob/v${version}/NEWS.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 19662cf7a37e..34ce22a46136 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1102"; + version = "3.0.1114"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-VEYFNu8z/PVn+CcQzRdKtUw+JkKzxSIS6t6NMEaNNDc="; + hash = "sha256-OqkXHnXoQE2BF2Lon9+3pPVvqXK9YQnoDewoQ13Aa1Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index af45054bac42..9fdc3bb71192 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.16.0"; + version = "2.16.2"; format = "wheel"; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-JjuQmiAJyzp52qar5kwXhcwxfCWlTk2y/stkKf/FTFg="; + hash = "sha256-nytOfa2GZnYVwOXNBy8eqEA/wDKimfAHLW90hVd1zEU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index e0a72af7a135..820b00744195 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -68,6 +68,9 @@ buildPythonPackage rec { disabledTestPaths = [ # we are not interested in linting errors "tests/test_lint.py" + # ImportError: cannot import name 'mock_s3' from 'moto' + "tests/test_embedding.py" + "tests/test_record_writer.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index e857a2916e20..8440eb58f4fc 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.9.3"; + version = "4.9.4"; format = "setuptools"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - hash = "sha256-ZXCcXChrWqs0FAK5Fe8cD+MuJpWa9Dwo/ny5fOX2lKU="; + hash = "sha256-HY/atBEWeEJgBNxEapq9jPFoZbFof2AHEDAiJa/lYAE="; }; patches = [ diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix index e108b1a773cb..58a3e64d5610 100644 --- a/pkgs/development/python-modules/tensorrt/default.nix +++ b/pkgs/development/python-modules/tensorrt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ unzip autoPatchelfHook - cudaPackages.autoAddOpenGLRunpathHook + cudaPackages.autoAddDriverRunpath ]; preUnpack = '' diff --git a/pkgs/development/python-modules/termgraph/default.nix b/pkgs/development/python-modules/termgraph/default.nix index 30d37d9f87d8..2e9f0a8c22bf 100644 --- a/pkgs/development/python-modules/termgraph/default.nix +++ b/pkgs/development/python-modules/termgraph/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python command-line tool which draws basic graphs in the terminal"; + mainProgram = "termgraph"; homepage = "https://github.com/mkaz/termgraph"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 9a07c2103518..45553889b1bd 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "A software composition analysis tool and Python library that generates a Software Bill of Materials for container images and Dockerfiles"; + mainProgram = "tern"; homepage = "https://github.com/tern-tools/tern"; changelog = "https://github.com/tern-tools/tern/releases/tag/v${version}"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index a9f70fdf92d9..e82fddf4c424 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.4.9"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-GiDhVN6aBj0yeIg596ox2ES28Dca81pVnsYWvc1SZ+A="; + hash = "sha256-IRUH3qWRJoCEvzkkR8/qH5i735B030CLKKRRWO9DVuI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix index fcdab982a02d..95222f4de389 100644 --- a/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tesla-powerwall"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jrester"; repo = "tesla_powerwall"; rev = "refs/tags/v${version}"; - hash = "sha256-if/FCfxAB48WGXZOMvCtdSOW2FWO43OrlcHZbXIPmGE="; + hash = "sha256-cAsJKFM0i0e7w2T4HP4a5ybJGuDvBAGCGmPEKFzNFAY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 4da0d7702317..8450fcde1126 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "3.7.1"; + version = "4.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; - rev = "v${version}"; - hash = "sha256-OHuvUi5oa0fVcfo0FW9XwaUp52MEH4NTM6GqK4ic0oM="; + rev = "refs/tags/testcontainers-v${version}"; + hash = "sha256-cVVP9nGRTLC09KHalQDz7KOszjuFVVpMlee4btPNgd4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 911d1496165f..b8c0a5dc1371 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,20 +1,17 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , mock , pytestCheckHook -, pythonAtLeast , pythonOlder , setuptools , sybil , twisted -, zope-component }: buildPythonPackage rec { pname = "testfixtures"; - version = "7.2.2"; + version = "8.1.0"; pyproject = true; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -23,23 +20,14 @@ buildPythonPackage rec { # https://github.com/simplistix/testfixtures/issues/169 # https://github.com/simplistix/testfixtures/issues/168 - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gHdK7LAklFgnWreD9TCT++dXlf8rMhjSLOP/8KEsTaY="; + hash = "sha256-gISJkDBIWcOito3+S8r3e25kJaOSUEe8JaUnVSd7+m0="; }; - patches = [ - # https://github.com/simplistix/testfixtures/pull/188 - (fetchpatch { - name = "python3.12-compatibility.patch"; - url = "https://github.com/simplistix/testfixtures/commit/2b80b195e30e12c739dc4f98e9de17dec8f3558a.patch"; - hash = "sha256-LrC0uI4k3F6ZGTqbKi319tRbVk5557xbyzQN36Y1160="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools ]; @@ -48,7 +36,6 @@ buildPythonPackage rec { pytestCheckHook sybil twisted - zope-component ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix index e23563de6ec8..a5b35de14213 100644 --- a/pkgs/development/python-modules/testrail-api/default.nix +++ b/pkgs/development/python-modules/testrail-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "testrail-api"; - version = "1.12.1"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tolstislon"; repo = "testrail-api"; rev = "refs/tags/${version}"; - hash = "sha256-lIlTrAdNtBJdwiSFwpcHA2e+fRC+MbHS0PX7prAN+RY="; + hash = "sha256-NGdNpNJ9ejwneSacNmifGJ8TMUuBqMu9tHTyLxTB5Uk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index 60abdaa86384..27caf08a9104 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A database of test results which can be used as part of developer workflow"; + mainProgram = "testr"; homepage = "https://pypi.python.org/pypi/testrepository"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index d5bd84a8c634..84eba320791c 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for parsing semi-structured text into python tables"; + mainProgram = "textfsm"; homepage = "https://github.com/google/textfsm"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/textile/default.nix b/pkgs/development/python-modules/textile/default.nix index adae00ef3ec5..01686e4fc2ac 100644 --- a/pkgs/development/python-modules/textile/default.nix +++ b/pkgs/development/python-modules/textile/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "MOdule for generating web text"; + mainProgram = "pytextile"; homepage = "https://github.com/textile/python-textile"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix index 5c58f63dcdbf..d8ca583d97b6 100644 --- a/pkgs/development/python-modules/textual-dev/default.nix +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Development tools for Textual"; + mainProgram = "textual"; homepage = "https://github.com/Textualize/textual-dev"; license = licenses.mit; maintainers = with maintainers; [ yannip ]; diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 7b4dd5ac2efb..52a7715e2400 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, importlib-metadata , jinja2 , markdown-it-py , poetry-core @@ -17,31 +16,30 @@ buildPythonPackage rec { pname = "textual"; - version = "0.47.1"; + version = "0.52.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Textualize"; - repo = pname; + repo = "textual"; rev = "refs/tags/v${version}"; - hash = "sha256-RFaZKQ+0o6ZvfZxx95a1FjSHVJ0VOIAfzkdxYQXYBKU="; + hash = "sha256-a5v8HS6ZswQOl/jIypFJTk+MuMsu89H2pAAlWMPkLjI="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - importlib-metadata + dependencies = [ markdown-it-py rich typing-extensions ] ++ markdown-it-py.optional-dependencies.plugins ++ markdown-it-py.optional-dependencies.linkify; - passthru.optional-dependencies = { + optional-dependencies = { syntax = [ tree-sitter # tree-sitter-languages @@ -54,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook syrupy time-machine - ] ++ passthru.optional-dependencies.syntax; + ] ++ optional-dependencies.syntax; disabledTestPaths = [ # snapshot tests require syrupy<4 @@ -68,6 +66,7 @@ buildPythonPackage rec { # requires tree-sitter-languages which is not packaged in nixpkgs "test_register_language" + "test_language_binary_missing" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index e169cbdb9b81..46847572714c 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -79,6 +79,7 @@ let meta = with lib; { description = "Domain-specific languages and parsers in Python"; + mainProgram = "textx"; homepage = "https://github.com/textx/textx/"; license = licenses.mit; maintainers = with maintainers; [ yuu ]; diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix index f1359e6fdaac..deb739ce162f 100644 --- a/pkgs/development/python-modules/tf2onnx/default.nix +++ b/pkgs/development/python-modules/tf2onnx/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tf2onnx"; - version = "1.15.1"; + version = "1.16.1"; format = "setuptools"; src = fetchFromGitHub { owner = "onnx"; repo = "tensorflow-onnx"; rev = "refs/tags/v${version}"; - hash = "sha256-HqzcoPPX9+NOj0uFfOSVI2MNCkxq1NmLqXflwdi5RF0="; + hash = "sha256-qtRzckw/KHWm3gjFwF+cPuBhGbfktjhYIwImwHn2CFk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/thelogrus/default.nix b/pkgs/development/python-modules/thelogrus/default.nix index 5fe496bda795..62011023516d 100644 --- a/pkgs/development/python-modules/thelogrus/default.nix +++ b/pkgs/development/python-modules/thelogrus/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python 3 version of logrus"; + mainProgram = "human-time"; homepage = "https://github.com/unixorn/thelogrus"; changelog = "https://github.com/unixorn/thelogrus/blob/${version}/ChangeLog.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 82ae98abc0c9..db5398550689 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.2.2"; + version = "8.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-boW5RGcsD5UkGnH2f5iC4asxnESaR3QLDRWfTPhtFYc="; + hash = "sha256-9a/FIikSqAvai9zslYNiorpTjXAn3I22FUhF0oWdynY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index 54d7fa128293..50dbe491fdf8 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "threadpoolctl"; - version = "3.1.0"; + version = "3.3.0"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joblib"; repo = pname; - rev = version; - hash = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; + rev = "refs/tags/${version}"; + hash = "sha256-mdOZcplqXrkKlL/SXipJg6A9Dh1lXGEHszBLGH/kxqs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/threat9-test-bed/default.nix b/pkgs/development/python-modules/threat9-test-bed/default.nix index b7d523b37684..cb4f47e6496e 100644 --- a/pkgs/development/python-modules/threat9-test-bed/default.nix +++ b/pkgs/development/python-modules/threat9-test-bed/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for adding unittests.mock as view functions"; + mainProgram = "test-bed"; homepage = "https://github.com/threat9/threat9-test-bed"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index 020417ece1df..8c3c2429dc72 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "tidalapi"; - version = "0.7.3"; + version = "0.7.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-sIPuo1kd08Quflf7oFxoo1H56cdUDlbNTfFkn8j3jVE="; + hash = "sha256-QzrIWQ7cWpPAu3+/zqAqX9eDWOF8F3Xj8Rt5D8I6h9M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 20858e870c73..30d99043f04c 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2023.9.26"; + version = "2024.2.12"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Z+NV5Flaqzl/hAXQSv4bSufG9ipE4i2TP+4aVxpIx64="; + hash = "sha256-SSCj7I6OAD5nPTxlMYY8me7dVw0bi34UHAcu14/4Aw0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tika/default.nix b/pkgs/development/python-modules/tika/default.nix index 7e2ce76f9f76..f9a645890084 100644 --- a/pkgs/development/python-modules/tika/default.nix +++ b/pkgs/development/python-modules/tika/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python binding to the Apache Tika™ REST services"; + mainProgram = "tika-python"; homepage = "https://github.com/chrismattmann/tika-python"; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index d7c724ab25d2..2c9fab82000c 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.24.0"; + version = "0.26.2"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - hash = "sha256-EcWqh/xFyFvTuyzsPuAkT67O0y8TPWt2MvXVPnaQzrg="; + hash = "sha256-8c1l4zoD44SjaOUXlFUSho/y7oMNOEVM9ZlnRs1irV8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix index 220f40354dcc..294a34d81177 100644 --- a/pkgs/development/python-modules/tilequant/default.nix +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for quantizing image colors using tile-based palette restrictions"; + mainProgram = "tilequant"; homepage = "https://github.com/SkyTemple/tilequant"; license = licenses.gpl3Plus; maintainers = with maintainers; [ marius851000 xfix ]; diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index d51cb5b35eee..b09d96871621 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interact with TimeTagger"; + mainProgram = "timetagger"; homepage = "https://github.com/almarklein/timetagger"; changelog = "https://github.com/almarklein/timetagger/releases/tag/v${version}"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index c39b04cd3fe7..79675ebc629a 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.4.1"; + version = "6.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jannikmi"; repo = "timezonefinder"; rev = "refs/tags/${version}"; - hash = "sha256-e9Zx236X76GYFuADCw9+5HWs2craeq44gVNclkc4th0="; + hash = "sha256-V5g1zTdXWeJba71/eUGQbF9XOhMQuzivtGkqGD4OHMY="; }; nativeBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/jannikmi/timezonefinder/blob/${version}/CHANGELOG.rst"; description = "Module for finding the timezone of any point on earth (coordinates) offline"; + mainProgram = "timezonefinder"; homepage = "https://github.com/MrMinimal64/timezonefinder"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix new file mode 100644 index 000000000000..25b1f049bf69 --- /dev/null +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -0,0 +1,111 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, gpuctypes +, numpy +, tqdm +, hypothesis +, librosa +, onnx +, pillow +, pytest-xdist +, pytestCheckHook +, safetensors +, sentencepiece +, tiktoken +, torch +, transformers +}: + +buildPythonPackage rec { + pname = "tinygrad"; + version = "0.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tinygrad"; + repo = "tinygrad"; + rev = "refs/tags/v${version}"; + hash = "sha256-QAccZ79qUbe27yUykIf22WdkxYUlOffnMlShakKfp60="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + gpuctypes + numpy + tqdm + ]; + + pythonImportsCheck = [ "tinygrad" ]; + + nativeCheckInputs = [ + hypothesis + librosa + onnx + pillow + pytest-xdist + pytestCheckHook + safetensors + sentencepiece + tiktoken + torch + transformers + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # Require internet access + "test_benchmark_openpilot_model" + "test_bn_alone" + "test_bn_linear" + "test_bn_mnist" + "test_car" + "test_chicken" + "test_chicken_bigbatch" + "test_conv_mnist" + "testCopySHMtoDefault" + "test_data_parallel_resnet" + "test_e2e_big" + "test_fetch_small" + "test_huggingface_enet_safetensors" + "test_linear_mnist" + "test_load_convnext" + "test_load_enet" + "test_load_enet_alt" + "test_load_llama2bfloat" + "test_load_resnet" + "test_openpilot_model" + "test_resnet" + "test_shufflenet" + "test_transcribe_batch12" + "test_transcribe_batch21" + "test_transcribe_file1" + "test_transcribe_file2" + "test_transcribe_long" + "test_transcribe_long_no_batch" + "test_vgg7" + ]; + + disabledTestPaths = [ + "test/extra/test_lr_scheduler.py" + "test/models/test_mnist.py" + "test/models/test_real_world.py" + ]; + + meta = with lib; { + description = "A simple and powerful neural network framework"; + homepage = "https://github.com/tinygrad/tinygrad"; + changelog = "https://github.com/tinygrad/tinygrad/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 026a033357fd..73d6f7b8876d 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to capitalize strings as specified by the New York Times"; + mainProgram = "titlecase"; homepage = "https://github.com/ppannuto/python-titlecase"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index a8a25bba00cf..8ec2c85d63a1 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extracts the top level domain (TLD) from the URL given"; + mainProgram = "update-tld-names"; homepage = "https://github.com/barseghyanartur/tld"; changelog = "https://github.com/barseghyanartur/tld/blob/${version}/CHANGELOG.rst"; # https://github.com/barseghyanartur/tld/blob/master/README.rst#license diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 12b6c51a7679..2aab849ae5f0 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -11,11 +11,12 @@ , responses , setuptools , setuptools-scm +, syrupy }: buildPythonPackage rec { pname = "tldextract"; - version = "5.1.1"; + version = "5.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "john-kurkowski"; repo = "tldextract"; rev = "refs/tags/${version}"; - hash = "sha256-/VBbU8FuB8MEuX6MgGO44+gfqVjl1aHHDHncHY2Jo38="; + hash = "sha256-rieDDSCit9UcMpCMs2X3+cCS41Wbrp4WWVMzKj/jwEM="; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook responses + syrupy ]; pythonImportsCheck = [ @@ -59,5 +61,6 @@ buildPythonPackage rec { changelog = "https://github.com/john-kurkowski/tldextract/blob/${version}/CHANGELOG.md"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "tldextract"; }; } diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index ee0dfefab645..92481399143d 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -88,6 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; + mainProgram = "toggl"; homepage = "https://toggl.uhlir.dev/"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 695ce44c20a8..662f96479834 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A wrapper around the stdlib `tokenize` which roundtrips"; + mainProgram = "tokenize-rt"; homepage = "https://github.com/asottile/tokenize-rt"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 040dc6c1ed29..f0204e08f8d8 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices"; + mainProgram = "tolo-cli"; homepage = "https://gitlab.com/MatthiasLohr/tololib"; changelog = "https://gitlab.com/MatthiasLohr/tololib/-/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/toml-adapt/default.nix b/pkgs/development/python-modules/toml-adapt/default.nix index a3a8cfc71f39..6af7f0940ed2 100644 --- a/pkgs/development/python-modules/toml-adapt/default.nix +++ b/pkgs/development/python-modules/toml-adapt/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "toml-adapt"; - version = "0.3.2"; - format = "pyproject"; + version = "0.3.3"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "firefly-cpp"; - repo = pname; + repo = "toml-adapt"; rev = "refs/tags/${version}"; - hash = "sha256-Za2v1Mon6e0mmGGTNXf1bCV5CIL8hrl7jGz4Lk3N8xc="; + hash = "sha256-KD5dTr/wxFbDg3AbfE0jUbgNjvxqDmbHwjY5Dmp6JFI="; }; nativeBuildInputs = [ @@ -42,7 +42,9 @@ buildPythonPackage rec { meta = with lib; { description = "A simple Command-line interface for manipulating toml files"; homepage = "https://github.com/firefly-cpp/toml-adapt"; + changelog = "https://github.com/firefly-cpp/toml-adapt/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; + mainProgram = "toml-adapt"; }; } diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index fa978be73bbd..94f63be259a6 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.12.3"; + version = "0.12.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-dbr1AS0GUB8HvuW/joAbnzQ+eqxaklgfIPgM5jLmtaQ="; + hash = "sha256-fKHPwSIygGUXqFFQR7pmoZNp5x7fJDnQ9YJPkQMrbMM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 60e38571a759..ccec8644b070 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "toolz"; - version = "0.12.0"; + version = "0.12.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-iMVwhhxEDuPy9gN8RlRhMij/QMk6bCXg66cNFygsYZQ="; + hash = "sha256-7Mo0JmSJPxd6E9rA5rQcvYrCWjWOXyFTFtQ+IQAiT00="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index 0bb415574e39..bee32b616345 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -40,7 +40,7 @@ in buildPythonPackage { nativeBuildInputs = lib.optionals stdenv.isLinux [ addOpenGLRunpath autoPatchelfHook - cudaPackages.autoAddOpenGLRunpathHook + cudaPackages.autoAddDriverRunpath ]; buildInputs = lib.optionals stdenv.isLinux (with cudaPackages; [ diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index d6c51904bd9d..10eecd1de99b 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -338,7 +338,7 @@ in buildPythonPackage rec { pythonRelaxDepsHook removeReferencesTo ] ++ lib.optionals cudaSupport (with cudaPackages; [ - autoAddOpenGLRunpathHook + autoAddDriverRunpath cuda_nvcc ]) ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 19885c488c5e..e5c05c6dd497 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -20,7 +20,7 @@ let pname = "torchmetrics"; - version = "1.3.1"; + version = "1.3.2"; in buildPythonPackage { inherit pname version; @@ -32,7 +32,7 @@ buildPythonPackage { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-ZFpLoF4t1ld2c3exX9H8AYG0XQM7MKmWe/I8XZmdrZw="; + hash = "sha256-0lverGF8HVlnwWmnCjScWoSfWPLZlMF2cHDG+uxNCCQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/torchsde/default.nix b/pkgs/development/python-modules/torchsde/default.nix index ba7b2e923612..bffbeeaa2c97 100644 --- a/pkgs/development/python-modules/torchsde/default.nix +++ b/pkgs/development/python-modules/torchsde/default.nix @@ -52,6 +52,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = [ # RuntimeError: a view of a leaf Variable that requires grad is being used in an in-place operation. "test_adjoint" diff --git a/pkgs/development/python-modules/torrent-parser/default.nix b/pkgs/development/python-modules/torrent-parser/default.nix index 2e946229747f..bd46ea57e0fb 100644 --- a/pkgs/development/python-modules/torrent-parser/default.nix +++ b/pkgs/development/python-modules/torrent-parser/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = { description = "A .torrent file parser and creator for both Python 2 and 3"; + mainProgram = "pytp"; homepage = "https://github.com/7sDream/torrent_parser"; changelog = "https://github.com/7sDream/torrent_parser/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index e90648ec0810..507160291b56 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility to produce useful, summarised news files"; + mainProgram = "towncrier"; homepage = "https://github.com/twisted/towncrier/"; changelog = "https://github.com/twisted/towncrier/blob/${version}/NEWS.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 8d227bb5df85..28176021d3bf 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.11.4"; + version = "4.14.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-pZmT8392YuHzCrAquPpveByYw3x6bkMGCUToCAqAGc8="; + hash = "sha256-b+HOv0xMIE3k0u39YAAyVbiJPnOAamATZeZYTBUyAZM="; }; postPatch = '' @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/tox-dev/tox/releases/tag/${version}"; description = "A generic virtualenv management and test command line tool"; + mainProgram = "tox"; homepage = "https://github.com/tox-dev/tox"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index d71d2c86194f..82150d9e0518 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.3.11"; + version = "1.3.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-/mH9VqdF1l89qtAhug+ii4PCRO0PxKDr7LzvevjuZgc="; + hash = "sha256-ND+n2KCj5g1KdSWf/MxJwzprLZOkSUUC4Sp9Z51Tzkw="; }; nativeBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the TP-Link Omada SDN Controller API"; + mainProgram = "omada"; homepage = "https://github.com/MarkGodwin/tplink-omada-api"; changelog = "https://github.com/MarkGodwin/tplink-omada-api/releases/tag/release%2Fv${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index b6f43516f3a3..484f3dc2d16e 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pythonOlder , asn1crypto , cffi @@ -20,50 +19,17 @@ buildPythonPackage rec { pname = "tpm2-pytss"; - version = "2.1.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; + hash = "sha256-uPFUc0IvN39ZxyF9zRR5FlzOYt+jOTTsl2oni68unv4="; }; patches = [ - # This patches the call to the C preprocessor not to include types - # pycparser does not handle. - # `hardeningDisable = [ "fortify" ]` would have the same effect but - # would also disable hardening from generated FFI objects. - # - # backport of https://github.com/tpm2-software/tpm2-pytss/pull/523 - (fetchpatch { - url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch"; - sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o="; - }) - - # Lookup tcti via getinfo not system's ld_library_path - # https://github.com/tpm2-software/tpm2-pytss/pull/525 - (fetchpatch { - url = "https://github.com/tpm2-software/tpm2-pytss/commit/97289a08ddf44f7bdccdd122d6055c69e12dc584.patch"; - sha256 = "sha256-VFq3Hv4I8U8ifP/aSjyu0BiW/4jfPlRDKqRcqUGw6UQ="; - }) - - (fetchpatch { - name = "test-new-cryptography.patch"; - url = "https://github.com/tpm2-software/tpm2-pytss/commit/e4006e6066c015d9ed55befa9b98247fbdcafd7d.diff"; - sha256 = "sha256-Wxe9u7Cvv2vKMGTcK3X8W1Mq/nCt70zrzWUKA+83Sas="; - }) - - # Inheritance in newer cryptography is not possible anymore - # for `RSAPrivateNumbers` because of a Rust implementation. - # https://github.com/tpm2-software/tpm2-pytss/pull/562 - (fetchpatch { - name = "fix-newer-cryptography-42-0-1-support.patch"; - url = "https://github.com/tpm2-software/tpm2-pytss/commit/0fbb9d099370c0a7031dd13990986538f586836a.patch"; - sha256 = "sha256-xnQIr4/iJra0+rn5estVqSvG8pXcuwWykmmayBpCzgw="; - }) - # Fix hardcoded `fapi-config.json` configuration path ./fapi-config.patch ]; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 2cd490e844e5..1fcc2b082766 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.66.1"; + version = "4.66.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-2I5lH5242FUaYlVtPP+eMDQnTKXWbpMZfPJJDi3Lacc="; + hash = "sha256-bNUs3w/vDg9UMpnPyW/skNe4p+iHRfQR7DPrRNXtNTE="; }; nativeBuildInputs = [ @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Fast, Extensible Progress Meter"; + mainProgram = "tqdm"; homepage = "https://github.com/tqdm/tqdm"; changelog = "https://tqdm.github.io/releases/"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index 5ebb2280f31b..cdfbf4b04600 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/pkgs/development/python-modules/trafilatura/default.nix @@ -10,20 +10,25 @@ , justext , lxml , urllib3 +, setuptools }: buildPythonPackage rec { pname = "trafilatura"; - version = "1.7.0"; - format = "setuptools"; + version = "1.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-oWbmfwBaahLvGU9Ix8n6ThsONnVv3Stk4CRzw1aWLwQ="; + hash = "sha256-6lSHXtJPPq+vGZuKD4m1g1x880NzPDLvvEr50wV6j3I="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ certifi charset-normalizer @@ -34,10 +39,12 @@ buildPythonPackage rec { urllib3 ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - # disable tests that require an internet connection disabledTests = [ + # Disable tests that require an internet connection "test_download" "test_fetch" "test_redirection" @@ -51,17 +58,22 @@ buildPythonPackage rec { # patch out gui cli because it is not supported in this packaging # nixify path to the trafilatura binary in the test suite postPatch = '' - substituteInPlace setup.py --replace '"trafilatura_gui=trafilatura.gui:main",' "" - substituteInPlace tests/cli_tests.py --replace "trafilatura_bin = 'trafilatura'" "trafilatura_bin = '$out/bin/trafilatura'" + substituteInPlace setup.py \ + --replace-fail '"trafilatura_gui=trafilatura.gui:main",' "" + substituteInPlace tests/cli_tests.py \ + --replace-fail "trafilatura_bin = 'trafilatura'" "trafilatura_bin = '$out/bin/trafilatura'" ''; - pythonImportsCheck = [ "trafilatura" ]; + pythonImportsCheck = [ + "trafilatura" + ]; meta = with lib; { description = "Python package and command-line tool designed to gather text on the Web"; homepage = "https://trafilatura.readthedocs.io"; changelog = "https://github.com/adbar/trafilatura/blob/v${version}/HISTORY.md"; - license = licenses.gpl3Plus; + license = licenses.asl20; maintainers = with maintainers; [ jokatzke ]; + mainProgram = "trafilatura"; }; } diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index f138489cf2bf..012347e2f76b 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.14.0"; + version = "5.14.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/NqorEnATfoO0+4zhO9t/bXW83QVAr4kcnlAdnkpZ3I="; + hash = "sha256-hYUQWzcaBLgxakPVzinAmFdcLkd4ULYrhIuWTxREUn4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 0a0af07b89ee..ac2af381ff02 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.38.2"; + version = "4.39.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-/rt2XHN46NcFwlM9MOygVvpQkfPVu2eCNybYmSj711M="; + hash = "sha256-OzuiKzhgI9eRTPq3l7x4aw3fxvCe4080pK1RKzcC1RQ="; }; propagatedBuildInputs = [ @@ -185,6 +185,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/huggingface/transformers"; description = "Natural Language Processing for TensorFlow 2.0 and PyTorch"; + mainProgram = "transformers-cli"; changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix index cb3c6c19d8b1..0fc86af44cc4 100644 --- a/pkgs/development/python-modules/translatepy/default.nix +++ b/pkgs/development/python-modules/translatepy/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "A module grouping multiple translation APIs"; + mainProgram = "translatepy"; homepage = "https://github.com/Animenosekai/translate"; license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ emilytrau ]; diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index cd572618a2fd..039b9ce21cea 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -1,37 +1,52 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "tree-sitter"; - version = "0.20.4"; - format = "pyproject"; + version = "0.21.1"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "tree_sitter"; - inherit version; - hash = "sha256-atsSPi8+VjmbvyNZkkYzyILMQO6DRIhSALygki9xO+U="; + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "py-tree-sitter"; + rev = "refs/tags/v${version}"; + hash = "sha256-U4ZdU0lxjZO/y0q20bG5CLKipnfpaxzV3AFR6fGS7m4="; + fetchSubmodules = true; }; + patches = [ + # Replace distutils with setuptools, https://github.com/tree-sitter/py-tree-sitter/pull/214 + (fetchpatch { + name = "replace-distutils.patch"; + url = "https://github.com/tree-sitter/py-tree-sitter/commit/80d3cae493c4a47e49cc1d2ebab0a8eaf7617825.patch"; + hash = "sha256-00coI8/COpYMiSflAECwh6yJCMJj/ucFEn18Npj2g+Q="; + }) + ]; + nativeBuildInputs = [ setuptools - wheel ]; - # PyPI tarball doesn't contains tests and source has additional requirements - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "tree_sitter" ]; + preCheck = '' + rm -r tree_sitter + ''; + meta = with lib; { description = "Python bindings to the Tree-sitter parsing library"; homepage = "https://github.com/tree-sitter/py-tree-sitter"; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 42e1352049b5..7a4403550964 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -80,6 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for communicating with Trezor Hardware Wallet"; + mainProgram = "trezorctl"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; license = licenses.gpl3; maintainers = with maintainers; [ np prusnak mmahut ]; diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index de238ddc7c23..a74b3889facd 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -2,19 +2,19 @@ , buildPythonPackage , fetchPypi , setuptools +, greenlet , trio , outcome , sniffio , exceptiongroup , pytest-trio , pytestCheckHook -, pythonAtLeast , pythonOlder }: buildPythonPackage rec { pname = "trio-asyncio"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,12 +22,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "trio_asyncio"; inherit version; - hash = "sha256-fKJLIaGxes3mV1LWkziGuiQoTlL0srDe/k6o7YpjSmI="; + hash = "sha256-msSKQ8vhZxtBIh7HNq4M2qc0yKOErGNiCWLBXXse3WQ="; }; postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'" "" + --replace '"pytest-runner"' "" ''; nativeBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + greenlet trio outcome sniffio @@ -42,6 +43,9 @@ buildPythonPackage rec { exceptiongroup ]; + # RuntimeWarning: Can't run the Python asyncio tests because they're not installed. On a Debian/Ubuntu system, you might need to install the libpython3.11-testsuite package. + doCheck = false; + nativeCheckInputs = [ pytest-trio pytestCheckHook diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 648f91f07b9b..cc276fef5c52 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -37,16 +37,21 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.23.1"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-FviffcyPe53N7B/Nhj4MA5r20PmiL439Vvdddexz/Ug="; + hash = "sha256-/6CadKa/gbhPhhOQn7C+ruhHV0UBg6ei4LR7RVwMrF0="; }; + postPatch = '' + substituteInPlace src/trio/_tests/test_subprocess.py \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" + ''; + nativeBuildInputs = [ setuptools ]; @@ -75,10 +80,9 @@ buildPythonPackage rec { ]; preCheck = '' - substituteInPlace trio/_tests/test_subprocess.py \ - --replace "/bin/sleep" "${coreutils}/bin/sleep" - export HOME=$TMPDIR + # $out is first in path which causes "import file mismatch" + PYTHONPATH=$PWD/src:$PYTHONPATH ''; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. @@ -96,7 +100,7 @@ buildPythonPackage rec { disabledTestPaths = [ # linters - "trio/_tests/tools/test_gen_exports.py" + "src/trio/_tests/tools/test_gen_exports.py" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index adb4df9753a3..f4645afc461b 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.6.0"; + version = "4.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DxLgAEuIfO8K42DbkOaPjE+MS6/WKnybDsszuCXwufM="; + hash = "sha256-9zzbBtIJ4v+eI0eJZ6vGUABN4i9GLJcMAzerRSnzpqQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index f65c9e651bed..64829175c198 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -10,14 +10,14 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2024.1.8"; + version = "2024.3.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bjbK9DD/ZIXEtXpMazZKE/aomNFrlBfGw3Rn5ZwUsFo="; + hash = "sha256-337f+cZ/+GtzNiiZgzCxgOgdElseCWU22DrA/XlnP9w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix index a4541ba7b98c..42cd12eb9d00 100644 --- a/pkgs/development/python-modules/tsfresh/default.nix +++ b/pkgs/development/python-modules/tsfresh/default.nix @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatic extraction of relevant features from time series"; + mainProgram = "run_tsfresh"; homepage = "https://github.com/blue-yonder/tsfresh"; changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.rev}/CHANGES.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix index 522d4a57adbc..c76b3c497295 100644 --- a/pkgs/development/python-modules/tskit/default.nix +++ b/pkgs/development/python-modules/tskit/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "The tree sequence toolkit"; + mainProgram = "tskit"; homepage = "https://github.com/tskit-dev/tskit"; license = licenses.mit; maintainers = with maintainers; [ alxsimon ]; diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index e2bfe61504af..c3f18f3d5d40 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Twinkly LEDs"; + mainProgram = "ttls"; homepage = "https://github.com/jschlyter/ttls"; changelog = "https://github.com/jschlyter/ttls/blob/v${version}/CHANGES.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix new file mode 100644 index 000000000000..ada7cc390b69 --- /dev/null +++ b/pkgs/development/python-modules/ttn-client/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ttn-client"; + version = "0.0.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "angelnu"; + repo = "thethingsnetwork_python_client"; + rev = "refs/tags/v${version}"; + hash = "sha256-oHGv9huk400nPl4ytV8uxzK7eENpoBHt8uFjD2Ck67w="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ttn_client" + ]; + + meta = with lib; { + description = "Module to fetch/receive and parse uplink messages from The Thinks Network"; + homepage = "https://github.com/angelnu/thethingsnetwork_python_client"; + changelog = "https://github.com/angelnu/thethingsnetwork_python_client/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 29d9bf7cc5f5..3df86d13cf3a 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -104,6 +104,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/dmulyalin/ttp/releases/tag/${version}"; description = "Template Text Parser"; + mainProgram = "ttp"; homepage = "https://github.com/dmulyalin/ttp"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index df06e4bd0263..aeeee4a81edd 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Youtube (and other video site) to Internet Archive Uploader"; + mainProgram = "tubeup"; homepage = "https://github.com/bibanon/tubeup"; changelog = "https://github.com/bibanon/tubeup/releases/tag/${version}"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index b003f134004a..27aaee039d3b 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Snapshot testing tool"; + mainProgram = "turnt"; homepage = "https://github.com/cucapra/turnt"; license = licenses.mit; maintainers = with maintainers; [ leungbk ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index a470b090a178..e62ee37e4024 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.0.1"; + version = "9.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-fOtNzyeE0Ijr2HvxuG5+01I1VBbX4io8OqGEjNcxAgk="; + hash = "sha256-xFl+Ucu7ve7She8zUaW5YdK0gE733NNadDka4NeJ8Tg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index f15a45509e58..ddea5117a6c0 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "twill"; - version = "3.2.1"; + version = "3.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JJheUl/Ar8BWNpzJzMvVgk4KeitoQZ8GjbFPN9dEd+g="; + hash = "sha256-m4jrxx7udWkRXzYS0Yfd14tKVHt8kGYPn2eTa4unOdc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index e656970ef627..265008731bd1 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "twine"; - version = "4.0.2"; + version = "5.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nhAu9f3VogZh64j61GM4gGw70yzx23KWA/42l7G8g8g="; + hash = "sha256-ibDMfTcKS2ZCHMYQLyaaqRD+DxhhwST1c88t3tvBDPQ="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = { description = "Collection of utilities for interacting with PyPI"; + mainProgram = "twine"; homepage = "https://github.com/pypa/twine"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index f641afea9b66..d919aa568d9d 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pname = "twisted"; - version = "23.10.0"; + version = "24.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -62,7 +62,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-mHhHoHkKLFlxl2E2huJ4T9VBZ986VdD7F8hBIwXXbOU="; + hash = "sha256-azi27Ocpa14SLJ6xfaLuqz2YoZj1DKnv0A+wPltP1K4="; }; patches = [ diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 7983ac8d29bf..55af22a1c94b 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -24,7 +24,7 @@ let in buildPythonPackage rec { pname = "type-infer"; - version = "0.0.17"; + version = "0.0.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "type_infer"; inherit version; - hash = "sha256-2bPXJuGDXTVoYUP9IfwyRy8LbMT/ySoHDzuelrOq/DU="; + hash = "sha256-nA5TlyHpCueFWqUggS7T/eKSLlffp0pIyGCouwXPZ28="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 6415e590af06..4b28386a1192 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "23.1.1"; + version = "24.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-0esWiZ0dVnIJ+TDSD+0+zq63I1JcKH3iVe34pFRQX9U="; + hash = "sha256-luUfVsN6uNYZkXfcAUc5P6Y+WYpfAdU6D01kgQMNniw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index ff98f62dcdf6..c02934519ca8 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -1,19 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "types-dateutil"; - version = "2.8.19.20240311"; - format = "setuptools"; + version = "2.9.0.20240316"; + pyproject = true; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-UReCJ7vUy+w13Jrf+/Wdgy8g4JhC19y4xzsWm4eAt8s="; + hash = "sha256-XS8uJAuGkF5AlE3Xh9ttqSY/Deq+8Qdt2u15c1HsAgI="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "dateutil-stubs" ]; diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix index 443a605a03c2..374ed108b7a2 100644 --- a/pkgs/development/python-modules/types-deprecated/default.nix +++ b/pkgs/development/python-modules/types-deprecated/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-deprecated"; - version = "1.2.9.20240106"; + version = "1.2.9.20240311"; pyproject = true; src = fetchPypi { pname = "types-Deprecated"; inherit version; - hash = "sha256-r+uBnpoD0KV5XxjIj+YgfEjtE8Y56TKBvZ2be7bTQxA="; + hash = "sha256-BoDomYmoFCcH3oED8V0YJEWlM8EEf9m36MVFkQHpuQo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index a55fe185e777..e8ebd39a07db 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.20240311"; + version = "0.20.0.20240317"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-sp3zYunm78umjieveBNZAtVmFPb6dsBz0pmJJy7tsGk="; + hash = "sha256-I2V6qw3lhjTREZFLZ3sYVYZ/Fs2anqEQJU4jtIZT4ag="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix index edfa253da75f..3ea38cde3d83 100644 --- a/pkgs/development/python-modules/types-markdown/default.nix +++ b/pkgs/development/python-modules/types-markdown/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-markdown"; - version = "3.5.0.20240311"; + version = "3.6.0.20240316"; pyproject = true; src = fetchPypi { pname = "types-Markdown"; inherit version; - hash = "sha256-TFjvM+4ngYPFQKWOWZy+lwkPZVMCtu9loQhMSzLXSKQ="; + hash = "sha256-3p+4SGC1W2R7FwyldolfzKYbk0puzcZcMZMsZ5W0QLg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index 360eb5c83bed..b6b882218d19 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.2.0.20240213"; + version = "10.2.0.20240311"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-SAC2G/fqva4vGxet4NCAcJ7TPp8moukA5HDotW6+I4c="; + hash = "sha256-9hH2uvfDeE/lUO6SsQgGD1VEpHw3xzrLgaeF8cYxJ3I="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 362681861f59..fb7da185e2ce 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.24.0.20240129"; + version = "4.24.0.20240302"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ioPdO5t2oz4I2GNsXaohKs4TlkGO2Rg3Y1/NVkpiSJE="; + hash = "sha256-8iwAzAzqlyLnHhTTibukKa+eNadKlJcZwWcgOlq74uQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 7b9da3aed9d7..881db628ede5 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "69.1.0.20240308"; + version = "69.1.0.20240310"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rU9eUSUe7cvkqo2whEr2ZUBUqvycD20/H6APcHPBd2c="; + hash = "sha256-/A4QgvVcl0YRvOhEseW+stGolVAfSkZOSDBVkqQmgQA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix index 03877756e572..153f8a79daf4 100644 --- a/pkgs/development/python-modules/typeshed-client/default.nix +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "typeshed-client"; - version = "2.4.0"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "JelleZijlstra"; repo = "typeshed_client"; rev = "refs/tags/v${version}"; - hash = "sha256-g3FECKebKeM3JPWem6+Y9T27PcAxVxj1SiBd5siLSJ4="; + hash = "sha256-lITreXYn/ZOc1fF2Sqcn8UDrZAjWYfjFSEaAxqTHb4s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 6a908dfd8e54..eb1c9c58d690 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.8.0"; + version = "4.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-345DOenLdzV1WMvbzsozwwNxTPhh0e7xXhBwBVrot+8="; + hash = "sha256-sKvXyJ6PuW+Y2xjYYQb/HZCraSAE63Rs9u2iaC+Rs8s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 91bbc854a26d..ac25b071a31b 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2023.3"; + version = "2024.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Ee8eCOVKyw1Plb2xvgXaZZZz3krL0hv5xp6UzF6Qejo="; + hash = "sha256-JnQSD42JGQl1HDirzf04asCloRJ5VPvDMq9rXOrgfv0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index a868fde95be0..334a4ce20e4b 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -8,7 +8,6 @@ , CFNetwork , cmake , CoreFoundation -, libcxxabi , openssl , Security , pytestCheckHook @@ -84,10 +83,6 @@ buildPythonPackage rec { certifi ]; - LDFLAGS = lib.optionals stdenv.isDarwin [ - "-L${lib.getLib libcxxabi}/lib" - ]; - dontUseCmakeConfigure = true; preCheck = '' diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 74ad0eb708a0..7429ed5750ac 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { preCheck = '' cd $TMP ''; - pytestFlagsArray = ["--pyargs" "uarray"]; + pytestFlagsArray = ["--pyargs" "uarray" "-W" "ignore::pytest.PytestRemovedIn8Warning" ]; pythonImportsCheck = [ "uarray" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/uc-micro-py/default.nix b/pkgs/development/python-modules/uc-micro-py/default.nix index f6aa059d709c..77f7eb1625d9 100644 --- a/pkgs/development/python-modules/uc-micro-py/default.nix +++ b/pkgs/development/python-modules/uc-micro-py/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "uc-micro-py"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsutsu3"; repo = "uc.micro-py"; rev = "refs/tags/v${version}"; - hash = "sha256-PUeWYG/VyxCfhB7onAcDFow1yYqArjmfMT99+058P7U="; + hash = "sha256-Z7XHWeV5I/y19EKg4lzcl9pwRexWnSQ7d8CpQu5xdnI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix index 6b378f4aa365..46824549ba27 100644 --- a/pkgs/development/python-modules/udatetime/default.nix +++ b/pkgs/development/python-modules/udatetime/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast RFC3339 compliant Python date-time library"; + mainProgram = "bench_udatetime.py"; homepage = "https://github.com/freach/udatetime"; license = licenses.asl20; maintainers = with maintainers; [ globin ]; diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index e216bdc71412..2e16ea7f2f82 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/seebye/ueberzug"; description = "An alternative for w3mimgdisplay"; + mainProgram = "ueberzug"; license = licenses.gpl3; maintainers = with maintainers; [ Br1ght0ne ]; }; diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix index cc510c0fa76f..3d1f9033cda6 100644 --- a/pkgs/development/python-modules/ufmt/default.nix +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Safe, atomic formatting with black and usort"; + mainProgram = "ufmt"; homepage = "https://github.com/omnilib/ufmt"; changelog = "https://github.com/omnilib/ufmt/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 6daa54a31e81..5cbcf1370372 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -9,6 +9,7 @@ , fonttools , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , setuptools-scm , skia-pathops , ufolib2 @@ -16,18 +17,23 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.33.4"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-e6p/H1Vub0Ln0VhQvwsVLuD/p8uNG5oCPhfQPCTl1nY="; + hash = "sha256-5EUrML1Yd88tVEP+Kd9TmXm+5Ejk/XIH/USYBakK/wQ="; }; nativeBuildInputs = [ setuptools-scm + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "cffsubr" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/development/python-modules/ufolint/default.nix index ab997b30097d..0b561bf6f830 100644 --- a/pkgs/development/python-modules/ufolint/default.nix +++ b/pkgs/development/python-modules/ufolint/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Linter for Unified Font Object (UFO) source code"; + mainProgram = "ufolint"; homepage = "https://github.com/source-foundry/ufolint"; license = licenses.mit; maintainers = with maintainers; [ danc86 ]; diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index dd1e6bd08a1d..bfc354c116e0 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Script to normalize the XML and other data inside of a UFO"; + mainProgram = "ufonormalizer"; homepage = "https://github.com/unified-font-object/ufoNormalizer"; license = licenses.bsd3; maintainers = [ maintainers.sternenseemann ]; diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix index 540aadd90132..dda782897b8d 100644 --- a/pkgs/development/python-modules/ufoprocessor/default.nix +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "ufoProcessor"; + pname = "ufoprocessor"; version = "1.9.0"; src = fetchPypi { - inherit pname version; + pname = "ufoProcessor"; + inherit version; sha256 = "0ns11aamgavgsfj8qf5kq7dvzmgl0mhr1cbych2f075ipfdvva5s"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index c7e823b74a2d..15c0d79984b2 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -3,7 +3,8 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, cython +, cython_3 +, setuptools , setuptools-scm , pytestCheckHook , ApplicationServices @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.37.3"; - format = "setuptools"; + version = "0.39.0"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -21,11 +22,12 @@ buildPythonPackage rec { repo = "uharfbuzz"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-876gFYyMqeGYoXMdBguV6bi7DJKHJs9HNLw9xRu+Mxk="; + hash = "sha256-I4fCaomq26FdkpiJdj+zyrbdqdynnD2hIutYTuTFvQs="; }; nativeBuildInputs = [ - cython + cython_3 + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 7eb4e5e3814b..1dd98186e26f 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.8.0"; + version = "5.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eOMY3vSt6JikYbPZKnn5RB5+Dk0q1UGavtQzbXAsdCU="; + hash = "sha256-icyS5z1VAbin9IV17rFK0nFWrQksLp/H48+UnwfnVTI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/undefined/default.nix b/pkgs/development/python-modules/undefined/default.nix new file mode 100644 index 000000000000..5348688680e1 --- /dev/null +++ b/pkgs/development/python-modules/undefined/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit +}: + +buildPythonPackage rec { + pname = "undefined"; + version = "0.0.8"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-xvI3wOPX51GWlLIb1HHcJe48M3nZwjt06/Aqo0nFz/c="; + }; + + nativeBuildInputs = [ + flit + ]; + + pythonImportsCheck = [ + "undefined" + ]; + + meta = with lib; { + description = "Ever needed a global object that act as None but not quite?"; + homepage = "https://github.com/Carreau/undefined"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 649e305aeeb3..60307ca4051d 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "A utility to fetch and download Python packages"; + mainProgram = "unearth"; homepage = "https://github.com/frostming/unearth"; changelog = "https://github.com/frostming/unearth/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 3e39c28eabd4..23263403fbd2 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "ASCII transliterations of Unicode text"; + mainProgram = "unidecode"; homepage = "https://github.com/avian2/unidecode"; changelog = "https://github.com/avian2/unidecode/blob/unidecode-${version}/ChangeLog"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 3dd206d509f5..a0c1f24a5c56 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unified diff python parsing/metadata extraction library"; + mainProgram = "unidiff"; homepage = "https://github.com/matiasb/python-unidiff"; changelog = "https://github.com/matiasb/python-unidiff/raw/v${version}/HISTORY"; license = licenses.mit; diff --git a/pkgs/development/python-modules/unify/default.nix b/pkgs/development/python-modules/unify/default.nix index fc0cd0d4f67e..52c6ba64e59f 100644 --- a/pkgs/development/python-modules/unify/default.nix +++ b/pkgs/development/python-modules/unify/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modifies strings to all use the same quote where possible"; + mainProgram = "unify"; homepage = "https://github.com/myint/unify"; license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen ]; diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index e9b8e0294d80..8c73bc5205ef 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v${version}"; description = "Flashes Silicon Labs radios running EmberZNet or CPC multi-pan firmware"; + mainProgram = "universal-silabs-flasher"; homepage = "https://github.com/NabuCasa/universal-silabs-flasher"; license = licenses.gpl3Only; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix index eeddbd1d6b62..f02056506b11 100644 --- a/pkgs/development/python-modules/unrpa/default.nix +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { homepage = "https://github.com/Lattyware/unrpa"; changelog = "https://github.com/Lattyware/unrpa/releases/tag/${version}"; description = "A program to extract files from the RPA archive format"; + mainProgram = "unrpa"; license = licenses.gpl3; maintainers = with maintainers; [ leo60228 ]; }; diff --git a/pkgs/development/python-modules/unstructured-api-tools/default.nix b/pkgs/development/python-modules/unstructured-api-tools/default.nix index b3c904ba2f24..6909d95eb26b 100644 --- a/pkgs/development/python-modules/unstructured-api-tools/default.nix +++ b/pkgs/development/python-modules/unstructured-api-tools/default.nix @@ -85,6 +85,7 @@ buildPythonPackage { meta = with lib; { description = ""; + mainProgram = "unstructured_api_tools"; homepage = "https://github.com/Unstructured-IO/unstructured-api-tools"; changelog = "https://github.com/Unstructured-IO/unstructured-api-tools/blob/${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index fe3ae5d9ccd3..82cda0652a51 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.7.21"; + version = "0.7.24"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; rev = "refs/tags/${version}"; - hash = "sha256-EuLzQHtcAPNuKCrUXHPbgF5i3QDvst/XOZ9RcCck+N8="; + hash = "sha256-AxQHTUgE4CyiinT7HEh6fvbw+uVi7lKUgfOc1KZOezU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 9ad99ec8d885..faae85664bfb 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -137,6 +137,7 @@ buildPythonPackage { meta = with lib; { description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; + mainProgram = "unstructured-ingest"; homepage = "https://github.com/Unstructured-IO/unstructured"; changelog = "https://github.com/Unstructured-IO/unstructured/blob/${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 342cd79e6837..d8473bd51851 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Console UI for pass"; + mainProgram = "upass"; homepage = "https://github.com/Kwpolska/upass"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/update-copyright/default.nix b/pkgs/development/python-modules/update-copyright/default.nix index 1502e92f9e7b..2abb9945ece2 100644 --- a/pkgs/development/python-modules/update-copyright/default.nix +++ b/pkgs/development/python-modules/update-copyright/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "An automatic copyright update tool"; + mainProgram = "update-copyright.py"; homepage = "http://blog.tremily.us/posts/update-copyright"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix index 00e4e51ebb78..7b9f4e3ccc9e 100644 --- a/pkgs/development/python-modules/update-dotdee/default.nix +++ b/pkgs/development/python-modules/update-dotdee/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generic modularized configuration file manager"; + mainProgram = "update-dotdee"; homepage = "https://github.com/xolox/python-update-dotdee"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; diff --git a/pkgs/development/python-modules/uplc/default.nix b/pkgs/development/python-modules/uplc/default.nix new file mode 100644 index 000000000000..a3aa8d10e7ad --- /dev/null +++ b/pkgs/development/python-modules/uplc/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonRelaxDepsHook +# Python deps +, frozenlist2 +, python-secp256k1-cardano +, setuptools +, poetry-core +, frozendict +, cbor2 +, rply +, pycardano +}: + +buildPythonPackage rec { + pname = "uplc"; + version = "0.6.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "OpShin"; + repo = "uplc"; + rev = version; + hash = "sha256-djJMNXijMVzMVzw8NZSe3YFRGyAPqdvr0P374Za5XkU="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + setuptools + poetry-core + frozendict + cbor2 + frozenlist2 + rply + pycardano + python-secp256k1-cardano + ]; + + pythonRelaxDeps = [ "pycardano" "rply" ]; + + pythonImportsCheck = [ "uplc" ]; + + meta = with lib; { + description = "Python implementation of untyped plutus language core"; + homepage = "https://opshin.dev"; + license = licenses.mit; + maintainers = with maintainers; [ t4ccer ]; + mainProgram = "opshin"; + }; +} diff --git a/pkgs/development/python-modules/urlextract/default.nix b/pkgs/development/python-modules/urlextract/default.nix index df2b134f9a65..a5701ee65160 100644 --- a/pkgs/development/python-modules/urlextract/default.nix +++ b/pkgs/development/python-modules/urlextract/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collects and extracts URLs from given text"; + mainProgram = "urlextract"; homepage = "https://github.com/lipoja/URLExtract"; changelog = "https://github.com/lipoja/URLExtract/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index 18c7ba59b584..f991bff5db11 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { homepage = "http://urlgrabber.baseurl.org"; license = licenses.lgpl2Plus; description = "Python module for downloading files"; + mainProgram = "urlgrabber"; maintainers = with maintainers; [ qknight ]; }; } diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 3c7da587cdde..70d8750a84d0 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -22,12 +22,12 @@ let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.1.0"; + version = "2.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-33qor7AUj6eEiOeJmyxZtfT/z6gubFTMud03wde1LVQ="; + hash = "sha256-0FcIdsYaueUg13bDisu7WwWndtP5/5ilyP1RYqREzxk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix index e489879bd502..6b15bec2684d 100644 --- a/pkgs/development/python-modules/us/default.nix +++ b/pkgs/development/python-modules/us/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A package for easily working with US and state metadata"; + mainProgram = "states"; longDescription = '' All US states and territories, postal abbreviations, Associated Press style abbreviations, FIPS codes, capitals, years of statehood, time zones, phonetic diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index 014de3cfeb1e..17783bef05c0 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cross-platform tool for adding locations to the user PATH"; + mainProgram = "userpath"; homepage = "https://github.com/ofek/userpath"; changelog = "https://github.com/ofek/userpath/releases/tag/v${version}"; license = with licenses; [ asl20 mit ]; diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix index 2bea93e08275..68dbe6a9b7d5 100644 --- a/pkgs/development/python-modules/usort/default.nix +++ b/pkgs/development/python-modules/usort/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Safe, minimal import sorting for Python projects"; + mainProgram = "usort"; homepage = "https://github.com/facebook/usort"; changelog = "https://github.com/facebook/usort/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index 8cd0a28b533d..6be1dc84065c 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Ubiquiti's Unifi Camera NVR"; + mainProgram = "uvc"; homepage = "https://github.com/kk7ds/uvcclient"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 112d25ef6403..6201bb615726 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { homepage = "https://www.uvicorn.org/"; changelog = "https://github.com/encode/uvicorn/blob/${src.rev}/CHANGELOG.md"; description = "The lightning-fast ASGI server"; + mainProgram = "uvicorn"; license = licenses.bsd3; maintainers = with maintainers; [ wd15 ]; }; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index fc4283766b52..c60d3310cda7 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "5.1.0"; + version = "6.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-u/FTLyYYoE8RvOKpmvOpZHoyyICVcpP/keCl8Ye2s9I="; + hash = "sha256-ngI/7n+JK6oLvaL32nyKxRFlwcbjj/hohoOhKkvekng="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 44678dcd884a..7edad1b6321a 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "vector"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-nQ7tzYVOmcF0oklmhxbgH4w5cJ+cwuJi1ihich7D7yc="; + hash = "sha256-GpQhDCGl04020Po2wa+5LChXuh0JyCSw1LhhXVH08uU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index bbd43887025c..6bd7384c9890 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Version-string management for VCS-controlled trees"; + mainProgram = "versioneer"; homepage = "https://github.com/python-versioneer/python-versioneer"; changelog = "https://github.com/python-versioneer/python-versioneer/blob/${version}/NEWS.md"; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index b87ec1e1a9aa..a58f2d6133aa 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -4,27 +4,27 @@ , fetchPypi , importlib-metadata , packaging -, setuptools , tomli , pytestCheckHook , build , hatchling , pydantic , pytest-mock +, setuptools , git , mercurial }: buildPythonPackage rec { pname = "versioningit"; - version = "2.3.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HQ1xz6PCvE+N+z1KFcFE64qmoJ2dqYkj1BCZSi74Juo="; + hash = "sha256-TjzkemQk2FCunlXhsTSgIOn8vLiVM48QfytcUdNMnBs="; }; postPatch = '' @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools + hatchling ]; propagatedBuildInputs = [ @@ -52,6 +52,7 @@ buildPythonPackage rec { hatchling pydantic pytest-mock + setuptools git mercurial ]; @@ -67,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "setuptools plugin for determining package version from VCS"; + mainProgram = "versioningit"; homepage = "https://github.com/jwodder/versioningit"; changelog = "https://versioningit.readthedocs.io/en/latest/changelog.html"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vharfbuzz/default.nix b/pkgs/development/python-modules/vharfbuzz/default.nix index 27ea9d84f256..6551ef2cbb7a 100644 --- a/pkgs/development/python-modules/vharfbuzz/default.nix +++ b/pkgs/development/python-modules/vharfbuzz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "vharfbuzz"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-uDX2fYqxV4wmAAIMfA3dBohWmq1N0VurSTEFOjSRpmY="; + hash = "sha256-bBKmVvLuc/CtQF+TSri8ngglnj4QCh77FV+JHPzsFAI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index 47e9c7b7a3c7..033e50ba2c40 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + pythonImportsCheck = [ "vine" ]; diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 1c464101bf7e..51c1d12b184d 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/edwardgeorge/virtualenv-clone"; description = "Script to clone virtualenvs"; + mainProgram = "virtualenv-clone"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index a79b5bcd6cc1..44ca0ff4f4f3 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.25.0"; + version = "20.25.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v1HA2cfdY+qORAhvoeT7EJOjHpY7hpWSVzeK7wIOHxs="; + hash = "sha256-4I4T7NynoL1TeY81bVgxQ0r6Wwe5Pwq98Hl7egb/4Zc="; }; nativeBuildInputs = [ @@ -71,6 +71,8 @@ buildPythonPackage rec { "test_seed_link_via_app_data" # Permission Error "test_bad_exe_py_info_no_raise" + ] ++ lib.optionals (pythonOlder "3.11") [ + "test_help" ] ++ lib.optionals (isPyPy) [ # encoding problems "test_bash" @@ -86,6 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool to create isolated Python environments"; + mainProgram = "virtualenv"; homepage = "http://www.virtualenv.org"; changelog = "https://github.com/pypa/virtualenv/blob/${version}/docs/changelog.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 93af1ab0c4ac..c7f6dad7c8ce 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "virtualenvwrapper"; - version = "4.8.4"; + version = "6.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "51a1a934e7ed0ff221bdd91bf9d3b604d875afbb3aa2367133503fee168f5bfa"; + sha256 = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q="; }; # pip depend on $HOME setting diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index ad8d696f91d9..21d8c68e7438 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JJpQl5/ACotlEJKDNU3PEs9BXBpdz5gh4RP25ZC5uTw="; + hash = "sha256-7ti0TW9ch70pWySqmi4OTm3GqQXM7gGy1ByPvwp2ez0="; }; patches = [ diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 8ffdf319013d..755417803a2e 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -11,13 +11,13 @@ }: buildPythonPackage rec { - version = "0.4.15"; + version = "0.4.17"; format = "setuptools"; pname = "vmprof"; src = fetchPypi { inherit pname version; - sha256 = "a2d872a40196404386d1e0d960e97b37c86c3f72a4f9d5a2b5f9ca1adaff5b62"; + sha256 = "sha256-ACYj7Lb/QT6deG0uuiPCj850QXhaw4XuQX6aZu8OM2U="; }; buildInputs = [ libunwind ]; @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "A vmprof client"; + mainProgram = "vmprofshow"; license = licenses.mit; homepage = "https://vmprof.readthedocs.org/"; }; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 47e3d029106b..1f9d53412d3d 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "voluptuous"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "alecthomas"; repo = "voluptuous"; rev = "refs/tags/${version}"; - hash = "sha256-7KXuypcKoqZboHTzoNKK5sYUR57wWGJu6y9zkLecep0="; + hash = "sha256-2a4lid9NibbvhHfs/fcyHgPRZ2HirIKuPYxMsl5oA4o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix index d61a6107baad..5a3a841a064d 100644 --- a/pkgs/development/python-modules/vpk/default.nix +++ b/pkgs/development/python-modules/vpk/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for working with Valve Pak files"; + mainProgram = "vpk"; homepage = "https://github.com/ValvePython/vpk"; license = licenses.mit; maintainers = with maintainers; [ joshuafern ]; diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 441969da6137..941c753f0e50 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for working with verisure devices"; + mainProgram = "vsure"; homepage = "https://github.com/persandstrom/python-verisure"; changelog = "https://github.com/persandstrom/python-verisure#version-history"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/vtjp/default.nix b/pkgs/development/python-modules/vtjp/default.nix index 4e193ea2eb48..006374ee4ec7 100644 --- a/pkgs/development/python-modules/vtjp/default.nix +++ b/pkgs/development/python-modules/vtjp/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python wrapper and cli for Västtrafik public API"; + mainProgram = "vtjp"; homepage = "https://github.com/Miicroo/python-vasttrafik"; changelog = "https://github.com/Miicroo/python-vasttrafik/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index 43d6f8b00fcd..e3a723ae0743 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Finds unused code in Python programs"; + mainProgram = "vulture"; homepage = "https://github.com/jendrikseipp/vulture"; changelog = "https://github.com/jendrikseipp/vulture/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index e33fb6dbc045..ff88abb41453 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "VXI-11 driver for controlling instruments over Ethernet"; + mainProgram = "vxi11-cli"; homepage = "https://github.com/python-ivi/python-vxi11"; license = licenses.mit; maintainers = with maintainers; [ bgamari ]; diff --git a/pkgs/development/python-modules/w1thermsensor/default.nix b/pkgs/development/python-modules/w1thermsensor/default.nix index e1592ab86287..7aa81b158e24 100644 --- a/pkgs/development/python-modules/w1thermsensor/default.nix +++ b/pkgs/development/python-modules/w1thermsensor/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to 1-Wire temperature sensors"; + mainProgram = "w1thermsensor"; longDescription = '' A Python package and CLI tool to work with w1 temperature sensors like DS1822, DS18S20 & DS18B20 on the Raspberry Pi, Beagle Bone and other diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 0e7bf3a3f185..f5ac78b6cb17 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "5.2.2"; + version = "6.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SOTCm3Kw5T60ejF41rDyxpmqKE0/Oiq/0vBPV49EtVo="; + hash = "sha256-Q89luoQwtB5TMWfudbJ2YKeobrBt2L156NZPtK8Feos="; }; postPatch = '' @@ -72,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Django content management system focused on flexibility and user experience"; + mainProgram = "wagtail"; homepage = "https://github.com/wagtail/wagtail"; changelog = "https://github.com/wagtail/wagtail/blob/v${version}/CHANGELOG.txt"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index 1d50b312b619..fad82f4952ce 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -11,6 +11,7 @@ buildPythonPackage { meta = with lib; { description = "A waitress WSGI server serving django"; + mainProgram = "waitress-serve-django"; license = licenses.mit; maintainers = with maintainers; [ basvandijk ]; }; diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index a79863c1e835..cf8d0eac97b2 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "waitress"; - version = "2.1.2"; + version = "3.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "780a4082c5fbc0fde6a2fcfe5e26e6efc1e8f425730863c04085769781f51eba"; + sha256 = "sha256-AF2kebBBNM3Z3WAtHufEnXneBTdhDWU2dMxsveIiuKE="; }; doCheck = false; @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/Pylons/waitress"; description = "Waitress WSGI server"; + mainProgram = "waitress-serve"; license = licenses.zpl20; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 97ceedec0d26..ea4f215a129e 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for wake on lan"; + mainProgram = "wakeonlan"; homepage = "https://github.com/remcohaszing/pywakeonlan"; changelog = "https://github.com/remcohaszing/pywakeonlan/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/wallet-py3k/default.nix b/pkgs/development/python-modules/wallet-py3k/default.nix new file mode 100644 index 000000000000..f78463e6748a --- /dev/null +++ b/pkgs/development/python-modules/wallet-py3k/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, substituteAll +, openssl +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "wallet-py3k"; + version = "0.0.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kyHSh8qHbzK6gFLGnL6dUJ/GLJHTNC86jjXa/APqIzI="; + }; + + patches = [ + (substituteAll { + src = ./openssl-path.patch; + openssl = lib.getExe openssl; + }) + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + six + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "wallet" + ]; + + meta = with lib; { + description = "Passbook file generator"; + homepage = "https://pypi.org/project/wallet-py3k"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/wallet-py3k/openssl-path.patch b/pkgs/development/python-modules/wallet-py3k/openssl-path.patch new file mode 100644 index 000000000000..8864818b13f7 --- /dev/null +++ b/pkgs/development/python-modules/wallet-py3k/openssl-path.patch @@ -0,0 +1,13 @@ +diff --git a/wallet/models.py b/wallet/models.py +index 1b75402..ad115de 100644 +--- a/wallet/models.py ++++ b/wallet/models.py +@@ -320,7 +320,7 @@ class Pass(object): + def _createSignature(self, manifest, certificate, key, + wwdr_certificate, password): + openssl_cmd = [ +- 'openssl', ++ '@openssl@', + 'smime', + '-binary', + '-sign', diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 654d63981a65..b2f22092638b 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.16.0"; + version = "0.16.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XXs9KjiAPzZ932r4UJ87RpM+qhg/bNDWEYsq2Ua6SRw="; + hash = "sha256-Q4NHUHay1/xb+V494n96jxE1VyAP7uVyQbIbS0/E85c="; }; patches = [ diff --git a/pkgs/development/python-modules/warcio/default.nix b/pkgs/development/python-modules/warcio/default.nix index fe9f7bdeb0f1..3121a49b5b28 100644 --- a/pkgs/development/python-modules/warcio/default.nix +++ b/pkgs/development/python-modules/warcio/default.nix @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Streaming WARC/ARC library for fast web archive IO"; + mainProgram = "warcio"; homepage = "https://github.com/webrecorder/warcio"; changelog = "https://github.com/webrecorder/warcio/blob/master/CHANGELIST.rst"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/ward/default.nix b/pkgs/development/python-modules/ward/default.nix index 9d438d74258f..f73cae95e25e 100644 --- a/pkgs/development/python-modules/ward/default.nix +++ b/pkgs/development/python-modules/ward/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test framework for Python"; + mainProgram = "ward"; homepage = "https://github.com/darrenburns/ward"; changelog = "https://github.com/darrenburns/ward/releases/tag/release%2F${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 4e4f491e23ae..9ac39683ba39 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "watchdog"; - version = "3.0.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TZijIFldp6fFoY/EjLYzwuc82nj5PKwu9C1Cv2CaM/k="; + hash = "sha256-4+cGXL2r5hg6uCGZ16T2s7oKQ4xaUSpoVZhGzLdqeOw="; }; # force kqueue on x86_64-darwin, because our api version does @@ -102,6 +102,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API and shell utilities to monitor file system events"; + mainProgram = "watchmedo"; homepage = "https://github.com/gorakhargosh/watchdog"; changelog = "https://github.com/gorakhargosh/watchdog/blob/v${version}/changelog.rst"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index cb113420006b..47b6e0a4eb26 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -82,6 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "File watching and code reload"; + mainProgram = "watchfiles"; homepage = "https://watchfiles.helpmanual.io/"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/watchgod/default.nix b/pkgs/development/python-modules/watchgod/default.nix index fcbddeec2d65..988fb53601b9 100644 --- a/pkgs/development/python-modules/watchgod/default.nix +++ b/pkgs/development/python-modules/watchgod/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple, modern file watching and code reload in python"; + mainProgram = "watchgod"; homepage = "https://github.com/samuelcolvin/watchgod"; license = licenses.mit; maintainers = with maintainers; [ globin ]; diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index eabd7de20ad0..6b7dce28924f 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to waterfurnace geothermal systems"; + mainProgram = "waterfurnace-debug"; homepage = "https://github.com/sdague/waterfurnace"; changelog = "https://github.com/sdague/waterfurnace/blob/v${version}/HISTORY.rst"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/wavedrom/default.nix b/pkgs/development/python-modules/wavedrom/default.nix index 32fa68a9dabd..3cf3eb30111c 100644 --- a/pkgs/development/python-modules/wavedrom/default.nix +++ b/pkgs/development/python-modules/wavedrom/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "WaveDrom compatible Python command line"; + mainProgram = "wavedrompy"; homepage = "https://github.com/wallento/wavedrompy"; license = licenses.mit; maintainers = with maintainers; [ airwoodix ]; diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index a5433c81db0e..26418749c80f 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cloudpathlib" + "smart-open" ]; nativeBuildInputs = [ @@ -64,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "A small and easy workflow system"; + mainProgram = "weasel"; homepage = "https://github.com/explosion/weasel/"; changelog = "https://github.com/explosion/weasel/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 403c577d6554..5d53bcbb7078 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "61.1"; + version = "61.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-fLyCTcQCbYKpc2Jkd1X4N90VeZlJY5zIpCjdM9OFAJo="; + hash = "sha256-R99s/u/4xsKM8uTK+DfN4XcV7+RicIradLqi6zkbYFk="; }; patches = [ @@ -100,6 +100,7 @@ buildPythonPackage rec { meta = with lib; { description = "Converts web documents to PDF"; + mainProgram = "weasyprint"; homepage = "https://weasyprint.org/"; license = licenses.bsd3; maintainers = with maintainers; [ elohmeier ]; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 35a4c5527533..5db198141293 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.26.2"; + version = "4.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y+xwg5tkkJgQpkqns+W4UIhGLpPH4u08MuvvtwLzZyM="; + hash = "sha256-gElboFIwEMiwN6HhpPPT+tcmh0pMiDjq7R8TG2eMMKI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index 1b1c0f77d4d2..75a127d475ef 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Media asset management for Python, with glue code for various web frameworks"; + mainProgram = "webassets"; homepage = "https://github.com/miracle2k/webassets/"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index 786862e44c08..5f18d28f9fbd 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -76,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "A high-performance Python-based I/O system for large (and small) deep learning problems, with strong support for PyTorch"; + mainProgram = "widsindex"; homepage = "https://github.com/webdataset/webdataset"; license = licenses.bsd3; maintainers = with maintainers; [ iynaix ]; diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index cc353777f632..831ebbe43dd4 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -90,6 +90,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for interacting with WebDAV"; + mainProgram = "dav"; homepage = "https://skshetry.github.io/webdav4/"; changelog = "https://github.com/skshetry/webdav4/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix index e44c1eb29259..0cd96d389bd0 100644 --- a/pkgs/development/python-modules/webdavclient3/default.nix +++ b/pkgs/development/python-modules/webdavclient3/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy to use WebDAV Client for Python 3.x"; + mainProgram = "wdc"; homepage = "https://github.com/ezhov-evgeny/webdav-client-python-3"; license = licenses.mit; maintainers = with maintainers; [ dmrauh ]; diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index f4d33df53144..1903c6cb6466 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.6.4"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-szJAGbPChXIIbEoxn5HR3NRObhHNNAIyl4xoSnZQ0N8="; + hash = "sha256-EOUR6jqMdEYx07135h6xftCTBMQTrULPbd+kx3h+j+Y="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Websocket client for Python"; + mainProgram = "wsdump"; homepage = "https://github.com/websocket-client/websocket-client"; changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index b456de718c7e..1dd941379274 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "WebSockets support for any application/server"; + mainProgram = "websockify"; homepage = "https://github.com/kanaka/websockify"; changelog = "https://github.com/novnc/websockify/releases/tag/v${version}"; license = licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index dd7fcaa5bcf9..4681b186c9ca 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web based SSH client"; + mainProgram = "wssh"; homepage = "https://github.com/huashengdun/webssh/"; changelog = "https://github.com/huashengdun/webssh/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 5e00ef399e61..003614876b98 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.48.4"; + version = "0.49.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-Yv6CAGTDi4P9pImLxVk2QkZ014iqQ8UMBUeiyZWnYiQ="; + hash = "sha256-V96fdy6h012SbP3tyOMniAwLf/1+iKzTc9WnevAVwTI="; }; postPatch = '' @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client that publishes data from Volkswagen WeConnect"; + mainProgram = "weconnect-mqtt"; homepage = "https://github.com/tillsteinbach/WeConnect-mqtt"; changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index e59eda006e6e..51e380ece2a1 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch2 # build-system , flit-core @@ -38,6 +39,14 @@ buildPythonPackage rec { hash = "sha256-UH6BHs6nKxikBJR63tSzOQ4duPgmtJTXZVDvRbs7Hcw="; }; + patches = [ + (fetchpatch2 { + name = "werkzeug-pytest8-compat.patch"; + url = "https://github.com/pallets/werkzeug/commit/4e5bdca7f8227d10cae828f8064fb98190ace4aa.patch"; + hash = "sha256-lVknzvC+HIM6TagpyIOhnb+7tx0UXuGw0tINjsujISI="; + }) + ]; + nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index b3cfcaa30b60..55ad178d0b38 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Zephyr RTOS meta tool"; + mainProgram = "west"; longDescription = '' West lets you manage multiple Git repositories under a single directory using a single file, called the west manifest file, or manifest for short. diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix index 1937d7710f3c..fd1ec9d946a2 100644 --- a/pkgs/development/python-modules/wheel-filename/default.nix +++ b/pkgs/development/python-modules/wheel-filename/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parse wheel filenames"; + mainProgram = "wheel-filename"; homepage = "https://github.com/jwodder/wheel-filename"; license = with licenses; [ mit ]; maintainers = with lib.maintainers; [ ayazhafiz ]; diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index 17195fa67dae..bf2ff4ece67b 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extract information from wheels"; + mainProgram = "wheel2json"; homepage = "https://github.com/jwodder/wheel-inspect"; changelog = "https://github.com/wheelodex/wheel-inspect/releases/tag/v${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 2b9626190500..14339d2056f3 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/pypa/wheel"; description = "A built-package format for Python"; + mainProgram = "wheel"; longDescription = '' This library is the reference implementation of the Python wheel packaging standard, as defined in PEP 427. diff --git a/pkgs/development/python-modules/wheezy-template/default.nix b/pkgs/development/python-modules/wheezy-template/default.nix index ef70345c1a18..0baba9c564e5 100644 --- a/pkgs/development/python-modules/wheezy-template/default.nix +++ b/pkgs/development/python-modules/wheezy-template/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://wheezytemplate.readthedocs.io/en/latest/"; description = "A lightweight template library"; + mainProgram = "wheezy.template"; license = licenses.mit; maintainers = with maintainers; [ lilyinstarlight ]; }; diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 4642da2b3ace..732c22d09575 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; rev = "refs/tags/${version}"; - hash = "sha256-vZRdt3Vxndp0iwA5uwMHSbzQZZZc5+tBWh3tMJYfIaU="; + hash = "sha256-5Ik9+i5T5ztb+2zqFZ+SBmrZFLDxji66e3lK0z2w92c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix index 5106ee3b0556..357d8d271ff4 100644 --- a/pkgs/development/python-modules/whispers/default.nix +++ b/pkgs/development/python-modules/whispers/default.nix @@ -86,6 +86,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to identify hardcoded secrets in static structured text"; + mainProgram = "whispers"; homepage = "https://github.com/adeptex/whispers"; changelog = "https://github.com/adeptex/whispers/releases/tag/${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/whoisdomain/default.nix b/pkgs/development/python-modules/whoisdomain/default.nix index 08dd213c3bec..eb28f68c957c 100644 --- a/pkgs/development/python-modules/whoisdomain/default.nix +++ b/pkgs/development/python-modules/whoisdomain/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to perform whois lookups"; + mainProgram = "whoisdomain"; homepage = "https://github.com/mboot-github/WhoisDomain"; changelog = "https://github.com/mboot-github/WhoisDomain/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index 10053bc27918..52831486f2b7 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -1,30 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +}: buildPythonPackage rec { - pname = "Whoosh"; + pname = "whoosh"; version = "2.7.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; + src = fetchPypi { - inherit pname version; - sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; + pname = "Whoosh"; + inherit version; + hash = "sha256-fKVjPb+p4OD6QA0xUaigxL7FO9Ls7cCmdwWxdWXDGoM="; }; - nativeCheckInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; # Wrong encoding postPatch = '' rm tests/test_reading.py - substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" - ''; - checkPhase = '' - # FIXME: test_minimize_dfa fails on python 3.6 - py.test -k "not test_timelimit and not test_minimize_dfa" + substituteInPlace setup.cfg \ + --replace-fail "[pytest]" "[tool:pytest]" ''; + pythonImportsCheck = [ + "whoosh" + ]; + + disabledTests = [ + "test_minimize_dfa" + ]; + meta = with lib; { - description = "Fast, pure-Python full text indexing, search, and spell -checking library."; - homepage = "https://bitbucket.org/mchaput/whoosh"; - license = licenses.bsd2; + description = "Fast, pure-Python full text indexing, search, and spell checking library"; + homepage = "https://github.com/mchaput/whoosh"; + license = licenses.bsd2; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix index 01a867f008f8..260f7e8a937f 100644 --- a/pkgs/development/python-modules/wifi/default.nix +++ b/pkgs/development/python-modules/wifi/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provides a command line wrapper for iwlist and /etc/network/interfaces"; + mainProgram = "wifi"; homepage = "https://github.com/rockymeza/wifi"; maintainers = with maintainers; [ rhoriguchi ]; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/wikipedia-api/default.nix b/pkgs/development/python-modules/wikipedia-api/default.nix index bb1fbd67dabb..e8959b078c75 100644 --- a/pkgs/development/python-modules/wikipedia-api/default.nix +++ b/pkgs/development/python-modules/wikipedia-api/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - pname = "Wikipedia-API"; + pname = "wikipedia-api"; version = "0.6.0"; format = "setuptools"; diff --git a/pkgs/development/python-modules/wikipedia2vec/default.nix b/pkgs/development/python-modules/wikipedia2vec/default.nix index f28addf30f4f..12f7ef753a59 100644 --- a/pkgs/development/python-modules/wikipedia2vec/default.nix +++ b/pkgs/development/python-modules/wikipedia2vec/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for learning vector representations of words and entities from Wikipedia"; + mainProgram = "wikipedia2vec"; homepage = "https://wikipedia2vec.github.io/wikipedia2vec/"; changelog = "https://github.com/wikipedia2vec/wikipedia2vec/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix index bf6c2153c7e0..6200082bc9fd 100644 --- a/pkgs/development/python-modules/withings-sync/default.nix +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Synchronisation of Withings weight"; + mainProgram = "withings-sync"; homepage = "https://github.com/jaroslawhartman/withings-sync"; changelog = "https://github.com/jaroslawhartman/withings-sync/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 72f390df41f5..0887533adb9a 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -3,21 +3,19 @@ , buildPythonPackage , fetchFromGitLab , fetchpatch -, gnupg , html2text -, libyaml , lxml -, nose , packaging , pillow , prettytable , pycountry +, pytestCheckHook , python-dateutil , pythonOlder , pyyaml , requests , rich -, termcolor +, setuptools , testers , unidecode , woob @@ -26,27 +24,25 @@ buildPythonPackage rec { pname = "woob"; version = "3.6"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "woob"; - repo = pname; + repo = "woob"; rev = version; hash = "sha256-M9AjV954H1w64YGCVxDEGGSnoEbmocG3zwltob6IW04="; }; nativeBuildInputs = [ - packaging + setuptools ]; propagatedBuildInputs = [ babel python-dateutil - gnupg html2text - libyaml lxml packaging pillow @@ -55,17 +51,18 @@ buildPythonPackage rec { pyyaml requests rich - termcolor unidecode ]; nativeCheckInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; + disabledTests = [ + # require networking + "test_ciphers" + "test_verify" + ]; pythonImportsCheck = [ "woob" @@ -77,7 +74,9 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://gitlab.com/woob/woob/-/blob/${src.rev}/ChangeLog"; description = "Collection of applications and APIs to interact with websites"; + mainProgram = "woob"; homepage = "https://woob.tech"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ DamienCassou ]; diff --git a/pkgs/development/python-modules/woodblock/default.nix b/pkgs/development/python-modules/woodblock/default.nix index 8dde484494e8..cb0d5bab3df1 100644 --- a/pkgs/development/python-modules/woodblock/default.nix +++ b/pkgs/development/python-modules/woodblock/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework to generate file carving test data"; + mainProgram = "woodblock"; homepage = "https://github.com/fkie-cad/woodblock"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index 1bca71009a99..a2d0fbb68450 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "wordcloud"; - version = "1.9.1.1"; + version = "1.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "amueller"; repo = "word_cloud"; rev = "refs/tags/${version}"; - hash = "sha256-Tcle9otT1eBN/RzajwKZDUq8xX0Lhi2t74OvhUrvHZE="; + hash = "sha256-UbryGiu1AW6Razbf4BJIKGKKhG6JOeZUGb1k0w8f8XA="; }; postPatch = '' @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Word cloud generator in Python"; + mainProgram = "wordcloud_cli"; homepage = "https://github.com/amueller/word_cloud"; changelog = "https://github.com/amueller/word_cloud/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index bff7c88f1463..e9f65687a3ee 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generic and extendable WebDAV server based on WSGI"; + mainProgram = "wsgidav"; homepage = "https://wsgidav.readthedocs.io/"; changelog = "https://github.com/mar10/wsgidav/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 4b724ce6acbd..9bb47be4a27a 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "wtforms"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "wtforms"; repo = "wtforms"; rev = "refs/tags/${version}"; - hash = "sha256-9EryEXGlGCtDH/XPM4Oihla42HnY0nho9DaauHfYnNQ="; + hash = "sha256-L6DmB7iVpJR775oRxuEkCKWlUJnmw8VPZTr2dZbqeEc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wunsen/default.nix b/pkgs/development/python-modules/wunsen/default.nix new file mode 100644 index 000000000000..5fc6ea2d3803 --- /dev/null +++ b/pkgs/development/python-modules/wunsen/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, pythonOlder + +, unittestCheckHook + +, hatchling + +, khanaa +}: + +buildPythonPackage rec { + pname = "wunsen"; + version = "0.0.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "cakimpei"; + repo = "wunsen"; + rev = "refs/tags/v${version}"; + hash = "sha256-lMEhtcWG+S3vAz+Y/qDxhaZslsO0pbs5xUn5QgZNs2U="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + khanaa + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ "-s" "tests" ]; + + pythonImportsCheck = [ "wunsen" ]; + + meta = with lib; + { + description = "Transliterate/transcribe other languages into Thai Topics"; + homepage = "https://github.com/cakimpei/wunsen"; + changelog = "https://github.com/cakimpei/wunsen/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix index 17afeaf5a348..f71e1c062869 100644 --- a/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , icalendar , pytz , pytestCheckHook @@ -10,17 +11,20 @@ buildPythonPackage rec { pname = "x-wr-timezone"; - version = "0.0.6"; - - format = "setuptools"; + version = "0.0.7"; + pyproject = true; src = fetchFromGitHub { owner = "niccokunzmann"; repo = "x-wr-timezone"; rev = "v${version}"; - hash = "sha256-9B1gXabpZsJSHYUHLu6bBGidO3C5m/I0oOc5U/mbX0I="; + hash = "sha256-itqsVYYUcpbKTh0BM6IHk6F9xhB+pAQnnJsnZAVpNL4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ icalendar pytz @@ -36,8 +40,10 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - # https://github.com/niccokunzmann/x-wr-timezone/issues/8 - doCheck = false; + disabledTests = [ + "test_input_to_output" + "test_output_stays_the_same" + ]; pythonImportsCheck = [ "x_wr_timezone" ]; diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index 2daf40454974..824ce8620839 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; - hash = "sha256-UT1XhIgnkZis4TrUl1ENKyIgTV15S2QUPQW3vpdOts8="; + hash = "sha256-BoMU/KP1RSRwFJLfQy+lTEhf1OOWE8os0nXhNpZOgak="; }; configureFlags = [ diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 8b8b795edda9..b5dc4e3e82ea 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "xapp"; - version = "21"; + version = "22"; format = "other"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "linuxmint"; repo = "python-xapp"; rev = "refs/tags/master.mint${version}"; - hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o="; + hash = "sha256-2Gx85y0ARu6EfDYAT9ZL154RH0R1HY78tm3rceODnZU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index aa89ff792eea..e3e3865ce588 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flaky , numpy , packaging , pandas @@ -12,14 +13,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2024.1.1"; + version = "2024.2.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-oboth6dIkuITycg/SkYtvN9oISMgpOMbNL14m6emTjU="; + hash = "sha256-oQXwJ5EILIiOviYiCQvq/y57aFcUiNYv5q/as1tLcX8="; }; nativeBuildInputs = [ @@ -34,9 +35,15 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + flaky pytestCheckHook ]; + pytestFlagsArray =[ + # ModuleNotFoundError: No module named 'xarray.datatree_' + "--ignore xarray/tests/datatree" + ]; + pythonImportsCheck = [ "xarray" ]; diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 3ef8332cae21..6d24e5dffc8f 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for extended filesystem attributes"; + mainProgram = "xattr"; homepage = "https://github.com/xattr/xattr"; changelog = "https://github.com/xattr/xattr/blob/v${version}/CHANGES.txt"; license = licenses.mit; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 5f4970f4fd13..f0bfe71fcbb0 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "An interactive viewer for graphs written in Graphviz's dot"; + mainProgram = "xdot"; homepage = "https://github.com/jrfonseca/xdot.py"; license = licenses.lgpl3Plus; }; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index f1c0d836bf74..f223e63c7f0e 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -2,36 +2,59 @@ , arabic-reshaper , buildPythonPackage , fetchFromGitHub +, fetchpatch2 , html5lib , pillow , pyhanko +, pyhanko-certvalidator , pypdf , pytestCheckHook , python-bidi , pythonOlder +, pythonRelaxDepsHook , reportlab +, setuptools , svglib }: buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.13"; + version = "0.2.15"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "xhtml2pdf"; + repo = "xhtml2pdf"; rev = "refs/tags/v${version}"; - hash = "sha256-K7gsTLYcXmKmEQzOXrJ2kvvLzKaDkZ/NRLRc0USii5M="; + hash = "sha256-JXxh/n1kUsy3O4P/6WTfa5p+mYy/t4ZBUhlHp+ypoQc="; }; + patches = [ + # https://github.com/xhtml2pdf/xhtml2pdf/pull/754 + (fetchpatch2 { + name = "reportlab-compat.patch"; + url = "https://github.com/xhtml2pdf/xhtml2pdf/commit/1252510bd23b833b45b4d252aeac62c1eb51eeef.patch"; + hash = "sha256-9Fkn086uh2biabmiChbBna8Q4lJV/604yX1ng9j5TGs="; + }) + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + pythonRelaxDeps = [ + "reportlab" + ]; + propagatedBuildInputs = [ arabic-reshaper html5lib pillow pyhanko + pyhanko-certvalidator pypdf python-bidi reportlab diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 8264a5b9fb17..548609caaaa2 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.27.0"; + version = "0.27.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-D1LqIdnusCs7vzVCPnbhXqRER/+uPKWoVsfeGe2M6b8="; + hash = "sha256-/LOq35YrGacXXP1Izl9xoF5rrCQGONPGj/u2zGOqbt0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 7ae231f03f89..3c5a946935ab 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; + mainProgram = "xkcdpass"; homepage = "https://github.com/redacted/XKCD-password-generator"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 8b2612f59af2..ce17ca1502ad 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://www.python-excel.org/"; description = "Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"; + mainProgram = "runxlrd.py"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index fec07f101cd8..5d4b37342f6f 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/dilshod/xlsx2csv"; description = "Convert xlsx to csv"; + mainProgram = "xlsx2csv"; license = licenses.bsd3; maintainers = with maintainers; [ jb55 ]; }; diff --git a/pkgs/development/python-modules/xlsxwriter/default.nix b/pkgs/development/python-modules/xlsxwriter/default.nix index 5bd96b3aa1b6..9eb6c83716aa 100644 --- a/pkgs/development/python-modules/xlsxwriter/default.nix +++ b/pkgs/development/python-modules/xlsxwriter/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for creating Excel XLSX files"; + mainProgram = "vba_extract.py"; homepage = "https://xlsxwriter.readthedocs.io/"; changelog = "https://xlsxwriter.readthedocs.io/changes.html"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index a4d23e9580dd..fd027903d714 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.20.0"; + version = "3.20.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-w4wmjY+yA5Nc1roAXBRTqQxqaSI1vzdMhK9hGkbv7Rk="; + hash = "sha256-JDJZegJR34aaIzMdq/GYzOpIBH7epe9yHnUaI7OzRes="; }; postPatch = '' @@ -87,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; + mainProgram = "xml2rfc"; homepage = "https://github.com/ietf-tools/xml2rfc"; changelog = "https://github.com/ietf-tools/xml2rfc/blob/v${version}/CHANGELOG.md"; # Well, parts might be considered unfree, if being strict; see: diff --git a/pkgs/development/python-modules/xmljson/default.nix b/pkgs/development/python-modules/xmljson/default.nix index dee35921e41e..441a0e571dc2 100644 --- a/pkgs/development/python-modules/xmljson/default.nix +++ b/pkgs/development/python-modules/xmljson/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Converts XML into dictionary structures and vice-versa"; + mainProgram = "xml2json"; homepage = "https://github.com/sanand0/xmljson"; license = with licenses; [ mit ]; maintainers = with maintainers; [ rakesh4g ]; diff --git a/pkgs/development/python-modules/xmod/default.nix b/pkgs/development/python-modules/xmod/default.nix new file mode 100644 index 000000000000..d5ba4bf1a322 --- /dev/null +++ b/pkgs/development/python-modules/xmod/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "xmod"; + version = "1.8.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rec"; + repo = "xmod"; + rev = "v${version}"; + hash = "sha256-pfFxtDQ4kaBrx4XzYMQO1vE4dUr2zs8jgGUQUdXB798="; + }; + + build-system = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_partial_function" + ]; + + pythonImportsCheck = [ + "xmod" + ]; + + meta = with lib; { + description = "Turn any object into a module"; + homepage = "https://github.com/rec/xmod"; + changelog = "https://github.com/rec/xmod/blob/${src.rev}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 097c2e1cc07c..b57fff4a94f0 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -93,6 +93,7 @@ buildPythonPackage rec { meta = { description = "Naive XML & JSON bindings for Python"; + mainProgram = "xsdata"; homepage = "https://github.com/tefra/xsdata"; changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.md"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 4f515f9b7bbb..2111d5fa4d6b 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "2.0.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-ozohIzw80YfyB0sxXQ9MY6VpF+EDDvXZYfkpuloE4AU="; + hash = "sha256-hY46hUUmbQUWmI+Oa9qIQ1rZdXT5daGo1Vd5JRKfDHE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix index f4e90d649a71..ae5705d9970d 100644 --- a/pkgs/development/python-modules/yamale/default.nix +++ b/pkgs/development/python-modules/yamale/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yamale"; - version = "4.0.4"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "23andMe"; repo = pname; - rev = version; - hash = "sha256-1GFvgfy3MDsJGKSEm0yaQoLM7VqIS2wphw16trNTUOc="; + rev = "refs/tags/${version}"; + hash = "sha256-WLI3cL6i7eLfaX1nN8K/fHlrkOm+JdTEscelql6jO44="; }; propagatedBuildInputs = [ @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "A schema and validator for YAML"; + mainProgram = "yamale"; homepage = "https://github.com/23andMe/Yamale"; license = licenses.mit; maintainers = with maintainers; [ rtburns-jpl ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 9200d7d508ac..79687d6cf621 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "A linter for YAML files"; + mainProgram = "yamllint"; homepage = "https://github.com/adrienverge/yamllint"; changelog = "https://github.com/adrienverge/yamllint/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index d402f1478b16..aea6481b6c1a 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -1,27 +1,33 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools-scm +, fetchFromGitHub +, poetry-core , elementpath +, pyyaml +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "yangson"; - version = "1.4.19"; - format = "setuptools"; + version = "1.5.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-rYUxv3TEdyr2D3UEmmHcJJtlG6gXJnp1c2pez4H13SU="; + src = fetchFromGitHub { + owner = "CZ-NIC"; + repo = "yangson"; + rev = "refs/tags/${version}"; + hash = "sha256-c/UWyfJdVz6wSluL1Ej9cSV3EpDUTkP0GTeHPYfAduE="; }; - nativeBuildInputs = [ - setuptools-scm + build-system = [ + poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ elementpath + pyyaml + setuptools ]; nativeCheckInputs = [ @@ -34,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for working with data modelled in YANG"; + mainProgram = "yangson"; homepage = "https://github.com/CZ-NIC/yangson"; license = with licenses; [ gpl3Plus diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 1e20c1ba2eab..7160245e8ec0 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python profiler that supports multithreading and measuring CPU time"; + mainProgram = "yappi"; homepage = "https://github.com/sumerc/yappi"; license = licenses.mit; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index 7bbf5288cf26..cdcd1ab08afd 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for YouTube archiving"; + mainProgram = "yark"; homepage = "https://github.com/Owez/yark"; changelog = "https://github.com/Owez/yark/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/yasi/default.nix b/pkgs/development/python-modules/yasi/default.nix index 08068ed6b6b4..dbcbfe1a5378 100644 --- a/pkgs/development/python-modules/yasi/default.nix +++ b/pkgs/development/python-modules/yasi/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "A dialect-aware s-expression indenter written in Python and newLISP"; + mainProgram = "yasi"; homepage = "https://github.com/nkmathew/yasi-sexp-indenter"; changelog = "https://github.com/nkmathew/yasi-sexp-indenter/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/yaswfp/default.nix b/pkgs/development/python-modules/yaswfp/default.nix index f4f6b8bc22be..65542562df94 100644 --- a/pkgs/development/python-modules/yaswfp/default.nix +++ b/pkgs/development/python-modules/yaswfp/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SWF Parser"; + mainProgram = "swfparser"; homepage = "https://github.com/facundobatista/yaswfp"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 46c9f1a3d7a9..04f9be193aac 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")"; + mainProgram = "ydiff"; longDescription = '' Term based tool to view colored, incremental diff in a version controlled workspace (supports Git, Mercurial, Perforce and Svn diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 06db089ca835..18e86dc16102 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to doiwnload Yahoo! Finance market data"; + mainProgram = "sample"; homepage = "https://github.com/ranaroussi/yfinance"; changelog = "https://github.com/ranaroussi/yfinance/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index e1e43b34a7ae..b52b2268a400 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.3.9"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = "yolink-api"; rev = "refs/tags/v${version}"; - hash = "sha256-RXO++8Dh0hLkjXev/WDhPixLHKXlqRabbrPW6Hs/xoM="; + hash = "sha256-YDfwF9ldL43yrhz1TibTatkZIccYTpNODdjqBkzeh1s="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiomqtt pydantic diff --git a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch index 26af7ad24c92..73aadac9a3de 100644 --- a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch +++ b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch @@ -1,25 +1,16 @@ -From 9013d36cfe7b2958eb18ce373f49193b66a0bbf6 Mon Sep 17 00:00:00 2001 -From: Dan Callaghan <djc@djc.id.au> -Date: Sun, 23 Apr 2023 16:14:55 +1000 -Subject: [PATCH] use packaged unicode data - - diff --git a/lib/youseedee/__init__.py b/lib/youseedee/__init__.py -index 4424ef1..9a72f52 100644 +index d2aeab3..c706277 100644 --- a/lib/youseedee/__init__.py +++ b/lib/youseedee/__init__.py -@@ -11,10 +11,7 @@ - UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip" +@@ -29,10 +29,7 @@ UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip" + def ucd_dir(): -- ucddir = os.path.expanduser("~/.youseedee") -- if not os.path.isdir(ucddir): -- os.mkdir(ucddir) -- return ucddir -+ return "@ucd_dir@" +- ucddir = os.path.expanduser("~/.youseedee") +- if not os.path.isdir(ucddir): +- os.mkdir(ucddir) +- return ucddir ++ return "@ucd_dir@" + def ensure_files(): - if os.path.isfile(os.path.join(ucd_dir(), "UnicodeData.txt")): --- -2.38.4 - diff --git a/pkgs/development/python-modules/youseedee/default.nix b/pkgs/development/python-modules/youseedee/default.nix index e2d9456110ab..3e04540dc577 100644 --- a/pkgs/development/python-modules/youseedee/default.nix +++ b/pkgs/development/python-modules/youseedee/default.nix @@ -2,18 +2,19 @@ , buildPythonPackage , fetchPypi , substituteAll +, filelock , requests , unicode-character-database }: buildPythonPackage rec { pname = "youseedee"; - version = "0.4.1"; + version = "0.5.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-fdI4CBUSMbdKW0qg4y22wjWI6bhotgDkQdFMc9X00as="; + hash = "sha256-hQkI8kdropLiO86LXDy6eQma3FEg48gLldU7bFg9dzI="; }; patches = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + filelock requests ]; diff --git a/pkgs/development/python-modules/youtokentome/default.nix b/pkgs/development/python-modules/youtokentome/default.nix index 2adb7480f906..0dfe0336c056 100644 --- a/pkgs/development/python-modules/youtokentome/default.nix +++ b/pkgs/development/python-modules/youtokentome/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unsupervised text tokenizer"; + mainProgram = "yttm"; homepage = "https://github.com/VKCOM/YouTokenToMe"; changelog = "https://github.com/VKCOM/YouTokenToMe/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index 79d9c4a174b8..e76038267a80 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API which allows you to get the transcripts/subtitles for a given YouTube video"; + mainProgram = "youtube_transcript_api"; homepage = "https://github.com/jdepoix/youtube-transcript-api"; changelog = "https://github.com/jdepoix/youtube-transcript-api/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 1754dab10d36..bc79ff51823f 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/tgalal/yowsup"; description = "The python WhatsApp library"; + mainProgram = "yowsup-cli"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix index 3056659cacbf..6b8bcfb95be1 100644 --- a/pkgs/development/python-modules/yte/default.nix +++ b/pkgs/development/python-modules/yte/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "YAML template engine with Python expressions"; + mainProgram = "yte"; homepage = "https://github.com/koesterlab/yte"; changelog = "https://github.com/yte-template-engine/yte/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 41e8f3c4248a..380738008361 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for YouTube Music"; + mainProgram = "ytmusicapi"; homepage = "https://github.com/sigma67/ytmusicapi"; changelog = "https://github.com/sigma67/ytmusicapi/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index 25b0fb7ba9e6..9f6a7ed4258e 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/z3c.checkversions"; changelog = "https://github.com/zopefoundation/z3c.checkversions/blob/${version}/CHANGES.rst"; description = "Find newer package versions on PyPI"; + mainProgram = "checkversions"; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 8be14e23e7d0..fcb57b3731dd 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.16.1"; + version = "2.17.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QnbPS0plNDEELNU/8igrxNKSpoQkEeiFKZZFBPsHMoY="; + hash = "sha256-Vks6oHISJUb+aaD6IXNvRmsg+tQXVDNLYmGfCIzkYmE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zc-lockfile/default.nix b/pkgs/development/python-modules/zc-lockfile/default.nix index 5104a221e1e8..8b7818ef119b 100644 --- a/pkgs/development/python-modules/zc-lockfile/default.nix +++ b/pkgs/development/python-modules/zc-lockfile/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "zc-lockfile"; - version = "3.0"; + version = "3.0.post1"; src = fetchPypi { pname = "zc.lockfile"; inherit version; - hash = "sha256-5Y/9ndYsbUMuhoK/oZbJDKw+XB4/JNrjuJ1ggihV14g="; + hash = "sha256-rbLubZ5qIzPJEXjcssm5aldEx47bdxLceEp9dWSOgew="; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/zcbor/default.nix b/pkgs/development/python-modules/zcbor/default.nix index 9bce9e925c1d..0ac5f5323b64 100644 --- a/pkgs/development/python-modules/zcbor/default.nix +++ b/pkgs/development/python-modules/zcbor/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "A low footprint CBOR library in the C language (C++ compatible), tailored for use in microcontrollers"; + mainProgram = "zcbor"; homepage = "https://pypi.org/project/zcbor/"; changelog = "https://github.com/NordicSemiconductor/zcbor/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index 4434ceb09545..54c096b64257 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A daemon process control library and tools for Unix-based systems"; + mainProgram = "zdaemon"; homepage = "https://pypi.python.org/pypi/zdaemon"; changelog = "https://github.com/zopefoundation/zdaemon/blob/${version}/CHANGES.rst"; license = licenses.zpl21; diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 39ee5b6cba7d..d68c90edd161 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { homepage = "https://zeroc.com/"; license = licenses.gpl2; description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more."; + mainProgram = "slice2py"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/zerorpc/default.nix b/pkgs/development/python-modules/zerorpc/default.nix index 0cc61ac695e2..3734496531a1 100644 --- a/pkgs/development/python-modules/zerorpc/default.nix +++ b/pkgs/development/python-modules/zerorpc/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "An easy to use, intuitive, and cross-language RPC"; + mainProgram = "zerorpc"; homepage = "https://www.zerorpc.io"; license = licenses.mit; maintainers = with maintainers; [ xeji ]; diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix index fe6e8771c057..d4972f70e450 100644 --- a/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/pkgs/development/python-modules/zipstream-ng/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to generate streamable zip files"; + mainProgram = "zipserver"; longDescription = '' A modern and easy to use streamable zip file generator. It can package and stream many files and folders on the fly without needing temporary files or excessive memory diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix index 4f93df3c692b..7cb498bbb12f 100644 --- a/pkgs/development/python-modules/zlib-ng/default.nix +++ b/pkgs/development/python-modules/zlib-ng/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "zlib-ng"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-zlib-ng"; rev = "v${version}"; - hash = "sha256-bVdt4GYdbzhoT6et+LOycg0Bt6dX9DtusNr8HPpgIFI="; + hash = "sha256-uK6Md8ZOVUNwXCjzM4zTVr3WBwzLdnvT9n8yBvf968k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index 7a21ad79e29b..6a664daaf026 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "zope-configuration"; - version = "5.0"; + version = "5.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.configuration"; inherit version; - hash = "sha256-I0tKGMcfazub9rzyJSZLrgFJrGjeoHsHLw9pmkzsJuc="; + hash = "sha256-81h36tXpmANjhdLdxGkZ6ryZjmmcBZh5ZPFxrY3ZJxs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index 3c2a6d4be9f8..6084a86f65ae 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "zope-proxy"; - version = "5.1"; + version = "5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.proxy"; inherit version; - hash = "sha256-d3e9P4986nRSFyYgLhptUVPb9knyBOJQBYrQOvRqQxg="; + hash = "sha256-93fVbCqy/PQNAmraHmfx45z2MY497rmhzVCH/MsfKG4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zope-testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix index 742adb082fad..0f91e35462b5 100644 --- a/pkgs/development/python-modules/zope-testrunner/default.nix +++ b/pkgs/development/python-modules/zope-testrunner/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A flexible test runner with layer support"; + mainProgram = "zope-testrunner"; homepage = "https://pypi.python.org/pypi/zope.testrunner"; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index bd5db6bf2baf..8ebdf0f596f6 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for zwave-js-server"; + mainProgram = "zwave-js-server-python"; homepage = "https://github.com/home-assistant-libs/zwave-js-server-python"; changelog = "https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix index e9a8f32700c6..91b9d03ccc2e 100644 --- a/pkgs/development/python-modules/zxcvbn/default.nix +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of Dropbox's realistic password strength estimator"; + mainProgram = "zxcvbn"; homepage = "https://github.com/dwolfhub/zxcvbn-python"; license = licenses.mit; maintainers = [ maintainers.marsam ]; |