diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules')
1708 files changed, 21382 insertions, 6064 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/nixpkgs/pkgs/development/python-modules/Cython/default.nix index 4f4cfea37c34..c2bb5811336d 100644 --- a/nixpkgs/pkgs/development/python-modules/Cython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Cython/default.nix @@ -24,12 +24,12 @@ let in buildPythonPackage rec { pname = "cython"; - version = "0.29.34"; + version = "0.29.36"; src = fetchPypi { pname = "Cython"; inherit version; - hash = "sha256-GQloj117Uhpgw5bSC7qeR6Gy0nhL+whUAeHh59KaKag="; + hash = "sha256-QcDP0tdU44PJ7rle/8mqSrhH0Ml0cHfd18Dctow7wB8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/Polygon3/default.nix b/nixpkgs/pkgs/development/python-modules/Polygon3/default.nix new file mode 100644 index 000000000000..e85eb209343d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/Polygon3/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: +let + pname = "Polygon3"; + version = "3.0.9"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jraedler"; + repo = pname; + rev = "7b2091f77741fa1d94251979bc4a4f2676b4d2d1"; + hash = "sha256-jXtjEzjWwMoVgrHWsK8brSN6TQRxIPRjUaRiLBXYLcI="; + }; + + # malloc error on running the tests + # python3.10(30620,0x115b74600) malloc: *** error for object 0x10d6db580: pointer being freed was not allocated + # > python3.10(30620,0x115b74600) malloc: *** set a breakpoint in malloc_error_break to debug + # > /nix/store/vbi8rnz0k3jyh4h4g16bbkchdd8mnxw7-setuptools-check-hook/nix-support/setup-hook: line 4: 30620 Abort trap: 6 /nix/store/5cxanhipcbfxnrqgw2qsr3zqr4z711bj-python3-3.10.12/bin/python3.10 nix_run_setup test + doCheck = false; + + meta = with lib; { + description = "Polygon is a python package that handles polygonal shapes in 2D"; + homepage = "https://github.com/jraedler/Polygon3"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix b/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix index 83db24896cbc..3b92fc06a915 100644 --- a/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/aardwolf/utils/rlers"; + sourceRoot = "${src.name}/aardwolf/utils/rlers"; name = "${pname}-${version}"; hash = "sha256-JGXTCCyC20EuUX0pP3xSZG3qFB5jRL7+wW2YRC3EiCc="; }; diff --git a/nixpkgs/pkgs/development/python-modules/accelerate/default.nix b/nixpkgs/pkgs/development/python-modules/accelerate/default.nix index 4de49a21a830..9aefa2294878 100644 --- a/nixpkgs/pkgs/development/python-modules/accelerate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/accelerate/default.nix @@ -2,6 +2,8 @@ , lib , buildPythonPackage , fetchFromGitHub +, fetchpatch +, pythonAtLeast , pythonOlder , pytestCheckHook , setuptools @@ -17,7 +19,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.19.0"; + version = "0.21.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,9 +27,18 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gW4wCpkyxoWfxXu8UHZfgopSQhOoPhGgqEqFiHJ+Db4="; + hash = "sha256-BwM3gyNhsRkxtxLNrycUGwBmXf8eq/7b56/ykMryt5w="; }; + patches = [ + # fix import error when torch>=2.0.1 and torch.distributed is disabled + # https://github.com/huggingface/accelerate/pull/1800 + (fetchpatch { + url = "https://github.com/huggingface/accelerate/commit/32701039d302d3875c50c35ab3e76c467755eae9.patch"; + hash = "sha256-Hth7qyOfx1sC8UaRdbYTnyRXD/VRKf41GtLc0ee1t2I="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -53,15 +64,25 @@ buildPythonPackage rec { # try to download data: "FeatureExamplesTests" "test_infer_auto_device_map_on_t0pp" - # known failure with Torch>2.0; see https://github.com/huggingface/accelerate/pull/1339: - # (remove for next release) - "test_gradient_sync_cpu_multi" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # RuntimeError: torch_shm_manager: execl failed: Permission denied + "CheckpointTest" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # python3.11 not yet supported for torch.compile + "test_dynamo_extract_model" ]; - # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException: - doCheck = !stdenv.isDarwin; + + disabledTestPaths = lib.optionals (!(stdenv.isLinux && stdenv.isx86_64)) [ + # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException: + "tests/test_cpu.py" + "tests/test_grad_sync.py" + "tests/test_metrics.py" + "tests/test_scheduler.py" + ]; + pythonImportsCheck = [ "accelerate" ]; diff --git a/nixpkgs/pkgs/development/python-modules/accupy/default.nix b/nixpkgs/pkgs/development/python-modules/accupy/default.nix index dfe47d306811..8b67fa4d9dbc 100644 --- a/nixpkgs/pkgs/development/python-modules/accupy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/accupy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -56,6 +57,10 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + # performance tests aren't useful to us and disabling them allows us to # decouple ourselves from an unnecessary build dep preCheck = '' @@ -70,6 +75,6 @@ buildPythonPackage rec { description = "Accurate sums and dot products for Python"; homepage = "https://github.com/nschloe/accupy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/acme/default.nix b/nixpkgs/pkgs/development/python-modules/acme/default.nix index 97e725bb7119..531ed8ae8d9b 100644 --- a/nixpkgs/pkgs/development/python-modules/acme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acme/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "acme" ]; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; meta = certbot.meta // { description = "ACME protocol implementation in Python"; diff --git a/nixpkgs/pkgs/development/python-modules/acquire/default.nix b/nixpkgs/pkgs/development/python-modules/acquire/default.nix index b96250df8eee..3b88d6bbb553 100644 --- a/nixpkgs/pkgs/development/python-modules/acquire/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-oH+uxu61+d6qEQmT7joxwlyfpv7mF8ug6OzHmyUa95Y="; + hash = "sha256-wGoMah3Pj7hS5+k/l5pEaDaM25RzdWRIG9Hrf3oWkR8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/actdiag/default.nix b/nixpkgs/pkgs/development/python-modules/actdiag/default.nix index 2f3549efb008..0f1e20041adf 100644 --- a/nixpkgs/pkgs/development/python-modules/actdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/actdiag/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor SuperSandro2000 ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index f9951f3e84ea..d9fe80fcba4f 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.46.0"; + version = "3.49.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-d8RhnMcTeHFDpVS+c5lETRz75vFPOMIaqbqPGVG4vHY="; + hash = "sha256-bLwPnKLOdk8scKF4hQgkBXRoz0Ph6/pcRLlJdN+cDoA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/adb-enhanced/default.nix b/nixpkgs/pkgs/development/python-modules/adb-enhanced/default.nix index 12726a6bac51..739d34014357 100644 --- a/nixpkgs/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adb-enhanced/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "adb-enhanced"; - version = "2.5.21"; + version = "2.5.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ashishb"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kisP2RXpQa5uc53M3wcqN+1xgE/MGa2dVYzHnr1dgX8="; + hash = "sha256-n1CME/swV+NsZdUfWwVY1qQeYzawwy+sm0mkRPQKm6A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix b/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix index fef0d6eea93c..b0af50573ad9 100644 --- a/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "2.4.0"; + version = "3.0.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-/dA3OwBBMjykSYaIbvhJZj9Z8/0+mfL5pW4GqgMgops="; + hash = "sha256-wCqCKomnkYgvxDWtjBwyqKb09sTPqPgWbYohgosUaHA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix b/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix index 8140b0e82acf..9d1e0ee96bab 100644 --- a/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix @@ -1,6 +1,10 @@ { lib , fetchFromGitHub , buildPythonPackage +, packaging +, setuptools +, pkgconfig +, freetype , pytest , python , pillow @@ -10,6 +14,7 @@ buildPythonPackage rec { pname = "aggdraw"; version = "1.3.16"; + format = "pyproject"; src = fetchFromGitHub { owner = "pytroll"; @@ -18,6 +23,16 @@ buildPythonPackage rec { hash = "sha256-2yajhuRyQ7BqghbSgPClW3inpw4TW2DhgQbomcRFx94="; }; + nativeBuildInputs = [ + packaging + setuptools + pkgconfig + ]; + + buildInputs = [ + freetype + ]; + nativeCheckInputs = [ numpy pillow diff --git a/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 6cd8f66eb02f..ab46608dde44 100644 --- a/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.54"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Wm8LV0R41muvhBNDsnoywI57ZRO022IaPFMZfVS4cPA="; + hash = "sha256-a4YRbFOnBTGte52wYlAsh9o4+x+dugHGhU6kboSdU2c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix b/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix index 3bed23499552..9082fd4b37a7 100644 --- a/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aio-pika/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.1.2"; + version = "9.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iyy6HaB3S/CPYuo62SThe3m96eg9rPTMaKg2KWt0Kf0="; + hash = "sha256-QCM/9Vt9/uXylaU8xymXJEjVd6sFRcVhpr2CGjB0AoY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix b/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix index 32d6a2062cee..db3f27b5d3f0 100644 --- a/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.1.8"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-VuUvutotxkC0Xur7kBBTwjzE+F1I3JSydcHkjrpbeUg="; + hash = "sha256-GOt6oFf1ogxODrgs6/OdgTjA1UNyiNZOPFr+0DRgz0M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix b/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix index 4c6ef2d49807..e1af7fa3927c 100644 --- a/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.6.3"; + version = "0.6.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-grUfhUc8U7d7GgUa8TfvSPYOYr4IW1mZM0tl6I5gUdg="; + hash = "sha256-kOx28JmtB5hpCwsNk00bMLrU4K2tU/JY/ZWn6KmPDP4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix b/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix index 5d8c934e4275..8bdc72a019ed 100644 --- a/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "AMQP implementation using asyncio"; homepage = "https://github.com/polyconseil/aioamqp"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix b/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix index 399f499b380c..b64c7e103a7e 100644 --- a/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "0.5.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-exxpJJA+JnVuehCnWs/ihk/SSPUqV7ODXZxvbmuHe8U="; + hash = "sha256-qt2/Wf9qolNF83tf2G5xGFJiLTbOWLPbtCnDfIrKvoI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index 42c366278f7a..6f7ef895c373 100644 --- a/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.4.2"; + version = "2.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IHVplle73JVLbz9R9uPyleL9Occ723EE9Ogl059TcPg="; + hash = "sha256-twIo5qJht7oZye5lbiPwLFa/5dCwgCm+OkwuCuWU0cU="; }; # Relax version constraints: aiobotocore works with newer botocore versions diff --git a/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix b/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix index 090b98b9ff3a..1845a2501603 100644 --- a/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix @@ -16,7 +16,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XR79o65jZFR9jr9ubw7wdxCWNH8ANMrBDTVpLnetsuU="; + hash = "sha256-axUJLh7yg2A+HB0fxBueuNT/rohHVq6svQUZvR2LKzo="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix b/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix index 9684dc406ad6..24f6f1b2e488 100644 --- a/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Asyncio support for PEP-567 contextvars backport"; homepage = "https://github.com/fantix/aiocontextvars"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 64ad7567f6bd..b126a756b2e5 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , async-timeout +, chacha20poly1305-reuseable , mock , noiseprotocol , protobuf @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.9.0"; + version = "15.1.15"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,11 +23,12 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RjLzOl8Cb6Vrq+75SvBntAmmiK70i3o2rED7Smnpiws="; + hash = "sha256-qNljw3V0rfMb6GDtTd+jy/hHBaM3kc9y+RCEoNTKHFM="; }; propagatedBuildInputs = [ async-timeout + chacha20poly1305-reuseable noiseprotocol protobuf zeroconf diff --git a/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index 7cb4fec4a45d..290935e8c2ce 100644 --- a/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Python FTP client/server for asyncio"; homepage = "https://github.com/aio-libs/aioftp"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aiogram/default.nix b/nixpkgs/pkgs/development/python-modules/aiogram/default.nix new file mode 100644 index 000000000000..ab5499f7ae96 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiogram/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, aiohttp +, aiohttp-socks +, aioredis +, aresponses +, babel +, certifi +, magic-filter +, pytest-asyncio +, pytest-lazy-fixture +, redis +}: + +buildPythonPackage rec { + pname = "aiogram"; + version = "2.25.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aiogram"; + repo = "aiogram"; + rev = "v${version}"; + hash = "sha256-g8nuvna7DpXElvjBehnGKHUsrf+nyQcoKNnyR59RALo="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "aiohttp>=3.8.0,<3.9.0" "aiohttp" \ + --replace "Babel>=2.9.1,<2.10.0" "Babel" \ + --replace "magic-filter>=1.0.9" "magic-filter" + ''; + + propagatedBuildInputs = [ + aiohttp + babel + certifi + magic-filter + ]; + + nativeCheckInputs = [ + aiohttp-socks + aioredis + aresponses + pytest-asyncio + pytest-lazy-fixture + pytestCheckHook + redis + ]; + + pythonImportsCheck = [ "aiogram" ]; + + meta = with lib; { + description = "Modern and fully asynchronous framework for Telegram Bot API"; + homepage = "https://github.com/aiogram/aiogram"; + changelog = "https://github.com/aiogram/aiogram/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index da20aa064d81..72edc78c1d44 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , aiocoap +, async-interrupt , bleak , bleak-retry-connector , chacha20poly1305 @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.6.5"; + version = "2.6.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Q5pz/irC+yA/A2GhGCug+jmxr4tCnPpkAV/AZEhd64A="; + hash = "sha256-33B9BBqvKQugGz4+9EuMPhLRyWd/Sbxwh4d5aMmDt4M="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiocoap + async-interrupt bleak bleak-retry-connector chacha20poly1305 diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 75449c9f625c..92f1fbd53828 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -48,6 +48,12 @@ buildPythonPackage rec { url = "https://github.com/aio-libs/aiohttp/commit/5718879cdb6a98bf48810a994b78bc02abaf3e07.patch"; hash = "sha256-4UynkTZOzWzusQ2+MPZszhFA8I/PJNLeT/hHF/fASy8="; }) + (fetchpatch { + # https://github.com/aio-libs/aiohttp/pull/7260 + # Merged upstream, should likely be dropped post-3.8.4 + url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch"; + hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g="; + }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix b/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix index 1335db763d12..849e51314d4b 100644 --- a/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { homepage = "https://aiokafka.readthedocs.org"; changelog = "https://github.com/aio-libs/aiokafka/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aiokef/default.nix b/nixpkgs/pkgs/development/python-modules/aiokef/default.nix index b2858b5b835c..0fb7f161436f 100644 --- a/nixpkgs/pkgs/development/python-modules/aiokef/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiokef/default.nix @@ -2,9 +2,7 @@ , async-timeout , buildPythonPackage , fetchFromGitHub -, pytest-cov , pytestCheckHook -, pytest-mypy , pythonOlder , tenacity }: @@ -21,14 +19,18 @@ buildPythonPackage rec { sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9"; }; + postPatch = '' + substituteInPlace tox.ini \ + --replace "--cov --cov-append --cov-fail-under=30 --cov-report=" "" \ + --replace "--mypy" "" + ''; + propagatedBuildInputs = [ async-timeout tenacity ]; nativeCheckInputs = [ - pytest-cov - pytest-mypy pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix b/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix index 2d06e507fce5..045168b8d162 100644 --- a/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.2"; + version = "17.3.21"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tJ8d02KbG4z6cUflvjSF/Y7UHH8UqWT8UY7XFqNPP+o="; + hash = "sha256-NaSwjU4SfUYeUe/3nWQxfgMYrN4Ez1Dc/PE4ffJmlSs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix b/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix new file mode 100644 index 000000000000..17f2cb45e6a0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + +# build-system +, poetry-core +, poetry-dynamic-versioning + +# dependencies +, paho-mqtt +, typing-extensions + +# tests +, anyio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiomqtt"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "sbtinstruments"; + repo = "aiomqtt"; + rev = "v${version}"; + hash = "sha256-ct4KIGxiC5m0yrid0tOa/snO9oErxbqhLLH9kD69aEQ="; + }; + + patches = [ + (fetchpatch { + # adds test marker for network access + url = "https://github.com/sbtinstruments/aiomqtt/commit/225c1bfc99bc6ff908bd03c1115963e43ab8a9e6.patch"; + hash = "sha256-UMEwCoX2mWBA7+p+JujkH5fc9sd/2hbb28EJ0fN24z4="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + + propagatedBuildInputs = [ + paho-mqtt + typing-extensions + ]; + + pythonImportsCheck = [ "aiomqtt" ]; + + nativeCheckInputs = [ + anyio + pytestCheckHook + ]; + + pytestFlagsArray = [ + "-m" "'not network'" + ]; + + meta = with lib; { + description = "The idiomatic asyncio MQTT client, wrapped around paho-mqtt"; + homepage = "https://github.com/sbtinstruments/aiomqtt"; + changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix b/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix index 0e3fde70d79a..80bc2b2a0525 100644 --- a/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix @@ -27,6 +27,12 @@ buildPythonPackage rec { hash = "sha256-hLUITEPUoUKGqN3AnacahnKwoKdfGN3mp34df74gsbE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=src --cov-report=term-missing:skip-covered" "" \ + --replace 'marshmallow = "^3.17"' 'marshmallow = "*"' \ + --replace 'awesomeversion = "^22.6"' 'awesomeversion = "*"' + ''; nativeBuildInputs = [ poetry-core ]; @@ -45,12 +51,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=src --cov-report=term-missing:skip-covered" "" \ - --replace 'marshmallow = "^3.17"' 'marshmallow = "*"' - ''; - pythonImportsCheck = [ "aiomysensors" ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix b/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix index 420b3aaf8b9c..3262ec4a1d21 100644 --- a/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiomysql"; - version = "0.1.1"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - hash = "sha256-rYEos2RuE2xI59httYlN21smBH4/fU4uT48FWwrI6Qg="; + rev = "refs/tags/v${version}"; + hash = "sha256-m/EgoBU3e+s3soXyYtACMDSjJfMLBOk/00qPtgawwQ8="; }; nativeBuildInputs = [ @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "MySQL driver for asyncio"; homepage = "https://github.com/aio-libs/aiomysql"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aiooncue/default.nix b/nixpkgs/pkgs/development/python-modules/aiooncue/default.nix index 728c28eddd88..1c19c02222c8 100644 --- a/nixpkgs/pkgs/development/python-modules/aiooncue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiooncue/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aiooncue"; - version = "0.3.4"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = version; - hash = "sha256-/Db32OomEkrBtq5lfT8zBGgvaUWnWE/sTqwNVNB9XAg="; + hash = "sha256-i3b/W2EeH/rNmMcNW+BA9w2BRzeV6EACSJI3zffVQS4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix b/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix index e1f5758377e1..85561d6472b1 100644 --- a/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.5"; + version = "0.2.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-NYr8i5OAYRaRnDkNmnw1IWXnSp7HAovNaSV79xcwyHo="; + hash = "sha256-eMmJpX7bjX5r6GW9N5KmLQpo5V8i6F95TfInct34a2g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix b/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix index e4afdbadbfa5..602128265fdc 100644 --- a/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiopvpc"; - version = "4.2.1"; + version = "4.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "azogue"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gfF/SFfiZgkWH0cQZF3hxEp6xxRi46nfDBB23Gerv5g="; + hash = "sha256-k02lNjFjOcMfHa1jLJlMFUOOVrdTrACNoEXDSZ693K8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix b/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix index 47d66af0b203..8098af3e87a6 100644 --- a/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2023.01.0"; + version = "2023.07.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-enNYzU65QBT/ryCUNwB08U+QiFvVb03fbYzZ5Qk6GTk="; + hash = "sha256-8EPELXxSq+B9o9eMFeM5ZPVYTa1+kT/S6cO7hKtD18s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiorun/default.nix b/nixpkgs/pkgs/development/python-modules/aiorun/default.nix index 82c6df741358..1103d095d347 100644 --- a/nixpkgs/pkgs/development/python-modules/aiorun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiorun/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/cjrh/aiorun"; changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aiosenseme/default.nix b/nixpkgs/pkgs/development/python-modules/aiosenseme/default.nix deleted file mode 100644 index ff90bed8e5a5..000000000000 --- a/nixpkgs/pkgs/development/python-modules/aiosenseme/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, ifaddr -, pythonOlder -}: - -buildPythonPackage rec { - pname = "aiosenseme"; - version = "0.6.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "bdraco"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ShK4DP1lAtAFI6z2kf5T1ecbNTKUn2kqUjps2ABRegg="; - }; - - propagatedBuildInputs = [ - ifaddr - ]; - - pythonImportsCheck = [ - "aiosenseme" - ]; - - # Module has no tests - doCheck = false; - - meta = with lib; { - description = "Module to interact with SenseME fans and lights by Big Ass Fans"; - homepage = "https://github.com/bdraco/aiosenseme"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index 10948344f3b7..d00469ecb099 100644 --- a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.3.2"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eqZyCQ96CasBlO++QcQ/HiVWWeB2jQltHXZRbIfub7Q="; + hash = "sha256-cbgDuJXvZmbhIgxpuySGbJqz7DeI65DHwk1UPdNUs1Q="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix b/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix index c2cdb28e399a..af681eec8ad4 100644 --- a/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "2.3.2"; + version = "2.3.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vKIqBbWQNgv1v73P6K51K+yaqXgC1BtllZ59yTNPr2g="; + hash = "sha256-d+PEzCF1Cw/7NmumxIRRlr3hojpNsZM/JMQ0KWdosXk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix b/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix index e9047034c8c5..97cad03a2048 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.14"; + version = "0.0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-YVZSqTynlAH7y6vH07wsFCLMWnde/cBx4jjfJ4ZV3LA="; + hash = "sha256-G7A5XXAElPFkuRM5bEcKqqn14tjJLn2lkYyqBtm5giM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix b/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix index 6e9ffec337a5..2da12df9edbc 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/jreese/aiosqlite"; changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 077a1c2cf51e..d99ff10cfa8d 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aioresponses +, async-timeout , buildPythonPackage , fetchFromGitHub , orjson @@ -8,11 +9,12 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, segno }: buildPythonPackage rec { pname = "aiounifi"; - version = "48"; + version = "51"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,12 +23,14 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HxZoHul8Nef52st/e10jjtRUvI9NGXuX6/pFYoFI/80="; + hash = "sha256-XR/yZLxTHVHxm/QLCKrp9XFJ7yZybPjPxKEhf1SOzD0="; }; propagatedBuildInputs = [ aiohttp + async-timeout orjson + segno ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix b/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix index e890ed7e2033..4cc8203625db 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Test asyncio code more easily"; homepage = "https://github.com/kwarunek/aiounittest"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/albumentations/default.nix b/nixpkgs/pkgs/development/python-modules/albumentations/default.nix new file mode 100644 index 000000000000..e2104641b78d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/albumentations/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, opencv4 +, pyyaml +, qudida +, scikit-image +, scipy +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "albumentations"; + version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-pqODiP5UbFaAcejIL0FEmOhsntA8CLWOeoizHPeiRMY="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "opencv-python" + ]; + + propagatedBuildInputs = [ + numpy + opencv4 + pyyaml + qudida + scikit-image + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # this test hangs up + "test_transforms" + ]; + + pythonImportsCheck = [ "albumentations" ]; + + meta = with lib; { + description = "Fast image augmentation library and easy to use wrapper around other libraries"; + homepage = "https://github.com/albumentations-team/albumentations"; + changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/alexapy/default.nix b/nixpkgs/pkgs/development/python-modules/alexapy/default.nix new file mode 100644 index 000000000000..559e00e3c81c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/alexapy/default.nix @@ -0,0 +1,81 @@ +{ lib +, aiofiles +, aiohttp +, authcaptureproxy +, backoff +, beautifulsoup4 +, buildPythonPackage +, certifi +, cryptography +, fetchFromGitLab +, fetchpatch +, poetry-core +, pyotp +, pythonOlder +, pythonRelaxDepsHook +, requests +, simplejson +, yarl +}: + +buildPythonPackage rec { + pname = "alexapy"; + version = "1.26.8"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitLab { + owner = "keatontaylor"; + repo = "alexapy"; + rev = "refs/tags/v${version}"; + hash = "sha256-AjtSEqUbJ5e/TZIYMX+pwBSH35tEVrfCA6H/55yrZsk="; + }; + + patches = [ + # Switch to poetry-core, https://gitlab.com/keatontaylor/alexapy/-/merge_requests/342 + (fetchpatch { + name = "switch-poetry-core.patch"; + url = "https://gitlab.com/keatontaylor/alexapy/-/commit/843daec4ba1fb219f1c4f4a6ca01c9af73014e53.patch"; + hash = "sha256-wlCq0/NJx4Adh/o61FSMWMQU99PZkJ0U2yqxqOfvAa8="; + }) + ]; + + pythonRelaxDeps = [ + "aiofiles" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + aiofiles + aiohttp + authcaptureproxy + backoff + beautifulsoup4 + certifi + cryptography + pyotp + requests + simplejson + yarl + ]; + + pythonImportsCheck = [ + "alexapy" + ]; + + # Module has no tests (only a websocket test which seems unrelated to the module) + doCheck = false; + + meta = with lib; { + description = "Python Package for controlling Alexa devices (echo dot, etc) programmatically"; + homepage = "https://gitlab.com/keatontaylor/alexapy"; + changelog = "https://gitlab.com/keatontaylor/alexapy/-/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 3a7b3804dfed..43f132b19020 100644 --- a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.53.0"; + version = "8.55.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dRNrbdFASkh1wWa1Z2VaUPijbyqUyIlVYSKvqR9N1js="; + hash = "sha256-cLiOdXZpjZUVJ0O0rykM6GQH0pXaiMQp1zH6kuDLqOY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix b/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix index b029296fd3a7..31bc1229e2ba 100644 --- a/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix @@ -1,25 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { pname = "allpairspy"; - version = "2.5.0"; + version = "2.5.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "9358484c91abe74ba18daf9d6d6904c5be7cc8818397d05248c9d336023c28b1"; + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-0wzoQDHB7Tt80ZTlKrNxFutztsgUuin5D2eb80c4PBI="; }; - propagatedBuildInputs = [ six ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ + "allpairspy" + ]; meta = with lib; { description = "Pairwise test combinations generator"; homepage = "https://github.com/thombashi/allpairspy"; + changelog = "https://github.com/thombashi/allpairspy/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/altair/default.nix b/nixpkgs/pkgs/development/python-modules/altair/default.nix index b939e508bbc3..82a4fc9d7848 100644 --- a/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -1,62 +1,74 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, entrypoints -, glibcLocales -, ipython -, jinja2 -, jsonschema +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# Runtime dependencies +, hatchling +, toolz , numpy +, jsonschema +, typing-extensions , pandas +, jinja2 +, importlib-metadata + +# Build, dev and test dependencies +, ipython , pytestCheckHook -, pythonOlder -, recommonmark -, six -, sphinx -, toolz -, typing ? null , vega_datasets +, sphinx }: buildPythonPackage rec { pname = "altair"; - version = "4.2.2"; - disabled = isPy27; + version = "5.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-OTmaJnxJsw0QLBBBHmerJjdBVqhLGuufzRUUBCm6ScU="; + src = fetchFromGitHub { + owner = "altair-viz"; + repo = "altair"; + rev = "refs/tags/v${version}"; + hash = "sha256-7bTrfryu4oaodVGNFNlVk9vXmDA5/9ahvCmvUGzZ5OQ="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ - entrypoints + jinja2 jsonschema numpy pandas - six toolz - jinja2 - ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; + ] ++ lib.optional (pythonOlder "3.8") importlib-metadata + ++ lib.optional (pythonOlder "3.11") typing-extensions; nativeCheckInputs = [ - glibcLocales ipython - pytestCheckHook - recommonmark sphinx vega_datasets + pytestCheckHook ]; pythonImportsCheck = [ "altair" ]; - # avoid examples directory, which fetches web resources - preCheck = '' - cd altair/tests - ''; + disabledTestPaths = [ + # Disabled because it requires internet connectivity + "tests/test_examples.py" + # TODO: Disabled because of missing altair_viewer package + "tests/vegalite/v5/test_api.py" + # avoid updating files and dependency on black + "tests/test_toplevel.py" + ]; meta = with lib; { description = "A declarative statistical visualization library for Python."; - homepage = "https://github.com/altair-viz/altair"; + homepage = "https://altair-viz.github.io"; + downloadPage = "https://github.com/altair-viz/altair"; license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - platforms = platforms.unix; + maintainers = with maintainers; [ teh vinetos ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/altgraph/default.nix b/nixpkgs/pkgs/development/python-modules/altgraph/default.nix new file mode 100644 index 000000000000..0f2321c81e51 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/altgraph/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "altgraph"; + version = "0.17.3"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "ad33358114df7c9416cdb8fa1eaa5852166c505118717021c6a8c7c7abbd03dd"; + }; + + pythonImportsCheck = [ "altgraph" ]; + + meta = with lib; { + changelog = "https://github.com/ronaldoussoren/altgraph/tags${version}"; + description = "A fork of graphlib: a graph (network) package for constructing graphs"; + longDescription = '' + altgraph is a fork of graphlib: a graph (network) package for constructing graphs, + BFS and DFS traversals, topological sort, shortest paths, etc. with graphviz output. + altgraph includes some additional usage of Python 2.6+ features and enhancements related to modulegraph and macholib. + ''; + homepage = "https://altgraph.readthedocs.io/"; + downloadPage = "https://pypi.org/project/altgraph/"; + license = licenses.mit; + maintainers = with maintainers; [ septem9er ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/amply/default.nix b/nixpkgs/pkgs/development/python-modules/amply/default.nix index 64aa0ad76b7b..235a697d2af4 100644 --- a/nixpkgs/pkgs/development/python-modules/amply/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amply/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "amply"; - version = "0.1.5"; + version = "0.1.6"; src = fetchPypi { inherit pname version; - hash = "sha256-rXF7SQtrcFWQn6oZXoKkQytwb4+VhUBQFy9Ckx5HhCY="; + hash = "sha256-YUIRA8z44QZnFxFf55F2ENgx1VHGjTGhEIdqW2x4rqQ="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/ancp-bids/default.nix b/nixpkgs/pkgs/development/python-modules/ancp-bids/default.nix index c23635e722c3..366b00e9c6e0 100644 --- a/nixpkgs/pkgs/development/python-modules/ancp-bids/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ancp-bids/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , pytestCheckHook , setuptools +, wheel , numpy , pandas }: @@ -11,25 +13,43 @@ buildPythonPackage rec { pname = "ancp-bids"; version = "0.2.1"; - disabled = pythonOlder "3.7"; format = "pyproject"; + disabled = pythonOlder "3.7"; # `tests/data` dir missing from PyPI dist src = fetchFromGitHub { - owner = "ANCPLabOldenburg"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-Nu9pulVSZysgm/F7jl+VpoqMCiHeysZjQDQ1dT7AnpE="; + owner = "ANCPLabOldenburg"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-Nu9pulVSZysgm/F7jl+VpoqMCiHeysZjQDQ1dT7AnpE="; }; - nativeBuildInputs = [ setuptools ] ; + patches = [ + # https://github.com/ANCPLabOldenburg/ancp-bids/pull/78 + (fetchpatch { + name = "unpin-wheel-build-dependency.patch"; + url = "https://github.com/ANCPLabOldenburg/ancp-bids/commit/6e7a0733002845aacb0152c5aacfb42054a9b65e.patch"; + hash = "sha256-WbQRwb8Wew46OJu+zo7n4qBtgtH/Lr6x3YHAyN9ko9M="; + }) + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + nativeCheckInputs = [ + numpy + pandas + pytestCheckHook + ]; - checkInputs = [ numpy pandas pytestCheckHook ]; pythonImportsCheck = [ "ancpbids" ]; pytestFlagsArray = [ "tests/auto" ]; + disabledTests = [ "test_fetch_dataset" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/nixpkgs/pkgs/development/python-modules/androidtv/default.nix index 856869445db3..f2afe5278330 100644 --- a/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.70"; + version = "0.0.71"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-LKV5aO3sptHz48UYpP+zPk6pPhyHAZWAxiTTIWKHiSg="; + hash = "sha256-vFEMOGxkt4zfOeKTKwr2tcBUSYRPSWNlaKUVcPIM34w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix b/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix index 62f124eb4d62..9640906d169f 100644 --- a/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "androidtvremote2"; - version = "0.0.9"; + version = "0.0.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "androidtvremote2"; rev = "refs/tags/v${version}"; - hash = "sha256-gQ2PVEhX1jwd0yvMf/Z0yKvruDzpY5080x4IU2i/PJ4="; + hash = "sha256-+9VVUIvM//Fxv1a/+PAKWSQE8/TgBZzeTisgMqj6KPU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/angr/default.nix b/nixpkgs/pkgs/development/python-modules/angr/default.nix index 6a1a2d80fe7b..9d06b45a3c29 100644 --- a/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.54"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5EDVJN8o6Dkb3/QzJJ072RN1kYoMxDhrFnSVAzHzdNc="; + hash = "sha256-GyX0LBXABRRQj3bVW8whxp2T5CSPnfI/Vjlj5V4MqrE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/angrcli/default.nix b/nixpkgs/pkgs/development/python-modules/angrcli/default.nix index a43b39a4e9eb..157e1e91341d 100644 --- a/nixpkgs/pkgs/development/python-modules/angrcli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angrcli/default.nix @@ -40,13 +40,6 @@ buildPythonPackage rec { --replace "/bin/ls" "${coreutils}/bin/ls" ''; - disabledTests = [ - "test_sims" - "test_proper_termination" - "test_branching" - "test_morph" - ]; - pythonImportsCheck = [ "angrcli" ]; diff --git a/nixpkgs/pkgs/development/python-modules/annotated-types/default.nix b/nixpkgs/pkgs/development/python-modules/annotated-types/default.nix new file mode 100644 index 000000000000..645e3c40c48c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/annotated-types/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, typing-extensions +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "annotated-types"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "annotated-types"; + repo = "annotated-types"; + rev = "v${version}"; + hash = "sha256-zCsWfJ8BQuov8FN+hlm9XBKWAAQ/KHPK/x024A8k2kE="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + pythonImportsCheck = [ "annotated_types" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Reusable constraint types to use with typing.Annotated"; + homepage = "https://github.com/annotated-types/annotated-types"; + changelog = "https://github.com/annotated-types/annotated-types/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/annoy/default.nix b/nixpkgs/pkgs/development/python-modules/annoy/default.nix index c7cf3c353b20..2dc3afa56a6f 100644 --- a/nixpkgs/pkgs/development/python-modules/annoy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/annoy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "annoy"; - version = "1.17.2"; + version = "1.17.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5nv7uDfRMG2kVVyIOGDHshXLMqhk5AAiKS1YR60foLs="; + hash = "sha256-nL/r7+Cl+EPropxr5MhNYB9PQa1N7QSG8biMOwdznBU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index 8c2bef974600..c18343d46f1c 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "4.1.2"; + version = "4.1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aWFi28EiPAtHQTamFmKz/kQRXUkN6NpgaxSc7lcrAe0="; + hash = "sha256-WXyDahhMETH+62sOI82iNsQf7N7mRCc3Unj7aSD9LnQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix index 3a8c871ea5c1..4acdddb523d5 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "An Ansible kernel for Jupyter"; homepage = "https://github.com/ansible/ansible-jupyter-kernel"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index dd136f0d7c3c..09cb189f40cd 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -3,7 +3,9 @@ , ansible-core , buildPythonPackage , fetchPypi +, fetchpatch , glibcLocales +, importlib-metadata , mock , openssh , pbr @@ -21,16 +23,25 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.1"; + version = "2.3.3"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HS8C06Ylc/OOaKI3kBGLeYF5HCvtK18i96NqIhwoh1Y="; + hash = "sha256-OP9jXkuUeR3ilWyB4mWDbsSWWzDp7jXXL88ycdxGuYs="; }; + patches = [ + (fetchpatch { + name = "fix-tests.patch"; + url = "https://github.com/ansible/ansible-runner/commit/0d522c90cfc1f305e118705a1b3335ccb9c1633d.patch"; + hash = "sha256-eTnQkftvjK0YHU+ovotRVSuVlvaVeXp5SvYk1DPCg88="; + excludes = [ ".github/workflows/ci.yml" "tox.ini" ]; + }) + ]; + nativeBuildInputs = [ pbr ]; @@ -42,6 +53,8 @@ buildPythonPackage rec { python-daemon pyyaml six + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; nativeCheckInputs = [ @@ -70,10 +83,6 @@ buildPythonPackage rec { "test_large_stdout_blob" # Failed: DID NOT RAISE <class 'RuntimeError'> "test_validate_pattern" - ] ++ lib.optionals stdenv.isDarwin [ - # test_process_isolation_settings is currently broken on Darwin Catalina - # https://github.com/ansible/ansible-runner/issues/413 - "process_isolation_settings" ]; disabledTestPaths = [ @@ -96,6 +105,6 @@ buildPythonPackage rec { description = "Helps when interfacing with Ansible"; homepage = "https://github.com/ansible/ansible-runner"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ansible-vault-rw/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-vault-rw/default.nix new file mode 100644 index 000000000000..b5a4c7a03631 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ansible-vault-rw/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, ansible-core, ... }: + +buildPythonPackage rec { + pname = "ansible-vault-rw"; + version = "2.1.0"; + src = fetchPypi { + pname = "ansible-vault"; + inherit version; + sha256 = "sha256-XOj9tUcPFEm3a/B64qvFZIDa1INWrkBchbaG77ZNvV4"; + }; + propagatedBuildInputs = [ ansible-core ]; + + # Otherwise tests will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "This project aim to R/W an ansible-vault yaml file."; + homepage = "https://github.com/tomoh1r/ansible-vault"; + changelog = + "https://github.com/tomoh1r/ansible-vault/blob/master/CHANGES.txt"; + license = licenses.gpl3; + maintainers = with maintainers; [ StillerHarpo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 0e4aef282a27..241e9cbd034f 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -1,9 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, pythonRelaxDepsHook , installShellFiles , ansible , cryptography +, importlib-resources , jinja2 , junit-xml , lxml @@ -24,11 +27,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.15.0"; + version = "2.15.2"; src = fetchPypi { inherit pname version; - hash = "sha256-z2kP1Ou0BZDgDFrNwGJHWMpMWNHksrAuwCagNAcOv00="; + hash = "sha256-hCUbAB8vnAkUvu3/zxlSnnRaExCBWdH+J96eOmpjrFo="; }; # ansible_connection is already wrapped, so don't pass it through @@ -41,6 +44,8 @@ buildPythonPackage rec { nativeBuildInputs = [ installShellFiles + ] ++ lib.optionals (pythonOlder "3.10") [ + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -64,7 +69,15 @@ buildPythonPackage rec { requests scp xmltodict - ] ++ lib.optional windowsSupport pywinrm; + ] ++ lib.optionals windowsSupport [ + pywinrm + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ]; + + pythonRelaxDeps = lib.optionals (pythonOlder "3.10") [ + "importlib-resources" + ]; postInstall = '' installManPage docs/man/man1/*.1 diff --git a/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/nixpkgs/pkgs/development/python-modules/ansible/default.nix index c4a355d64850..7a61364ca7a4 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -20,17 +20,17 @@ let pname = "ansible"; - version = "7.2.0"; + version = "8.1.0"; in buildPythonPackage { inherit pname version; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w="; + hash = "sha256-kfILW/z18phTPBdKk4geALyea0FBFGT0TAVKONcWpWo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix b/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix index 3dc3a8df13be..7e55912bed20 100644 --- a/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/jonathaneunice/ansiwrap"; changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix index c1812f33271b..b9248fcb8716 100644 --- a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix @@ -1,43 +1,55 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub +, poetry-core +, anyio +, distro , httpx -, importlib-metadata -, requests +, pydantic +, pytest-asyncio +, respx , tokenizers -, aiohttp +, typing-extensions +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "anthropic"; - version = "0.2.10"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-5NoGGobY/7hgcsCw/q8hmjpPff3dQiTfm6dp5GlJjBk="; + src = fetchFromGitHub { + owner = "anthropics"; + repo = "anthropic-sdk-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-dfMlM7IRP1PG7Ynr+MR4OPeKnHBbhhWKSug7UQ4/4rI="; }; nativeBuildInputs = [ - setuptools + poetry-core ]; propagatedBuildInputs = [ + anyio + distro httpx - requests + pydantic tokenizers - aiohttp - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata + typing-extensions ]; - # try downloading tokenizer in tests - # relates https://github.com/anthropics/anthropic-sdk-python/issues/24 - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + ]; + + disabledTests = [ + "api_resources" + ]; pythonImportsCheck = [ "anthropic" @@ -49,5 +61,6 @@ buildPythonPackage rec { changelog = "https://github.com/anthropics/anthropic-sdk-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 4f5f25d0159b..39fef995bf98 100644 --- a/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { inherit (antlr4.runtime.cpp) version src; disabled = python.pythonOlder "3.6"; - sourceRoot = "source/runtime/Python3"; + sourceRoot = "${src.name}/runtime/Python3"; # in 4.9, test was renamed to tests checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix b/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix index ecae25b067f9..c8bd56469702 100644 --- a/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { "pyarrow" ]; - sourceRoot = "source/sdks/python"; + sourceRoot = "${src.name}/sdks/python"; nativeBuildInputs = [ cython diff --git a/nixpkgs/pkgs/development/python-modules/apispec-webframeworks/default.nix b/nixpkgs/pkgs/development/python-modules/apispec-webframeworks/default.nix new file mode 100644 index 000000000000..3211eed5aa3f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/apispec-webframeworks/default.nix @@ -0,0 +1,50 @@ +{ lib +, apispec +, bottle +, buildPythonPackage +, fetchFromGitHub +, flask +, mock +, pytestCheckHook +, pythonOlder +, tornado +}: + +buildPythonPackage rec { + pname = "apispec-webframeworks"; + version = "0.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "marshmallow-code"; + repo = "apispec-webframeworks"; + rev = version; + hash = "sha256-ByNmmBLO99njw9JrT+cCW/K4NJBH92smAiIgg47Cvkk="; + }; + + propagatedBuildInputs = [ + apispec + ] ++ apispec.optional-dependencies.yaml; + + nativeCheckInputs = [ + bottle + flask + mock + pytestCheckHook + tornado + ]; + + pythonImportsCheck = [ + "apispec_webframeworks" + ]; + + meta = with lib; { + description = "Web framework plugins for apispec"; + homepage = "https://github.com/marshmallow-code/apispec-webframeworks"; + changelog = "https://github.com/marshmallow-code/apispec-webframeworks/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/nixpkgs/pkgs/development/python-modules/apispec/default.nix index e3ead0e91665..dab433e1619f 100644 --- a/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "A pluggable API specification generator with support for the OpenAPI Specification"; homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/app-model/default.nix b/nixpkgs/pkgs/development/python-modules/app-model/default.nix index 14ed5bc4060a..c906b316d46e 100644 --- a/nixpkgs/pkgs/development/python-modules/app-model/default.nix +++ b/nixpkgs/pkgs/development/python-modules/app-model/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.1.4"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GvMPWIvDydJ8C7wDR5DjmEGhVt0jd5e4WzP10a7mGm8="; + hash = "sha256-4I0lDL6B+8f/lj09zT14lvbGATuHIfjKwwABXi6OIvE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/nixpkgs/pkgs/development/python-modules/apprise/default.nix index c7a47f9b48ff..3cdc55f63499 100644 --- a/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.4.0"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4xUFNIVNrFPU8Hg42Mv7Is4NRdQuugX5bWbE9IQ81Vo="; + hash = "sha256-t8ZlE8VFZpCimO2IfJAW3tQvFeNl0WFC5yi3T3z/7oI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index a21b6f7b66c5..f55ca7e29670 100644 --- a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - version = "8.2.5"; + version = "8.3.1"; pname = "approvaltests"; format = "setuptools"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-guZR996UBqWsBnZx2kdSffkPzkMRfS48b1XcM5L8+I4="; + hash = "sha256-FyYT+w4CX+CdUg0uGwyjw98H8Z+HMVecgMBW/ytrtFU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 17626ca23f52..0a2dd009f6a4 100644 --- a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -11,13 +11,14 @@ , pythonOlder , pythonRelaxDepsHook , semver +, setuptools , tabulate }: buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.1.1"; - format = "setuptools"; + version = "5.2.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,15 +26,12 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-lbaDoLEOMzMGwqBx6gBynVpXz/NM/uCJELwd4d1IEwk="; + hash = "sha256-OtaoyqYRsZVoWezrTAy3zROyNeRLbZmCT+z7YCwf9Ow="; }; postPatch = '' substituteInPlace pytest.ini \ --replace " --cov-append --cov-report term --cov vdb" "" - # https://github.com/AppThreat/vulnerability-db/pull/48 - substituteInPlace vdb/lib/utils.py \ - --replace "isvalid(" "is_valid(" ''; pythonRelaxDeps = [ @@ -42,6 +40,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aranet4/default.nix b/nixpkgs/pkgs/development/python-modules/aranet4/default.nix index 6ea81a8347a3..dda10a9d6f22 100644 --- a/nixpkgs/pkgs/development/python-modules/aranet4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aranet4/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aranet4"; - version = "2.1.3"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Anrijs"; repo = "Aranet4-Python"; rev = "refs/tags/v${version}"; - hash = "sha256-5q4eOC9iuN8pUmDsiQ7OwEXkxi4KdL+bhGVjlQlTBAg="; + hash = "sha256-HiveHkGQUCvG4aqK2HSCbONObidT7yof4LzKSJPEOKU="; }; propagatedBuildInputs = [ @@ -34,6 +34,11 @@ buildPythonPackage rec { "aranet4" ]; + disabledTests = [ + # Test compares rendered output + "test_current_values" + ]; + meta = with lib; { description = "Module to interact with Aranet4 devices"; homepage = "https://github.com/Anrijs/Aranet4-Python"; diff --git a/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix b/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix index adc187fdc544..df5bcc40836f 100644 --- a/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = "refs/tags/${version}"; - hash = "sha256-TFZoWni33dzioADpTt50fqwBlZ/rdUergGs3s3d0504="; + hash = "sha256-/A3Fs0JyzW05L80CtI07Y/kTTrIC6yqubJfYO0kAEf0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 801e35c8fd8b..58b6cc6c6fdc 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.54"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oAthM9ekGfMnkvX8AlslnABJ+LxjJV8OTTaWxJP3HyI="; + hash = "sha256-7PNwJMsX3Z/j+zy9CgEvCRpbyJi9qI7ex6KJXwkywgU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix index 9725d8b92bd8..cc0ae612ce55 100644 --- a/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix +++ b/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix @@ -1,33 +1,33 @@ { lib , buildPythonPackage -, fetchPypi -, pexpect +, fetchFromGitHub , pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "argcomplete"; - version = "2.1.1"; - format = "setuptools"; + version = "3.1.1"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-cuCDQIUtMlREWcDBmq0bSKosOpbejG5XQkVrT1OMpS8="; + src = fetchFromGitHub { + owner = "kislyuk"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-N1Us/dpF/y638qIuwTzBiuv4vXfBMtWxmQnMBxNTUuc="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"coverage",' "" \ - --replace " + lint_require" "" - ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ - pexpect + nativeBuildInputs = [ + setuptools + setuptools-scm ]; - # tries to build and install test packages which fails + # Tries to build and install test packages which fails doCheck = false; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/argilla/default.nix b/nixpkgs/pkgs/development/python-modules/argilla/default.nix new file mode 100644 index 000000000000..24b9668d12b0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/argilla/default.nix @@ -0,0 +1,187 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pythonRelaxDepsHook +, deprecated +, rich +, backoff +, packaging +, pydantic +, typer +, tqdm +, wrapt +, numpy +, httpx +, pandas +, monotonic +# optional-dependencies +, fastapi +, opensearch-py +, elasticsearch8 +, uvicorn +, smart-open +, brotli-asgi +, alembic +, sqlalchemy +, greenlet +, aiosqlite +, luqum +, scikit-learn +, aiofiles +, pyyaml +, python-multipart +, python-jose +, passlib +, psutil +# , segment-analytics-python +, asyncpg +, psycopg2 +, schedule +, prodict +, cleanlab +, datasets +, huggingface-hub +# , flair +, faiss +, flyingsquid +, pgmpy +, plotly +, snorkel +, spacy +, transformers +, evaluate +, seqeval +# , setfit +# , span_marker +, openai +, peft +# test dependencies +, pytestCheckHook +, pytest-cov +, pytest-mock +, pytest-asyncio +, factory_boy +}: +let + pname = "argilla"; + version = "1.13.2"; + optional-dependencies = { + server = [ + fastapi + opensearch-py + elasticsearch8 + uvicorn + smart-open + brotli-asgi + alembic + sqlalchemy + greenlet + aiosqlite + luqum + scikit-learn + aiofiles + pyyaml + python-multipart + python-jose + passlib + psutil + # segment-analytics-python + ] ++ + elasticsearch8.optional-dependencies.async ++ + uvicorn.optional-dependencies.standard ++ + python-jose.optional-dependencies.cryptography ++ + passlib.optional-dependencies.bcrypt; + postgresql = [ asyncpg psycopg2 ]; + listeners = [ schedule prodict ]; + integrations = [ + pyyaml + cleanlab + datasets + huggingface-hub + # flair + faiss + flyingsquid + pgmpy + plotly + snorkel + spacy + transformers + evaluate + seqeval + # setfit + # span_marker + openai + peft + ] ++ transformers.optional-dependencies.torch; + }; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "argilla-io"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-FCPlEbgViWZEyXpdtaa6pJxpgbSXmcfJX/1RUFF7Zs4="; + }; + + pythonRelaxDeps = [ + "typer" + "rich" + "numpy" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + httpx + deprecated + packaging + pandas + pydantic + wrapt + numpy + tqdm + backoff + monotonic + rich + typer + ]; + + # still quite a bit of optional dependencies missing + doCheck = false; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + pytest-mock + pytest-asyncio + factory_boy + ] + ++ optional-dependencies.server + ++ optional-dependencies.postgresql + ++ optional-dependencies.listeners + ++ optional-dependencies.integrations; + + pytestFlagsArray = [ "--ignore=tests/server/datasets/test_dao.py" ]; + + passthru.optional-dependencies = optional-dependencies; + + meta = with lib; { + description = "Argilla: the open-source data curation platform for LLMs"; + homepage = "https://github.com/argilla-io/argilla"; + changelog = "https://github.com/argilla-io/argilla/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/argos-translate-files/default.nix b/nixpkgs/pkgs/development/python-modules/argos-translate-files/default.nix new file mode 100644 index 000000000000..1acab31b723c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/argos-translate-files/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, translatehtml +}: + +buildPythonPackage rec { + pname = "argos-translate-files"; + version = "1.1.3"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "c6931ea8fbabdc24903ceaabfe848be0fa4a0477d00451a8dfbc1525b623f0ba"; + }; + + propagatedBuildInputs = [ + lxml + translatehtml + ]; + + postPatch = '' + ln -s */requires.txt requirements.txt + ''; + + # required for import check to work (argostranslate) + env.HOME = "/tmp"; + + pythonImportsCheck = [ "argostranslatefiles" ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Translate files using Argos Translate"; + homepage = "https://www.argosopentech.com"; + license = licenses.mit; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix b/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix new file mode 100644 index 000000000000..8a1cadfb8803 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, ctranslate2 +, ctranslate2-cpp +, sentencepiece +, stanza +}: +let + ctranslate2OneDNN = ctranslate2.override { + ctranslate2-cpp = ctranslate2-cpp.override { + # https://github.com/OpenNMT/CTranslate2/issues/1294 + withOneDNN = true; + withOpenblas = false; + }; + }; +in +buildPythonPackage rec { + pname = "argostranslate"; + version = "1.8.0"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "9b109255d6a2c692c6f3bfbde494d1a27b3d5ed1c1d1d78711cdc1b1e3744c64"; + }; + + propagatedBuildInputs = [ + ctranslate2OneDNN + sentencepiece + stanza + ]; + + postPatch = '' + ln -s */requires.txt requirements.txt + + substituteInPlace requirements.txt \ + --replace "==" ">=" + ''; + + doCheck = false; # needs network access + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # required for import check to work + # PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + env.HOME = "/tmp"; + + pythonImportsCheck = [ + "argostranslate" + "argostranslate.translate" + ]; + + meta = with lib; { + description = "Open-source offline translation library written in Python"; + homepage = "https://www.argosopentech.com"; + license = licenses.mit; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix b/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix index 96a42b68a413..8c7da464c453 100644 --- a/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix @@ -6,19 +6,14 @@ buildPythonPackage rec { pname = "arpeggio"; - version = "2.0.0"; + version = "2.0.2"; src = fetchPypi { pname = "Arpeggio"; inherit version; - hash = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0="; + hash = "sha256-x5CysG4ibS3UaOT7+1t/UGzsZkFgMf3hRBzx3ioLpwA="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" - ''; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "arpeggio" ]; @@ -27,6 +22,6 @@ buildPythonPackage rec { description = "Recursive descent parser with memoization based on PEG grammars (aka Packrat parser)"; homepage = "https://github.com/textX/Arpeggio"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/array-record/default.nix b/nixpkgs/pkgs/development/python-modules/array-record/default.nix new file mode 100644 index 000000000000..98362396de58 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/array-record/default.nix @@ -0,0 +1,43 @@ +{ lib +, absl-py +, buildPythonPackage +, etils +, fetchPypi +, importlib-resources +, python +, typing-extensions +, zipp +}: + +buildPythonPackage rec { + pname = "array-record"; + version = "0.4.0"; + format = "wheel"; + + disabled = python.pythonVersion != "3.10"; + + src = fetchPypi { + inherit version format; + pname = "array_record"; + dist = "py310"; + python = "py310"; + hash = "sha256-VHDU6RLR/z3/tNxJiDdAruz1cva6cHu5NzMlsKrLYXg="; + }; + + propagatedBuildInputs = [ + absl-py + etils + importlib-resources + typing-extensions + zipp + ]; + + pythonImportsCheck = [ "array_record" ]; + + meta = with lib; { + description = "ArrayRecord is a new file format derived from Riegeli, achieving a new frontier of IO efficiency"; + homepage = "https://github.com/google/array_record"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/art/default.nix b/nixpkgs/pkgs/development/python-modules/art/default.nix index be7eef117037..669b81032be7 100644 --- a/nixpkgs/pkgs/development/python-modules/art/default.nix +++ b/nixpkgs/pkgs/development/python-modules/art/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "art"; - version = "5.9"; + version = "6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "v${version}"; - hash = "sha256-3fX0kYYyeJ9tHX8/+hlv5aRE6LujXW915N5Ov6Q+EW8="; + hash = "sha256-ZF7UvqJU7KxNccMXL7tsL/s5KYpgGeGqaEATHo4WyNI="; }; pythonImportsCheck = [ "art" ]; diff --git a/nixpkgs/pkgs/development/python-modules/asciitree/default.nix b/nixpkgs/pkgs/development/python-modules/asciitree/default.nix index 9e0ac79eefac..ad978efffb5f 100644 --- a/nixpkgs/pkgs/development/python-modules/asciitree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asciitree/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Draws ASCII trees"; homepage = "https://github.com/mbr/asciitree"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/asdf/default.nix b/nixpkgs/pkgs/development/python-modules/asdf/default.nix index 406a7ee61916..0363eae2919b 100644 --- a/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -93,6 +93,6 @@ buildPythonPackage rec { description = "Python tools to handle ASDF files"; homepage = "https://github.com/asdf-format/asdf"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ase/default.nix b/nixpkgs/pkgs/development/python-modules/ase/default.nix index 058bfe8f3446..cad89cd576b1 100644 --- a/nixpkgs/pkgs/development/python-modules/ase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ase/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Atomic Simulation Environment"; homepage = "https://wiki.fysik.dtu.dk/ase/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/asgiref/default.nix b/nixpkgs/pkgs/development/python-modules/asgiref/default.nix index dca0cfff0e48..11fd868ebd91 100644 --- a/nixpkgs/pkgs/development/python-modules/asgiref/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asgiref/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "3.6.0"; + version = "3.7.2"; pname = "asgiref"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "django"; repo = "asgiref"; rev = "refs/tags/${version}"; - hash = "sha256-Kl4483rfuFKbnD7pBSTND1QAtBsZP6jKsrDlpVCZLDs="; + hash = "sha256-VW1PBh6+nLMD7qxmL83ymuxCPYKVY3qGKsB7ZiMqMu8="; }; propagatedBuildInputs = [ @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Reference ASGI adapters and channel layers"; homepage = "https://github.com/django/asgiref"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix b/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix index 9bda0a9e6638..8bc58e992c86 100644 --- a/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "ASN.1 parsing, encoding and decoding"; homepage = "https://github.com/eerimoq/asn1tools"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix b/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix index 49cf9e21a32d..1af34b43fc29 100644 --- a/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Python wrapper for aspell (C extension and Python version)"; homepage = "https://github.com/WojciechMula/aspell-python"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/nixpkgs/pkgs/development/python-modules/asteval/default.nix index 4bfd53c08561..49abd982a0f0 100644 --- a/nixpkgs/pkgs/development/python-modules/asteval/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asteval/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.29"; + version = "0.9.31"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,11 +17,16 @@ buildPythonPackage rec { owner = "newville"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cJIrb0lo/FmeyZd8L6nlCEt6MP7Fdv3rr5C6xvplN6c="; + hash = "sha256-XIRDm/loZOOPQ7UO/XAo86TzhtHHRrnWFU7MNI4f1vM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=asteval --cov-report xml" "" + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -30,18 +35,19 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=asteval --cov-report xml" "" - ''; - pythonImportsCheck = [ "asteval" ]; + disabledTests = [ + # AssertionError: 'ImportError' != None + "test_set_default_nodehandler" + ]; + meta = with lib; { description = "AST evaluator of Python expression using ast module"; homepage = "https://github.com/newville/asteval"; + changelog = "https://github.com/newville/asteval/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/nixpkgs/pkgs/development/python-modules/astroid/default.nix index a3ce19b4fbef..fa78f2f5faaa 100644 --- a/nixpkgs/pkgs/development/python-modules/astroid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astroid/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "An abstract syntax tree for Python with inference support"; homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/async-interrupt/default.nix b/nixpkgs/pkgs/development/python-modules/async-interrupt/default.nix new file mode 100644 index 000000000000..b6e16f54963d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/async-interrupt/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "async-interrupt"; + version = "1.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "async_interrupt"; + rev = "refs/tags/v${version}"; + hash = "sha256-mbvOj1ybCkDNr3je3PtFwmddkh2k/nHOerpC6hGSUYI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=async_interrupt --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "async_interrupt" + ]; + + meta = with lib; { + description = "Context manager to raise an exception when a future is done"; + homepage = "https://github.com/bdraco/async_interrupt"; + changelog = "https://github.com/bdraco/async_interrupt/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/async-lru/default.nix b/nixpkgs/pkgs/development/python-modules/async-lru/default.nix index 0aab8c3ae41d..2f4ef7262acd 100644 --- a/nixpkgs/pkgs/development/python-modules/async-lru/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-lru/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "async-lru"; - version = "2.0.2"; + version = "2.0.4"; disabled = pythonOlder "3.8"; @@ -18,11 +18,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; - rev = "v${version}"; - hash = "sha256-kcvtF/p1L5OVXJSRxRQ0NMFtV29tAysZs8cnTHqOBOo="; + rev = "refs/tags/v${version}"; + hash = "sha256-S2sOkgtS+YdMtVP7UHD3+oR8Fem8roLhhgVVfh33PcM="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; diff --git a/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix b/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix new file mode 100644 index 000000000000..bb00fbcde53b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python3Packages +, poetry-core +, tkinter +, pythonRelaxDepsHook +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "async-tkinter-loop"; + version = "0.8.1"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "async_tkinter_loop"; + hash = "sha256-+9AvnYIZMWCbpCEKdbIadyU8zgyUlW/fRYYyDOxAzeg="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + poetry-core + ]; + + propagatedBuildInputs = [ + tkinter + ]; + + pythonRemoveDeps = [ + "asyncio" + ]; + + pythonImportsCheck = [ + "async_tkinter_loop" + ]; + + meta = with lib; { + description = "Implementation of asynchronous mainloop for tkinter, the use of which allows using async handler functions"; + homepage = "https://github.com/insolor/async-tkinter-loop"; + changelog = "https://github.com/insolor/async-tkinter-loop/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ AngryAnt ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 7b0e1903f8b9..a3ca61f98620 100644 --- a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , defusedxml , fetchFromGitHub +, pytest-aiohttp , pytest-asyncio , pytestCheckHook , python-didl-lite @@ -14,16 +15,16 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.33.2"; + version = "0.34.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-6bTXKlogciD1iTFbo3Pss3fYnXsg4bc2GvryBvC3CDg="; + hash = "sha256-Ktl6YVYd8QpC6eaz3Xe6YyJZhB92ZLL9/XG4WSc2qS8="; }; propagatedBuildInputs = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-aiohttp pytest-asyncio ]; diff --git a/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix b/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix new file mode 100644 index 000000000000..9257e12f721e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, python +}: + +buildPythonPackage rec { + pname = "asyncinotify"; + version = "4.0.2"; + format = "flit"; + + src = fetchFromGitLab { + owner = "Taywee"; + repo = "asyncinotify"; + rev = "v${version}"; + hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw="; + }; + + checkPhase = '' + ${python.pythonForBuild.interpreter} ${src}/test.py + ''; + pythonImportsCheck = ["asyncinotify"]; + + meta = with lib; { + description = "A simple optionally-async python inotify library, focused on simplicity of use and operation, and leveraging modern Python features"; + homepage = "https://pypi.org/project/asyncinotify/"; + changelog = "https://gitlab.com/Taywee/asyncinotify/-/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index 0e95beec83e0..3f52c3acd354 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.13.1"; + version = "2.13.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-67uDwFwLRc8jDeHvLwYFnjYPmvpcPd9g/JL697lP+Ic="; + hash = "sha256-mR5THEu32+xit1SHjZajJGM4qsEaKM48PpkBj7L1gow="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asyncua/default.nix b/nixpkgs/pkgs/development/python-modules/asyncua/default.nix index 7e36099f186c..0ad561ebfb9b 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncua/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncua/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , aiofiles , aiosqlite , buildPythonPackage @@ -60,6 +61,17 @@ buildPythonPackage rec { "asyncua" ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Failed: DID NOT RAISE <class 'asyncio.exceptions.TimeoutError'> + "test_publish" + # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',... + "test_anonymous_rejection" + "test_certificate_handling_success" + "test_encrypted_private_key_handling_success" + "test_encrypted_private_key_handling_success_with_cert_props" + "test_encrypted_private_key_handling_failure" + ]; + meta = with lib; { description = "OPC UA / IEC 62541 Client and Server for Python"; homepage = "https://github.com/FreeOpcUa/opcua-asyncio"; diff --git a/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix index 27d9c71fc3c1..cddb597b43e0 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.6"; + version = "1.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SakO+s05P1Kj2NWlhMcdNa4bDs+DaVZ1W2ybs51U+BQ="; + hash = "sha256-OiDi9hD2IDDfQoQoPhLpClBnJyI/wlZfGyzqmVI94yA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index d4ec880039a8..835f593e561f 100755 --- a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.38.0"; + version = "3.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jk5q5ymnwyQ3t6fP8E1dPM4jkaUllvZqo9RiX8+SnvI="; + hash = "sha256-ixESPQqXQ7HDiYm8rJ8oZ/xaRHO4spUGMyRdov4vJr8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/atomman/default.nix b/nixpkgs/pkgs/development/python-modules/atomman/default.nix index 1b71b66a63c9..7b32dc9b9ec6 100644 --- a/nixpkgs/pkgs/development/python-modules/atomman/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atomman/default.nix @@ -86,6 +86,6 @@ buildPythonPackage rec { description = "Atomistic Manipulation Toolkit"; homepage = "https://github.com/usnistgov/atomman/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix b/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix index b47621730be3..f9977ec84121 100644 --- a/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { 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"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix index f1294133dc5a..44599435f149 100644 --- a/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.2.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DyFRCQGjyv75YVBPN+1xWjKQtPUv29xblYu2TehkkVo="; + hash = "sha256-Yf8/NmQygdikQXv9sUukQEKKd+FcpSPnGbbi8kzVyLo="; }; propagatedBuildInputs = [ @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/auth0/auth0-python"; changelog = "https://github.com/auth0/auth0-python/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index d3b024ef71fa..363763efd60e 100644 --- a/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , attrs , argon2-cffi , base58 @@ -21,7 +20,7 @@ , msgpack , passlib , py-ecc -, py-eth-sig-utils +# , py-eth-sig-utils , py-multihash , py-ubjson , pynacl @@ -49,22 +48,14 @@ buildPythonPackage rec { pname = "autobahn"; - version = "22.7.1"; + version = "23.6.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; - - patches = [ - (fetchpatch { - # https://github.com/crossbario/autobahn-python/pull/1604 - url = "https://github.com/crossbario/autobahn-python/commit/ffe679fae4ebcdde964d4ee88cb82a9c65c40529.patch"; - hash = "sha256-QNnQkxMZJsFbiYUp4Os+dWo7jdCa96+kyb/2HxSMU8k="; - }) - ]; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k="; + hash = "sha256-7JQhxSohAzZNHvBGgDbmAZ7oT3FyHoazb+Ga1pZsEYE="; }; postPatch = '' @@ -110,13 +101,13 @@ buildPythonPackage rec { serialization = [ cbor2 flatbuffers msgpack ujson py-ubjson ]; twisted = [ attrs args.twisted zope_interface ]; ui = [ pygobject3 ]; - xbr = [ base58 cbor2 click ecdsa eth-abi jinja2 hkdf mnemonic py-ecc py-eth-sig-utils py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ]; + xbr = [ base58 cbor2 click ecdsa eth-abi jinja2 hkdf mnemonic py-ecc /* py-eth-sig-utils */ py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ]; }; meta = with lib; { description = "WebSocket and WAMP in Python for Twisted and asyncio"; homepage = "https://crossbar.io/autobahn"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/autocommand/default.nix b/nixpkgs/pkgs/development/python-modules/autocommand/default.nix index 009c0992bf7b..ca9eaf668495 100644 --- a/nixpkgs/pkgs/development/python-modules/autocommand/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autocommand/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = " Autocommand turns a python function into a CLI program "; homepage = "https://github.com/Lucretiel/autocommand"; license = licenses.lgpl3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/autoflake/default.nix b/nixpkgs/pkgs/development/python-modules/autoflake/default.nix index 6cb03e00de1e..9446a6dc2b4c 100644 --- a/nixpkgs/pkgs/development/python-modules/autoflake/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autoflake/default.nix @@ -4,8 +4,9 @@ , hatchling , pyflakes , pytestCheckHook +, pythonOlder +, tomli }: - buildPythonPackage rec { pname = "autoflake"; version = "2.0.1"; @@ -22,7 +23,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyflakes - ]; + ] + ++ lib.optional (pythonOlder "3.11") tomli; nativeCheckInputs = [ pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/autograd/default.nix b/nixpkgs/pkgs/development/python-modules/autograd/default.nix index f0b82fa67a44..26f636e85bf0 100644 --- a/nixpkgs/pkgs/development/python-modules/autograd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autograd/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, future }: +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, future +, pythonOlder +}: buildPythonPackage rec { pname = "autograd"; - version = "1.5"; + version = "1.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2AvSJRVNHbE8tOrM96GMNYvnIJJkG2hxf5b88dFqzQs="; + hash = "sha256-hzHgigxOOJ2GlaQAcq2kUSZBwRO2ys6PTPvo636a7es="; }; - propagatedBuildInputs = [ numpy future ]; + propagatedBuildInputs = [ + numpy + future + ]; # Currently, the PyPI tarball doesn't contain the tests. When that has been # fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404 doCheck = false; + pythonImportsCheck = [ + "autograd" + ]; + meta = with lib; { homepage = "https://github.com/HIPS/autograd"; description = "Compute derivatives of NumPy code efficiently"; diff --git a/nixpkgs/pkgs/development/python-modules/automat/default.nix b/nixpkgs/pkgs/development/python-modules/automat/default.nix index 5abb1a384d0d..301e71a0a7ad 100644 --- a/nixpkgs/pkgs/development/python-modules/automat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/automat/default.nix @@ -43,6 +43,6 @@ let automat = buildPythonPackage rec { homepage = "https://github.com/glyph/Automat"; description = "Self-service finite-state machines for the programmer on the go"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in automat diff --git a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix index f22d92d7bfb1..b34a78351bd9 100644 --- a/nixpkgs/pkgs/development/python-modules/autopep8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autopep8/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , glibcLocales , pycodestyle , pytestCheckHook @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "autopep8"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,18 +19,9 @@ buildPythonPackage rec { owner = "hhatto"; repo = "autopep8"; rev = "refs/tags/v${version}"; - hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo="; + hash = "sha256-+EZgo7xtYKMgpcntU5FtPrfikDDpnvGHhorhtoqDsvE="; }; - patches = [ - # Ignore DeprecationWarnings to fix tests on Python 3.11, https://github.com/hhatto/autopep8/pull/665 - (fetchpatch { - name = "ignore-deprecation-warnings.patch"; - url = "https://github.com/hhatto/autopep8/commit/75b444d7cf510307ef67dc2b757d384b8a241348.patch"; - hash = "sha256-5hcJ2yAuscvGyI7zyo4Cl3NEFG/fZItQ8URstxhzwzE="; - }) - ]; - propagatedBuildInputs = [ pycodestyle ] ++ lib.optionals (pythonOlder "3.11") [ @@ -43,7 +33,7 @@ buildPythonPackage rec { pytestCheckHook ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; meta = with lib; { changelog = "https://github.com/hhatto/autopep8/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/python-modules/avro/default.nix b/nixpkgs/pkgs/development/python-modules/avro/default.nix index 0f01045a6f14..e59a7d475079 100644 --- a/nixpkgs/pkgs/development/python-modules/avro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/avro/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "avro"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8SNiPsxkjQ4gzhT47YUWIUDBPMSxCIZdGyUp+/oGwAg="; + hash = "sha256-U9zVv/zLmnITbwjQsYdxeV6vTu+wKLuq7V9OF4fw4mg="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ @@ -29,6 +29,8 @@ buildPythonPackage rec { disabledTests = [ # Requires network access "test_server_with_path" + # AssertionError: 'reader type: null not compatible with writer type: int' + "test_schema_compatibility_type_mismatch" ]; pythonImportsCheck = [ @@ -38,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python serialization and RPC framework"; homepage = "https://github.com/apache/avro"; + changelog = "https://github.com/apache/avro/releases/tag/release-${version}"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aw-client/default.nix b/nixpkgs/pkgs/development/python-modules/aw-client/default.nix index f71225155595..dde0df0e71c6 100644 --- a/nixpkgs/pkgs/development/python-modules/aw-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aw-client/default.nix @@ -10,11 +10,12 @@ , tabulate , typing-extensions , pytestCheckHook +, gitUpdater }: buildPythonPackage rec { pname = "aw-client"; - version = "0.5.11"; + version = "0.5.12"; format = "pyproject"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "ActivityWatch"; repo = "aw-client"; rev = "v${version}"; - sha256 = "sha256-5WKGRoZGY+QnnB1Jzlju5OmCJreYMD8am2kW3Wcjhlw="; + sha256 = "sha256-Aketk+itfd9gs3s+FDfzmGNWd7tKJQqNn1XsH2VTBD8="; }; disabled = pythonOlder "3.8"; @@ -56,6 +57,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "aw_client" ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "Client library for ActivityWatch"; homepage = "https://github.com/ActivityWatch/aw-client"; diff --git a/nixpkgs/pkgs/development/python-modules/aw-core/default.nix b/nixpkgs/pkgs/development/python-modules/aw-core/default.nix index e0caf6b41c0e..37523f7f24dd 100644 --- a/nixpkgs/pkgs/development/python-modules/aw-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aw-core/default.nix @@ -8,17 +8,17 @@ , appdirs , iso8601 , rfc3339-validator -, takethetime , strict-rfc3339 , tomlkit , deprecation , timeslot , pytestCheckHook +, gitUpdater }: buildPythonPackage rec { pname = "aw-core"; - version = "0.5.12"; + version = "0.5.14"; format = "pyproject"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ActivityWatch"; repo = "aw-core"; rev = "v${version}"; - sha256 = "sha256-DbugVMaQHlHpfbFEsM6kfpDL2VzRs0TDn9klWjAwz64="; + sha256 = "sha256-+XmFh4/wPUpuoRVi8OdzFs/3dwoI1Mjx1hnTiGj+12I="; }; disabled = pythonOlder "3.8"; @@ -42,7 +42,6 @@ buildPythonPackage rec { appdirs iso8601 rfc3339-validator - takethetime strict-rfc3339 tomlkit deprecation @@ -60,6 +59,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "aw_core" ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "Core library for ActivityWatch"; homepage = "https://github.com/ActivityWatch/aw-core"; diff --git a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index fd2f0aa77bd5..d838a0f28750 100644 --- a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "22.9.0"; + version = "23.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - hash = "sha256-OQArggd7210OyFpZKm3kr3fFbakIDG7U3WBNImAAobw="; + hash = "sha256-3bHE3U4MM/fQM9zBYfoLpAObay82vchjX9FpJukMGNg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index 0a034282eba1..c64d29d03990 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "15"; + version = "17"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f6c825db2db981f852903d9574a07015c5d53ef8e4630772f18c7f167045aa0d"; + hash = "sha256-gTO7rxgkjdUgSkF6Ztq5bhti5VUpsrhocOLz7L6xllE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 0279327da208..27bd89a039f2 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.2.1"; + version = "2.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "653e5b69f1c8e32d1d59445a8414d03f850d327eb933f45aad163f0778861dc2"; + hash = "sha256-v06mYdoP/WfIfz6x6+MJvS4YOsTsyWqhCyAykZ1d5v4="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Manipulate JSON-like data with NumPy-like idioms"; homepage = "https://github.com/scikit-hep/awkward"; + changelog = "https://github.com/scikit-hep/awkward/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index 9752cd5c177e..b42e64bdfa22 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -1,8 +1,6 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , mock , parameterized , pyelftools @@ -13,7 +11,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.28.0"; + version = "1.34.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,22 +20,13 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-JSN51zwIh9N/Id3fhBXjmwGa2tLK/LoyPlHPl2rbVU4="; + hash = "sha256-MjX0im9GX0mdWkumUoJUIBjPZl/Ok5+sR6Dgq6vVGKM="; }; propagatedBuildInputs = [ six ]; - patches = [ - # This patch can be removed once https://github.com/aws/aws-lambda-builders/pull/475 has been merged. - (fetchpatch { - name = "setuptools-66-support"; - url = "https://patch-diff.githubusercontent.com/raw/aws/aws-lambda-builders/pull/475.patch"; - sha256 = "sha256-EkYQ6DNzbSnvkOads0GFwpGzeuBoLVU42THlSZNOHMc="; - }) - ]; - nativeCheckInputs = [ mock parameterized @@ -71,7 +60,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Tool to compile, build and package AWS Lambda functions"; homepage = "https://github.com/awslabs/aws-lambda-builders"; changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix b/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix index 4b426b1a7ca9..09bfabc9f4b7 100644 --- a/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.0.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-uuY6+GCMBtqcj4pLbns0ESRDA8I/0kzJ6Cc4eqsyQ44="; + hash = "sha256-mpKvg3CM8kMK+RI9XdHHGfy6qlMye+T/B77M4XeTqw0="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/ax/default.nix b/nixpkgs/pkgs/development/python-modules/ax/default.nix index 5f87602064bf..be254b3db9ce 100644 --- a/nixpkgs/pkgs/development/python-modules/ax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ax/default.nix @@ -6,8 +6,10 @@ , jinja2 , pandas , plotly +, setuptools , setuptools-scm , typeguard +, wheel , hypothesis , mercurial , pyfakefs @@ -27,13 +29,18 @@ buildPythonPackage rec { hash = "sha256-1KLLjeUktXvIDOlTQzMmpbL/On8PTxZQ44Qi4BT3nPk="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ botorch ipywidgets jinja2 pandas plotly - setuptools-scm typeguard ]; diff --git a/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix b/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix index 76829f46fd90..2ca6a6d743ca 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "13.0.0"; + version = "14.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-6Sld5wQE0nbtoN0iU9djl0Oavl2PGMH8oZnEm41q4wo="; + hash = "sha256-FlsembhvghAkxProX7NIadQHqg67DKS5b7JthZwmyTQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix index 504748f033ff..47d0039e5e4b 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-common/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { azure-nspkg ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup - postInstall = if isPy3k then "" else '' + postInstall = lib.optionalString (!isPy3k) '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; diff --git a/nixpkgs/pkgs/development/python-modules/azure-containerregistry/default.nix b/nixpkgs/pkgs/development/python-modules/azure-containerregistry/default.nix index 5bc1bde1ad83..7b6d8ba17915 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-containerregistry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-containerregistry/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-containerregistry"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6IU+fzMIL8HJv4rCrWlcJSuYre6cdBa7BjS9KrIbIRU="; + hash = "sha256-Ss0ygh0IZVPqvV3f7Lsh+5FbXRPvg3XRWvyyyAvclqM="; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 1206bf48710c..44f3c1b81085 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -14,19 +14,22 @@ , requests , six , trio -, typing-extensions }: +, typing-extensions +}: buildPythonPackage rec { - version = "1.26.3"; + version = "1.28.0"; pname = "azure-core"; - disabled = pythonOlder "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-rL0NqpZ1zohiPaNcgNgZza+pFzHe5rJpXGTXyp2oLbQ="; + hash = "sha256-6e78Zvwf3lbatvBNTl0SxgdU1an6Sb3P2FNPyW7ZNr0="; }; propagatedBuildInputs = [ @@ -35,9 +38,14 @@ buildPythonPackage rec { typing-extensions ]; + passthru.optional-dependencies = { + aio = [ + aiohttp + ]; + }; + nativeCheckInputs = [ aiodns - aiohttp flask mock pytest @@ -45,14 +53,17 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # test server needs to be available preCheck = '' export PYTHONPATH=tests/testserver_tests/coretestserver:$PYTHONPATH ''; - pytestFlagsArray = [ "tests/" ]; + pytestFlagsArray = [ + "tests/" + ]; + # disable tests which touch network disabledTests = [ "aiohttp" @@ -68,6 +79,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ "location_polling_fail" ]; + disabledTestPaths = [ # requires testing modules which aren't published, and likely to create cyclic dependencies "tests/test_connection_string_parsing.py" @@ -88,6 +100,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Core Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix b/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix index 6c7fb17c636c..b09102eaf0f0 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-data-tables"; - version = "12.4.2"; + version = "12.4.3"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-Oz1dFbKpY+CbSTSx/iuiF/Kd2axRghwXVJ/K+HRwJDQ="; + hash = "sha256-qLA0vNRyIu36xKwB55BD/TCTOv+nmyOtk3+Y4P+SalI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix b/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix index 571279f7ffe0..8d47f60afcb9 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.11.2"; + version = "5.11.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-/QVHPlElUNT7whLdMe1k8wYXePg+tQRBmXmZJM1w6fU="; + hash = "sha256-mXXMvKHk+U+VtBG5zPbKJcXrRMDssnU/18wGXT5xSK8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix new file mode 100644 index 000000000000..b9e3a2e4a053 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, azure-common +, azure-mgmt-core +, msrest +, msrestazure +}: + +buildPythonPackage rec { + version = "2.0.0"; + pname = "azure-mgmt-appcontainers"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU="; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; + + # no tests included + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.appcontainers" ]; + + meta = with lib; { + description = "Microsoft Azure Appcontainers Management Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appcontainers/azure-mgmt-appcontainers"; + license = licenses.mit; + maintainers = with maintainers; [ jfroche ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 4aaee3f68ffd..08b3c763227b 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-authorization"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0="; + hash = "sha256-abhavAmuZPxyl1vUNDEXDYx+tdFmdUuYqsXzhF3lfcQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index b72ffdd4ea50..25dfe383e35d 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.4.0"; + version = "13.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-GQXDIWOiKGqZqrzpNfvDR8hTU4KnpjZQKrLivcD0tsA="; + hash = "sha256-RK8LGbH4J+nN6gnGBUweZgkqUcMrwe9aVtvZtAvFeBU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix index 28043046d8aa..dfd7ac2a3f05 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { msrestazure ]; - postInstall = if isPy3k then "" else '' + postInstall = pkgs.lib.optionalString (!isPy3k) '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index e76e593d2963..5a3cb3a370fe 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "30.0.0"; + version = "30.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-cyD7r8OSdwsD7QK2h2AYXmCUVS7ZjX/V6nchClpRPHg="; + hash = "sha256-pWN525DU4kwHi8h0XQ5fdzIp+e8GfNcSwQ+qmIYVp1s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 4ca94e9ff662..e3ec3ee71b95 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "23.0.0"; + version = "25.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-V8IUTQvbUSOpsqkGfBqLo4DVIB7fryYMVx6WpfWzOnc="; + hash = "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 515a8ab6026a..85f84b34a79c 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-dns"; - version = "8.0.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; + sha256 = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 772d60fd26b7..2f7d1486c102 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "10.2.2"; + version = "10.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-LG6oMTZepgT87KdJrwCpc4ZYEclUsEAHUitZrxFCkL4="; + hash = "sha256-JDM6F0ToMpUeBlLULih17TLzCbrNdxrGrcq5oIfsybU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index b4321d50dba3..5195c0102db4 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-dkuVCFR+w3Yr764izDqxGfKtDvgRmAuziSPpkKDWcxc="; + hash = "sha256-zgkFMrufHoX3gq9QXo8SlJYZOfV5GlY3pVQXmIWyx7c="; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 4bd9877c48ab..46061f5a0028 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "10.0.0"; + version = "10.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9+cXsY8Qr5ds9lYw39duWdcqm6QUTedQbjn8x6zJoyE="; + hash = "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index aacdf91ded3a..b0bdd1c086bb 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "23.1.0"; + version = "24.0.0"; pname = "azure-mgmt-network"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-NxcmmRE4MdfOG7naNcY1AHxzz/xUmoWlj1VUK1SxK/M="; + hash = "sha256-LtahQ2PnJC2jlD3pHp+IBLaUaNXTamZqdFdE/iJ4840="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index c6ed92e0428d..2a89a0460cd8 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -1,32 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib , azure-common , azure-mgmt-core +, buildPythonPackage +, fetchPypi +, isodate , msrest -, msrestazure +, pythonOlder +, typing-extensions }: buildPythonPackage rec { - version = "1.0.0"; pname = "azure-mgmt-privatedns"; - disabled = isPy27; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; + hash = "sha256-MtucYFpKj/ANNON1UdXrBrTsJnq53iph3SJ1ypWj+5g="; extension = "zip"; }; propagatedBuildInputs = [ azure-common azure-mgmt-core + isodate msrest - msrestazure + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.privatedns" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.privatedns" + ]; meta = with lib; { description = "Microsoft Azure DNS Private Zones Client Library for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix index 1790922d8273..8b0a71a324af 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "14.1.0"; + version = "14.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig="; + hash = "sha256-u6PG1mx3iiiLssoLzOj5kxI2L3uvQMnWrEQY6MBJOtA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index e7d67da692b5..abc9aa64b22d 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.10.0"; + version = "7.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-ANEJ5aLqfHX/OGO41FNjCqr9S6UygQMrGMQvMtR3z/Q="; + hash = "sha256-iWbHtpFSiQTcpSQ6S8lrUWAi9kjesh1ZvKPVvNquxYU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix index 3dd83966a29c..a537e32c2545 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.16.0"; + version = "12.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-Q7RfGaUYpcaJVjLyY7OCXrwjV08lzIS2bhYwphYORm8="; + hash = "sha256-wUt4WhcFCzD8MmoxW9rmvEoHiFX0+UpMMDrXSkjcjGM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index df5ab11e6c93..1582ea52bc9d 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.12.0"; + version = "12.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-z35H90n8Buy5m2RhKrS9lCJ7mTFJekwnwoZXF8PaoIk="; + hash = "sha256-ozqVIWPvAl0doaqK77P+VBhx9q+6Ljk/q7WrAP2ZPm8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/babel/default.nix b/nixpkgs/pkgs/development/python-modules/babel/default.nix index 1393a7084e1f..a97224b5c860 100644 --- a/nixpkgs/pkgs/development/python-modules/babel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/babel/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, isPyPy , pythonAtLeast , pythonOlder +, tzdata # tests , freezegun @@ -31,11 +33,12 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3.9"; nativeCheckInputs = [ - # via setup.py freezegun pytestCheckHook - # via tox.ini + # https://github.com/python-babel/babel/issues/988#issuecomment-1521765563 pytz + ] ++ lib.optionals isPyPy [ + tzdata ]; disabledTests = [ @@ -49,6 +52,6 @@ buildPythonPackage rec { changelog = "https://github.com/python-babel/babel/releases/tag/v${version}"; description = "Collection of internationalizing tools"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix index bfec97496ae7..88e140ad82f5 100644 --- a/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Backport of Python 3.11's datetime.fromisoformat"; homepage = "https://github.com/movermeyer/backports.datetime_fromisoformat"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 9ff04e0e5038..669f997f6e86 100644 --- a/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Compatibility shim providing selectable entry points for older implementations"; homepage = "https://github.com/jaraco/backports.entry_points_selectable"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix b/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix deleted file mode 100644 index 6086178c9597..000000000000 --- a/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, future }: - -buildPythonPackage rec { - - pname = "backports.csv"; - version = "1.0.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "0vdx5jlhs91iizc8j8l8811nqprwvdx39pgkdc82w2qkfgzxyxqj"; - }; - - propagatedBuildInputs = [ future ]; - - meta = with lib; { - description = "Backport of Python 3 csv module"; - homepage = "https://github.com/ryanhiebert"; - license = licenses.psfl; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix deleted file mode 100644 index 0045a7950391..000000000000 --- a/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools-scm -, isPy3k -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "backports.functools_lru_cache"; - version = "1.6.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - # Test fail on Python 2 - doCheck = isPy3k; - - pythonNamespaces = [ "backports" ]; - - meta = { - description = "Backport of functools.lru_cache"; - homepage = "https://github.com/jaraco/backports.functools_lru_cache"; - license = lib.licenses.mit; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix b/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix deleted file mode 100644 index 0e0f3ac03378..000000000000 --- a/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, unittestCheckHook -, buildPythonPackage -, fetchPypi -, setuptools-scm -, backports_weakref -}: - -buildPythonPackage rec { - pname = "backports.tempfile"; - version = "1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762"; - }; - - buildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ backports_weakref ]; - - # requires https://pypi.org/project/backports.test.support - doCheck = false; - - nativeCheckInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ "-s" "tests" ]; - - meta = { - description = "Backport of new features in Python's tempfile module"; - license = lib.licenses.psfl; - homepage = "https://github.com/pjdelport/backports.tempfile"; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix b/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix deleted file mode 100644 index bf81efce8d89..000000000000 --- a/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, mock }: - -buildPythonPackage rec { - pname = "backports.unittest_mock"; - version = "1.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "eff58e53de8fdeb27a1c87a9d57e7b91d15d1bc3854e85344b1a2e69f31ecda7"; - }; - - propagatedBuildInputs = [ mock ]; - - buildInputs = [ setuptools-scm ]; - - # does not contain tests - doCheck = false; - pythonImportsCheck = [ "backports.unittest_mock" ]; - - meta = with lib; { - description = "Provides a function install() which makes the mock module"; - homepage = "https://github.com/jaraco/backports.unittest_mock"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix b/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix deleted file mode 100644 index 2a0ef0b43203..000000000000 --- a/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools-scm -# , backports -, unittestCheckHook -}: - -buildPythonPackage rec { - pname = "backports.weakref"; - version = "1.0.post1"; - src = fetchPypi { - inherit pname version; - sha256 = "bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2"; - }; - - buildInputs = [ setuptools-scm ]; -# nativeCheckInputs = [ backports ]; - - # Requires backports package - doCheck = false; - - nativeCheckInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ "tests" ]; - - meta = with lib; { - description = "Backports of new features in Python’s weakref module"; - license = licenses.psfl; - maintainers = with maintainers; [ jyp ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix b/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix new file mode 100644 index 000000000000..4546843dbc88 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, demjson3 +, html5lib +, lxml +, requests +}: + +buildPythonPackage rec { + pname = "bandcamp-api"; + version = "0.2.2"; + + format = "setuptools"; + + src = fetchPypi { + pname = "bandcamp_api"; + inherit version; + hash = "sha256-v/iACVcBFC/3x4v7Q/1p+aHGhfw3AQ43eU3sKz5BskI="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + demjson3 + html5lib + lxml + requests + ]; + + pythonImportsCheck = [ "bandcamp_api" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Obtains information from bandcamp.com"; + homepage = "https://github.com/RustyRin/bandcamp-api"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix b/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix index ebdbbe4d1594..158c3f3f19c4 100644 --- a/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix +++ b/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "basemap-data"; inherit (basemap) version src; - sourceRoot = "source/packages/basemap_data"; + sourceRoot = "${src.name}/packages/basemap_data"; # no tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/basemap/default.nix b/nixpkgs/pkgs/development/python-modules/basemap/default.nix index 8db89a43266b..578fd84db77c 100644 --- a/nixpkgs/pkgs/development/python-modules/basemap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/basemap/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-oWKCUARTMCiXDp4SCOOrOUQLUDU4DIzwsmUXCXoDvx0="; }; - sourceRoot = "source/packages/basemap"; + sourceRoot = "${src.name}/packages/basemap"; nativeBuildInputs = [ cython diff --git a/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix b/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix index 09023536a94b..70c64827a8ca 100644 --- a/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers"; homepage = "https://jupyter.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix b/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix index 9d173187ef73..0b7d04c69e85 100644 --- a/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.29"; + version = "1.4.30"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-oMJMiXS4/OU5/LWV2i2CcDQZL5yuusXGwgZG2OMMlaQ="; + hash = "sha256-wq+SKOiMcVO7OiK+RdRk4RNsjSAT7lBdAjLHfurSIRo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bcf/default.nix b/nixpkgs/pkgs/development/python-modules/bcf/default.nix new file mode 100644 index 000000000000..03b53ca2e6e9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bcf/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, appdirs +, click +, colorama +, intelhex +, packaging +, pyaml +, pyftdi +, pyserial +, requests +, schema +}: +buildPythonPackage rec { + pname = "bcf"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "hardwario"; + repo = "bch-firmware-tool"; + rev = "v${version}"; + sha256 = "i28VewTB2XEZSfk0UeCuwB7Z2wz4qPBhzvxJIYkKwJ4="; + }; + + postPatch = '' + sed -ri 's/@@VERSION@@/${version}/g' \ + bcf/__init__.py setup.py + ''; + + propagatedBuildInputs = [ + appdirs + click + colorama + intelhex + packaging + pyaml + pyftdi + pyserial + requests + schema + ]; + + pythonImportsCheck = [ "bcf" ]; + doCheck = false; # Project provides no tests + + meta = with lib; { + homepage = "https://github.com/hardwario/bch-firmware-tool"; + description = "HARDWARIO Firmware Tool"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bcg/default.nix b/nixpkgs/pkgs/development/python-modules/bcg/default.nix new file mode 100644 index 000000000000..ce32e61ff809 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bcg/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, appdirs +, click +, click-log +, paho-mqtt +, pyaml +, pyserial +, schema +, simplejson +}: +buildPythonPackage rec { + pname = "bcg"; + version = "1.17.0"; + + src = fetchFromGitHub { + owner = "hardwario"; + repo = "bch-gateway"; + rev = "v${version}"; + sha256 = "2Yh5MeIv+BIxjoO9GOPqq7xTAFhyBvnxPy7DeO2FrkI="; + }; + + postPatch = '' + sed -ri 's/@@VERSION@@/${version}/g' \ + bcg/__init__.py setup.py + ''; + + propagatedBuildInputs = [ + appdirs + click + click-log + paho-mqtt + pyaml + pyserial + schema + simplejson + ]; + + pythonImportsCheck = [ "bcg" ]; + + meta = with lib; { + homepage = "https://github.com/hardwario/bch-gateway"; + description = "HARDWARIO Gateway (Python Application «bcg»)"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bch/default.nix b/nixpkgs/pkgs/development/python-modules/bch/default.nix new file mode 100644 index 000000000000..8b9308cf0217 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bch/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, click-log +, paho-mqtt +, pyaml +}: + +buildPythonPackage rec { + pname = "bch"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "hardwario"; + repo = "bch-control-tool"; + rev = "v${version}"; + sha256 = "/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY="; + }; + + propagatedBuildInputs = [ + click + click-log + paho-mqtt + pyaml + ]; + + postPatch = '' + sed -ri 's/@@VERSION@@/${version}/g' \ + bch/cli.py setup.py + ''; + + pythonImportsCheck = [ "bch" ]; + + meta = with lib; { + homepage = "https://github.com/hardwario/bch-control-tool"; + description = "HARDWARIO Hub Control Tool"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/before-after/default.nix b/nixpkgs/pkgs/development/python-modules/before-after/default.nix new file mode 100644 index 000000000000..919914d7fd7a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/before-after/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage, fetchPypi, fetchpatch, pytestCheckHook, lib }: + +buildPythonPackage rec { + pname = "before-after"; + version = "1.0.1"; + + src = fetchPypi { + pname = "before_after"; + inherit version; + hash = "sha256-x9T5uLi7UgldoUxLnFnqaz9bnqn9zop7/HLsrg9aP4U="; + }; + + patches = [ + # drop 'mock' dependency for python >=3.3 + (fetchpatch { + url = "https://github.com/c-oreills/before_after/commit/cf3925148782c8c290692883d1215ae4d2c35c3c.diff"; + hash = "sha256-FYCpLxcOLolNPiKzHlgrArCK/QKCwzag+G74wGhK4dc="; + }) + (fetchpatch { + url = "https://github.com/c-oreills/before_after/commit/11c0ecc7e8a2f90a762831e216c1bc40abfda43a.diff"; + hash = "sha256-8YJumF/U8H+hc7rLZLy3UhXHdYJmcuN+O8kMx8yqMJ0="; + }) + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "before_after" ]; + + meta = with lib; { + description = "sugar over the Mock library to help test race conditions"; + homepage = "https://github.com/c-oreills/before_after"; + maintainers = with maintainers; [ yuka ]; + license = licenses.gpl2Only; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 5112d9d46167..1c1461848658 100644 --- a/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.35.5"; + version = "0.35.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-JpRL4RxVcH+hzz7YTlRw+FHH95RavS/m1HWyBiLLWME="; + hash = "sha256-N0Rxa685jWAvlvCTUw3SKF+VqnkIaKyXPU58o9VOrjE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bentoml/default.nix b/nixpkgs/pkgs/development/python-modules/bentoml/default.nix new file mode 100644 index 000000000000..0b7aee718ff6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bentoml/default.nix @@ -0,0 +1,198 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, hatch-vcs +, aiohttp +, attrs +, cattrs +, circus +, click +, click-option-group +, cloudpickle +, deepmerge +, fs +, jinja2 +, numpy +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-instrumentation-aiohttp-client +, opentelemetry-instrumentation-asgi +, opentelemetry-sdk +, opentelemetry-semantic-conventions +, opentelemetry-util-http +, packaging +, pathspec +, pip-requirements-parser +, pip-tools +, prometheus-client +, psutil +, pynvml +, python-dateutil +, python-json-logger +, python-multipart +, pyyaml +, requests +, rich +, schema +, simple-di +, starlette +, uvicorn +, watchfiles +, fs-s3fs +, grpcio +, grpcio-health-checking +, opentelemetry-instrumentation-grpc +, protobuf +, grpcio-channelz +, grpcio-reflection +, filetype +, pillow +, pydantic +, pandas +, pyarrow +, opentelemetry-exporter-otlp-proto-http +# https://pypi.org/project/opentelemetry-exporter-jaeger-proto-grpc/ +# , opentelemetry-exporter-jaeger # support for this exporter ends in july 2023 +, opentelemetry-exporter-otlp +# , opentelemetry-exporter-zipkin +, tritonclient +# native check inputs +, pytestCheckHook +, scikit-learn +, lxml +, orjson +, pytest-asyncio +, fastapi +}: + +let + version = "1.1.1"; + aws = [ fs-s3fs ]; + grpc = [ + grpcio + grpcio-health-checking + opentelemetry-instrumentation-grpc + protobuf + ]; + io-file = [ filetype ]; + io-image = io-file ++ [ pillow ]; + io-json = [ pydantic ]; + io-pandas = [ pandas pyarrow ]; + grpc-reflection = grpc ++ [ grpcio-reflection ]; + grpc-channelz = grpc ++ [ grpcio-channelz ]; + monitor-otlp = [ opentelemetry-exporter-otlp-proto-http ]; + # tracing-jaeger = [ opentelemetry-exporter-jaeger ]; + tracing-otlp = [ opentelemetry-exporter-otlp ]; + # tracing-zipkin = [ opentelemetry-exporter-zipkin ]; + io = io-json ++ io-image ++ io-pandas ++ io-file; + tracing = tracing-otlp; # ++ tracing-zipkin ++ tracing-jaeger + optional-dependencies = { + all = aws ++ io ++ grpc ++ grpc-reflection ++ grpc-channelz ++ tracing ++ monitor-otlp; + inherit aws grpc io-file io-image io-json io-pandas io grpc-reflection + grpc-channelz monitor-otlp tracing-otlp tracing; + triton = [ tritonclient ] ++ tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc; + }; +in +buildPythonPackage { + pname = "bentoml"; + inherit version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bentoml"; + repo = "BentoML"; + rev = "v${version}"; + hash = "sha256-V5lquPZT7XBnRdPIEfgbxIBHX+i4N081SYQVK0CkSo8="; + }; + + pythonRelaxDeps = [ + "opentelemetry-semantic-conventions" + ]; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + aiohttp + attrs + cattrs + circus + click + click-option-group + cloudpickle + deepmerge + fs + jinja2 + numpy + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-aiohttp-client + opentelemetry-instrumentation-asgi + opentelemetry-sdk + opentelemetry-semantic-conventions + opentelemetry-util-http + packaging + pathspec + pip-requirements-parser + pip-tools + prometheus-client + psutil + pynvml + python-dateutil + python-json-logger + python-multipart + pyyaml + requests + rich + schema + simple-di + starlette + uvicorn + watchfiles + ]; + + passthru.optional-dependencies = optional-dependencies; + + pythonImportsCheck = [ "bentoml" ]; + + preCheck = '' + # required for CI testing + # https://github.com/bentoml/BentoML/pull/4056/commits/66302b502a3f4df4e8e6643d2afefefca974073e + export GITHUB_ACTIONS=1 + ''; + + disabledTestPaths = [ + "tests/e2e" + "tests/integration" + ]; + + disabledTests = [ + # flaky test + "test_store" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pandas + pydantic + scikit-learn + lxml + orjson + pytest-asyncio + pillow + fastapi + starlette + ] ++ optional-dependencies.grpc; + + + meta = with lib; { + description = "Build Production-Grade AI Applications"; + homepage = "https://github.com/bentoml/BentoML"; + changelog = "https://github.com/bentoml/BentoML/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index 1d25ecbf357f..7412fb2077b7 100644 --- a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bids-validator"; - version = "1.11.0"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QIxWdIt8+Yz3wxgi8zqNicXm59tSVMNFEH6NUnV2/1M="; + hash = "sha256-X569N5zfbTg+mDwQU5iGv16kiOTr8rwhKTEl9RCJMRY="; }; # needs packages which are not available in nixpkgs diff --git a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index b809249fbfe8..bccd2ddfbeee 100644 --- a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.13.6"; + version = "0.13.9"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-MQYS7EEBGgvIBjSQ80a49SQv1GNVgeriBtQn+O7hMtg="; + hash = "sha256-iAfP8idJXhAsCnhlGUyMHK723kEER5bCYJNLsvaCrTA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/biopandas/default.nix b/nixpkgs/pkgs/development/python-modules/biopandas/default.nix new file mode 100644 index 000000000000..d33a9faf4403 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/biopandas/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, looseversion +, mmtf-python +, nose +, numpy +, pandas +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "biopandas"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "BioPandas"; + repo = "biopandas"; + rev = "refs/tags/v${version}"; + hash = "sha256-PRdemBo+bB2xJWmF2NylFTfNwEEo67i6XSaeDAFmQ/c="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "looseversion" + ]; + + propagatedBuildInputs = [ + numpy + pandas + mmtf-python + looseversion + ]; + + nativeCheckInputs = [ + nose + ]; + + checkPhase = '' + runHook preCheck + + nosetests + + runHook postCheck + ''; + + pythonImportsCheck = [ + "biopandas" + ]; + + meta = { + description = "Working with molecular structures in pandas DataFrames"; + homepage = "https://github.com/BioPandas/biopandas"; + changelog = "https://github.com/BioPandas/biopandas/releases/tag/${src.rev}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 3d480ea63098..9ce3dbf8bd02 100644 --- a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.7.4"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FD1PZeH0WlM+E1Ib4dxVengjF+z3ZSDqvVqQOybssYc="; + hash = "sha256-zWmpJqM2PiXpSmRAgwMoPFkIW+ltcVJL2+a/yNouNOA="; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix b/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix index 91872700b4f2..7d6f89175608 100644 --- a/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix @@ -1,24 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi, base58, ecdsa, hidapi, noiseprotocol, protobuf, semver, typing-extensions }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, base58 +, ecdsa +, hidapi +, noiseprotocol +, protobuf +, semver +, typing-extensions +}: buildPythonPackage rec { pname = "bitbox02"; - version = "6.1.1"; + version = "6.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mVA0CdbGGJn44R6xHnophmsnVMsCwDrPNM3vmXVa7dg="; + hash = "sha256-zt4G45nJjtU2/tbYpCEgjaoA+Xtpe9g2OpQaxfMzCb8="; }; - propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; + propagatedBuildInputs = [ + base58 + ecdsa + hidapi + noiseprotocol + protobuf + semver + typing-extensions + ]; # does not contain tests doCheck = false; - pythonImportsCheck = [ "bitbox02" ]; + + pythonImportsCheck = [ + "bitbox02" + ]; meta = with lib; { description = "Firmware code of the BitBox02 hardware wallet"; homepage = "https://github.com/digitalbitbox/bitbox02-firmware/"; + changelog = "https://github.com/digitalbitbox/bitbox02-firmware/blob/py-bitbox02-${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bitlist/default.nix b/nixpkgs/pkgs/development/python-modules/bitlist/default.nix index 6571c93470c2..4c97f84cc7f3 100644 --- a/nixpkgs/pkgs/development/python-modules/bitlist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitlist/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , setuptools -, nose +, wheel , parts , pytestCheckHook , pythonOlder @@ -20,8 +21,23 @@ buildPythonPackage rec { hash = "sha256-eViakuhgSe9E8ltxzeg8m6/ze7QQvoKBtYZoBZzHxlA="; }; + patches = [ + # https://github.com/lapets/bitlist/pull/1 + (fetchpatch { + name = "unpin-setuptools-dependency.patch"; + url = "https://github.com/lapets/bitlist/commit/d1f977a9e835852df358b2d93b642a6820619c10.patch"; + hash = "sha256-BBa6gdhuYsWahtp+Qdp/RigmVHK+uWyK46M1CdD8O2g="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '--cov=bitlist --cov-report term-missing' "" + ''; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ @@ -30,18 +46,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - nose ]; pythonImportsCheck = [ "bitlist" ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--doctest-modules --ignore=docs --cov=bitlist --cov-report term-missing" "" - ''; - meta = with lib; { description = "Python library for working with little-endian list representation of bit strings"; homepage = "https://github.com/lapets/bitlist"; diff --git a/nixpkgs/pkgs/development/python-modules/black/default.nix b/nixpkgs/pkgs/development/python-modules/black/default.nix index 7ae36bc2c549..6019db6c7d7e 100644 --- a/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "black"; - version = "23.1.0"; + version = "23.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sL2XvqiQP1orpyGSV6ROPx+dAAc9bMGt1o8L7saWkqw="; + hash = "sha256-HHuNYG5yikHqHMvXJkZ35JTofPYw45kmLO2S1KjayUA="; }; nativeBuildInputs = [ @@ -108,6 +108,7 @@ buildPythonPackage rec { homepage = "https://github.com/psf/black"; changelog = "https://github.com/psf/black/blob/${version}/CHANGES.md"; license = licenses.mit; + mainProgram = "black"; maintainers = with maintainers; [ sveitser autophagy ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix index 8f027f0e0ca5..846684551480 100644 --- a/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.0.2"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mJQ3Y6o6HAqnktsPVuD9ebGgJo0BjSnlDTyqTpNPb1M="; + hash = "sha256-fw1Eo4f9MdCjICkZiCUX3wa947s1kv9qqYmYjd0zqF4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/nixpkgs/pkgs/development/python-modules/blinker/default.nix index 4e6147bbfbc7..88bd08c92554 100644 --- a/nixpkgs/pkgs/development/python-modules/blinker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blinker/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://pythonhosted.org/blinker/"; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix index 95c83b993284..ce100622b585 100644 --- a/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor SuperSandro2000 ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix b/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix index aaa20a4ae31c..ac53b567e5a9 100644 --- a/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "0.4.5"; + version = "0.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BLR1eivvlbSTx/jr7Rl778apPBcoFCaKOsYOqxS6Fo4="; + hash = "sha256-uANAMNoAC4HUoUuR5ldxoiy+LLzZVpKosU5JttXLnqg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix b/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix index 8fb575658a83..b631846b5e43 100644 --- a/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.15.4"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H8QkOs+QPN9jB/g4f3OaGlX/F2SO2hIDptoPB47ogqA="; + hash = "sha256-gbnsTRiT/4YumyaJ1h4VRzDAf8/oSkD3yL9mdACvWWk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index c0047b69dd41..c76e979f97d3 100644 --- a/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -1,5 +1,6 @@ { lib , async-timeout +, bluetooth-adapters , btsocket , buildPythonPackage , fetchFromGitHub @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uPa8iXG++doRMAK83NSnqiqnZSIjdL7zMTkjdRrSjtA="; + hash = "sha256-5OOIehWb7nxKs1AF9/0yjZhbc3h4MWdgAVCa7irq5YE="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout + bluetooth-adapters btsocket pyric usb-devices diff --git a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 1466d435d3c8..918cba4f54b1 100644 --- a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.4.0"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Zu2tD5isiOKOn1/bNgVo1F2/CbFFj5wVp1CUO+6btBc="; + hash = "sha256-A3zdM2kVmz8cUix9JT8cnIABZK64r6yiZisvb8A1RSQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 65a5fc6444ec..a74769d0ec57 100644 --- a/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.6.1"; + version = "1.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-3qZlk6zV/AeFG4OSRONQ7EMw9Kk/yHjVHV2o64bxCGM="; + hash = "sha256-NC0l3wbQKz4MVM0kHbXBAUol74ir7V/JQgeYCVuyRs4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/boilerpy3/default.nix b/nixpkgs/pkgs/development/python-modules/boilerpy3/default.nix new file mode 100644 index 000000000000..49573b94ae81 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/boilerpy3/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +let + pname = "boilerpy3"; + version = "1.0.6"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jmriebold"; + repo = "BoilerPy3"; + rev = "refs/tags/v${version}"; + hash = "sha256-hl2+XpSvVaHpq9RGMnSzWHCA8TtBQnYwDtEOia1Rl/A="; + }; + + postPatch = '' + # the version mangling in mautrix_signal/get_version.py interacts badly with pythonRelaxDepsHook + substituteInPlace setup.py \ + --replace '>=3.6.*' '>=3.6' + ''; + + + pythonImportsCheck = [ "boilerpy3" ]; + + meta = with lib; { + homepage = "https://github.com/jmriebold/BoilerPy3"; + description = "Python port of Boilerpipe library"; + changelog = "https://github.com/jmriebold/BoilerPy3/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix index 04cf75a76d1f..b8b493258354 100644 --- a/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { description = "Band-structure interpolator and transport coefficient calculator"; homepage = "http://www.boltztrap.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bond-async/default.nix b/nixpkgs/pkgs/development/python-modules/bond-async/default.nix index 4b541c5b7173..1278315d78cc 100644 --- a/nixpkgs/pkgs/development/python-modules/bond-async/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bond-async/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , aiohttp , aioresponses +, orjson , pytest-asyncio , pytestCheckHook , pythonOlder @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "bond-async"; - version = "0.1.23"; + version = "0.2.1"; disabled = pythonOlder "3.7"; @@ -20,11 +21,12 @@ buildPythonPackage rec { owner = "bondhome"; repo = "bond-async"; rev = "refs/tags/v${version}"; - hash = "sha256-Kht2O/+F7Nw78p1Q6NGugm2bfAwZAUWAs30htoWkafI="; + hash = "sha256-YRJHUOYFLf4dtQGIFKHLdUQxWTnZzG1MPirMsGvDor8="; }; propagatedBuildInputs = [ aiohttp + orjson ]; nativeCheckInputs = [ @@ -37,11 +39,11 @@ buildPythonPackage rec { "bond_async" ]; - meta = { + meta = with lib; { description = "Asynchronous Python wrapper library over Bond Local API"; homepage = "https://github.com/bondhome/bond-async"; changelog = "https://github.com/bondhome/bond-async/releases/tag/v${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/boto/default.nix b/nixpkgs/pkgs/development/python-modules/boto/default.nix index 08a773cf6bb2..f731c0ebcd34 100644 --- a/nixpkgs/pkgs/development/python-modules/boto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { future infrastructural services offered by Amazon Web Services. This includes S3, SQS, EC2, among others. ''; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bottombar/default.nix b/nixpkgs/pkgs/development/python-modules/bottombar/default.nix new file mode 100644 index 000000000000..e3e9bb38cc11 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bottombar/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +}: + +buildPythonPackage rec { + pname = "bottombar"; + version = "1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "evalf"; + repo = "bottombar"; + rev = "refs/tags/v${version}"; + hash = "sha256-/3m34HcYmmEf92H3938dYV1Q6k44KaCb9TDx9nDNPnM="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + # The package only has some "interactive" tests where a user must check for + # the correct output and hit enter after every check + doCheck = false; + pythonImportsCheck = [ + "bottombar" + ]; + + meta = with lib; { + description = "Context manager that prints a status line at the bottom of a terminal window"; + homepage = "https://github.com/evalf/bottombar"; + changelog = "https://github.com/evalf/bottombar/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ conni2461 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bracex/default.nix b/nixpkgs/pkgs/development/python-modules/bracex/default.nix index 94866e064ba2..b519021295b1 100644 --- a/nixpkgs/pkgs/development/python-modules/bracex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bracex/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Bash style brace expansion for Python"; homepage = "https://github.com/facelessuser/bracex"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix b/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix index 7f34a3c48bc7..86c7f7b57c91 100644 --- a/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "bravado-core"; - version = "5.17.1"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = "Yelp"; repo = pname; rev = "v${version}"; - hash = "sha256-7LnKNR1/YIzw2iIPYXAuoC6G7fdm4D3frkSl/wJhYG4="; + hash = "sha256-/ePs3znbwamMHHzb/PD4UHq+7v0j1r1X3J3Bnb4S2VU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/brotli-asgi/default.nix b/nixpkgs/pkgs/development/python-modules/brotli-asgi/default.nix new file mode 100644 index 000000000000..8bdd814cfe5e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/brotli-asgi/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# build inputs +, starlette +, brotli +# check inputs +, requests +, mypy +, brotlipy +}: +let + pname = "brotli-asgi"; + version = "1.4.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "fullonic"; + repo = pname; + rev = "v${version}"; + hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y="; + }; + + propagatedBuildInputs = [ + starlette + brotli + ]; + + pythonImportsCheck = [ "brotli_asgi" ]; + + nativeCheckInputs = [ + requests + mypy + brotlipy + ]; + + meta = with lib; { + description = "A compression AGSI middleware using brotli"; + homepage = "https://github.com/fullonic/brotli-asgi"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/brotli/default.nix b/nixpkgs/pkgs/development/python-modules/brotli/default.nix index ad7835506609..b70302fe9ea6 100644 --- a/nixpkgs/pkgs/development/python-modules/brotli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/brotli/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix b/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix index cf168ae6969d..1fcaa43f2246 100644 --- a/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.18.0"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bSP6likSwEbxN4S9qbJmPcs8joc5e10FiqVL9gE7ni8="; + hash = "sha256-MDGtFLlrR+8eTIVF8vRj4QrYRO+DTc0Ova42HjHGEZo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix index 82459398ca73..ee2f5b16ad50 100644 --- a/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { 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 - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/btest/default.nix b/nixpkgs/pkgs/development/python-modules/btest/default.nix index d993f1a9746f..dc36b1981940 100644 --- a/nixpkgs/pkgs/development/python-modules/btest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/btest/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "btest"; - version = "1.0"; + version = "1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "zeek"; repo = "btest"; rev = "refs/tags/v${version}"; - hash = "sha256-QvK2MZTx+DD2u+h7dk0F5kInXGVp73ZTvG080WV2BVQ="; + hash = "sha256-D01hAKcE52eKJRUh1/x5DGxRQpWgA2J0nutshpKrtRU="; }; # No tests available and no module to import diff --git a/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix b/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix index d1771f97c793..31774f941983 100644 --- a/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix @@ -2,26 +2,27 @@ , bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage +, cryptography , fetchFromGitHub , poetry-core -, pycryptodomex , pytestCheckHook , pythonOlder +, pytz , sensor-state-data }: buildPythonPackage rec { pname = "bthome-ble"; - version = "2.11.3"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-axumlQnD7MKGdmy1gGQNU4B/3jXffK2jTyO3BtWvp5w="; + hash = "sha256-dLXeJojGeiwPPxXES1qzay1kC/YiI6pKyxKD2z32Av8="; }; nativeBuildInputs = [ @@ -31,8 +32,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ bluetooth-data-tools bluetooth-sensor-state-data + cryptography sensor-state-data - pycryptodomex + pytz ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/btsmarthub_devicelist/default.nix b/nixpkgs/pkgs/development/python-modules/btsmarthub_devicelist/default.nix index 59fb071c744c..ea5e61f7a49d 100644 --- a/nixpkgs/pkgs/development/python-modules/btsmarthub_devicelist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/btsmarthub_devicelist/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jxwolstenholme"; repo = "btsmarthub_devicelist"; - rev = "${version}"; + rev = version; hash = "sha256-7ncxCpY+A2SuSFa3k21QchrmFs1dPRUMb1r1z/laa6M="; }; diff --git a/nixpkgs/pkgs/development/python-modules/bugz/default.nix b/nixpkgs/pkgs/development/python-modules/bugz/default.nix index a57e957efe67..f67be664c227 100644 --- a/nixpkgs/pkgs/development/python-modules/bugz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bugz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { homepage = "https://github.com/williamh/pybugz"; description = "Command line interface for Bugzilla"; license = licenses.gpl2; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bytecode/default.nix b/nixpkgs/pkgs/development/python-modules/bytecode/default.nix index 3c474fadfd88..d8521ddf0f15 100644 --- a/nixpkgs/pkgs/development/python-modules/bytecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bytecode/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bytecode"; - version = "0.14.1"; + version = "0.14.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "vstinner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vSuGjNTQw7prFxmVyiq7s8cnl+VGbRArC2sp7GVP0XA="; + hash = "sha256-HBXtpUl8Lcx3yCVnk9kVU0+AUVdgy1HQBV4rHEndiek="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix index 225ee7efd010..99a128b0496b 100644 --- a/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix @@ -2,7 +2,8 @@ , buildPythonPackage , cherrypy , fetchFromGitHub -, lockfile +, flit-core +, filelock , mock , msgpack , pytestCheckHook @@ -13,8 +14,8 @@ buildPythonPackage rec { pname = "cachecontrol"; - version = "0.12.11"; - format = "setuptools"; + version = "0.13.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ionrock"; repo = pname; - rev = "v${version}"; - hash = "sha256-uUPIQz/n347Q9G7NDOGuB760B/KxOglUxiS/rYjt5Po="; + rev = "refs/tags/v${version}"; + hash = "sha256-4N+vk65WxOrT+IJRn+lEnbs5vlWQh9ievVHWWe3BKJ0="; }; postPatch = '' @@ -34,30 +35,40 @@ buildPythonPackage rec { "urllib3.response.HTTPResponse.from_httplib" ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ msgpack requests ]; + passthru.optional-dependencies = { + filecache = [ + filelock + ]; + redis = [ + redis + ]; + }; + nativeCheckInputs = [ cherrypy mock pytestCheckHook - ] ++ passthru.optional-dependencies.filecache; + requests + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "cachecontrol" ]; - passthru.optional-dependencies = { - filecache = [ lockfile ]; - redis = [ redis ]; - }; - meta = with lib; { description = "Httplib2 caching for requests"; homepage = "https://github.com/ionrock/cachecontrol"; + changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cadquery/default.nix b/nixpkgs/pkgs/development/python-modules/cadquery/default.nix index 385a36d46f16..15142e3d80e4 100644 --- a/nixpkgs/pkgs/development/python-modules/cadquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cadquery/default.nix @@ -98,6 +98,6 @@ in description = "Parametric scripting language for creating and traversing CAD models"; homepage = "https://github.com/CadQuery/cadquery"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc marcus7070 ]; + maintainers = with maintainers; [ marcus7070 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix index 6a60128bacf9..1eaed132fc6d 100644 --- a/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/SimonSapin/cairocffi"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; description = "cffi-based cairo bindings for Python"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix index cc03fabcbc75..46c556818ee1 100644 --- a/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://cairosvg.org"; license = licenses.lgpl3Plus; description = "SVG converter based on Cairo"; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/caldav/default.nix b/nixpkgs/pkgs/development/python-modules/caldav/default.nix index e67344270abe..c53eb0e20bce 100644 --- a/nixpkgs/pkgs/development/python-modules/caldav/default.nix +++ b/nixpkgs/pkgs/development/python-modules/caldav/default.nix @@ -32,12 +32,12 @@ buildPythonPackage rec { requests icalendar recurring-ical-events + pytz + tzlocal ]; nativeCheckInputs = [ pytestCheckHook - tzlocal - pytz ]; # xandikos and radicale are only optional test dependencies, not available for python3 diff --git a/nixpkgs/pkgs/development/python-modules/calmjs-types/default.nix b/nixpkgs/pkgs/development/python-modules/calmjs-types/default.nix new file mode 100644 index 000000000000..9f940e92c502 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/calmjs-types/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "calmjs-types"; + version = "1.0.1"; + + src = fetchPypi { + pname = "calmjs.types"; + inherit version; + sha256 = "sha256-EGWYv9mx3RPqs9dnB5t3Bu3hiujL2y/XxyMP7JkjjAQ="; + extension = "zip"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "calmjs.types" ]; + + meta = with lib; { + description = "Types for the calmjs framework"; + homepage = "https://github.com/calmjs/calmjs.types"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/calmjs/default.nix b/nixpkgs/pkgs/development/python-modules/calmjs/default.nix new file mode 100644 index 000000000000..2f27dbc98523 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/calmjs/default.nix @@ -0,0 +1,54 @@ +{ lib +, fetchPypi +, buildPythonPackage +, calmjs-types +, calmjs-parse +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "calmjs"; + version = "3.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-73NQiY1RMdBrMIlm/VTvHY4dCHL1pQoj6a48CWRos3o="; + extension = "zip"; + }; + + propagatedBuildInputs = [ + calmjs-parse + calmjs-types + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # ModuleNotFoundError: No module named 'calmjs.types' + # Not yet clear how to run these tests correctly + # https://github.com/calmjs/calmjs/issues/63 + # https://github.com/NixOS/nixpkgs/pull/186298 + disabledTestPaths = [ + "src/calmjs/tests/test_dist.py" + "src/calmjs/tests/test_testing.py" + "src/calmjs/tests/test_artifact.py" + "src/calmjs/tests/test_interrogate.py" + "src/calmjs/tests/test_loaderplugin.py" + "src/calmjs/tests/test_npm.py" + "src/calmjs/tests/test_runtime.py" + "src/calmjs/tests/test_toolchain.py" + "src/calmjs/tests/test_vlqsm.py" + "src/calmjs/tests/test_yarn.py" + "src/calmjs/tests/test_command.py" + ]; + + pythonImportsCheck = [ "calmjs" ]; + + meta = with lib; { + description = "Framework for building toolchains and utilities for working with the Node.js ecosystem"; + homepage = "https://github.com/calmjs/calmjs"; + license = licenses.gpl2; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix b/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix index 3d2f9e7b40e6..cc9c345d3fb0 100644 --- a/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "camel-converter"; - version = "3.0.0"; + version = "3.0.2"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sanders41"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SUuSaQU6o2OtjDNrDcO3nS0EZH2ammEkP7AEp4H5ysI="; + hash = "sha256-XKtWR9dmSMfqkJYUHDQtWBLG3CHrbrI5lNtPUTShmBE="; }; postPatch = '' @@ -44,6 +44,11 @@ buildPythonPackage rec { "camel_converter" ]; + disabledTests = [ + # AttributeError: 'Test' object has no attribute 'model_dump' + "test_camel_config" + ]; + meta = with lib; { description = "Client for the Meilisearch API"; homepage = "https://github.com/sanders41/camel-converter"; diff --git a/nixpkgs/pkgs/development/python-modules/camelot/default.nix b/nixpkgs/pkgs/development/python-modules/camelot/default.nix new file mode 100644 index 000000000000..2e2f9ef87578 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/camelot/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, buildPythonPackage +, chardet +, openpyxl +, charset-normalizer +, fetchPypi +, fetchpatch +, pythonOlder +, pandas +, tabulate +, click +, pdfminer +, pypdf +, opencv3 +}: + +buildPythonPackage rec { + pname = "camelot-py"; + version = "0.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-l6fZBtaF5AWaSlSaY646UfCrcqPIJlV/hEPGWhGB3+Y="; + }; + + propagatedBuildInputs = [ + charset-normalizer + chardet + pandas + tabulate + click + pdfminer + openpyxl + pypdf + opencv3 + ]; + + doCheck = false; + + pythonImportsCheck = [ + "camelot" + ]; + + meta = with lib; { + description = "A Python library to extract tabular data from PDFs"; + homepage = "http://camelot-py.readthedocs.io"; + changelog = "https://github.com/camelot-dev/camelot/blob/v${version}/HISTORY.md"; + license = licenses.mit; + maintainers = with maintainers; [ _2gn ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/can/default.nix b/nixpkgs/pkgs/development/python-modules/can/default.nix index 4051dc88e0c9..2ed28098a63e 100644 --- a/nixpkgs/pkgs/development/python-modules/can/default.nix +++ b/nixpkgs/pkgs/development/python-modules/can/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "can"; - version = "4.2.1"; + version = "4.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "hardbyte"; repo = "python-can"; rev = "refs/tags/v${version}"; - hash = "sha256-3luuff/yAAERaptMsKCYISwWrzqDJClm+dnoJpjBkVY="; + hash = "sha256-MyVGjAy13Ne0PkVufB0JDNEZHhVBzeUYWWlH72ib/pI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/canals/default.nix b/nixpkgs/pkgs/development/python-modules/canals/default.nix new file mode 100644 index 000000000000..6832a3626132 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/canals/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, pythonOlder +, pythonAtLeast +, fetchFromGitHub +# native build inputs +, hatchling +# build input +, networkx +# check inputs +, pytestCheckHook +# optional dependencies +, pygraphviz +, requests +, mkdocs-material +, mkdocs-mermaid2-plugin +, mkdocstrings +}: +let + pname = "canals"; + version = "0.2.2"; + optional-dependencies = { + graphviz = [ pygraphviz ]; + mermaid = [ requests ]; + docs = [ mkdocs-material mkdocs-mermaid2-plugin mkdocstrings ]; + }; +in +buildPythonPackage { + inherit version pname; + format = "pyproject"; + + # Pypi source package doesn't contain tests + src = fetchFromGitHub { + owner = "deepset-ai"; + repo = pname; + rev = "v${version}"; + hash = "sha256-dF0bkY4DFJIovaseNiOLgF8lmha+njTTTzr2/4LzZEc="; + }; + + disabled = pythonOlder "3.8"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + networkx + ]; + + passthru = { inherit optional-dependencies; }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.mermaid; + + disabledTestPaths = [ + # requires internet connection to mermaid.ink + "test/pipelines/integration" + ]; + + pythonImportsCheck = [ "canals" ]; + + meta = with lib; { + description = "A component orchestration engine"; + homepage = "https://github.com/deepset-ai/canals"; + changelog = "https://github.com/deepset-ai/canals/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/capstone/default.nix b/nixpkgs/pkgs/development/python-modules/capstone/default.nix index f1a37fb70a0f..6846ed86f6f8 100644 --- a/nixpkgs/pkgs/development/python-modules/capstone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/capstone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = lib.getVersion capstone; src = capstone.src; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; postPatch = '' ln -s ${capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix index f5bb83c7734f..60693f781897 100644 --- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.19.0"; + version = "1.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-lIVZhWtGWJutmHgReT4k4G5hJZuD52AaJhwmwTmqHIY="; + hash = "sha256-+DoXjIRbXhX3lAOWnDEwG3e0bF9T3dVEU33JMLMAO6Y="; }; propagatedBuildInputs = [ @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/casbin/pycasbin"; changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cattrs/default.nix b/nixpkgs/pkgs/development/python-modules/cattrs/default.nix index ddca9628f0fe..b637f714d26d 100644 --- a/nixpkgs/pkgs/development/python-modules/cattrs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cattrs/default.nix @@ -1,6 +1,7 @@ { lib , attrs , buildPythonPackage +, cbor2 , fetchFromGitHub , exceptiongroup , hypothesis @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "cattrs"; - version = "22.2.0"; + version = "23.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "python-attrs"; repo = pname; rev = "v${version}"; - hash = "sha256-Qnrq/mIA/t0mur6IAen4vTmMIhILWS6v5nuf+Via2hA="; + hash = "sha256-YO4Clbo5fmXbysxwwM2qCHJwO5KwDC05VctRVFruJcw="; }; nativeBuildInputs = [ @@ -40,11 +41,11 @@ buildPythonPackage rec { attrs ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup - ] ++ lib.optionals (pythonOlder "3.7") [ typing-extensions ]; nativeCheckInputs = [ + cbor2 hypothesis immutables motor @@ -54,6 +55,7 @@ buildPythonPackage rec { pytestCheckHook pyyaml tomlkit + typing-extensions ujson ]; @@ -94,6 +96,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python custom class converters for attrs"; homepage = "https://github.com/python-attrs/cattrs"; + changelog = "https://github.com/python-attrs/cattrs/blob/${src.rev}/HISTORY.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/cdcs/default.nix b/nixpkgs/pkgs/development/python-modules/cdcs/default.nix index 4a3f89a3c831..511a3975d97f 100644 --- a/nixpkgs/pkgs/development/python-modules/cdcs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cdcs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cdcs"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,9 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "usnistgov"; repo = "pycdcs"; - # https://github.com/usnistgov/pycdcs/issues/1 - rev = "3aeaeb4782054a220e916c189ffe440d113b571d"; - hash = "sha256-OsabgO2B2PRhU3DVvkK+f9VLOMqctl4nyCETxLtzwNs="; + rev = "refs/tags/v${version}"; + hash = "sha256-WiNjMMcpp5K+Re44ryB7LNzr2LnnYzLZ5b0iT7u1ZiA="; }; nativeBuildInputs = [ @@ -51,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for performing REST calls to configurable data curation system (CDCS) databases"; homepage = "https://github.com/usnistgov/pycdcs"; + changelog = "https://github.com/usnistgov/pycdcs/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix b/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix index c3c4aa69dfd9..a61eacfcb86c 100644 --- a/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix @@ -1,38 +1,48 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , python-dateutil , celery , redis , tenacity , pytestCheckHook +, pytz , fakeredis , mock }: buildPythonPackage rec { pname = "celery-redbeat"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "sibson"; repo = "redbeat"; rev = "v${version}"; - hash = "sha256-pu4umhfNFZ30bQu5PcT2LYN4WGzFj4p4/qHm3pVIV+c="; + hash = "sha256-WW/OYa7TWEKkata1eULir29wHaCnavBJebn4GrBzmWY="; }; + patches = [ + (fetchpatch { + # celery 5.3.0 support + url = "https://github.com/sibson/redbeat/commit/4240e17172a4d9d2744d5c4da3cfca0e0a024e2e.patch"; + hash = "sha256-quEfSFhv0sIpsKHX1CpFhbMC8LYXA8NASWYU8MMYPSk="; + }) + ]; + propagatedBuildInputs = [ - python-dateutil celery + python-dateutil redis tenacity ]; nativeCheckInputs = [ - pytestCheckHook fakeredis mock + pytestCheckHook + pytz ]; pythonImportsCheck = [ "redbeat" ]; diff --git a/nixpkgs/pkgs/development/python-modules/celery-singleton/default.nix b/nixpkgs/pkgs/development/python-modules/celery-singleton/default.nix new file mode 100644 index 000000000000..bb3ac446a600 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/celery-singleton/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchFromGitHub +, poetry-core +, celery +, redis +, pytestCheckHook +, pytest-celery +}: + +buildPythonPackage rec { + pname = "celery-singleton"; + version = "0.3.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "steinitzu"; + repo = "celery-singleton"; + rev = version; + hash = "sha256-fHlakxxjYIADELZdxIj6rvsZ/+1QfnKvAg3w5cdzvDc="; + }; + + postPatch = '' + # Disable coverage reporting in tests + substituteInPlace setup.cfg \ + --replace "--cov" "" \ + --replace "--no-cov-on-fail" "" + ''; + + patches = [ + # chore(poetry): use poetry-core + # https://github.com/steinitzu/celery-singleton/pull/54 + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/steinitzu/celery-singleton/pull/54/commits/634a001c92a1dff1fae513fc95d733ea9b87e4cf.patch"; + hash = "sha256-lXN4khwyL96pWyBS+iuSkGEkegv4HxYtym+6JUcPa94="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + celery + redis + ]; + + checkInputs = [ + pytestCheckHook + pytest-celery + ]; + + pytestFlagsArray = [ "tests" ]; + + # Tests require a running Redis backend + disabledTests = [ + "TestLock" + "TestUnlock" + "TestClear" + "TestSimpleTask" + "TestRaiseOnDuplicateConfig" + "TestUniqueOn" + ]; + + pythonImportsCheck = [ "celery_singleton" ]; + + meta = with lib; { + description = "Seamlessly prevent duplicate executions of celery tasks"; + homepage = "https://github.com/steinitzu/celery-singleton"; + changelog = "https://github.com/steinitzu/celery-singleton/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index 52fcaad47adf..836c270a4c03 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, backports-zoneinfo , billiard , boto3 , buildPythonPackage @@ -10,50 +11,33 @@ , click-repl , dnspython , fetchPypi -, fetchpatch , kombu , moto , pymongo , pytest-celery +, pytest-click , pytest-subtests , pytest-timeout , pytestCheckHook +, python-dateutil , pythonOlder -, pytz +, tzdata , vine , nixosTests }: buildPythonPackage rec { pname = "celery"; - version = "5.2.7"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+vvYKTTTD4oAT4Ho96Bi4xQToj1ES+juMyZVORWVjG0="; + hash = "sha256-Hqul7hTYyMC+2PYGPl4Q2r288jUDqGHPDhC3Ih2Zyw0="; }; - patches = [ - (fetchpatch { - name = "billiard-4.0-compat.patch"; - url = "https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch"; - hash = "sha256-NWB/UB0fE7A/vgMRYz6QGmqLmyN1ninAMyL4V2tpzto="; - }) - (fetchpatch { - name = "billiard-4.1-compat.patch"; - url = "https://github.com/celery/celery/pull/7781/commits/879af6341974c3778077d8212d78f093b2d77a4f.patch"; - hash = "sha256-+m8/YkeAPPjwm0WF7dw5XZzf7MImVBLXT0/FS+fk0FE="; - }) - ]; - - postPatch = '' - substituteInPlace requirements/default.txt \ - --replace "billiard>=3.6.4.0,<4.0" "billiard>=3.6.4.0" - ''; - propagatedBuildInputs = [ billiard click @@ -61,8 +45,12 @@ buildPythonPackage rec { click-plugins click-repl kombu - pytz + python-dateutil + tzdata vine + ] + ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ]; nativeCheckInputs = [ @@ -72,6 +60,7 @@ buildPythonPackage rec { moto pymongo pytest-celery + pytest-click pytest-subtests pytest-timeout pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/censys/default.nix b/nixpkgs/pkgs/development/python-modules/censys/default.nix index 014776d30ca5..70601478b1bd 100644 --- a/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -1,4 +1,5 @@ { lib +, argcomplete , backoff , buildPythonPackage , fetchFromGitHub @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.0"; + version = "2.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-CtW6EN9oH/OIZ4XaoSuKlMYK9Mh/ewRs6y34xbfY234="; + hash = "sha256-gCq01lfAoKoS74C8gjj84mZpXDMtdNVaRLwhlEXwiPI="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + argcomplete backoff requests rich @@ -73,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API wrapper for the Censys Search Engine (censys.io)"; homepage = "https://github.com/censys/censys-python"; + changelog = "https://github.com/censys/censys-python/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index fc6a645ade63..d60e1e60d974 100644 --- a/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-cloudflare"; + sourceRoot = "${src.name}/certbot-dns-cloudflare"; meta = certbot.meta // { description = "Cloudflare DNS Authenticator plugin for Certbot"; diff --git a/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix b/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix index 6a320209ecf1..6ceaac115ff7 100644 --- a/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-google"; + sourceRoot = "${src.name}/certbot-dns-google"; meta = certbot.meta // { description = "Google Cloud DNS Authenticator plugin for Certbot"; diff --git a/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index 18765f12d233..58319625b1e7 100644 --- a/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-rfc2136"; + sourceRoot = "${src.name}/certbot-dns-rfc2136"; meta = certbot.meta // { description = "RFC 2136 DNS Authenticator plugin for Certbot"; diff --git a/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix b/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix index 20df82303a44..db923f1a1926 100644 --- a/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-route53"; + sourceRoot = "${src.name}/certbot-dns-route53"; meta = certbot.meta // { description = "Route53 DNS Authenticator plugin for Certbot"; diff --git a/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/nixpkgs/pkgs/development/python-modules/certbot/default.nix index d0d6280e4e0c..369879878bb2 100644 --- a/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -15,7 +15,7 @@ , pytz , requests , six -, zope_component +, zope-component , zope_interface , dialog , gnureadline @@ -35,7 +35,7 @@ buildPythonPackage rec { hash = "sha256-BQsdhlYABZtz5+SORiCVnWMZdMmiWGM9W1YLqObyFo8="; }; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; propagatedBuildInputs = [ configargparse @@ -50,7 +50,7 @@ buildPythonPackage rec { pytz requests six - zope_component + zope-component zope_interface ]; diff --git a/nixpkgs/pkgs/development/python-modules/certifi/default.nix b/nixpkgs/pkgs/development/python-modules/certifi/default.nix index 93c3ac801a57..7931432bd5e1 100644 --- a/nixpkgs/pkgs/development/python-modules/certifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certifi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2022.12.07"; + version = "2023.05.07"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-r6TJ6YGL0cygz+F6g6wiqBfBa/QKhynZ92C6lHTZ2rI="; + hash = "sha256-KXm0CtuZJL9VgFeY+DV0rdjaKqPQCqcoGPCkeGieTX8="; }; patches = [ @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/certifi/python-certifi"; description = "Python package for providing Mozilla's CA Bundle"; license = licenses.isc; - maintainers = with maintainers; [ koral SuperSandro2000 ]; + maintainers = with maintainers; [ koral ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix b/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix index 3f97d996bdfb..37a1c750b319 100644 --- a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix @@ -1,6 +1,7 @@ { lib , asn1crypto , buildPythonPackage +, cryptography , dnspython , dsinternals , fetchFromGitHub @@ -10,12 +11,14 @@ , pycryptodome , pyopenssl , pythonOlder +, requests , requests_ntlm +, unicrypto }: buildPythonPackage rec { pname = "certipy-ad"; - version = "4.4.0"; + version = "4.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +27,7 @@ buildPythonPackage rec { owner = "ly4k"; repo = "Certipy"; rev = "refs/tags/${version}"; - hash = "sha256-llLGr9IpuXQYIN2WaOkvfE2dAZb3PMVlNmketUpuyDI="; + hash = "sha256-CkIxk+Aps9TRA2wEE/zZKl9t4CyjxEsgLntbn9kWY6o="; }; postPatch = '' @@ -35,14 +38,17 @@ buildPythonPackage rec { propagatedBuildInputs = [ asn1crypto + cryptography dnspython dsinternals impacket - pyopenssl ldap3 pyasn1 pycryptodome + pyopenssl + requests requests_ntlm + unicrypto ]; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/cgen/default.nix b/nixpkgs/pkgs/development/python-modules/cgen/default.nix index fd0dbe4ba906..f61e02878c54 100644 --- a/nixpkgs/pkgs/development/python-modules/cgen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cgen/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "C/C++ source generation from an AST"; homepage = "https://github.com/inducer/cgen"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/chainer/default.nix b/nixpkgs/pkgs/development/python-modules/chainer/default.nix index c6793137ba24..1f5be76e2d21 100644 --- a/nixpkgs/pkgs/development/python-modules/chainer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chainer/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , config -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cupy , fetchFromGitHub , filelock diff --git a/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/nixpkgs/pkgs/development/python-modules/chalice/default.nix index d0ced676ed60..915e40544a82 100644 --- a/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -105,6 +105,6 @@ buildPythonPackage rec { homepage = "https://github.com/aws/chalice"; changelog = "https://github.com/aws/chalice/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/chardet/default.nix b/nixpkgs/pkgs/development/python-modules/chardet/default.nix index e750bbece81d..69353dcaec28 100644 --- a/nixpkgs/pkgs/development/python-modules/chardet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chardet/default.nix @@ -23,8 +23,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - # "hypothesis" indirectly depends on chardet to build its documentation. - (hypothesis.override { enableDocumentation = false; }) + hypothesis pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index 0735ac55a15b..5bcc3050497a 100644 --- a/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.13.1"; + version = "5.15.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-LcCptMtRxXQPbghMIunrPcSLAXQ/r3xVktueMUQ0+gE="; + hash = "sha256-H+p2fPBXn+VqrW63KkdmPn2xqxC9uAOzQUV1ruKEUSs="; }; - sourceRoot = "source/packages/python/chart-studio"; + sourceRoot = "${src.name}/packages/python/chart-studio"; propagatedBuildInputs = [ plotly diff --git a/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index cd6cabbe5791..11ce178e6906 100644 --- a/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -2,8 +2,8 @@ , stdenv , buildPythonPackage , fetchPypi -, jaraco_functools -, jaraco_text +, jaraco-functools +, jaraco-text , more-itertools , portend , pypytools @@ -35,13 +35,13 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jaraco_functools + jaraco-functools more-itertools six ]; nativeCheckInputs = [ - jaraco_text + jaraco-text portend pypytools pytest-mock diff --git a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index d9b9d7d4687e..48b040565f79 100644 --- a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , cheroot , fetchPypi -, jaraco_collections +, jaraco-collections , more-itertools , objgraph , path @@ -53,7 +53,7 @@ buildPythonPackage rec { portend more-itertools zc_lockfile - jaraco_collections + jaraco-collections ]; nativeCheckInputs = [ @@ -65,6 +65,10 @@ buildPythonPackage rec { requests-toolbelt ]; + preCheck = '' + export CI=true + ''; + pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" diff --git a/nixpkgs/pkgs/development/python-modules/chess/default.nix b/nixpkgs/pkgs/development/python-modules/chess/default.nix index c96c722cc386..5e32d74b4379 100644 --- a/nixpkgs/pkgs/development/python-modules/chess/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chess/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "chess"; - version = "1.9.4"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "niklasf"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-YBABB//53gwJIwrmKJh8W+05hTBhl+49vCYv9//4E+0="; + hash = "sha256-jfPg1W9Qp0DlAbMXaFqZ6Ri2zMOW6EKUHwi7Azn/yl0="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix b/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix index 80e39ccc9014..a2ed3295f01f 100644 --- a/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.8"; + version = "1.0.10"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ilT7tCdX8ak3qmpXJ0LITf0ZGAdFSN4tm6GKw06A/m8="; + hash = "sha256-660Frlaj6WbYOl0sfb5ox6qTzE+jKJR0Qka9nEijSyg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix b/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix index c939022a29bb..141a5f349b70 100644 --- a/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU="; }; - sourceRoot = "source/python/src"; + sourceRoot = "${src.name}/python/src"; propagatedBuildInputs = [ google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/circus/default.nix b/nixpkgs/pkgs/development/python-modules/circus/default.nix new file mode 100644 index 000000000000..e5420f26c1a0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/circus/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchPypi +, psutil +, pytestCheckHook +, pyyaml +, pyzmq +, tornado +}: + +buildPythonPackage rec { + pname = "circus"; + version = "0.18.0"; + format = "flit"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas="; + }; + + propagatedBuildInputs = [ + psutil + pyzmq + tornado + ]; + + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + disabledTests = [ + # these tests raise circus.tests.support.TimeoutException + "test_reload1" + "test_reload2" + "test_reload_sequential" + "test_reload_uppercase" + "test_reload_wid_1_worker" + "test_reload_wid_4_workers" + "test_add" + "test_add_start" + "test_command_already_running" + "test_launch_cli" + "test_handler" + "test_resource_watcher_max_cpu" + "test_resource_watcher_max_mem" + "test_resource_watcher_max_mem_abs" + "test_resource_watcher_min_cpu" + "test_resource_watcher_min_mem" + "test_resource_watcher_min_mem_abs" + "test_full_stats" + "test_watchdog_discovery_found" + "test_watchdog_discovery_not_found" + "test_dummy" + "test_handler" + "test_stdin_socket" + "test_stop_and_restart" + "test_stream" + "test_inherited" + "test_set_before_launch" + "test_set_by_arbiter" + "test_max_age" + "test_signal" + "test_exits_within_graceful_timeout" + "test_kills_after_graceful_timeout" + # this test requires socket communication + "test_plugins" + ]; + + pythonImportsCheck = [ "circus" ]; + + meta = with lib; { + description = "A process and socket manager"; + homepage = "https://github.com/circus-tent/circus"; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix b/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix index ae53a5eef6bd..f8e6fb4a2bf2 100644 --- a/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cirq-aqt"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix b/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix index 4c69172fdd4c..39e3cf9d47be 100644 --- a/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { hash = "sha256-5j4hbG95KRfRQTyyZgoNp/eHIcy0FphyEhbYnzyUMO4="; }; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ # https://github.com/quantumlib/Cirq/pull/5991 diff --git a/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix b/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix index c636897fc6a2..491caa5f9293 100644 --- a/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cirq-google"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix b/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix index bf96d35b5318..b1f66e25ced2 100644 --- a/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cirq-ionq"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix b/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix index 5066455e294a..4d755266180b 100644 --- a/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cirq-pasqal"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix b/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix index b3bd2d3a0549..f09f7ce04539 100644 --- a/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix b/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix index 3488ab56586c..ca1c67ad1218 100644 --- a/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "cirq-web"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; propagatedBuildInputs = [ cirq-core diff --git a/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix b/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix index 83035774d05a..edf15661dfec 100644 --- a/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage -, dnspython , deprecat +, dnspython , fetchFromGitHub , loguru , passlib , poetry-core , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , toml }: @@ -25,12 +26,17 @@ buildPythonPackage rec { hash = "sha256-vL/CQdYcOP356EyRToviWylP1EBtxmeov6qkhfQNZ2Y="; }; + pythonRelaxDeps = [ + "loguru" + ]; + postPatch = '' patchShebangs tests ''; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix b/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix new file mode 100644 index 000000000000..cec151526074 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, googleapis-common-protos +, grpcio +, protobuf +, requests +}: + +buildPythonPackage rec { + pname = "clarifai-grpc"; + version = "9.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-amMUgRXtvcrALfWwat7W0W60FJQnEeMvHhyxxBCMqUg="; + }; + + propagatedBuildInputs = [ + googleapis-common-protos + grpcio + protobuf + requests + ]; + + # almost all tests require network access + doCheck = false; + + pythonImportsCheck = [ "clarifai_grpc" ]; + + meta = with lib; { + description = "Clarifai gRPC API Client"; + homepage = "https://github.com/Clarifai/clarifai-python-grpc"; + changelog = "https://github.com/Clarifai/clarifai-python-grpc/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/clarifai/default.nix b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix new file mode 100644 index 000000000000..ffc02aa60480 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, clarifai-grpc +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "clarifai"; + version = "9.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Clarifai"; + repo = "clarifai-python-utils"; + rev = "refs/tags/${version}"; + hash = "sha256-29by0YAQ7qc0gL/3lAFOk4FLDB5Qv4X9QDyK49gfyAo="; + }; + + propagatedBuildInputs = [ + clarifai-grpc + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "clarifai" ]; + + meta = with lib; { + description = "Clarifai Python Utilities"; + homepage = "https://github.com/Clarifai/clarifai-python-utils"; + changelog = "https://github.com/Clarifai/clarifai-python-utils/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix index df16caa5b5d4..e9b2ded49a2b 100644 --- a/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.54"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YZvc2BIc8dAvDFfJ9+DEkfi8pXTFB0gQ5z7irYKZkw8="; + hash = "sha256-rjHz0NfxUzEQxDD4XiUlIr/RltXN7GKRojWs/nxs1ac="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cle/default.nix b/nixpkgs/pkgs/development/python-modules/cle/default.nix index e7effa4fd9cd..17e09f785ff5 100644 --- a/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.54"; + version = "9.2.62"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LezNPmHEy+rDGERhGfKuHGwfjAqlfBYxapjnxcY25ug="; + hash = "sha256-w1U9/Hvu64ULWQouE5gFRxtfUcNdKIIWACaYXtvlCtE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix b/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix new file mode 100644 index 000000000000..0ac79e306c17 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, scikit-learn +, termcolor +, tqdm +, pandas +# test dependencies +, tensorflow +, torch +, datasets +, torchvision +, keras +, fasttext +}: +let + pname = "cleanlab"; + version = "2.4.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "cleanlab"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XFrjjBJA0OQEAspnQQiSIW4td0USJDXTp9C/91mobp8="; + }; + + # postPatch = '' + # substituteInPlace pyproject.toml \ + # --replace '"rich <= 13.0.1"' '"rich"' \ + # --replace '"numpy < 1.24.0"' '"numpy"' + # ''; + + propagatedBuildInputs = [ + scikit-learn + termcolor + tqdm + pandas + ]; + + nativeCheckInputs = [ + tensorflow + torch + datasets + torchvision + keras + fasttext + ]; + + meta = with lib; { + description = "The standard data-centric AI package for data quality and machine learning with messy, real-world data and labels."; + homepage = "https://github.com/cleanlab/cleanlab"; + changelog = "https://github.com/cleanlab/cleanlab/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix index a6b2ba5e9f11..faf20403e62b 100644 --- a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, backports_csv , configobj , mock , pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/cliche/default.nix b/nixpkgs/pkgs/development/python-modules/cliche/default.nix new file mode 100644 index 000000000000..e0657336a093 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cliche/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ipdb +, pytestCheckHook +}: + +buildPythonPackage { + pname = "cliche"; + version = "0.10.108"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "kootenpv"; + repo = "cliche"; + rev = "80a9ae2e90f4493880b669d5db51f1d4038589df"; # no tags + sha256 = "sha256-7/icSneLQzwdkRL/mS4RjsgnKa6YIVvGCmdS6pB6r5Y="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "ipdb == 0.13.9" "ipdb" + ''; + + propagatedBuildInputs = [ ipdb ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cliche" ]; + + meta = with lib; { + description = "Build a simple command-line interface from your functions :computer:"; + homepage = "https://github.com/kootenpv/cliche"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/click-aliases/0001-Fix-quotes-in-test.patch b/nixpkgs/pkgs/development/python-modules/click-aliases/0001-Fix-quotes-in-test.patch new file mode 100644 index 000000000000..13cc6a68e8d3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/click-aliases/0001-Fix-quotes-in-test.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nicolas Benes <nbenes.gh@xandea.de> +Date: Mon, 12 Jun 2023 11:29:32 +0200 +Subject: [PATCH] Fix quotes in test + + +diff --git a/tests/test_basic.py b/tests/test_basic.py +index 077e6c0..90bbdc3 100644 +--- a/tests/test_basic.py ++++ b/tests/test_basic.py +@@ -43,8 +43,8 @@ def test_foobar(runner): + + TEST_INVALID = """Usage: cli [OPTIONS] COMMAND [ARGS]... + {} +-Error: No such command "bar". +-""".format('Try "cli --help" for help.\n' if _click7 else '') ++Error: No such command 'bar'. ++""".format("Try 'cli --help' for help.\n" if _click7 else '') + + + def test_invalid(runner): +diff --git a/tests/test_foobar.py b/tests/test_foobar.py +index fd6c4e6..ab0ad5d 100644 +--- a/tests/test_foobar.py ++++ b/tests/test_foobar.py +@@ -44,8 +44,8 @@ def test_foobar(runner): + + TEST_INVALID = """Usage: cli [OPTIONS] COMMAND [ARGS]... + {} +-Error: No such command "baz". +-""".format('Try "cli --help" for help.\n' if _click7 else '') ++Error: No such command 'baz'. ++""".format("Try 'cli --help' for help.\n" if _click7 else '') + + + def test_invalid(runner): +-- +2.40.1 + diff --git a/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix b/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix new file mode 100644 index 000000000000..677cb1309fd7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "click-aliases"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "click-contrib"; + repo = "click-aliases"; + rev = "v${version}"; + hash = "sha256-vzWlCb4m9TdRaVz4DrlRRZ60+9gj60NoiALgvaIG0gA="; + }; + + patches = [ + ./0001-Fix-quotes-in-test.patch + ]; + + propagatedBuildInputs = [ + click + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "click_aliases" ]; + + meta = with lib; { + homepage = "https://github.com/click-contrib/click-aliases"; + description = "Enable aliases for click"; + license = licenses.mit; + maintainers = with maintainers; [ panicgh ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/click-command-tree/default.nix b/nixpkgs/pkgs/development/python-modules/click-command-tree/default.nix index 1f836a64e9fd..ccd7e74fc8dc 100644 --- a/nixpkgs/pkgs/development/python-modules/click-command-tree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-command-tree/default.nix @@ -1,31 +1,22 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , click , pytestCheckHook }: buildPythonPackage rec { pname = "click-command-tree"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "whwright"; repo = pname; rev = version; - hash = "sha256-vFOcn+ibyLZnhU3OQMtnHI04UqAY2/CCvhq4EEU4XFo="; + hash = "sha256-uBp7462LutL8aFRFix3pbVYbSf1af6k0nW0J0HhJa1U="; }; - patches = [ - (fetchpatch { - name = "remove-setup-downloading-flake8.patch"; - url = "https://github.com/whwright/click-command-tree/commit/1ecfcfa29bf01e1131e6ec712bd7338ac1283dc8.patch"; - hash = "sha256-u5jsNfEo1+XNlkVGPCM/rsDPnYko6cr2z2si9nq+sLA="; - }) - ]; - propagatedBuildInputs = [ click ]; diff --git a/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix b/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix index 2f8600a37352..b1a2defe518f 100644 --- a/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "click-option-group"; - version = "0.5.5"; + version = "0.5.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "click-contrib"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ur7ycioZmgWMp4N+MURj1ggYMzs2eauteg1B5eLkSvc="; + hash = "sha256-uR5rIZPPT6pRk/jJEy2rZciOXrHWVWN6BfGroQ3znas="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/click/default.nix b/nixpkgs/pkgs/development/python-modules/click/default.nix index bb86932a709e..6844cfb649a0 100644 --- a/nixpkgs/pkgs/development/python-modules/click/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click/default.nix @@ -5,7 +5,7 @@ , importlib-metadata , pytestCheckHook -# large-rebuild downstream dependencies and applications + # large-rebuild downstream dependencies and applications , flask , black , magic-wormhole @@ -43,6 +43,6 @@ buildPythonPackage rec { composable way, with as little code as necessary. ''; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cliff/tests.nix b/nixpkgs/pkgs/development/python-modules/cliff/tests.nix index 56a29a6ef6ab..a2738cc590e8 100644 --- a/nixpkgs/pkgs/development/python-modules/cliff/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/cliff/tests.nix @@ -5,11 +5,10 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { pname = "cliff"; - inherit (cliff) version; - - src = cliff.src; + inherit (cliff) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/nixpkgs/pkgs/development/python-modules/clifford/default.nix index e277ef409d34..645fdc43764f 100644 --- a/nixpkgs/pkgs/development/python-modules/clifford/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clifford/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { description = "Numerical Geometric Algebra Module"; homepage = "https://clifford.readthedocs.io"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cligj/default.nix b/nixpkgs/pkgs/development/python-modules/cligj/default.nix index b71f1945e084..521a7b31ef36 100644 --- a/nixpkgs/pkgs/development/python-modules/cligj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cligj/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Click params for commmand line interfaces to GeoJSON"; + description = "Click params for command line interfaces to GeoJSON"; homepage = "https://github.com/mapbox/cligj"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; diff --git a/nixpkgs/pkgs/development/python-modules/clintermission/default.nix b/nixpkgs/pkgs/development/python-modules/clintermission/default.nix index c4bf46135aa8..c84fd16f823c 100644 --- a/nixpkgs/pkgs/development/python-modules/clintermission/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clintermission/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/sebageek/clintermission"; changelog = "https://github.com/sebageek/clintermission/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/clize/default.nix b/nixpkgs/pkgs/development/python-modules/clize/default.nix index 91c362237f41..d708cd93a4ae 100644 --- a/nixpkgs/pkgs/development/python-modules/clize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clize/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "clize"; - version = "5.0.0"; + version = "5.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/cFpEvAN/Movd38xaE53Y+D9EYg/SFyHeqtlVUo1D0I="; + hash = "sha256-BH9aRHNgJxirG4VnKn4VMDOHF41agcJ13EKd+sHstRA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix b/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix index d8ed37e7110a..a8e958307987 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.11.2"; + version = "2.11.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-igOsDHqfjD1cxcHYsTNbjkhsxKR7LNJf5Zw1kkr4a2E="; + hash = "sha256-ZTHUyvFguvME0Jl0JRzwWmJOaWPUz4RFeMEVTvupb14="; }; propagatedBuildInputs = [ @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/cloudflare/python-cloudflare"; changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix b/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix index 42282fc17838..5e6aac6ff13b 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.2"; + version = "2.0.7"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - hash = "sha256-6y63xo3ftZPT7GX/oN8bHZIEJRdKnUFar3eThjyKN6w="; + hash = "sha256-Vw5ifMJ+gwXecYjSe8QKkq+RtrBWxx3B/LdA80ZxuxU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix b/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix index f134b488cc32..042091634481 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.5.1"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-L7sEv0xe8+riJb7DW2N6+MsoXBXJNzK96oGkpAkAyLU="; + hash = "sha256-1p0Lrx4uirgyhE8cdhrSOJLBSN11f6X5WqdWtVutDzQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloup/default.nix b/nixpkgs/pkgs/development/python-modules/cloup/default.nix index 1ee2e652a5ce..d5502d9a9fa2 100644 --- a/nixpkgs/pkgs/development/python-modules/cloup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloup/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloup"; - version = "2.1.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3ULHyc1JP63FOkI2+WF4o/EYu72UWn+K2vzVA02CaXE="; + hash = "sha256-ur1L3P0nT4Z3nW0845ueoPbMWrPU7+NbpoQebW0DeJM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix b/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix new file mode 100644 index 000000000000..213a57ff0621 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix @@ -0,0 +1,79 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +, dotnetCorePackages +, setuptools +, setuptools-scm +, wheel +, buildDotnetModule +, cffi +}: + +let + pname = "clr-loader"; + version = "0.2.5"; + src = fetchPypi { + pname = "clr_loader"; + inherit version; + hash = "sha256-gu1ftlRynRT9iCludLtrhOss+5dv9LfUnU5En9eKIms="; + }; + + # This buildDotnetModule is used only to get nuget sources, the actual + # build is done in `buildPythonPackage` below. + dotnet-build = buildDotnetModule { + inherit pname version src; + projectFile = [ "netfx_loader/ClrLoader.csproj" "example/example.csproj" ]; + nugetDeps = ./deps.nix; + }; +in +buildPythonPackage { + inherit pname version src; + + format = "pyproject"; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + dotnetCorePackages.sdk_6_0 + ]; + + propagatedBuildInputs = [ + cffi + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # TODO: mono does not work due to https://github.com/NixOS/nixpkgs/issues/7307 + "test_mono" + "test_mono_debug" + "test_mono_signal_chaining" + "test_mono_set_dir" + ]; + + # Perform dotnet restore based on the nuget-source + preConfigure = '' + dotnet restore "netfx_loader/ClrLoader.csproj" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source "${dotnet-build.nuget-source}" + + dotnet restore "example/example.csproj" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source "${dotnet-build.nuget-source}" + ''; + + passthru.fetch-deps = dotnet-build.fetch-deps; + + meta = with lib; { + description = "Generic pure Python loader for .NET runtimes"; + homepage = "https://pythonnet.github.io/clr-loader/"; + license = licenses.mit; + maintainers = with maintainers; [ mdarocha ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/clr-loader/deps.nix b/nixpkgs/pkgs/development/python-modules/clr-loader/deps.nix new file mode 100644 index 000000000000..df303afaa791 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/clr-loader/deps.nix @@ -0,0 +1,11 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net47"; version = "1.0.0"; sha256 = "00v56phfn01ahf4fq7zanz6hjyzpp00hkkk4a190l0dywrv387i6"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "NXPorts"; version = "1.0.0"; sha256 = "02zva596c3vsnlhi1b1391vbfl8a6142dvm61r8j1c70b07916lj"; }) +] diff --git a/nixpkgs/pkgs/development/python-modules/clustershell/default.nix b/nixpkgs/pkgs/development/python-modules/clustershell/default.nix index da99e446600d..f95b9f02aa10 100644 --- a/nixpkgs/pkgs/development/python-modules/clustershell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clustershell/default.nix @@ -98,7 +98,7 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "Scalable Python framework for cluster administration"; homepage = "https://cea-hpc.github.io/clustershell"; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/python-modules/cma/default.nix b/nixpkgs/pkgs/development/python-modules/cma/default.nix index ee3a552b94f3..82fdcf07153d 100644 --- a/nixpkgs/pkgs/development/python-modules/cma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cma/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization"; homepage = "https://github.com/CMA-ES/pycma"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/coffea/default.nix b/nixpkgs/pkgs/development/python-modules/coffea/default.nix new file mode 100644 index 000000000000..ac0c293e29ab --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/coffea/default.nix @@ -0,0 +1,97 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, hatch-vcs +, awkward +, uproot +, dask +, dask-awkward +, dask-histogram +, correctionlib +, pyarrow +, fsspec +, matplotlib +, numba +, numpy +, scipy +, tqdm +, lz4 +, cloudpickle +, toml +, mplhep +, packaging +, pandas +, hist +, cachetools +, distributed +, pyinstrument +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "coffea"; + version = "2023.6.0.rc1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "CoffeaTeam"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-TEtQ2KnwcylQbprlRtgHv7HIFg7roDWD4TihrQE4icU="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "numba>=0.57.0" "numba" + ''; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + awkward + uproot + dask + dask.optional-dependencies.array + dask-awkward + dask-histogram + correctionlib + pyarrow + fsspec + matplotlib + numba + numpy + scipy + tqdm + lz4 + cloudpickle + toml + mplhep + packaging + pandas + hist + cachetools + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeCheckInputs = [ + distributed + pyinstrument + pytestCheckHook + ]; + + pythonImportsCheck = [ + "coffea" + ]; + + meta = with lib; { + description = "Basic tools and wrappers for enabling not-too-alien syntax when running columnar Collider HEP analysis"; + homepage = "https://github.com/CoffeaTeam/coffea"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cohere/default.nix b/nixpkgs/pkgs/development/python-modules/cohere/default.nix index 441cfb7723f9..dddb7e892e0c 100644 --- a/nixpkgs/pkgs/development/python-modules/cohere/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cohere/default.nix @@ -3,21 +3,22 @@ , fetchPypi , poetry-core , pythonOlder -, requests , aiohttp , backoff +, importlib-metadata +, requests }: buildPythonPackage rec { pname = "cohere"; - version = "4.5.1"; + version = "4.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+/oeZpYyCrQava0lEt5uLlSc65XaBCyI/G/lwAxfBTA="; + hash = "sha256-i6kbjugulAcmmInFb+rH4WB50dM7SDO1HNW/JgD4OTQ="; }; nativeBuildInputs = [ @@ -25,9 +26,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - requests aiohttp backoff + importlib-metadata + requests ]; # tests require CO_API_KEY diff --git a/nixpkgs/pkgs/development/python-modules/coincurve/default.nix b/nixpkgs/pkgs/development/python-modules/coincurve/default.nix index e7a07a8572e1..1ad80f6d6694 100644 --- a/nixpkgs/pkgs/development/python-modules/coincurve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coincurve/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { description = "Cross-platform bindings for libsecp256k1"; homepage = "https://github.com/ofek/coincurve"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 31fc61aa0d98..976b1abbb871 100644 --- a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -5,10 +5,11 @@ , orjson , pandas , poetry-core -, pytestCheckHook , pytest-mock -, pythonOlder +, pytestCheckHook , python-dateutil +, pythonOlder +, pythonRelaxDepsHook , requests , typer , websocket-client @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.5.26.17"; + version = "2023.6.8.20"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,11 +27,16 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-GCHXraeH6WWTlCnw9B1Xwtb6jwcxcvW1siy2T/8x14Q="; + hash = "sha256-Koll0pod0vSW/F3veGTn8JYOMQI61REUW6Eh+TDJKNI="; }; + pythonRelaxDeps = [ + "typer" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -52,7 +58,9 @@ buildPythonPackage rec { passthru = { optional-dependencies = { - pandas = [ pandas ]; + pandas = [ + pandas + ]; }; updateScript = nix-update-script { }; }; diff --git a/nixpkgs/pkgs/development/python-modules/colorcet/default.nix b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix index ea3b729032a3..9167fd5a4f26 100644 --- a/nixpkgs/pkgs/development/python-modules/colorcet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colorcet/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Collection of perceptually uniform colormaps"; homepage = "https://colorcet.pyviz.org"; license = licenses.cc-by-40; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/commandparse/default.nix b/nixpkgs/pkgs/development/python-modules/commandparse/default.nix index 68da870f4e2d..e146649604f0 100644 --- a/nixpkgs/pkgs/development/python-modules/commandparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/commandparse/default.nix @@ -1,20 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "commandparse"; - version = "1.1.1"; + version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "06mcxc0vs5qdcywalgyx5zm18z4xcsrg5g0wsqqv5qawkrvmvl53"; + sha256 = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; }; # tests only distributed upstream source, not PyPi doCheck = false; - pythonImportsCheck = [ "commandparse" ]; + + pythonImportsCheck = [ + "commandparse" + ]; meta = with lib; { description = "Python module to parse command based CLI application"; diff --git a/nixpkgs/pkgs/development/python-modules/commentjson/default.nix b/nixpkgs/pkgs/development/python-modules/commentjson/default.nix index 78001464bf45..d40de1ad8c2f 100644 --- a/nixpkgs/pkgs/development/python-modules/commentjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/commentjson/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Add JavaScript or Python style comments in JSON"; homepage = "https://github.com/vaidik/commentjson/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/compreffor/default.nix b/nixpkgs/pkgs/development/python-modules/compreffor/default.nix index 00f69b69497f..e08c348f384c 100644 --- a/nixpkgs/pkgs/development/python-modules/compreffor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/compreffor/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "compreffor"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-fUEpbU+wqh72lt/ZJdKvMifUAwYivpmzx9QQfcb4cTo="; + hash = "sha256-MGulQEUGPrQ30T3VYzwRRlvzvWkFqNzqsNzAjtjX9xU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/confection/default.nix b/nixpkgs/pkgs/development/python-modules/confection/default.nix index 08dccaafcf1b..d4b3152c3b46 100644 --- a/nixpkgs/pkgs/development/python-modules/confection/default.nix +++ b/nixpkgs/pkgs/development/python-modules/confection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "confection"; - version = "0.0.4"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "explosion"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JZQ9D5+UAobywlj8eiyw15wXKYhUKz6+lf9hikMV6x0="; + hash = "sha256-OpUMx8hcTnBdaATzRXBICwF6eAGsdyA0jFvX4nVBiM4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/configargparse/default.nix b/nixpkgs/pkgs/development/python-modules/configargparse/default.nix index 7d4728374f50..1e1e2885f04f 100644 --- a/nixpkgs/pkgs/development/python-modules/configargparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/configargparse/default.nix @@ -4,33 +4,43 @@ , mock , pytestCheckHook , pyyaml +, pythonOlder }: buildPythonPackage rec { pname = "configargparse"; - version = "1.5.3"; - + version = "1.5.5"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; - rev = "v${version}"; - sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; + rev = "refs/tags/${version}"; + hash = "sha256-nhsbgyoIsYyrW20j4X4RosMJU/B+j7Z5YbebmZCLW4I="; + }; + + passthru.optional-dependencies = { + yaml = [ + pyyaml + ]; }; nativeCheckInputs = [ - mock pytestCheckHook - pyyaml - ]; + mock + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ "configargparse" ]; + pythonImportsCheck = [ + "configargparse" + ]; meta = with lib; { description = "A drop-in replacement for argparse"; homepage = "https://github.com/bw2/ConfigArgParse"; + changelog = "https://github.com/bw2/ConfigArgParse/releases/tag/${version}"; license = licenses.mit; - maintainers = [ maintainers.willibutz ]; + maintainers = with maintainers; [ willibutz ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix b/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix index 17f33d8b7fc9..03cdb826786c 100644 --- a/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,22 +1,73 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: +{ lib +, avro +, buildPythonPackage +, fastavro +, fetchFromGitHub +, jsonschema +, protobuf +, pyflakes +, pyrsistent +, pytestCheckHook +, pythonOlder +, rdkafka +, requests +, requests-mock +}: buildPythonPackage rec { - version = "2.0.2"; pname = "confluent-kafka"; + version = "2.1.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-OzQupCJu0QXKi8A1sId+TcLxFf/adOOjUPNjaDNWUVs="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "confluentinc"; + repo = "confluent-kafka-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-xnbovQRvbhaYYXnssV0Jy+U9L6BUddIagbup2jdTugY="; + }; + + buildInputs = [ + rdkafka + ]; + + propagatedBuildInputs = [ + requests + ]; + + passthru.optional-dependencies = { + avro = [ + avro + fastavro + ]; + json = [ + jsonschema + pyrsistent + ]; + protobuf = [ + protobuf + ]; }; - buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; + nativeCheckInputs = [ + pyflakes + pytestCheckHook + requests-mock + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "confluent_kafka" + ]; - # No tests in PyPi Tarball - doCheck = false; + disabledTestPaths = [ + "tests/integration/" + ]; meta = with lib; { description = "Confluent's Apache Kafka client for Python"; homepage = "https://github.com/confluentinc/confluent-kafka-python"; + changelog = "https://github.com/confluentinc/confluent-kafka-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ mlieberman85 ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/cons/default.nix b/nixpkgs/pkgs/development/python-modules/cons/default.nix index 2f352aebd18b..d08f5deb3c96 100644 --- a/nixpkgs/pkgs/development/python-modules/cons/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cons/default.nix @@ -5,17 +5,21 @@ , py , pytestCheckHook , pytest-html +, pythonOlder }: buildPythonPackage rec { pname = "cons"; - version = "0.4.5"; + version = "0.4.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pythological"; repo = "python-cons"; - rev = "fbeedfc8a3d1bff4ba179d492155cdd55538365e"; - hash = "sha256-ivHFep9iYPvyiBIZKMAzqrLGnQkeuxd0meYMZwZFFH0="; + rev = "refs/tags/v${version}"; + hash = "sha256-XssERKiv4A8x7dZhLeFSciN6RCEfGs0or3PAQiYSPII="; }; propagatedBuildInputs = [ @@ -38,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "An implementation of Lisp/Scheme-like cons in Python"; homepage = "https://github.com/pythological/python-cons"; - changelog = "https://github.com/pythological/python-cons/releases"; + changelog = "https://github.com/pythological/python-cons/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ Etjean ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/constantly/default.nix b/nixpkgs/pkgs/development/python-modules/constantly/default.nix index b75eca716365..b88163506476 100644 --- a/nixpkgs/pkgs/development/python-modules/constantly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/constantly/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi -}: -buildPythonPackage rec { - pname = "constantly"; - version = "15.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0dgwdla5kfpqz83hfril716inm41hgn9skxskvi77605jbmp4qsq"; - }; +{ lib, buildPythonPackage, fetchFromGitHub, twisted }: + +let + self = buildPythonPackage rec { + pname = "constantly"; + version = "15.1.0"; + + src = fetchFromGitHub { + owner = "twisted"; + repo = "constantly"; + rev = version; + hash = "sha256-0RPK5Vy0b6V4ubvm+vfNOAua7Qpa6j+G+QNExFuHgUU="; + }; + + # would create dependency loop with twisted + doCheck = false; + + nativeCheckInputs = [ twisted ]; + + checkPhase = '' + trial constantly + ''; + + pythonImportsCheck = [ "constantly" ]; - pythonImportsCheck = [ "constantly" ]; + passthru.tests.constantly = self.overrideAttrs (_: { doInstallCheck = true; }); - meta = with lib; { - homepage = "https://github.com/twisted/constantly"; - description = "symbolic constant support"; - license = licenses.mit; - maintainers = [ ]; + meta = with lib; { + homepage = "https://github.com/twisted/constantly"; + description = "symbolic constant support"; + license = licenses.mit; + maintainers = [ ]; + }; }; -} +in +self diff --git a/nixpkgs/pkgs/development/python-modules/coredis/default.nix b/nixpkgs/pkgs/development/python-modules/coredis/default.nix new file mode 100644 index 000000000000..1e3375b28bd1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/coredis/default.nix @@ -0,0 +1,59 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, async-timeout +, deprecated +, pympler +, wrapt +, pytestCheckHook +, redis +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "coredis"; + version = "4.14.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "alisaifee"; + repo = pname; + rev = version; + hash = "sha256-pHCQ5dePk2VhYNf/Ka+sovIn2OAVYHnLQhPFVjKmgb4="; + }; + + postPatch = '' + substituteInPlace pytest.ini --replace "-K" "" + ''; + + propagatedBuildInputs = [ + async-timeout + deprecated + pympler + wrapt + ]; + + pythonImportsCheck = [ "coredis" ]; + + nativeCheckInputs = [ + pytestCheckHook + redis + pytest-asyncio + ]; + + # all other tests require docker + pytestFlagsArray = [ + "tests/test_lru_cache.py" + "tests/test_parsers.py" + "tests/test_retry.py" + "tests/test_utils.py" + ]; + + meta = with lib; { + changelog = "https://github.com/alisaifee/coredis/blob/${src.rev}/HISTORY.rst"; + homepage = "https://github.com/alisaifee/coredis"; + description = "An async redis client with support for redis server, cluster & sentinel"; + license = licenses.mit; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/nixpkgs/pkgs/development/python-modules/cornice/default.nix index 9062ad22fd83..49825c7af2a1 100644 --- a/nixpkgs/pkgs/development/python-modules/cornice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cornice/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/mozilla-services/cornice"; description = "Build Web Services with Pyramid"; license = licenses.mpl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix b/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix new file mode 100644 index 000000000000..41ac4a8f8f36 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, numpy +, scikit-build +, setuptools +, setuptools-scm +, pybind11 +, pydantic +, pytestCheckHook +, rich +, scipy +, zlib +}: + +buildPythonPackage rec { + pname = "correctionlib"; + version = "2.2.2"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-h3eggtPLSF/8ShQ5xzowZW1KSlcI/YBsPu3lsSyzHkw="; + }; + + nativeBuildInputs = [ + cmake + numpy + scikit-build + setuptools + setuptools-scm + pybind11 + ]; + + buildInputs = [ + zlib + ]; + + propagatedBuildInputs = [ + pydantic + rich + ]; + + dontUseCmakeConfigure = true; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeCheckInputs = [ + pytestCheckHook + scipy + ]; + + pythonImportsCheck = [ + "correctionlib" + ]; + + 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"; + homepage = "https://cms-nanoaod.github.io/correctionlib/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix b/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix index 7880999746b0..1ee4fe165878 100644 --- a/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cpyparsing"; - version = "2.4.7.1.2.1"; + version = "2.4.7.2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "evhub"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HJ0I5DKZ2WV+1pXZCvJHA7Wih3Gkn7vL/ojXnTssKxw="; + hash = "sha256-Y3EyX9Gjssez0DkD6dIaOpazNLy7rDYzjKO1u+lLGFI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/crc/default.nix b/nixpkgs/pkgs/development/python-modules/crc/default.nix index 6117ad4c5aea..eee1f058366f 100644 --- a/nixpkgs/pkgs/development/python-modules/crc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crc/default.nix @@ -3,27 +3,38 @@ , fetchFromGitHub , poetry-core , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "crc"; - version = "4.2.0"; + version = "4.3.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "Nicoretti"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-h/RVMIJX+Lyted0FHNBcKY54EiirSclkBXCpAQSATq8="; + hash = "sha256-rH/jc6/gxww3NSCYrhu+InZX1HTTdJFfa52ioU8AclY="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; - pythonImportsCheck = [ "crc" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "crc" + ]; - disabledTestPaths = [ "test/bench" ]; + disabledTestPaths = [ + "test/bench" + ]; meta = with lib; { changelog = "https://github.com/Nicoretti/crc/releases/tag/${version}"; diff --git a/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/nixpkgs/pkgs/development/python-modules/croniter/default.nix index 6cc8bd247627..12268dc72aee 100644 --- a/nixpkgs/pkgs/development/python-modules/croniter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/croniter/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.3.15"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kko4/aiPZ17Gg1Zn4dMqw3/w1lUJwhUnKdFv8gXjKmU="; + hash = "sha256-Gm32DqzsO3oKpSqPLvJRrj3Sp8fIuYdOc+eRY21Vo2E="; }; propagatedBuildInputs = [ @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/kiorky/croniter"; changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 4815bfe90559..2ebcb9efffe2 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -52,14 +52,14 @@ buildPythonPackage rec { cargoRoot = "src/rust"; - nativeBuildInputs = lib.optionals (!isPyPy) [ - cffi - pkg-config - ] ++ [ + nativeBuildInputs = [ rustPlatform.cargoSetupHook setuptools-rust cargo rustc + pkg-config + ] ++ lib.optionals (!isPyPy) [ + cffi ]; buildInputs = [ openssl ] @@ -72,8 +72,7 @@ buildPythonPackage rec { nativeCheckInputs = [ cryptography-vectors - # "hypothesis" indirectly depends on cryptography to build its documentation - (hypothesis.override { enableDocumentation = false; }) + hypothesis iso8601 pretend py diff --git a/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix index 5133f1642e13..07e5c19f8d2b 100644 --- a/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix @@ -5,11 +5,12 @@ , pycryptodome , pythonOlder , setuptools +, solc-select }: buildPythonPackage rec { pname = "crytic-compile"; - version = "0.3.0"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,18 +19,22 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; rev = "refs/tags/${version}"; - hash = "sha256-4iTvtu2TmxvLTyWm4PV0+yV1fRLYpJHZNBgjy1MFLjM="; + hash = "sha256-Nx3eKy/0BLg82o3qDHjxcHXtpX3KDdnBKYwCuTLWRUE="; }; propagatedBuildInputs = [ cbor2 pycryptodome setuptools + solc-select ]; # Test require network access doCheck = false; + # required for import check to work + # PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + env.HOME = "/tmp"; pythonImportsCheck = [ "crytic_compile" ]; @@ -39,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/crytic/crytic-compile"; changelog = "https://github.com/crytic/crytic-compile/releases/tag/${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 arturcygan ]; + maintainers = with maintainers; [ arturcygan hellwolf ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cson/default.nix b/nixpkgs/pkgs/development/python-modules/cson/default.nix new file mode 100644 index 000000000000..c05ad78240c0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cson/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, speg +}: + +buildPythonPackage rec { + pname = "cson"; + version = "0.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-7owBZvzR9ReJiHGX4+g1Sse++jlvwpcGvOta8l7cngE="; + }; + + propagatedBuildInputs = [ speg ]; + + pythonImportChecks = [ "cson" ]; + + meta = with lib; { + description = "A python parser for the Coffeescript Object Notation (CSON)"; + homepage = "https://github.com/avakar/pycson"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ xworld21 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/css-inline/Cargo.lock b/nixpkgs/pkgs/development/python-modules/css-inline/Cargo.lock index bfb78a2ac79e..58bca2b6e0f7 100644 --- a/nixpkgs/pkgs/development/python-modules/css-inline/Cargo.lock +++ b/nixpkgs/pkgs/development/python-modules/css-inline/Cargo.lock @@ -9,6 +9,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -46,9 +52,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "built" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" +checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" dependencies = [ "cargo-lock", "chrono", @@ -56,9 +62,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byteorder" @@ -74,9 +80,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cargo-lock" -version = "8.0.3" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" +checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ "semver", "serde", @@ -98,12 +104,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "winapi", ] @@ -152,9 +158,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -165,29 +171,30 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] name = "css-inline" -version = "0.8.5" +version = "0.10.1" dependencies = [ "attohttpc", - "cssparser 0.29.6", + "cssparser", + "html5ever", "indexmap", - "kuchiki", "memchr", + "selectors", "smallvec", "url", ] [[package]] name = "css-inline-python" -version = "0.8.7" +version = "0.10.1" dependencies = [ "built", "css-inline", @@ -199,30 +206,13 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser" version = "0.29.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" dependencies = [ "cssparser-macros", "dtoa-short", - "itoa 1.0.6", + "itoa", "matches", "phf 0.10.1", "proc-macro2", @@ -233,12 +223,12 @@ dependencies = [ [[package]] name = "cssparser-macros" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -256,15 +246,15 @@ dependencies = [ [[package]] name = "dtoa" -version = "0.4.8" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" [[package]] name = "dtoa-short" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" dependencies = [ "dtoa", ] @@ -293,9 +283,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -332,9 +322,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -358,9 +348,9 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.25.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ "log", "mac", @@ -378,14 +368,14 @@ checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa 1.0.6", + "itoa", ] [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -406,9 +396,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -432,48 +422,30 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser 0.27.2", - "html5ever", - "matches", - "selectors", -] - -[[package]] name = "libc" -version = "0.2.144" +version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -481,12 +453,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "mac" @@ -496,13 +465,13 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "markup5ever" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ "log", - "phf 0.8.0", - "phf_codegen", + "phf 0.10.1", + "phf_codegen 0.10.0", "string_cache", "string_cache_codegen", "tendril", @@ -522,9 +491,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -551,16 +520,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] name = "num-traits" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -581,9 +540,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" @@ -597,22 +556,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "phf" @@ -620,9 +579,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_macros 0.8.0", "phf_shared 0.8.0", - "proc-macro-hack", ] [[package]] @@ -631,7 +588,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros 0.10.0", + "phf_macros", "phf_shared 0.10.0", "proc-macro-hack", ] @@ -647,6 +604,16 @@ dependencies = [ ] [[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] name = "phf_generator" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -668,20 +635,6 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_macros" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" @@ -732,18 +685,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.57" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" +checksum = "cffef52f74ec3b1a1baf295d9b8fcc3070327aefc39a6d00656b13c1d0b8885c" dependencies = [ "cfg-if", "indoc", @@ -758,9 +711,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +checksum = "713eccf888fb05f1a96eb78c0dbc51907fee42b3377272dc902eb38985f418d5" dependencies = [ "once_cell", "target-lexicon", @@ -774,9 +727,9 @@ checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" [[package]] name = "pyo3-ffi" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +checksum = "5b2ecbdcfb01cbbf56e179ce969a048fd7305a66d4cdf3303e0da09d69afe4c3" dependencies = [ "libc", "pyo3-build-config", @@ -784,9 +737,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" +checksum = "b78fdc0899f2ea781c463679b20cb08af9247febc8d052de941951024cd8aea0" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -796,9 +749,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" +checksum = "60da7b84f1227c3e2fe7593505de274dcf4c8928b4e0a1c23d551a14e4e80a0f" dependencies = [ "proc-macro2", "quote", @@ -807,9 +760,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -874,7 +827,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -919,9 +872,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] @@ -952,9 +905,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" dependencies = [ "log", "ring", @@ -990,22 +943,20 @@ dependencies = [ [[package]] name = "selectors" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" dependencies = [ "bitflags", - "cssparser 0.27.2", + "cssparser", "derive_more", "fxhash", "log", - "matches", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", "smallvec", - "thin-slice", ] [[package]] @@ -1019,29 +970,38 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.163" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", +] + +[[package]] +name = "serde_spanned" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +dependencies = [ + "serde", ] [[package]] name = "servo_arc" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" dependencies = [ "nodrop", "stable_deref_trait", @@ -1110,9 +1070,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -1121,9 +1081,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" [[package]] name = "tendril" @@ -1137,12 +1097,6 @@ dependencies = [ ] [[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1159,14 +1113,39 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.5.11" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" dependencies = [ "serde", ] [[package]] +name = "toml_edit" +version = "0.19.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] name = "unicode-bidi" version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1174,9 +1153,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -1201,9 +1180,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -1230,9 +1209,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1240,24 +1219,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1265,28 +1244,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.62" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -1304,9 +1283,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa54963694b65584e170cf5dc46aeb4dcaa5584e652ff5f3952e56d66aff0125" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ "rustls-webpki", ] @@ -1339,31 +1318,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] @@ -1372,95 +1327,62 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" +name = "winnow" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +dependencies = [ + "memchr", +] diff --git a/nixpkgs/pkgs/development/python-modules/css-inline/default.nix b/nixpkgs/pkgs/development/python-modules/css-inline/default.nix index 96535eb94d95..9eb36c8bd61b 100644 --- a/nixpkgs/pkgs/development/python-modules/css-inline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/css-inline/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "css-inline"; - version = "0.8.7"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Stranger6667"; repo = "css-inline"; rev = "python-v${version}"; - hash = "sha256-VtWvzEqozbRo9OIcObdaRRqDq9Tcp0KxXOPZWO5qTeE="; + hash = "sha256-oBAJv/hAz/itT2WakIw/1X1NvOHX108NoeS6V7k+aG8="; }; postPatch = '' @@ -32,14 +32,16 @@ buildPythonPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; + # call `cargo build --release` in bindings/python and copy the + # resulting lock file cargoDeps = rustPlatform.fetchCargoTarball { inherit src; postPatch = '' - cd bindings/python + cd bindings/python ln -s ${./Cargo.lock} Cargo.lock ''; name = "${pname}-${version}"; - hash = "sha256-S8ebg5sMK7zoG84eAeXIWqDYuRVW9Mx9GJUAaKD9mxw="; + hash = "sha256-SFG1nsP4+I0zH8VeyL1eeaTx0tHNIvmx6M0cko0pqIA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index 0f37366ed7f2..75ded7bd3e59 100644 --- a/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cssutils"; - version = "2.6.0"; + version = "2.7.1"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-99zSPBzskJ/fNjDeNG4UE7eyVVk23sFLouu5kTvwgY4="; + hash = "sha256-NA7P2YNdId+PmFAPDfzqCu5By04Z7Lws+U8KbTbXy2w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ctranslate2/default.nix b/nixpkgs/pkgs/development/python-modules/ctranslate2/default.nix new file mode 100644 index 000000000000..bfb8c31a48a8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ctranslate2/default.nix @@ -0,0 +1,84 @@ +{ lib +, buildPythonPackage + +# build-system +, pybind11 +, setuptools + +# dependencies +, ctranslate2-cpp +, numpy +, pyyaml + +# tests +, pytestCheckHook +, tensorflow +, torch +, transformers +, wurlitzer +}: + +buildPythonPackage rec { + inherit (ctranslate2-cpp) pname version src; + format = "setuptools"; + + # https://github.com/OpenNMT/CTranslate2/tree/master/python + sourceRoot = "${src.name}/python"; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + buildInputs = [ + ctranslate2-cpp + ]; + + propagatedBuildInputs = [ + numpy + pyyaml + ]; + + pythonImportsCheck = [ + # https://opennmt.net/CTranslate2/python/overview.html + "ctranslate2" + "ctranslate2.converters" + "ctranslate2.models" + "ctranslate2.specs" + ]; + + nativeCheckInputs = [ + pytestCheckHook + tensorflow + torch + transformers + wurlitzer + ]; + + preCheck = '' + # run tests against build result, not sources + rm -rf ctranslate2 + + export HOME=$TMPDIR + ''; + + disabledTests = [ + # AssertionError: assert 'int8' in {'float32'} + "test_get_supported_compute_types" + ]; + + disabledTestPaths = [ + # TODO: ModuleNotFoundError: No module named 'opennmt' + "tests/test_opennmt_tf.py" + # OSError: We couldn't connect to 'https://huggingface.co' to load this file + "tests/test_transformers.py" + ]; + + meta = with lib; { + description = "Fast inference engine for Transformer models"; + homepage = "https://github.com/OpenNMT/CTranslate2"; + changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/nixpkgs/pkgs/development/python-modules/cupy/default.nix index 7cc986e34b84..656447e2ef4c 100644 --- a/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -17,13 +17,13 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "12.0.0"; + version = "12.1.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Yd2773PVDWBr1Qh1cGRfPJHskXbCVmeEwdSG1qNARUU="; + hash = "sha256-9tMZic2y2WWB2hKCLiixAvKeJUQnGVwgF+rDJ4abcyA="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both diff --git a/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index e8ba85c3a98a..b6bbf7b2dfc6 100644 --- a/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "4.0.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xXtUEunPYiuVh+1o4xoFutGstZ918ju5xK5zLvgbLHc="; + hash = "sha256-GCY7M0XnVsGyuADSq/EzOy9fged5frj+hRDLhs2Uq8I="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dacite/default.nix b/nixpkgs/pkgs/development/python-modules/dacite/default.nix index a33a26d5224d..fca71b11a0e0 100644 --- a/nixpkgs/pkgs/development/python-modules/dacite/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dacite/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "dacite"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "konradhalas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aQwQHFWaXwTaA6GQgDcWT6ivE9YtWtHCTOtxDi503+M="; + hash = "sha256-lvObQ+jyBH2s4GOwyDXEAYmG7ZGQN9WDqL8ftNItPCQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/dash/default.nix b/nixpkgs/pkgs/development/python-modules/dash/default.nix index 2602a613ca31..d990d710d639 100644 --- a/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.10.1"; + version = "2.10.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-f/+GKbuijSE4LXhC7uPuLwJRk9xmChhanPIe2jagzEg="; + hash = "sha256-OcY4nEtIfR9nvBaBwpHeUJkHXwWZp+LZxjhEkwjRC9k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix b/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix index 1c6cb7b5bbe5..d7ef1204bc3e 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.4.2"; + version = "2023.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-c3NnARost/406cALQDKmeUsl2kFSQHAswAEwgreFXPc="; + hash = "sha256-sSsd35Psf3VEydkNxtd9mSBzV23S7fRM/jhbC9T62kY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix b/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix index 5ebc0c57389f..1d144b3db5f0 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -70,6 +70,6 @@ buildPythonPackage rec { description = "A multi-tenant server for securely deploying and managing multiple Dask clusters"; homepage = "https://gateway.dask.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix b/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix index af38853ef2c8..270999b55070 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-+YCHIfNq8E2rXO8b91Q1D21dVzNWnJZIKZeY4AETa7s="; }; - sourceRoot = "source/dask-gateway"; + sourceRoot = "${src.name}/dask-gateway"; nativeBuildInputs = [ setuptools ]; @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "A client library for interacting with a dask-gateway server"; homepage = "https://gateway.dask.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix index 28bcc8fbb5e8..77dbf3717d5d 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Generalized Linear Models with Dask"; homepage = "https://github.com/dask/dask-glm/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix b/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix new file mode 100644 index 000000000000..6b2fbb01d270 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, boost-histogram +, dask +, hatchling +, hatch-vcs +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dask-histogram"; + version = "2023.6.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dask-contrib"; + repo = "dask-histogram"; + rev = "refs/tags/${version}"; + hash = "sha256-9b2+vrUH8lZYsEbJg+GmY5zHZ+7PyA9NV2h5VAN0J1s="; + }; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + boost-histogram + dask + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dask_histogram" + ]; + + meta = with lib; { + description = "Histograms with task scheduling"; + homepage = "https://dask-histogram.readthedocs.io/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dask-image/default.nix b/nixpkgs/pkgs/development/python-modules/dask-image/default.nix index 3ae2278298a7..d53fc4ee5c59 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-image/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-image/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "dask-image"; - version = "2022.9.0"; + version = "2023.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8SPf0Wp9FcdmYqasFHeFCe1e7ZtJT0Mi5ZRemxWSNUc="; + hash = "sha256-M6qckhUG2DvBw2uY5pAJFyuvatC7owVlb6XWkkrzAys="; }; propagatedBuildInputs = [ @@ -45,10 +45,9 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Distributed image processing"; homepage = "https://github.com/dask/dask-image"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index 6061b294734c..e403545839fd 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "dask-jobqueue"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Fv0bZGoHOtPedd3hKg3+UpuDbyGjvbzuKoi+8k6REqc="; + hash = "sha256-01QHoFoFNDR8XZWK50m5+FNb7FKYV9ATtuVknN5DkUo="; }; propagatedBuildInputs = [ @@ -82,6 +82,6 @@ buildPythonPackage rec { description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; homepage = "https://github.com/dask/dask-jobqueue"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 73645bfb8180..3cb7ed9618b1 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Scalable Machine Learn with Dask"; homepage = "https://github.com/dask/dask-ml"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix b/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix index ecc5ebf60942..ed3215595c2b 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Deploy Dask using mpi4py"; homepage = "https://github.com/dask/dask-mpi"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/databases/default.nix b/nixpkgs/pkgs/development/python-modules/databases/default.nix index f3bbe6ace9d5..2f731daa1131 100644 --- a/nixpkgs/pkgs/development/python-modules/databases/default.nix +++ b/nixpkgs/pkgs/development/python-modules/databases/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { homepage = "https://github.com/encode/databases"; changelog = "https://github.com/encode/databases/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; # https://github.com/encode/databases/issues/530 broken = lib.versionAtLeast sqlalchemy.version "2.0.0"; }; diff --git a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index 12dfea0650a8..661e77703bc0 100644 --- a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -4,19 +4,18 @@ , typing-inspect , marshmallow-enum , hypothesis -, mypy , pytestCheckHook }: buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.7"; + version = "0.5.9"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; - rev = "v${version}"; - sha256 = "1xv9br6mm5pcwfy10ykbc1c0n83fqyj1pa81z272kqww7wpkkp6j"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-2/J+d7SQvUs7nXw1n+qwy0DQCplK28eUrbP7+yQPB7g="; }; propagatedBuildInputs = [ @@ -26,14 +25,14 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - mypy pytestCheckHook ]; - disabledTests = [ + disabledTestPaths = [ + # fails with the following error and avoid dependency on mypy # mypy_main(None, text_io, text_io, [__file__], clean_exit=True) # TypeError: main() takes at most 4 arguments (5 given) - "test_type_hints" + "tests/test_annotations.py" ]; pythonImportsCheck = [ "dataclasses_json" ]; diff --git a/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/nixpkgs/pkgs/development/python-modules/datadog/default.nix index bbac242bea97..d38279452317 100644 --- a/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.45.0"; + version = "0.46.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a//tZ0SMtL9d/1WfsqzuHAbn2oYSuOKnNPJ4tQs5ZgM="; + hash = "sha256-5PvJKoXisJGaImiWrkX8Xks1bAxX8cJlllnfvgeJxnQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix index 145342a60a36..380429809836 100644 --- a/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; homepage = "https://github.com/usnistgov/DataModelDict/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/nixpkgs/pkgs/development/python-modules/datasette/default.nix index 5dafa583f114..34a6bbf7dbbf 100644 --- a/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -102,6 +102,6 @@ buildPythonPackage rec { description = "Multi-tool for exploring and publishing data"; homepage = "https://datasette.io/"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/nixpkgs/pkgs/development/python-modules/datashader/default.nix index d9c5b1b4464d..41c0ad418d33 100644 --- a/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.14.4"; + version = "0.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AkHmEflRvjJFlycI5adpuxg6+/zu7Dzy7vbYCvd1b70="; + hash = "sha256-vkgfO9WGKMuaL5SxcwMQWKG6FEYxLgRbkvftUkMwg4s="; }; propagatedBuildInputs = [ @@ -98,6 +98,6 @@ buildPythonPackage rec { description = "Data visualization toolchain based on aggregating into a grid"; homepage = "https://datashader.org"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dateutils/default.nix b/nixpkgs/pkgs/development/python-modules/dateutils/default.nix index 9a53d92fe7f3..ba9996bbed73 100644 --- a/nixpkgs/pkgs/development/python-modules/dateutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dateutils/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Utilities for working with datetime objects."; homepage = "https://github.com/jmcantrell/python-dateutils"; license = licenses.bsd0; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/datrie/default.nix b/nixpkgs/pkgs/development/python-modules/datrie/default.nix index 920e31c7f11e..414474af6ccb 100644 --- a/nixpkgs/pkgs/development/python-modules/datrie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datrie/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , cython , pytestCheckHook , hypothesis @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "datrie"; version = "0.8.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -16,17 +18,17 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools cython ]; - buildInputs = [ - hypothesis + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner", ' "" - ''; + checkInputs = [ + hypothesis + ]; pythonImportsCheck = [ "datrie" ]; diff --git a/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix b/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix index b683db0901ff..d3fc32ab01d9 100644 --- a/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-db-dtypes-pandas"; changelog = "https://github.com/googleapis/python-db-dtypes-pandas/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix new file mode 100644 index 000000000000..9d456c84d22c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, agate +, dbt-core +, google-cloud-bigquery +, google-cloud-storage +, google-cloud-dataproc +, pytestCheckHook +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "dbt-bigquery"; + version = "1.5.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-mzqUdT+dI7U0tHHcr0joIB1UCfKXrDdqhtVFShjIKus="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "agate" + ]; + + propagatedBuildInputs = [ + agate + dbt-core + google-cloud-bigquery + google-cloud-storage + google-cloud-dataproc + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + pythonImportsCheck = [ + "dbt.adapters.bigquery" + ]; + + meta = with lib; { + description = "Plugin enabling dbt to operate on a BigQuery database"; + homepage = "https://github.com/dbt-labs/dbt-bigquery"; + changelog = "https://github.com/dbt-labs/dbt-bigquery/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix new file mode 100644 index 000000000000..bd346c3262d7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -0,0 +1,113 @@ +{ lib +, python3 +, buildPythonPackage +, fetchFromGitHub +, agate +, cffi +, click +, colorama +, dbt-extractor +, hologram +, idna +, isodate +, jinja2 +, logbook +, mashumaro +, minimal-snowplow-tracker +, networkx +, packaging +, pathspec +, protobuf +, pythonRelaxDepsHook +, pytz +, pyyaml +, requests +, sqlparse +, typing-extensions +, urllib3 +, werkzeug +}: + +buildPythonPackage rec { + pname = "dbt-core"; + version = "1.5.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-ZgP11fVMtXpzo9QaTkejvKl0LzCAkIyGBMcOquBirxQ="; + }; + + sourceRoot = "source/core"; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "agate" + "click" + "mashumaro" + "networkx" + ]; + + propagatedBuildInputs = [ + agate + cffi + click + colorama + dbt-extractor + hologram + idna + isodate + jinja2 + logbook + mashumaro + minimal-snowplow-tracker + networkx + packaging + pathspec + protobuf + pytz + pyyaml + requests + sqlparse + typing-extensions + urllib3 + werkzeug + ] ++ mashumaro.optional-dependencies.msgpack; + + # tests exist for the dbt tool but not for this package specifically + doCheck = false; + + passthru = { + withAdapters = python3.pkgs.callPackage ./with-adapters.nix { }; + }; + + meta = with lib; { + description = "Enables data analysts and engineers to transform their data using the same practices that software engineers use to build applications"; + longDescription = '' + The dbt tool needs adapters to data sources in order to work. The available + adapters are: + + dbt-bigquery + dbt-postgres + dbt-redshift + dbt-snowflake + + An example of building this package with a few adapters: + + dbt.withAdapters (adapters: [ + adapters.dbt-bigquery + adapters.dbt-postgres + ]) + ''; + homepage = "https://github.com/dbt-labs/dbt-core"; + changelog = "https://github.com/dbt-labs/dbt-core/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ mausch tjni ]; + mainProgram = "dbt"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dbt-core/with-adapters.nix b/nixpkgs/pkgs/development/python-modules/dbt-core/with-adapters.nix new file mode 100644 index 000000000000..006f4a96b853 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbt-core/with-adapters.nix @@ -0,0 +1,18 @@ +{ python3 +, dbt-bigquery +, dbt-core +, dbt-postgres +, dbt-redshift +, dbt-snowflake +}: +let + adapters = { + inherit dbt-bigquery dbt-postgres dbt-redshift dbt-snowflake; + }; +in +adapterFun: (python3.buildEnv.override { + extraLibs = [ dbt-core ] ++ (adapterFun adapters); + ignoreCollisions = true; +}).overrideAttrs { + meta.mainProgram = dbt-core.meta.mainProgram; +} diff --git a/nixpkgs/pkgs/development/python-modules/dbt-extractor/Cargo.lock b/nixpkgs/pkgs/development/python-modules/dbt-extractor/Cargo.lock new file mode 100644 index 000000000000..8b297123703a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbt-extractor/Cargo.lock @@ -0,0 +1,531 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ + "cfg-if", + "lazy_static", +] + +[[package]] +name = "dbt-extractor" +version = "0.4.1" +dependencies = [ + "pyo3", + "quickcheck", + "quickcheck_macros", + "rayon", + "thiserror", + "tree-sitter", + "tree-sitter-jinja2", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "instant" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" + +[[package]] +name = "lock_api" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memoffset" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "pyo3" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cf01dbf1c05af0a14c7779ed6f3aa9deac9c3419606ac9de537a2d649005720" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "parking_lot", + "paste", + "pyo3-build-config", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf9e4d128bfbddc898ad3409900080d8d5095c379632fbbfbb9c8cfb1fb852b" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pyo3-macros" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a" +dependencies = [ + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger", + "log", + "rand", +] + +[[package]] +name = "quickcheck_macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "syn" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "thiserror" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tree-sitter" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad726ec26496bf4c083fff0f43d4eb3a2ad1bba305323af5ff91383c0b6ecac0" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-jinja2" +version = "0.1.0" +source = "git+https://github.com/dbt-labs/tree-sitter-jinja2?tag=v0.1.0#52da7b0b1480b23381ea84cf5ea3bf058dd6d8c4" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "unindent" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix new file mode 100644 index 000000000000..2656be91086d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, rustPlatform +, libiconv +}: + +buildPythonPackage rec { + pname = "dbt-extractor"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchPypi { + pname = "dbt_extractor"; + inherit version; + hash = "sha256-dbHGZWmewPH/zhuj13b3386AIVbyLnCnucjwtNfoD0I="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "tree-sitter-jinja2-0.1.0" = "sha256-lzA2iq4AK0iNwkLvbIt7Jm5WGFbMPFDi6i4AFDm0FOU="; + }; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + + # no python tests exist + doCheck = false; + + pythonImportsCheck = [ + "dbt_extractor" + ]; + + meta = with lib; { + description = "A tool that processes the most common jinja value templates in dbt model files"; + homepage = "https://github.com/dbt-labs/dbt-extractor"; + license = licenses.asl20; + maintainers = with maintainers; [ mausch tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix new file mode 100644 index 000000000000..f5be13ccff7a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, agate +, dbt-core +, psycopg2 +}: + +buildPythonPackage { + pname = "dbt-postgres"; + format = "setuptools"; + + inherit (dbt-core) version src; + + sourceRoot = "source/plugins/postgres"; + + env.DBT_PSYCOPG2_NAME = "psycopg2"; + + propagatedBuildInputs = [ + agate + dbt-core + psycopg2 + ]; + + # tests exist for the dbt tool but not for this package specifically + doCheck = false; + + pythonImportsCheck = [ + "dbt.adapters.postgres" + ]; + + meta = with lib; { + description = "Plugin enabling dbt to work with a Postgres database"; + homepage = "https://github.com/dbt-labs/dbt-core"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix new file mode 100644 index 000000000000..b757683e9516 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, agate +, boto3 +, dbt-core +, dbt-postgres +, pytestCheckHook +, pythonRelaxDepsHook +, redshift-connector +}: + +buildPythonPackage rec { + pname = "dbt-redshift"; + version = "1.5.8"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-T7cNszIroOT8TNfOzZpdJDR1+5ybhkXvyvvM5zokVgo="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "boto3" + "redshift-connector" + ]; + + propagatedBuildInputs = [ + agate + boto3 + dbt-core + dbt-postgres + redshift-connector + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + pythonImportsCheck = [ + "dbt.adapters.redshift" + ]; + + meta = with lib; { + description = "Plugin enabling dbt to work with Amazon Redshift"; + homepage = "https://github.com/dbt-labs/dbt-redshift"; + changelog = "https://github.com/dbt-labs/dbt-redshift/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix new file mode 100644 index 000000000000..b32f7fbd9a6b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, dbt-core +, pytestCheckHook +, snowflake-connector-python +}: + +buildPythonPackage rec { + pname = "dbt-snowflake"; + version = "1.5.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Oz9BDvxSG4kOteuwKiPccxlsmQtOEwDLVyirDSWy1kY="; + }; + + propagatedBuildInputs = [ + dbt-core + snowflake-connector-python + ] ++ snowflake-connector-python.optional-dependencies.secure-local-storage; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + pythonImportsCheck = [ + "dbt.adapters.snowflake" + ]; + + meta = with lib; { + description = "Plugin enabling dbt to work with Snowflake"; + homepage = "https://github.com/dbt-labs/dbt-snowflake"; + changelog = "https://github.com/dbt-labs/dbt-snowflake/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index 58551be4de1f..ec01d5ab3327 100644 --- a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.86.0"; + version = "1.90.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YSkSnRQqalHpRVJx5PUO8EXXV8V6jRNpycO/GqNWmIM="; + hash = "sha256-B+NW7ORKIBtjxeR0W0tX7V1MgBtNoyGFX35TXUl7rVE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbutils/default.nix b/nixpkgs/pkgs/development/python-modules/dbutils/default.nix index dfff3a4d36a6..570f770e7777 100644 --- a/nixpkgs/pkgs/development/python-modules/dbutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbutils/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Database connections for multi-threaded environments"; homepage = "https://webwareforpython.github.io/DBUtils/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/debian/default.nix b/nixpkgs/pkgs/development/python-modules/debian/default.nix index 5fa306d651b0..70b33cfa7a3b 100644 --- a/nixpkgs/pkgs/development/python-modules/debian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/debian/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://salsa.debian.org/python-debian-team/python-debian"; changelog = "https://salsa.debian.org/python-debian-team/python-debian/-/blob/master/debian/changelog"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix b/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix index 5c10dc90904d..19386cdb53b8 100644 --- a/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix @@ -3,11 +3,10 @@ , stestr }: -buildPythonPackage rec { +buildPythonPackage { pname = "debtcollector-tests"; - inherit (debtcollector) version; - - src = debtcollector.src; + inherit (debtcollector) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/nixpkgs/pkgs/development/python-modules/decli/default.nix b/nixpkgs/pkgs/development/python-modules/decli/default.nix index 2926d2d10287..a1d6e0db2ead 100644 --- a/nixpkgs/pkgs/development/python-modules/decli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/decli/default.nix @@ -1,22 +1,41 @@ -{ buildPythonPackage -, lib -, fetchPypi +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "decli"; - version = "0.5.2"; + version = "0.6.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-8s3lUDSnXIGcYwx2VahExhLyWYxCwhKZFgRl32rUY60="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "woile"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-FZYKNKkQExx/YBn5y/W0+0aMlenuwEctYTL7LAXMZGE="; }; - pythonImportsCheck = [ "decli" ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "decli" + ]; meta = with lib; { description = "Minimal, easy to use, declarative command line interface tool"; homepage = "https://github.com/Woile/decli"; + changelog = "https://github.com/woile/decli/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/decorator/default.nix b/nixpkgs/pkgs/development/python-modules/decorator/default.nix index a918f7e941d2..c86721f9c736 100644 --- a/nixpkgs/pkgs/development/python-modules/decorator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/decorator/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/micheles/decorator"; description = "Better living through Python with decorators"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix b/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix index 758ea888b5f4..614affcc3fcb 100644 --- a/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.11.1"; + version = "1.11.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "deep_translator"; inherit version; - hash = "sha256-Q73sKqin8R8dUsMS9EjYXlxWDCSQb9R8wvvh4OXl6GY="; + hash = "sha256-gBJgxpIxE4cH6oiglV5ITbfUDiEMngrg93Ny/9pfS/U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/deepl/default.nix b/nixpkgs/pkgs/development/python-modules/deepl/default.nix index 88618ca2b6cc..bc674c3bf6f0 100644 --- a/nixpkgs/pkgs/development/python-modules/deepl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deepl/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.14.0"; + version = "1.15.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-jUHxyx+b1OICJHAs8lh5NVtl+MExyEYM/yfs2qz6fv4="; + hash = "sha256-BRFC4R5d1gxHyEJI41Fi0Az8GqmDG7mQ6Fx/o23OGcE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix index d460f7f55826..fa119a798e20 100644 --- a/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.12.0"; + version = "6.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fJRGtes5EdGHiTJ5SDOyZT9NEnghbu+7I9OD2h4JOjw="; + hash = "sha256-gIjb8+UEMf/wQSJOassMc9MBysTtieExFTIiSq1m/3Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/demes/default.nix b/nixpkgs/pkgs/development/python-modules/demes/default.nix new file mode 100644 index 000000000000..986bb7f9ac9f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/demes/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, ruamel-yaml +, attrs +, pythonOlder +, pytestCheckHook +, pytest-xdist +, numpy +}: + +buildPythonPackage rec { + pname = "demes"; + version = "0.2.3"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-nmE7ZbR126J3vKdR3h83qJ/V602Fa6J3M6IJnIqCNhc="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + ruamel-yaml + attrs + ]; + + postPatch = '' + # remove coverage arguments to pytest + sed -i '/--cov/d' setup.cfg + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + numpy + ]; + + disabledTestPaths = [ + "tests/test_spec.py" + ]; + + pythonImportsCheck = [ + "demes" + ]; + + meta = with lib; { + description = "Tools for describing and manipulating demographic models"; + homepage = "https://github.com/popsim-consortium/demes-python"; + license = licenses.isc; + maintainers = with maintainers; [ alxsimon ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/demesdraw/default.nix b/nixpkgs/pkgs/development/python-modules/demesdraw/default.nix new file mode 100644 index 000000000000..42e9fdc4c5f9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/demesdraw/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, setuptools-scm +, demes +, matplotlib +, numpy +, scipy +, pythonOlder +, pytestCheckHook +, pytest-xdist +, mpmath +}: + +buildPythonPackage rec { + pname = "demesdraw"; + version = "0.4.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-n7dz+kYf2yyr66TBx452W6z4qT6bT81u0J4aMAYuGCc="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + demes + matplotlib + numpy + scipy + ]; + + postPatch = '' + # remove coverage arguments to pytest + sed -i '/--cov/d' setup.cfg + ''; + + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + mpmath + ]; + + pythonImportsCheck = [ + "demesdraw" + ]; + + meta = with lib; { + description = "Drawing functions for Demes demographic models"; + homepage = "https://github.com/grahamgower/demesdraw"; + license = licenses.isc; + maintainers = with maintainers; [ alxsimon ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/denonavr/default.nix b/nixpkgs/pkgs/development/python-modules/denonavr/default.nix index 3bcc2990b2b8..534d960b49a8 100644 --- a/nixpkgs/pkgs/development/python-modules/denonavr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/denonavr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.11.2"; + version = "0.11.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ol-iver"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Sa5pfvSzshgwHh9LGWPBVIC7pXouZbTmSMYncT46phU="; + hash = "sha256-QBy1nm09trAmL7KsPWgv5iMAOJ3Fkviug/o7a+tSSDA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/deploykit/default.nix b/nixpkgs/pkgs/development/python-modules/deploykit/default.nix index e89eab8c0e50..2d1636818021 100644 --- a/nixpkgs/pkgs/development/python-modules/deploykit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deploykit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "deploykit"; - version = "1.0.2"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "numtide"; repo = pname; rev = version; - hash = "sha256-I1vAefWQBBRNykDw38LTNwdiPFxpPkLzCcevYAXO+Zo="; + hash = "sha256-re7r2K9F5FTTVn84WC+wZX30JA9AXQcHK3pLjYglMs8="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/descartes/default.nix b/nixpkgs/pkgs/development/python-modules/descartes/default.nix deleted file mode 100644 index a4df1fe20c99..000000000000 --- a/nixpkgs/pkgs/development/python-modules/descartes/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, - matplotlib, shapely -}: - -buildPythonPackage rec { - pname = "descartes"; - version = "1.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0nq36w9ylvfwmwn5qd9c8fsp2jzsqpmy4xcr6pzxcpmg8qhm0nhk"; - }; - - propagatedBuildInputs = [ - matplotlib - shapely - ]; - - meta = with lib; { - description = "Python library to use Shapely or GeoJSON objects as matplotlib paths"; - homepage = "https://bitbucket.org/sgillies/descartes/"; - license = licenses.bsd3; - maintainers = with maintainers; [ knedlsepp ]; - # all tests are failing - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix b/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix index 83b62ccaf7dc..b56a6b0849d0 100644 --- a/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix @@ -5,13 +5,12 @@ , stdenv , packaging , setuptools -, importlib-resources , dbus-next }: buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.5.3"; + version = "3.5.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IA9LTsjO9se3Gx6Jm36m+tUxUHPjwmVCt9gAw1ZqDgg="; + hash = "sha256-txUWRCWLQ6jWrdEJ/D5+CsflNad5Onr/wLycENri1z8="; }; nativeBuildInputs = [ @@ -29,8 +28,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources ] ++ lib.optionals stdenv.isLinux [ dbus-next ]; diff --git a/nixpkgs/pkgs/development/python-modules/detectron2/default.nix b/nixpkgs/pkgs/development/python-modules/detectron2/default.nix new file mode 100644 index 000000000000..cc750427dacb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/detectron2/default.nix @@ -0,0 +1,171 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pythonRelaxDepsHook +, ninja +, which +# build inputs +, pillow +, matplotlib +, pycocotools +, termcolor +, yacs +, tabulate +, cloudpickle +, tqdm +, tensorboard +, fvcore +, iopath +, omegaconf +, hydra-core +, packaging +, torch +, pydot +, black +# optional dependencies +, fairscale +, timm +, scipy +, shapely +, pygments +, psutil +# check inputs +, pytestCheckHook +, torchvision +, av +, opencv4 +, pytest-mock +}: + +let + pname = "detectron2"; + version = "0.6"; + optional-dependencies = { + all = [ + fairscale + timm + scipy + shapely + pygments + psutil + ]; + }; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "detectron2"; + rev = "v${version}"; + sha256 = "1w6cgvc8r2lwr72yxicls650jr46nriv1csivp2va9k1km8jx2sf"; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ninja + which + ]; + + pythonRelaxDeps = [ + "black" + ]; + + propagatedBuildInputs = [ + pillow + matplotlib + pycocotools + termcolor + yacs + tabulate + cloudpickle + tqdm + tensorboard + fvcore + iopath + omegaconf + hydra-core + packaging + black + torch # not explicitly declared in setup.py because they expect you to install it yourself + pydot # no idea why this is not in their setup.py + ]; + + passthru.optional-dependencies = optional-dependencies; + + nativeCheckInputs = [ + av + opencv4 + pytest-mock + pytestCheckHook + torchvision + ]; + + preCheck = '' + # prevent import errors for C extension modules + rm -r detectron2 + ''; + + pytestFlagsArray = [ + # prevent include $sourceRoot/projects/*/tests + "tests" + ]; + + disabledTestPaths = [ + # try import caffe2 + "tests/test_export_torchscript.py" + "tests/test_model_analysis.py" + "tests/modeling/test_backbone.py" + "tests/modeling/test_roi_heads.py" + "tests/modeling/test_rpn.py" + "tests/structures/test_instances.py" + # hangs for some reason + "tests/modeling/test_model_e2e.py" + ]; + + disabledTests = [ + # fails for some reason + "test_checkpoint_resume" + "test_map_style" + # requires shapely + "test_resize_and_crop" + # require caffe2 + "test_predict_boxes_tracing" + "test_predict_probs_tracing" + "testMaskRCNN" + "testRetinaNet" + # require coco dataset + "test_default_trainer" + "test_unknown_category" + "test_build_dataloader_train" + "test_build_iterable_dataloader_train" + # require network access + "test_opencv_exif_orientation" + "test_read_exif_orientation" + # use deprecated api, numpy.bool + "test_BWmode_nomask" + "test_draw_binary_mask" + "test_draw_empty_mask_predictions" + "test_draw_instance_predictions" + "test_draw_no_metadata" + "test_overlay_instances" + "test_overlay_instances_no_boxes" + "test_get_bounding_box" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + "test_build_batch_dataloader_inference" + "test_build_dataloader_inference" + "test_build_iterable_dataloader_inference" + "test_to_iterable" + ]; + + pythonImportsCheck = [ "detectron2" ]; + + meta = with lib; { + description = "Facebooks's next-generation platform for object detection, segmentation and other visual recognition tasks"; + homepage = "https://github.com/facebookresearch/detectron2"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix b/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix index 8170601914a5..d352925308cb 100644 --- a/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "1.3.1"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "refs/tags/v${version}"; - hash = "sha256-wJyBCQ9rk+UwjWhMIeqsIbMR8cXA9Xu+lmubJoOauEg="; + hash = "sha256-viOyxgFydPrTPFz6JsjJT6IiUIeoIwd+bcrAJfomDI8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix b/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix index 4295506989ab..0a05e0843587 100644 --- a/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix @@ -35,5 +35,11 @@ buildPythonPackage rec { description = "Utilities jointly used by devpi-server and devpi-client"; license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; + # It fails to build because it depends on packaging <22 while we + # use packaging >22. + # See the following issues for details: + # - https://github.com/NixOS/nixpkgs/issues/231346 + # - https://github.com/devpi/devpi/issues/939 + broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix b/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix index dae663f2bb73..6990105b757e 100644 --- a/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix +++ b/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "7.5.0"; + version = "7.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-pLMCSoMeTzjCLoCZRfCdCmp7pmLcjjDSjxprIaPt6/w="; + hash = "sha256-YGFM9+ciz3+xveSXr6wLUUKU4eJlNESWItrE2ilhI/s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/diffimg/default.nix b/nixpkgs/pkgs/development/python-modules/diffimg/default.nix new file mode 100644 index 000000000000..e5afcdf8cdf1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/diffimg/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "diffimg"; + version = "0.3.0"; # github recognized 0.1.3, there's a v0.1.5 tag and setup.py says 0.3.0 + format = "setuptools"; + + src = fetchFromGitHub { + owner = "nicolashahn"; + repo = "diffimg"; + rev = "b82f0bb416f100f9105ccccf1995872b29302461"; + hash = "sha256-H/UQsqyfdnlESBe7yRu6nK/0dakQkAfeFaZNwjCMvdM="; + }; + + # it imports the wrong diff, + # 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" + ''; + + propagatedBuildInputs = [ + pillow + ]; + + pythonImportsCheck = [ "diffimg" ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + description = "Differentiate images in python - get a ratio or percentage difference, and generate a diff image"; + homepage = "https://github.com/nicolashahn/diffimg"; + license = licenses.mit; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix b/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix index 50f4b03123a3..a7195fcee166 100644 --- a/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix @@ -2,24 +2,25 @@ , buildPythonPackage , fetchFromGitHub , hatchling +, pydantic +, pytest-examples , pytestCheckHook , pythonOlder , pytz -, typing-extensions }: buildPythonPackage rec { pname = "dirty-equals"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yYptO6NPhQRlF0T2eXliw2WBms9uqTZVzdYzGj9pCug="; + hash = "sha256-j+EqsKVRG2DDka1G3Px8ExYZt8QkqHkhojRnAHObdR4="; }; nativeBuildInputs = [ @@ -28,10 +29,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz - typing-extensions ]; nativeCheckInputs = [ + pydantic + pytest-examples pytestCheckHook ]; @@ -42,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for doing dirty (but extremely useful) things with equals"; homepage = "https://github.com/samuelcolvin/dirty-equals"; + changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix b/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix index 49a563fcba84..ad4268b8f712 100644 --- a/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.6"; + version = "2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joalla"; repo = "discogs_client"; rev = "refs/tags/v${version}"; - hash = "sha256-Si1EH5TalNC3BY7L/GqbGSCjDBWzbodB4NZlNayhZYs="; + hash = "sha256-sTzYhUKPqaCE553FqWR4qdtDDtymhuybHWiDOUwgglA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/nixpkgs/pkgs/development/python-modules/discordpy/default.nix index e5552c4f86bc..cd06f9df5da9 100644 --- a/nixpkgs/pkgs/development/python-modules/discordpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/discordpy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , aiohttp , buildPythonPackage , fetchFromGitHub @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "2.2.3"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rh3gijm67LVyOaliP7w3YwKviKydnxXvu4snNrM5H1c="; + hash = "sha256-vbbTnmzYI6cbF7GWjPVGqy7KKDGpWQ+4q96/kGFjQ8Y="; }; propagatedBuildInputs = [ @@ -33,7 +34,7 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace "discord/opus.py" \ - --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" + --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}'" '' + lib.optionalString withVoice '' substituteInPlace "discord/player.py" \ --replace "executable='ffmpeg'" "executable='${ffmpeg}/bin/ffmpeg'" diff --git a/nixpkgs/pkgs/development/python-modules/diskcache/default.nix b/nixpkgs/pkgs/development/python-modules/diskcache/default.nix index 30eb172513e3..6f275a01fa70 100644 --- a/nixpkgs/pkgs/development/python-modules/diskcache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/diskcache/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Disk and file backed persistent cache"; homepage = "http://www.grantjenks.com/docs/diskcache/"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix index 2c77074afaa6..37de761ca567 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-cim"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cim"; rev = "refs/tags/${version}"; - hash = "sha256-/Ze/fuWHa1Jfh63JnyJ4RvAq7HZv9CJyUGlt87YzpEs="; + hash = "sha256-+HHjDUSepAEebMD5ckjXbfgA4AKlNMBYHwxDq+jdhxw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix index 209f1a33f9d1..8dc3c9e20c12 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-clfs"; - version = "1.5"; + version = "1.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.clfs"; rev = "refs/tags/${version}"; - hash = "sha256-utXgMVsNp78bwTBaSv5kglFfHrav5cV/YYzGCogJmtI="; + hash = "sha256-JdfO9KVuK1TsDyqEQkuHPJtSHDCym63imvLSHsVwQ3k="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 494273003642..c232bdb0bf4a 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -64,6 +64,8 @@ buildPythonPackage rec { ]; }; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-httpserver pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix index e6ba0f5057da..46093c1268bb 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-K+crraBIMCtT5WsGgyxoAZ49ff7ZUHga2qYtih6w0Ug="; + hash = "sha256-ART7m0OR0KjkZYHXDoNGJDX0v7h+FgctAaWXNFohGV8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix index da8fa0a9e4b1..bf2ef463247e 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-FQow4zuN1B6irX3ovz5K4xe6Z3PojtC9N+VLtb+UWzA="; + hash = "sha256-OW0HqKQDg15fO/ETNv+cIupfsX53+qopMoZZ/3xcAUI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix index d080905ade78..06e9d2f282dd 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.etl"; rev = "refs/tags/${version}"; - hash = "sha256-zVUe4obNhfUnI/wbxrKago/zgJcv9lzXbj1ogtIq5i4="; + hash = "sha256-Z6IdSLHXwZULqV6aTZlXjRo5Xq/rRNw7b/nOhuKOth4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix index 919ac9ce2423..9c11a3ee8778 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-eventlog"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.eventlog"; rev = "refs/tags/${version}"; - hash = "sha256-YSJnNT+zzsS7aKT44NFwU3AmvhbTtW6kIgNd/CbSLYY="; + hash = "sha256-h1LrBt8f9YFkc1uAAb4WwY3LjPuvsdVFvxji3QxKF0A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix index dd59ea746205..13dbb72e9572 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.evidence"; rev = "refs/tags/${version}"; - hash = "sha256-yJDrI4BgCXgKt4DdMyUE7Y7EzYk5utBVir6Ejm7NCDQ="; + hash = "sha256-0rDV7hMOUA18h4Mm4EnIL2NQO9wbVAh00P2V5t2YcZU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix index 64bd4957cd56..d8f3e6cb08c2 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-executable"; - version = "1.3"; + version = "1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.executable"; rev = "refs/tags/${version}"; - hash = "sha256-YGpClgRVW8l5Ln6e3RrH1RhOSuZ/A6Kfjf1plomWE9U="; + hash = "sha256-h9eOTWJR0Bd3DY8WDYWqLCl1jYJcqP6cRTgWubf/rKI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix index 0c8281a85600..dd93579fa022 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-JLMOW1DkLI/8+1Zx3DL0fwWKaMi8OcQMxUNE9k8zhXA="; + hash = "sha256-jCra6ZvILzFgIlBDAKfYhH4mxnJ2B8+Smjs9Hf7nhQo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix index ab5457dbfb68..0fd868f4835f 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-eZtAUgy8WuJXZOMwdJ9fmGA85kBN/zCjRAU+jGP06LE="; + hash = "sha256-3Zyjo7yoSLtAnC5lOLzjWsqMRoJxsrw2LKjQ2Qy38sg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix index c6a524d9c046..8e5dbaac0445 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ffs"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ffs"; rev = "refs/tags/${version}"; - hash = "sha256-53XYrS8JbkdjOlzb1gF3tMuWEsdVhAwy4ciCdLae8kk="; + hash = "sha256-eyqqsOKcRmzOY+fj1FYudh9FUanD0Z59zZPtsNz6I0s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix index 962338174a6c..26f466365939 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-glBmRzL5u+r668XHOZb6Lv0tSVvfQASPRUMAAJN4YHU="; + hash = "sha256-PTF1PSFsjD9lYa3SLd7329+ZZuSC07tN1GqwOndo8Go="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix index a83766523562..e81211286003 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-LehPdKCM7F7SpWDz3/svhUhiM4ii0AxENX0AyIGa2aY="; + hash = "sha256-kGvy1+MSjJ6IQjffmsT02toBNaSbBZXeYmC9AqwbfFk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix index f2a0ab138c94..d76e11cb3f53 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-ole"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ole"; rev = "refs/tags/${version}"; - hash = "sha256-K+YHxxQAPmvJtsDAB/1oKdUOeUmY9LAT4/TT5bfMDQo="; + hash = "sha256-4shxYKR6IrrMj2BIb5yFD7+C0SNyqsGOoBkWpad1EbI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix index f92539113642..726c9aad178c 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-/C2MuCziHCk/O38atcYOfnpjafom5jMKSx3z2mmJKVc="; + hash = "sha256-doyyBmkRPH2wRZA44/7ldkUdNLX1lulo/XcSVFxaIfM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix index 0a3ce03ff4c9..ad2fb1ed7a75 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.shellitem"; rev = "refs/tags/${version}"; - hash = "sha256-m/RBOF7BbYZuqfljgc/lE+HpRs+6wNNiwNa1/6SXp8U="; + hash = "sha256-g8o6W5MZ7E8AKYs5QGQGw3IQhZehrOcY6wJrt9TJf4s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix index c02b8d6eb241..c7192854fcf8 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-eKhW3Z7fzIKzGiemfjluuyBjsYXIZdgvnx39BIWYObM="; + hash = "sha256-CMUXMSkrutziAIYjUFbLEpsYpCZUiPmV16puXneGeHE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix index 7bfb0a2fcf49..cc1f4999d858 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-squashfs"; - version = "1.2"; + version = "1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.squashfs"; rev = "refs/tags/${version}"; - hash = "sha256-TgrtONUis0yD3s0JxJ0mNGLjEKlDgGZ+eO6NvSBTK14="; + hash = "sha256-MJKC05/8NnJFdyBB5YPbqe8mp1zlIoS2FglKEPSSYd8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix index 14579971ec99..1a5bc7756f86 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , asn1crypto , buildPythonPackage , defusedxml @@ -38,16 +39,16 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.9"; + version = "3.10"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-oqBBcoqk8HFuxnJK7/01Neb7Lwb1sIM/TMgXKVCBUoc="; + hash = "sha256-zAcNkRwCnU/53h8/WsaGjCpgPovPb+5VOu/6SHXu31g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -109,7 +110,11 @@ buildPythonPackage rec { "test_tar_sensitive_drive_letter" # Tests compare dates and times "yum" - ]; + # Filesystem access, windows defender tests + "test_defender_quarantine_recovery" + ] ++ + # test is broken on Darwin + lib.optional stdenv.hostPlatform.isDarwin "test_fs_attrs_no_os_listxattr"; disabledTestPaths = [ # Tests are using Windows paths diff --git a/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix index f7b2f3a01bbc..1e5ac9980963 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.4"; + version = "1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.thumbcache"; rev = "refs/tags/${version}"; - hash = "sha256-9+vXnXeIvC+kfH1Mv1Vnj7mm4f+Vtso5pdblQVUgFjg="; + hash = "sha256-xWwmkvBKKVCISL5RKzPkdPGo/ganNydymp4FaE9Mr7w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix index 000ac19ecc80..22c1fe568279 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-w2RT3tInp30IWk3CY02coJtSHdgWMravWwTK69GgSHc="; + hash = "sha256-u8FPGSG9bZi+bxqI5zABwHcqwmM24hURvHcHTKz8dYw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix index 8ea98013e05b..d3efbcdf6420 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.vmfs"; rev = "refs/tags/${version}"; - hash = "sha256-diCJfaR5Q3s44ZJpxZv5R0rx8aThpZzyyLn/4dqJERQ="; + hash = "sha256-FDxB87TeAMUp0hP9YS/nrqNx71+ZlHf3Bsaqvuwx36U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix index a493eb72cc23..b82fad029b91 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-qEVTutZzE5pjFsQ7XZSXyWa47RRsPj0eKFukuHPYUpU="; + hash = "sha256-dKDefDPdmr20mo7YhZtPeMVkhLXQn5a5dLdRAEoe7+8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix index 0f5c473b2fe0..d4f36cbc04d5 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.xfs"; rev = "refs/tags/${version}"; - hash = "sha256-Dy7Tgp1eWROo3SGXKAl7hoaQgYOQomQjE9lnhsC7HyE="; + hash = "sha256-unrkmhLvjWWKHiqJWCEVEVcUjxWXMznjOytRbDwAxKw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect/default.nix b/nixpkgs/pkgs/development/python-modules/dissect/default.nix index d3fd72f9da57..aedb4dcbb7e9 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-B/yXxkWE3hxPhOKnvuB/DAgNOvLITJJre2I8QPo4eZs="; + hash = "sha256-noo7yDRTPPSIrSt8Hewb9mZsMuPgDmL3aIxI/bknsGc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index be2fb48ea8d8..18f7ca8ecb52 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { homepage = "https://distributed.readthedocs.io/"; changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ teh costrouc ]; + maintainers = with maintainers; [ teh ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix index f539a637d4f4..5f043f008e16 100644 --- a/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Use an URL to configure email backend settings in your Django Application"; homepage = "https://github.com/migonzalvar/dj-email-url"; license = licenses.bsd0; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix b/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix index 3f480b1d716a..2abee722b97e 100644 --- a/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Authentication for Django Rest Framework"; homepage = "https://github.com/iMerica/dj-rest-auth"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix index b216c8e62a1e..410ed08d9478 100644 --- a/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { homepage = "https://github.com/dstufft/dj-search-url"; description = "Use Search URLs in your Django Haystack Application"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix b/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix new file mode 100644 index 000000000000..e8561e69df52 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, django +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-admin-datta"; + version = "1.0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Onk9T+QKsl8y68eJ2ikrUEeMc9ljzzvSw7cjjP4D3sE="; + }; + + propagatedBuildInputs = [ + django + ]; + + # no tests + doCheck = false; + + pythonImportCheck = [ + "admin-datta" + ]; + + meta = with lib; { + description = "Modern template for Django that covers Admin Section"; + homepage = "https://appseed.us/product/datta-able/django"; + changelog = "https://github.com/app-generator/django-admin-datta/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix b/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix index 379b63642321..774bcda4ba83 100644 --- a/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -7,7 +7,7 @@ , django-debug-toolbar , django-extensions , django-taggit -, django_tagging +, django-tagging , mock , pytest-django , selenium @@ -41,7 +41,7 @@ buildPythonPackage rec { django-debug-toolbar django-extensions django-taggit - django_tagging + django-tagging mock pytest-django selenium diff --git a/nixpkgs/pkgs/development/python-modules/django-cachalot/default.nix b/nixpkgs/pkgs/development/python-modules/django-cachalot/default.nix new file mode 100644 index 000000000000..f52a3aa46e62 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-cachalot/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, django-debug-toolbar +, psycopg2 +, beautifulsoup4 +, python +}: + +buildPythonPackage rec { + pname = "django-cachalot"; + version = "2.5.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "noripyt"; + repo = "django-cachalot"; + rev = "v${version}"; + hash = "sha256-ayAN+PgK3aIpt4R8aeC6c6mRGTnfObycmkoXPTjx4WI="; + }; + + patches = [ + # Disable tests for unsupported caching and database types which would + # require additional running backends + ./disable-unsupported-tests.patch + ]; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + beautifulsoup4 + django-debug-toolbar + psycopg2 + ]; + + pythonImportsCheck = [ "cachalot" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} runtests.py + runHook postCheck + ''; + + meta = with lib; { + description = "No effort, no worry, maximum performance"; + homepage = "https://github.com/noripyt/django-cachalot"; + changelog = "https://github.com/noripyt/django-cachalot/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-cachalot/disable-unsupported-tests.patch b/nixpkgs/pkgs/development/python-modules/django-cachalot/disable-unsupported-tests.patch new file mode 100644 index 000000000000..8683fffbb146 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-cachalot/disable-unsupported-tests.patch @@ -0,0 +1,65 @@ +diff --git a/cachalot/tests/models.py b/cachalot/tests/models.py +index 8c48640..817602c 100644 +--- a/cachalot/tests/models.py ++++ b/cachalot/tests/models.py +@@ -77,11 +77,6 @@ class PostgresModel(Model): + date_range = DateRangeField(null=True, blank=True) + datetime_range = DateTimeRangeField(null=True, blank=True) + +- class Meta: +- # Tests schema name in table name. +- db_table = '"public"."cachalot_postgresmodel"' +- +- + class UnmanagedModel(Model): + name = CharField(max_length=50) + +diff --git a/settings.py b/settings.py +index 19d7560..7095367 100644 +--- a/settings.py ++++ b/settings.py +@@ -8,18 +8,9 @@ DATABASES = { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': 'cachalot.sqlite3', + }, +- 'postgresql': { +- 'ENGINE': 'django.db.backends.postgresql', +- 'NAME': 'cachalot', +- 'USER': 'cachalot', +- 'PASSWORD': 'password', +- 'HOST': '127.0.0.1', +- }, +- 'mysql': { +- 'ENGINE': 'django.db.backends.mysql', +- 'NAME': 'cachalot', +- 'USER': 'root', +- 'HOST': '127.0.0.1', ++ 'test': { ++ 'ENGINE': 'django.db.backends.sqlite3', ++ 'NAME': ':memory:', + }, + } + if 'MYSQL_PASSWORD' in os.environ: +@@ -36,22 +27,6 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" + DATABASE_ROUTERS = ['cachalot.tests.db_router.PostgresRouter'] + + CACHES = { +- 'redis': { +- 'BACKEND': 'django_redis.cache.RedisCache', +- 'LOCATION': 'redis://127.0.0.1:6379/0', +- 'OPTIONS': { +- # Since we are using both Python 2 & 3 in tests, we need to use +- # a compatible pickle version to avoid unpickling errors when +- # running a Python 2 test after a Python 3 test. +- 'PICKLE_VERSION': 2, +- }, +- }, +- 'memcached': { +- 'BACKEND': 'django.core.cache.backends.memcached.' +- + ('PyMemcacheCache' if __DJ_V[0] > 2 +- and (__DJ_V[1] > 1 or __DJ_V[0] > 3) else 'MemcachedCache'), +- 'LOCATION': '127.0.0.1:11211', +- }, + 'locmem': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + 'OPTIONS': { diff --git a/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix index d70abd2d64eb..01cccaf8c50d 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/epicserve/django-cache-url"; description = "Use Cache URLs in your Django application"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix b/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix index 8122af7e28b9..566eb06f5043 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix @@ -1,27 +1,40 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook , django , funcy , redis -, pytest-django +, six , pytestCheckHook +, pytest-django +, mock +, dill +, jinja2 +, before-after , pythonOlder -, six +, nettools +, pkgs }: buildPythonPackage rec { pname = "django-cacheops"; - version = "6.2"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zHP9ChwUeZJT/yCopFeRo8jSgCIXswHnDPoIroGeQ48="; + hash = "sha256-Ed3qh90DlWiXikCD2JyJ37hm6lWnpI+2haaPwZiotlA="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ "funcy" ]; + propagatedBuildInputs = [ django funcy @@ -32,23 +45,26 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-django + mock + dill + jinja2 + before-after + nettools + pkgs.redis ]; - disabledTests = [ - # Tests require networking - "test_cached_as" - "test_invalidation_signal" - "test_queryset" - "test_queryset_empty" - "test_lock" - "test_context_manager" - "test_decorator" - "test_in_transaction" - "test_nested" - "test_unhashable_args" - "test_db_agnostic_by_default" - "test_db_agnostic_disabled" - ]; + preCheck = '' + redis-server & + REDIS_PID=$! + while ! redis-cli --scan ; do + echo waiting for redis to be ready + sleep 1 + done + ''; + + postCheck = '' + kill $REDIS_PID + ''; DJANGO_SETTINGS_MODULE = "tests.settings"; diff --git a/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix b/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix index 2b2fe06de614..3e413ca4e15a 100644 --- a/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix @@ -7,14 +7,15 @@ }: buildPythonPackage rec { - pname = "django_celery_results"; + pname = "django-celery-results"; version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "django_celery_results"; + inherit version; hash = "sha256-dapRlw21aRy/JCxqD/UMjN9BniZc0Om3cjNdBkNsS5k="; }; diff --git a/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix b/nixpkgs/pkgs/development/python-modules/django-classy-tags/default.nix index 06a336be0814..06a336be0814 100644 --- a/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-classy-tags/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix index 00dccb9caff4..acc94865c02b 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-cleanup"; - version = "7.0.0"; + version = "8.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KKlp+InGYeug2UOJeGk5gPCUgsl5g70I7lKVXa6NceQ="; + hash = "sha256-xzmgVUTh5I3ISIcchw2/FZX4Uz0kUjvGc2DkNWLtrw0="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix b/nixpkgs/pkgs/development/python-modules/django-colorful/default.nix index 5de127a97221..5de127a97221 100644 --- a/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-colorful/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix b/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix index 0df2ebc96239..a8d367e854af 100644 --- a/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix @@ -7,48 +7,58 @@ , beautifulsoup4 , brotli , pytestCheckHook +, django-sekizai +, pytest-django +, csscompressor +, calmjs +, jinja2 +, python }: buildPythonPackage rec { pname = "django-compressor"; - version = "4.3.1"; + version = "4.4"; format = "setuptools"; src = fetchPypi { pname = "django_compressor"; inherit version; - hash = "sha256-aIWMDabMCZzCmgIthsO6iu0RTanXCe7OsNe4GBtfiUI="; + hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "rcssmin == 1.1.0" "rcssmin>=1.1.0" \ - --replace "rjsmin == 1.2.0" "rjsmin>=1.2.0" - ''; - propagatedBuildInputs = [ + beautifulsoup4 + calmjs + django-appconf + jinja2 rcssmin rjsmin - django-appconf - ]; - - pythonImportsCheck = [ - "compressor" ]; - doCheck = false; # missing package django-sekizai - - nativeCheckInputs = [ + checkInputs = [ beautifulsoup4 brotli + csscompressor + django-sekizai pytestCheckHook + pytest-django ]; + # Getting error: compressor.exceptions.OfflineGenerationError: You have + # offline compression enabled but key "..." is missing from offline manifest. + # You may need to run "python manage.py compress" + disabledTestPaths = [ + "compressor/tests/test_offline.py" + ]; + + 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/en/latest/"; + homepage = "https://django-compressor.readthedocs.org/"; + changelog = "https://github.com/django-compressor/django-compressor/blob/${version}/docs/changelog.txt"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix index 8581dcce8749..c7fbde5bdf37 100644 --- a/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { description = "A helper for organizing Django settings"; homepage = "https://django-configurations.readthedocs.io/"; license = licenses.bsd0; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix b/nixpkgs/pkgs/development/python-modules/django-contrib-comments/default.nix index 66189a88d0d6..66189a88d0d6 100644 --- a/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-contrib-comments/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/django_environ/default.nix b/nixpkgs/pkgs/development/python-modules/django-environ/default.nix index bb3cd1acf7ce..bb3cd1acf7ce 100644 --- a/nixpkgs/pkgs/development/python-modules/django_environ/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-environ/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix b/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix index 2842a085d8e1..0ae0eac3ecb8 100644 --- a/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Per object permissions for Django"; homepage = "https://github.com/django-guardian/django-guardian"; license = with licenses; [ mit bsd2 ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix deleted file mode 100644 index 9d3f931cac5f..000000000000 --- a/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, - django-hijack, django_nose }: -buildPythonPackage rec { - pname = "django-hijack-admin"; - version = "2.1.10"; - - # the pypi packages don't include everything required for the tests - src = fetchFromGitHub { - owner = "arteria"; - repo = "django-hijack-admin"; - rev = "v${version}"; - sha256 = "0m98lchp2y43886n67j4s7miyd50pg2r5r966vjnxmd7nx7qkihf"; - }; - - nativeCheckInputs = [ django_nose ]; - propagatedBuildInputs = [ django-hijack ]; - - checkPhase = '' - runHook preCheck - - # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the - # source directory - mkdir testbase - pushd testbase - mv ../runtests.py . - ${python.interpreter} runtests.py hijack_admin - popd - - runHook postCheck - ''; - - meta = with lib; { - description = "Admin integration for django-hijack"; - homepage = "https://github.com/arteria/django-hijack-admin"; - license = licenses.mit; - maintainers = with maintainers; [ lsix ]; - # may be unmaintained, doesn't work with recent django-hijack: - # https://github.com/django-hijack/django-hijack-admin/issues/46 - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix index 47719995c69a..18ef2e3ace79 100644 --- a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix @@ -11,7 +11,7 @@ # dependencies , django -, django_compat +, django-compat # tests , pytest-django @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django - django_compat + django-compat ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-leaflet/default.nix b/nixpkgs/pkgs/development/python-modules/django-leaflet/default.nix new file mode 100644 index 000000000000..7ea1ba4a58d9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-leaflet/default.nix @@ -0,0 +1,39 @@ +{ pkgs +, buildPythonPackage +, django +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-leaflet"; + version = "0.29.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-L23Ixxh/0i5itvK3tC7thpIPgb7DEqplSYHr5byOCGY="; + }; + + propagatedBuildInputs = [ + django + ]; + + # The tests seem to be impure. + # They are throwing a error about unset configs: + # > django.core.exceptions.ImproperlyConfigured: Requested setting LEAFLET_CONFIG, but settings are not configured. + doCheck = false; + + # This dosn't work either because of the same exception as above + # pythonImportsCheck = [ "leaflet" ]; + + meta = with pkgs.lib; { + description = "Allows you to use Leaflet in your Django projects"; + homepage = "https://github.com/makinacorpus/django-leaflet"; + changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix b/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix index 36b72c586d97..8dd2ad71b242 100644 --- a/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -1,9 +1,10 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage -, pytest , django , python-fsutil +, python , pythonOlder }: @@ -21,18 +22,26 @@ buildPythonPackage rec { hash = "sha256-Mcj8O20hCINGf5T3PCG9jq0onSrm4R+Ke5CLMqMDmuU="; }; + patches = [ + (fetchpatch { + name = "fix-broken-test.patch"; + url = "https://github.com/fabiocaccamo/django-maintenance-mode/commit/68cde8d9ceef00eeaa2068f420698c1c562fa9fc.patch"; + hash = "sha256-K/zYYkcnmWGc7Knz4l9PgvUtT0IccPRXc3UFriC1ldc="; + }) + ]; + propagatedBuildInputs = [ django python-fsutil ]; - nativeCheckInputs = [ - pytest - ]; + checkPhase = '' + runHook preCheck - pythonImportsCheck = [ - "maintenance_mode" - ]; + ${python.interpreter} runtests.py + + runHook postCheck + ''; meta = with lib; { description = "Shows a 503 error page when maintenance-mode is on"; diff --git a/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix b/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix index 8730d367d91a..648634b0f32c 100644 --- a/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Django model mixins and utilities"; changelog = "https://github.com/jazzband/django-model-utils/blob/${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix b/nixpkgs/pkgs/development/python-modules/django-modelcluster/default.nix index b7fbc9f2b179..b7fbc9f2b179 100644 --- a/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-modelcluster/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix b/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix index 0a53c6489fe0..1995574762dd 100644 --- a/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-mysql"; - version = "4.9.0"; + version = "4.11.0"; format = "pyproject"; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-mysql"; rev = "refs/tags/${version}"; - hash = "sha256-mXAdwNqSIrWMh+YcCjksiqmkLSXGAd+ofyzJmiG+gNo="; + hash = "sha256-4PxJH5P/a4oNigbTjrZa3q+FeDQTdkvCKonUUl4I8m0="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://django-mysql.readthedocs.io/en/latest/changelog.html"; + changelog = "https://github.com/adamchainz/django-mysql/blob/${version}/docs/changelog.rst"; description = "Extensions to Django for use with MySQL/MariaD"; homepage = "https://github.com/adamchainz/django-mysql"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/django_nose/default.nix b/nixpkgs/pkgs/development/python-modules/django-nose/default.nix index 2506f6aba44a..2506f6aba44a 100644 --- a/nixpkgs/pkgs/development/python-modules/django_nose/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-nose/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/django-otp/default.nix b/nixpkgs/pkgs/development/python-modules/django-otp/default.nix index 5b2a41faf785..b2417303133b 100644 --- a/nixpkgs/pkgs/development/python-modules/django-otp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-otp/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-model-utils"; description = "Pluggable framework for adding two-factor authentication to Django using one-time passwords"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix b/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix index f9756a8d59da..6db31decd287 100644 --- a/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { homepage = "https://github.com/django-polymorphic/django-polymorphic"; description = "Improved Django model inheritance with automatic downcasting"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-raster/default.nix b/nixpkgs/pkgs/development/python-modules/django-raster/default.nix index f590aca527f4..673a86797266 100644 --- a/nixpkgs/pkgs/development/python-modules/django-raster/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-raster/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, - numpy, django_colorful, pillow, psycopg2, + numpy, django-colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: @@ -17,7 +17,7 @@ buildPythonPackage rec { # Tests require a postgresql + postgis server doCheck = false; - propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 + propagatedBuildInputs = [ numpy django-colorful pillow psycopg2 pyparsing django celery boto3 importlib-metadata ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix b/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix index 654118fedaad..5b8937fb048c 100644 --- a/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Django app that makes registration and authentication easy"; homepage = "https://github.com/Tivix/django-rest-auth"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix index 5f108f37b112..730d05d445ed 100644 --- a/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Polymorphic serializers for Django REST Framework"; homepage = "https://github.com/apirobot/django-rest-polymorphic"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-rosetta/default.nix b/nixpkgs/pkgs/development/python-modules/django-rosetta/default.nix new file mode 100644 index 000000000000..d9337081ba3e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-rosetta/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, polib +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "django-rosetta"; + version = "0.9.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mbi"; + repo = "django-rosetta"; + rev = "refs/tags/v${version}"; + hash = "sha256-OuKgqGYBlzQNKKAJYFhNi+LnONB/mxINMj4VBAVWjqI="; + }; + + propagatedBuildInputs = [ + django + polib + requests + ]; + + # require internet connection + doCheck = false; + + pythonImportsCheck = [ + "rosetta" + ]; + + meta = with lib; { + description = "Rosetta is a Django application that facilitates the translation process of your Django projects"; + homepage = "https://github.com/mbi/django-rosetta"; + changelog = "https://github.com/mbi/django-rosetta/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ derdennisop ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix b/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix index 0f8c449e5985..5f3fdecc64ba 100644 --- a/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix @@ -8,14 +8,13 @@ buildPythonPackage rec { pname = "django-scopes"; - version = "1.2.0.post1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "raphaelm"; repo = "django-scopes"; - # No 1.2.0.post1 tag, see https://github.com/raphaelm/django-scopes/issues/27 - rev = "0b93cdb6a8335cb02a8ea7296511358ba841d137"; - hash = "sha256-djptJRkW1pfVbxhhs58fJA4d8dKZuvYRy01Aa3Btr+k="; + rev = "refs/tags/${version}"; + hash = "sha256-CtToztLVvSb91pMpPNL8RysQJzlRkeXuQbpvbkX3jfM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-sekizai/default.nix b/nixpkgs/pkgs/development/python-modules/django-sekizai/default.nix new file mode 100644 index 000000000000..0c28ee283a1d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-sekizai/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchPypi +, buildPythonPackage +, django-classy-tags +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "django-sekizai"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; + }; + + propagatedBuildInputs = [ + django-classy-tags + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + pythonImportsCheck = [ "sekizai" ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + meta = with lib; { + description = "Define placeholders where your blocks get rendered and append to those blocks"; + homepage = "https://github.com/django-cms/django-sekizai"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django_silk/default.nix b/nixpkgs/pkgs/development/python-modules/django-silk/default.nix index 0b420e9362c9..0b420e9362c9 100644 --- a/nixpkgs/pkgs/development/python-modules/django_silk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-silk/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix b/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix index a84bf2cd8712..0f505b21d3df 100644 --- a/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "django-simple-captcha"; - version = "0.5.17"; + version = "0.5.18"; src = fetchPypi { inherit pname version; - hash = "sha256-lknmbatOce+sv+8C9IuDuRaEiYNSoatW8Whs5xAzsyg="; + hash = "sha256-bh/MT0AF99ae56Llmn6GO105GPNqhaTYEUmJhK7MSM4="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix b/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix index c5ea30c14560..a3bbfd91b0d8 100644 --- a/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-stubs-ext"; - version = "4.2.1"; + version = "4.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-JpbW99hTg0GwYM/6lWXHLqeX6GZofgQLhtKcrYeZ5f4="; + hash = "sha256-xp0cxG8cTDt4lLaFpQIsKbKjbHz7UuI3YurzV+v8LJg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix index 037d1f31ee98..fe7e96579cdb 100644 --- a/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "4.2.0"; + version = "4.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k7r/gk8KBW5xA2tCO5QqdPB7kJ5F4/o4GFuRD1l8XAg="; + hash = "sha256-2tqzm0bZro83qOh5xZDzmp4EK1ZcA/oMWo91S0QbHyM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-tables2/default.nix b/nixpkgs/pkgs/development/python-modules/django-tables2/default.nix index 41637e7472ca..96811351269d 100644 --- a/nixpkgs/pkgs/development/python-modules/django-tables2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-tables2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-tables2"; - version = "2.4.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jieter"; repo = pname; rev = "v${version}"; - sha256 = "04vvgf18diwp0mgp14b71a0dxhgrcslv1ljybi300gvzvzjnp3qv"; + hash = "sha256-n8qvsm/i+2VclFc00jQGO0Z4l6Ke8qZ03EYuEQcPuVQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django_tagging/default.nix b/nixpkgs/pkgs/development/python-modules/django-tagging/default.nix index 4bcaa549a12f..4bcaa549a12f 100644 --- a/nixpkgs/pkgs/development/python-modules/django_tagging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-tagging/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix b/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix index 7870e79140d7..cfca863be096 100644 --- a/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-timezone-field"; - version = "5.0"; + version = "5.1"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mfogel"; repo = pname; rev = version; - hash = "sha256-GXkvF/kAOU1JK0GDpUT1irCQlkxIWieYRqPd0fr2HXw="; + hash = "sha256-FAYO8OEE/h4rsbC4Oc57ylWV7TqQ6DOd6/2M+mb/AsM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix b/nixpkgs/pkgs/development/python-modules/django-treebeard/default.nix index dd6e054b55c3..dd6e054b55c3 100644 --- a/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-treebeard/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/django-vite/default.nix b/nixpkgs/pkgs/development/python-modules/django-vite/default.nix index 12918bb33bf2..88dc763aa15f 100644 --- a/nixpkgs/pkgs/development/python-modules/django-vite/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-vite/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "django-vite"; - version = "2.1.1"; + version = "2.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MrBin99"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MKAzNtmFue7MrYtg5sOXog1u1daJwh3t98aIUSyyfBQ="; + hash = "sha256-HrcQt0Mdko+/XJd0srQTBYMtHaLZyImMuQn39HIwDfY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix b/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix index fc6818dec10c..1e9f0202bd70 100644 --- a/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2hgi5tg//A6ZSbPhWlUEbrumxBY4G2Am5fLK9uHv9lQ="; + hash = "sha256-Do37L82znb/QG+dgPAYBMqRmT0g4Ec48dfLTwNOat2I="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use webpack to generate your static bundles"; homepage = "https://github.com/owais/django-webpack-loader"; + changelog = "https://github.com/django-webpack/django-webpack-loader/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ peterromfeldhk ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/django/3.nix b/nixpkgs/pkgs/development/python-modules/django/3.nix index cd07c13358d5..9c8e13842422 100644 --- a/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.19"; + version = "3.2.20"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-AxNluuloFNoZwQcGIYxE3/O2VMxN4gqYvS0pub3kafA="; + hash = "sha256-3sKhFnh7jhSWIBS/eOEgu6RUE1EI4a+em5Gt57KWTEA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/django/4.nix b/nixpkgs/pkgs/development/python-modules/django/4.nix index 8359785305ef..c3df9cf4aef0 100644 --- a/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.2"; + version = "4.2.4"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-Kmtvv/W1ndB77xC8sBm+4uqXowsqZW1RNGWWckMkut8="; + hash = "sha256-fkIl7AZeDzVMz3NJoi0gneCcwcB0gyvp64TFHBeZxDI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index d45b600c8072..d5b388f5f5e3 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Camel case JSON support for Django REST framework"; homepage = "https://github.com/vbabiy/djangorestframework-camel-case"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index dc97ddb2955e..04ea80c1a83c 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = " Dataclasses serializer for Django REST framework"; homepage = "https://github.com/oxan/djangorestframework-dataclasses"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix index 9aec9ff0c701..fdc6b3184d98 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Django-guardian support for Django REST Framework"; homepage = "https://github.com/rpkilby/django-rest-framework-guardian"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix index b6029ad9938b..d4a96d679522 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = " Recursive Serialization for Django REST framework "; homepage = "https://github.com/heywbj/django-rest-framework-recursive"; license = licenses.isc; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix index 912c484b0a0e..ced22d54803a 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web APIs for Django, made easy"; homepage = "https://www.django-rest-framework.org/"; - maintainers = with maintainers; [ desiderius SuperSandro2000 ]; + maintainers = with maintainers; [ desiderius ]; license = licenses.bsd2; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix b/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix index c756ff67a138..3f3e0deb95e9 100644 --- a/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-d5THbfMRrbBL/2sQ99l2yeaTI9gT+bSkcxmVdRJT5bA="; + hash = "sha256-EZx3o6PgTeFjTwI9Ko9H39EqPSE0yLWWpsdqX6ALlo4="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix b/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix index 208fb14e76be..dec909729dcf 100644 --- a/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , dm-haiku , chex , cloudpickle @@ -16,9 +15,10 @@ , rlax , distrax , tensorflow-probability -, optax }: +, optax +}: -buildPythonPackage rec { +buildPythonPackage { pname = "dm-haiku-tests"; inherit (dm-haiku) version; diff --git a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix index 8cf15e9fda75..88a568ed258b 100644 --- a/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dockerfile-parse"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-If59UQZC8rYamZ1Fw9l0X5UOEf5rokl1Vbj2N4K3jkU="; + hash = "sha256-MYTM3FEyIZg+UDrADhqlBKKqj4Tl3mc8RrC27umex7w="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix b/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix index cae32e4a2b44..bd8af6391a43 100644 --- a/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Dockerspawner: A custom spawner for Jupyterhub"; homepage = "https://jupyter.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/docrep/default.nix b/nixpkgs/pkgs/development/python-modules/docrep/default.nix index 37785f1e29db..78bbba8a790b 100644 --- a/nixpkgs/pkgs/development/python-modules/docrep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docrep/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python package for docstring repetition"; homepage = "https://github.com/Chilipp/docrep"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ costrouc ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dokuwiki/default.nix b/nixpkgs/pkgs/development/python-modules/dokuwiki/default.nix new file mode 100644 index 000000000000..0d221c3b73b0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dokuwiki/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "dokuwiki"; + version = "1.3.3"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gtTyO6jmjQT0ZwmxvH+RAe1v5aruNStfP1qz1+AqYXs="; + }; + + pythonImportsCheck = [ + "dokuwiki" + ]; + + meta = with lib; { + homepage = "https://github.com/fmenabe/python-dokuwiki"; + description = "A python module that aims to manage DokuWiki wikis by using the provided XML-RPC API"; + license = licenses.mit; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dotwiz/default.nix b/nixpkgs/pkgs/development/python-modules/dotwiz/default.nix new file mode 100644 index 000000000000..f7fcd7847b76 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dotwiz/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyheck +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dotwiz"; + version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rnag"; + repo = "dotwiz"; + rev = "refs/tags/v${version}"; + hash = "sha256-ABmkwpJ40JceNJieW5bhg0gqWNrR6Wxj84nLCjKU11A="; + }; + + propagatedBuildInputs = [ + pyheck + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dotwiz" + ]; + + pytestFlagsArray = [ + "--ignore=benchmarks" + "--ignore-glob=*integration*" + ]; + + meta = with lib; { + description = "Dict subclass that supports dot access notation"; + homepage = "https://github.com/rnag/dotwiz"; + changelog = "https://github.com/rnag/dotwiz/blob/v${version}/HISTORY.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dparse/default.nix b/nixpkgs/pkgs/development/python-modules/dparse/default.nix index 72c372e5aa78..3c8b56a2c406 100644 --- a/nixpkgs/pkgs/development/python-modules/dparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dparse/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dparse"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1FJVvaIfmYvH3fKv1eYlBbphNHVrotQqhMVrCCZhTf4="; + hash = "sha256-J7uLS8rv7DmXaXuj9uBrJEcgC6JzwLCFw9ASoEVxtSg="; }; propagatedBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A parser for Python dependency files"; homepage = "https://github.com/pyupio/dparse"; + changelog = "https://github.com/pyupio/dparse/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ thomasdesr ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix b/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix index 8e5236389da8..15676ed304b6 100644 --- a/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "drf-nested-routers"; - version = "0.93.3"; + version = "0.93.4"; src = fetchFromGitHub { owner = "alanjds"; repo = "drf-nested-routers"; rev = "v${version}"; - sha256 = "1gmw6gwiqzfysx8qn7aan7xgkizxy64db94z30pm3bvn6jxv08si"; + hash = "sha256-qlXNDydoQJ9FZB6G7yV/pNmx3BEo+lvRqsfjrvlbdNY="; }; propagatedBuildInputs = [ django djangorestframework setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix index 0789e76dabd8..1413cd324803 100644 --- a/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Serve self-contained distribution builds of Swagger UI and Redoc with Django"; homepage = "https://github.com/tfranzel/drf-spectacular-sidecar"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix b/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix index d21e9f5b9dc7..e9c3a752b0dc 100644 --- a/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { homepage = "https://github.com/tfranzel/drf-spectacular"; changelog = "https://github.com/tfranzel/drf-spectacular/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/drms/default.nix b/nixpkgs/pkgs/development/python-modules/drms/default.nix index bc2d2763e49c..739cf1bf505b 100644 --- a/nixpkgs/pkgs/development/python-modules/drms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drms/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "drms"; - version = "0.6.3"; + version = "0.6.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-crPVo7ALErZWvNcsaJ/BuBa0VkfCsZ+C929x4kEZHKw="; + hash = "sha256-fH290QRhhglkhkMrpwHUkqVuYvZ6w/MDIYo9V0queVY="; }; nativeBuildInputs = [ @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index 5c8f4287e6b7..762b9b7ff8cf 100644 --- a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.36.0"; + version = "11.36.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-J2AaGkD4TMDcVzTtdcNH0bgy6de+BRjYdtTaRL3lYrs="; + hash = "sha256-d++lxsbwPxnz1JPguWkImHXB+GQpMa9Uo3JNIxIe2ok="; }; propagatedBuildInputs = [ @@ -42,10 +42,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace ">= 2.*" ">= 2.0" \ --replace "'pytest-runner == 5.2.0'," "" - substituteInPlace test/requirements.txt \ - --replace ">=2.*" ">=2.0" ''; doCheck = true; @@ -53,6 +50,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dropbox" ]; + nativeBuildInputs = [ sphinxHook ]; # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value. diff --git a/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix b/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix index eea6e4894a39..4f63c677e676 100644 --- a/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "1.2.3"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-M6ztqENIeD5foagKUXtJiGfFZPHsczlB0/AH4FMIsLY="; + hash = "sha256-nPhXJgky9/CgqBnyqbF2+BASHRSpwKd0ePIRFMq29Vc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dtlssocket/default.nix b/nixpkgs/pkgs/development/python-modules/dtlssocket/default.nix index 107c9d23f1b8..80831ea0eb50 100644 --- a/nixpkgs/pkgs/development/python-modules/dtlssocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dtlssocket/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dtlssocket"; - version = "0.1.15"; + version = "0.1.16"; format = "pyproject"; src = fetchPypi { pname = "DTLSSocket"; inherit version; - hash = "sha256-RWscUxJsmLkI2GPjnpS1oJVPsJ+xbqPAKk4Q1G7ISu4="; + hash = "sha256-MLEIrkX84cAz4+9sLd1+dBgGKuN0Io46f6lpslQ2ajk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ducc0/default.nix b/nixpkgs/pkgs/development/python-modules/ducc0/default.nix index 491e274bf798..14289caae466 100644 --- a/nixpkgs/pkgs/development/python-modules/ducc0/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ducc0/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.30.0"; + version = "0.31.0"; disabled = pythonOlder "3.7"; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-xYjgJGtWl9AjnzlFvdj/0chnIUDmoH85AtKXsNBwWUU="; + hash = "sha256-4aNIq5RNo1Qqiqr2wjYB/FXKyvbARsRF1yW1ZzZlAOo="; }; buildInputs = [ pybind11 ]; diff --git a/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index 2b4615694ef5..f582ae9c3fdf 100644 --- a/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , duckdb , google-cloud-storage -, mypy , numpy , pandas , psutil @@ -15,9 +14,8 @@ buildPythonPackage rec { inherit (duckdb) pname version src patches; format = "setuptools"; - # we can't use sourceRoot otherwise patches don't apply, because the patches - # apply to the C++ library postPatch = '' + # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library cd tools/pythonpkg # 1. let nix control build cores @@ -25,6 +23,9 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" \ --replace "setuptools_scm<7.0.0" "setuptools_scm" + + # avoid dependency on mypy + rm tests/stubs/test_stubs.py ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -41,7 +42,6 @@ buildPythonPackage rec { nativeCheckInputs = [ google-cloud-storage - mypy psutil pytestCheckHook ]; @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Python binding for DuckDB"; homepage = "https://duckdb.org/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc cpcloud ]; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/duct-py/default.nix b/nixpkgs/pkgs/development/python-modules/duct-py/default.nix new file mode 100644 index 000000000000..6a79305e90b5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/duct-py/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "duct-py"; + version = "0.6.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "oconnor663"; + repo = "duct.py"; + rev = version; + hash = "sha256-4ja/SQ9R/SbKlf3NqKxLi+Fl/4JI0Fl/zG9EmTZjWZc="; + }; + + pythonImportsCheck = [ "duct" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # This test completely empties the environment then tries to run a Python command. + # The test then fails because it can't find the `python` executable. It's unclear + # how this test even passes _outside_ of Nix. + "test_full_env" + ]; + + meta = with lib; { + description = "A Python library for running child processes"; + homepage = "https://github.com/oconnor663/duct.py"; + license = licenses.mit; + maintainers = with maintainers; [ zmitchell ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/duo-client/default.nix b/nixpkgs/pkgs/development/python-modules/duo-client/default.nix index 17ee62c93191..088e9dc844cb 100644 --- a/nixpkgs/pkgs/development/python-modules/duo-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duo-client/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/duosecurity/duo_client_python"; changelog = "https://github.com/duosecurity/duo_client_python/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dvc-azure/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-azure/default.nix index 6ff2f4b3e298..97dc33c539d0 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-azure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-azure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "dvc-azure"; - version = "2.21.2"; + version = "2.22.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ATxVIJ6qNNuz4p/DmcbBrc8KypfYquk4y/XQK7JmlPE="; + hash = "sha256-aGPh77HLeUcddGtmFcLd9bc+WaYAFUprtpFkw3h5iSc="; }; # Prevent circular dependency diff --git a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 7e4cfac084a9..3cb159e65e23 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.55.0"; + version = "2.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eE1cVzhwyClVYmaotw37sG46g5W1ToUE/f3pZ2CCcE0="; + hash = "sha256-Nqxaw5gGlKZCwTquNY/6z4b8l762mnrhHyvrteVzdHE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index 7611690fea66..a4c3fb583873 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.22.0"; + version = "0.24.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MJuvpFXsywtkzW6XZdivo3FETMWA24gAvkeebhGAfdw="; + hash = "sha256-DpRnbvGF6HOCAcQ7HRf9x1bzrHHnL95Fz/TzpCosRZo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dvc-s3/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-s3/default.nix index a5d6369376d7..ca4fe5a810d0 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-s3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-s3/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "dvc-s3"; - version = "2.22.0"; + version = "2.23.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-19j/JD8KZEQKaj55HYEucHwh/LUJ+88PPFEqAWov2Gg="; + hash = "sha256-HyhZj1sN70o1CTNCiroGKjaMk7tBGqPG2PRsrnm1uVc="; }; # Prevent circular dependency diff --git a/nixpkgs/pkgs/development/python-modules/dvc-studio-client/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-studio-client/default.nix index 8869ff7cd18d..5be66325f5a6 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvc-studio-client"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RhIHjTaNokuWlafG+UjzOmD7ByL3+CaRZTM96wbkxqY="; + hash = "sha256-bjwIle7O/qwwhhK+wa2/36EO/F1kjsORJjGyASypwVE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix index 77b5aa44d319..6cec59e72ac1 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-task"; - version = "0.2.1"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DIjS56QDdjH8lp8yZE8UIccOM+OoafJK3DWZ1d/q29k="; + hash = "sha256-nrE8PdvzhH7lO0flvNkGC61NOVT4aj2E2gKEDRkp+b4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dvclive/default.nix b/nixpkgs/pkgs/development/python-modules/dvclive/default.nix index d3abd709e93c..a2d501bfa156 100644 --- a/nixpkgs/pkgs/development/python-modules/dvclive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "2.11.1"; + version = "2.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zr8fLRwan1/G8RMHa6lf4Qa5fTh5DzVLO53PMW0fm4c="; + hash = "sha256-g2pRr8a+Rp2zIoB+Mmrb99nfbhrEQKTmJ6lfOOqiCrs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix index ebd6a6621032..4796ab99623a 100644 --- a/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "EditorConfig File Locator and Interpreter for Python"; homepage = "https://github.com/editorconfig/editorconfig-core-py"; license = licenses.psfl; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix b/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix index 15b3b883cdb2..70b11a9f23f3 100644 --- a/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.15.2"; + version = "0.15.4"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-gadFpFDHfiZ0vbUIEODu4SUL5SSsukdThxqP2ik5adI="; + hash = "sha256-jGZa1qfI/OybwgG2L4N1hICHpWZTufgElpl31EhU+O4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/edlib/default.nix b/nixpkgs/pkgs/development/python-modules/edlib/default.nix index 30c3f8fb3b42..357db8d2b8e8 100644 --- a/nixpkgs/pkgs/development/python-modules/edlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/edlib/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { disabled = pythonOlder "3.6"; - sourceRoot = "source/bindings/python"; + sourceRoot = "${edlib.src.name}/bindings/python"; preBuild = '' ln -s ${edlib.src}/edlib . diff --git a/nixpkgs/pkgs/development/python-modules/effdet/default.nix b/nixpkgs/pkgs/development/python-modules/effdet/default.nix new file mode 100644 index 000000000000..e6a7945ae0be --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/effdet/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +# build inputs +, torch +, torchvision +, timm +, pycocotools +, omegaconf +}: +let + pname = "effdet"; + version = "0.4.1"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-rFWJ/TBKVlDCAZhrLvX44QwREJOnGxxJ+muIF3EIErU="; + }; + + propagatedBuildInputs = [ + torch + torchvision + timm + pycocotools + omegaconf + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "effdet" ]; + + meta = { + description = "A PyTorch implementation of EfficientDet"; + homepage = "https://pypi.org/project/effdet"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix b/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix index 9774a97f3639..c50b5042a6c1 100644 --- a/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.16.0"; + version = "6.18.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-BPk1F50aUNzROfK/r73AlMX2LIDgsn0R5HUthht/ItU="; + hash = "sha256-s4aM2HuagqcF2sLHHRh2kj1tglf+JZ7hXT4PcAeFStQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/elastic-transport/default.nix b/nixpkgs/pkgs/development/python-modules/elastic-transport/default.nix index 0c0ba62ce3a2..7975b2f2abef 100644 --- a/nixpkgs/pkgs/development/python-modules/elastic-transport/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elastic-transport/default.nix @@ -60,6 +60,13 @@ buildPythonPackage rec { "test_default_headers" "test_head" "tls" + "test_simple_request" + "test_node" + "test_debug_logging" + "test_debug_logging_uncompressed_body" + "test_debug_logging_no_body" + "test_httpbin" + "test_sniffed_nodes_added_to_pool" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index 1fbcc828b0b7..b9efe304226f 100644 --- a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.1.2"; + version = "4.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-tu0WH/RwLVjGRX7vFlx7yLhmsE4Svg+qoWIoMbJSZjo="; + hash = "sha256-5K2xcnTo3/A6/pCxQn5qZqni7C64p/yNAWWJlhQeKe4="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix b/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix index b899c5417a0b..d7536d9a56e0 100644 --- a/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.2.4"; + version = "2.2.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = "refs/tags/${version}"; - hash = "sha256-qqkKsVSspVBVxX96vlM8+6SqfdIBTcVyODJzQ4Ga+6g="; + hash = "sha256-8Mzxaww6a+vi3i8H4W9jRgY+5mpTGaJbNBXPDPn8sl4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix b/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix index 8265ff1a6d99..59015f3fa4ba 100644 --- a/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "embedding-reader"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "rom1504"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uyeIcAW9O9PR4cqmifC6Lx+Hn6XPb1RH/ksmUWvbdtw="; + hash = "sha256-isb7i+RfZvbtQWySiPatuvOTxNXyPhLhoZTQMZjdC24="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/nixpkgs/pkgs/development/python-modules/emoji/default.nix index a3d7d7179606..b17305f144c8 100644 --- a/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.5.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "carpedm20"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-S2gU16kO8QVdhgjsfIeuv0ypcYSjWOFaVFGJdQsdijg="; + hash = "sha256-HxEQqWG0a96PQ0bNQsIyTSEK0G21WojgoAyaWLMmjyE="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/empty-files/default.nix b/nixpkgs/pkgs/development/python-modules/empty-files/default.nix index e539d0fea813..3c875da847a4 100644 --- a/nixpkgs/pkgs/development/python-modules/empty-files/default.nix +++ b/nixpkgs/pkgs/development/python-modules/empty-files/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "empty-files"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "approvals"; repo = "EmptyFiles.Python"; - rev = "v${version}"; - hash = "sha256-K4rlVO1X1AWxYI3EqLsyQ5/Ist/jlwFrmOM4aMojtKU="; + rev = "refs/tags/v${version}"; + hash = "sha256-sXatMH2QEGxzDGszAoFXUoPzB00rYaQIasz93vsfyz8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/encodec/default.nix b/nixpkgs/pkgs/development/python-modules/encodec/default.nix new file mode 100644 index 000000000000..930878782f60 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/encodec/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# dependencies +, einops +, numpy +, torch-bin +, torchaudio-bin +}: + +buildPythonPackage rec { + pname = "encodec"; + version = "0.1.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "encodec"; + rev = "v${version}"; + hash = "sha256-+iJZkX1HoyuNFu9VRxMO6aAzNQybkH9lrQJ5Ao9+/CY="; + }; + + propagatedBuildInputs = [ + einops + numpy + torch-bin + torchaudio-bin + ]; + + pythonImportsCheck = [ "encodec" ]; + + # requires model data from the internet + doCheck = false; + + meta = with lib; { + description = "State-of-the-art deep learning based audio codec supporting both mono 24 kHz audio and stereo 48 kHz audio"; + homepage = "https://github.com/facebookresearch/encodec"; + changelog = "https://github.com/facebookresearch/encodec/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/enochecker-core/default.nix b/nixpkgs/pkgs/development/python-modules/enochecker-core/default.nix new file mode 100644 index 000000000000..806bd4a14e9f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/enochecker-core/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "enochecker-core"; + version = "0.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version; + pname = "enochecker_core"; + hash = "sha256-N41p2XRCp55rcPXLpA4rPIARsva/dQzK8qafjzXtavI="; + }; + + + pythonImportsCheck = [ + "enochecker_core" + ]; + + # no tests upstream + doCheck = false; + + meta = with lib; { + description = "Base library for enochecker libs"; + homepage = "https://github.com/enowars/enochecker_core"; + changelog = "https://github.com/enowars/enochecker_core/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fwc ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/enrich/default.nix b/nixpkgs/pkgs/development/python-modules/enrich/default.nix index d823f3c4c848..abaa47ec07dc 100644 --- a/nixpkgs/pkgs/development/python-modules/enrich/default.nix +++ b/nixpkgs/pkgs/development/python-modules/enrich/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Enrich adds few missing features to the wonderful rich library"; homepage = "https://github.com/pycontribs/enrich"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index 9bd758342278..332d4866e09a 100644 --- a/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.34"; + version = "0.5.36"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-gnNncWhrqGTWq8cNVmNMzkgqW0hoglzVGrLjqyUvOIc="; + hash = "sha256-5eA9fqL748VigNgy1G7bZtMstV7EI9LLPhv6xZnCEFA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/espeak-phonemizer/default.nix b/nixpkgs/pkgs/development/python-modules/espeak-phonemizer/default.nix index 77d1ecc60c75..42eb17326921 100644 --- a/nixpkgs/pkgs/development/python-modules/espeak-phonemizer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/espeak-phonemizer/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "espeak-phonemizer"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = "espeak-phonemizer"; rev = "refs/tags/v${version}"; - hash = "sha256-F+A2ge9YAib6IjDW3RNi7QqKnh1RGy2mlPFEB+OLCJU="; + hash = "sha256-K0s24mzXUqG0Au40jjGbpKNAznBkMHQzfh2/CDBN0F8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix b/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix index 43d5401ce58f..3a7d12b410d9 100644 --- a/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "eth-abi"; - version = "3.0.1"; + version = "4.1.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-abi"; rev = "v${version}"; - hash = "sha256-xrZpT/9zwDtjSwSPDDse+Aq8plPm26OR/cIrliZUpLY="; + hash = "sha256-CGAfu3Ovz2WPJOD+4W2+cOAz+wYvuIyFL333Jw66ozA="; }; postPatch = '' substituteInPlace setup.py \ - --replace "parsimonious>=0.8.0,<0.9.0" "parsimonious" + --replace "parsimonious>=0.9.0,<0.10.0" "parsimonious" ''; propagatedBuildInputs = [ @@ -56,6 +56,6 @@ buildPythonPackage rec { description = "Ethereum ABI utilities"; homepage = "https://github.com/ethereum/eth-abi"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/eth-account/default.nix b/nixpkgs/pkgs/development/python-modules/eth-account/default.nix index 38389fc31fe8..319db8701115 100644 --- a/nixpkgs/pkgs/development/python-modules/eth-account/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eth-account/default.nix @@ -7,6 +7,7 @@ , eth-keys , eth-rlp , eth-utils +, websockets , hexbytes , pythonOlder , rlp @@ -14,21 +15,16 @@ buildPythonPackage rec { pname = "eth-account"; - version = "0.6.1"; + version = "0.9.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-account"; rev = "v${version}"; - hash = "sha256-cjQvTKC4lDbKnAvbmnTGHQiJZsZFhXc/+UH5rUdlGxs="; + hash = "sha256-Ps/vzJv0W1+wy1mSJaqRNNU6CoCMchReHIocB9kPrGs="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "bitarray>=1.2.1,<1.3.0" "bitarray>=2.4.0,<3" - ''; - propagatedBuildInputs = [ bitarray eth-abi @@ -38,6 +34,7 @@ buildPythonPackage rec { eth-utils hexbytes rlp + websockets ]; # require buildinga npm project @@ -49,6 +46,6 @@ buildPythonPackage rec { description = "Account abstraction library for web3.py"; homepage = "https://github.com/ethereum/eth-account"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix b/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix index aabd3b38f429..c26914f36006 100644 --- a/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "eth-hash"; - version = "0.3.2"; + version = "0.5.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-hash"; rev = "v${version}"; - hash = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ="; + hash = "sha256-6UN+kvLjjAtkmLgUaovjZC/6n3FZtXCwyXZH7ijQObU="; }; nativeCheckInputs = [ @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "The Ethereum hashing function keccak256"; homepage = "https://github.com/ethereum/eth-hash"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix b/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix index f50da1d17d0d..e4320e8e035c 100644 --- a/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Tools for handling the encrypted keyfile format used to store private keys"; homepage = "https://github.com/ethereum/eth-keyfile"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix b/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix index 601013b20f8b..e9d3cc28cb83 100644 --- a/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "Common API for Ethereum key operations"; homepage = "https://github.com/ethereum/eth-keys"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix b/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix index 8747d15f551a..0b2e9468c2aa 100644 --- a/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "RLP definitions for common Ethereum objects"; homepage = "https://github.com/ethereum/eth-rlp"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix b/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix index 8ed085ad0e4a..434fc6d8c10d 100644 --- a/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-typing"; changelog = "https://github.com/ethereum/eth-typing/blob/v${version}/docs/release_notes.rst"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix b/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix index 42aa421accf1..73a287b49aa5 100644 --- a/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "2.0.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - hash = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; + hash = "sha256-Ogp4o99smw5qVwDec6zd/xVqqKMyNk41iBfRNzrwuvE="; }; propagatedBuildInputs = [ @@ -29,18 +29,23 @@ buildPythonPackage rec { ] ++ lib.optional (!isPyPy) cytoolz ++ lib.optional isPyPy toolz; - nativeCheckInputs = [ hypothesis pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; + # Removing a poorly written test case from test suite. + # TODO work with the upstream + disabledTestPaths = [ + "tests/functional-utils/test_type_inference.py" + ]; + pythonImportsCheck = [ "eth_utils" ]; meta = { description = "Common utility functions for codebases which interact with ethereum"; homepage = "https://github.com/ethereum/eth-utils"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ SuperSandro2000 ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix b/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix index 5e7930bbc9cd..61eef0a05abe 100644 --- a/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.1.0"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "exceptiongroup"; rev = version; - hash = "sha256-XQcYYz4MOxWj9QlgM6KuwBaCHjYzGRkQw3cN5WBSnAo="; + hash = "sha256-19taP6adzmO4zH2As1OTXeYNFj6KwjhxBr09X+SrZRk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/exdown/default.nix b/nixpkgs/pkgs/development/python-modules/exdown/default.nix index 15979b0f2251..937e90250a86 100644 --- a/nixpkgs/pkgs/development/python-modules/exdown/default.nix +++ b/nixpkgs/pkgs/development/python-modules/exdown/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Extract code blocks from markdown"; homepage = "https://github.com/nschloe/exdown"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/execnet/default.nix b/nixpkgs/pkgs/development/python-modules/execnet/default.nix index a7ad4cf4ed5d..528e849290db 100644 --- a/nixpkgs/pkgs/development/python-modules/execnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/execnet/default.nix @@ -27,13 +27,14 @@ buildPythonPackage rec { }) ]; - # remove vbox tests postPatch = '' - rm -v testing/test_termination.py - rm -v testing/test_channel.py - rm -v testing/test_xspec.py - rm -v testing/test_gateway.py - ${lib.optionalString isPyPy "rm -v testing/test_multi.py"} + # remove vbox tests + rm testing/test_termination.py + rm testing/test_channel.py + rm testing/test_xspec.py + rm testing/test_gateway.py + '' + lib.optionalString isPyPy '' + rm testing/test_multi.py ''; nativeBuildInputs = [ @@ -44,8 +45,11 @@ buildPythonPackage rec { apipkg ]; + # sometimes crashes with: OSError: [Errno 9] Bad file descriptor + doCheck = !isPyPy; + nativeCheckInputs = [ - py + py # no longer required with 1.10.0 pytestCheckHook ]; @@ -62,5 +66,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/experiment-utilities/default.nix b/nixpkgs/pkgs/development/python-modules/experiment-utilities/default.nix new file mode 100644 index 000000000000..46c50e1e2ec0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/experiment-utilities/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, cloudpickle +, dill +, fasteners +, fetchFromGitLab +, qgrid +, ipywidgets +, odfpy +, scipy +, plotly +, pytestCheckHook +, pyyaml +, tabulate +, tensorboard +, torch +}: + +buildPythonPackage rec { + pname = "experiment-utilities"; + version = "0.3.4"; + + src = fetchFromGitLab { + owner = "creinke"; + repo = "exputils"; + domain = "gitlab.inria.fr"; + rev = "refs/tags/version_${version}"; + hash = "sha256-zjmmLUpGjUhpw2+stLJE6cImesnBSvrcid5bHMftX/Q="; + }; + + # This dependency constraint (<=7.6.5) was due to a bug in qgrid that has been patched in its + # owned derivation + postPatch = '' + substituteInPlace setup.cfg \ + --replace "ipywidgets >= 7.5.1,<= 7.6.5" "ipywidgets >= 7.5.1" + ''; + + propagatedBuildInputs = [ + cloudpickle + dill + fasteners + ipywidgets + odfpy + plotly + pyyaml + qgrid + scipy + tabulate + tensorboard + ]; + + nativeCheckInputs = [ + pytestCheckHook + torch + ]; + + disabledTests = [ + "test_experimentstarter" + ]; + + pythonImportsCheck = [ "exputils" ]; + + meta = with lib; { + description = "Various tools to run scientific computer experiments."; + homepage = "https://gitlab.inria.fr/creinke/exputils"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix b/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix index 895253d5a458..89a0bd110d4b 100644 --- a/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix +++ b/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; - sourceRoot = "source/builtins/extractcode_7z-linux"; + sourceRoot = "${src.name}/builtins/extractcode_7z-linux"; propagatedBuildInputs = [ plugincode diff --git a/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix b/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix index f1dd6f12959c..0031c7a27941 100644 --- a/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix +++ b/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; - sourceRoot = "source/builtins/extractcode_libarchive-linux"; + sourceRoot = "${src.name}/builtins/extractcode_libarchive-linux"; preBuild = '' pushd src/extractcode_libarchive/lib diff --git a/nixpkgs/pkgs/development/python-modules/f5-icontrol-rest/default.nix b/nixpkgs/pkgs/development/python-modules/f5-icontrol-rest/default.nix new file mode 100644 index 000000000000..080c3f5f0d73 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/f5-icontrol-rest/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, six +}: + +buildPythonPackage rec { + pname = "f5-icontrol-rest"; + version = "1.3.15"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "F5Networks"; + repo = "f5-icontrol-rest-python"; + rev = "v${version}"; + sha256 = "sha256-ScudlJTQfa0BsEVI+mIndYWF8OcARdxwFwTAOEJxA8w="; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + # needs to be updated to newer pytest version and requires physical device + doCheck = false; + + pytestFlags = [ + "icontrol/test" + ]; + + pythonImportsCheck = [ "icontrol" ]; + + meta = with lib; { + description = "F5 BIG-IP iControl REST API client"; + homepage = "https://github.com/F5Networks/f5-icontrol-rest-python"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/f5-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/f5-sdk/default.nix new file mode 100644 index 000000000000..b73afcec0fab --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/f5-sdk/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, f5-icontrol-rest +, six +}: + +buildPythonPackage rec { + pname = "f5-sdk"; + version = "3.0.21"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-IokMj9mCMsFMVFYO4CpZUB2i32cOamhS5u2mNkNjljo="; + }; + + propagatedBuildInputs = [ + f5-icontrol-rest + six + ]; + + # needs to be updated to newer pytest version and requires physical device + doCheck = false; + + pythonImportsCheck = [ "f5" ]; + + meta = with lib; { + description = "F5 Networks Python SDK"; + homepage = "https://github.com/F5Networks/f5-common-python"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fabric/default.nix b/nixpkgs/pkgs/development/python-modules/fabric/default.nix index 8dfd10253905..80a4bd6674a2 100644 --- a/nixpkgs/pkgs/development/python-modules/fabric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fabric/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Pythonic remote execution"; homepage = "https://www.fabfile.org/"; license = licenses.bsd2; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix index e9300edab09d..6ab228baf547 100644 --- a/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; homepage = "https://github.com/pythonforfacebook/facebook-sdk"; license = licenses.asl20 ; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/fairscale/default.nix b/nixpkgs/pkgs/development/python-modules/fairscale/default.nix new file mode 100644 index 000000000000..42a7da74f9bc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fairscale/default.nix @@ -0,0 +1,72 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +# build inputs +, torch +, numpy +, ninja +# check inputs +, pytestCheckHook +, parameterized +, pytest-cov +, pytest-timeout +, remote-pdb +}: +let + pname = "fairscale"; + version = "0.4.13"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "fairscale"; + rev = "refs/tags/v${version}"; + hash = "sha256-L2Rl/qL6l0OLAofygzJBGQdp/2ZrgDFarwZRjyAR3dw="; + }; + + # setup.py depends on ninja python dependency, but we have the binary in nixpkgs + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup_requires=["ninja"]' 'setup_requires=[]' + ''; + + nativeBuildInputs = [ + ninja + setuptools + ]; + + propagatedBuildInputs = [ + torch + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + parameterized + pytest-cov + pytest-timeout + remote-pdb + ]; + + # Some tests try to build distributed models, which doesn't work in the sandbox. + doCheck = false; + + pythonImportsCheck = [ + "fairscale" + ]; + + meta = with lib; { + description = "PyTorch extensions for high performance and large scale training"; + homepage = "https://github.com/facebookresearch/fairscale"; + changelog = "https://github.com/facebookresearch/fairscale/releases/tag/v${version}"; + license = with licenses; [ mit asl20 bsd3 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fairseq/default.nix b/nixpkgs/pkgs/development/python-modules/fairseq/default.nix new file mode 100644 index 000000000000..92d8a5e78560 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fairseq/default.nix @@ -0,0 +1,106 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + +# Native build inputs +, cython +, pythonRelaxDepsHook +, which + +# Propagated build inputs +, cffi +, hydra-core +, omegaconf +, sacrebleu +, numpy +, regex +, torch +, tqdm +, bitarray +, torchaudio +, scikit-learn +, packaging + +# Check inputs +, expecttest +, hypothesis +, pytestCheckHook +}: +let + pname = "fairseq"; + version = "0.12.3"; +in +buildPythonPackage rec { + inherit version pname; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XX/grU5ljQCwx33miGoFc/7Uj9fZDtmhm4Fz7L4U+Bc="; + }; + + disabled = pythonOlder "3.7"; + + nativeBuildInputs = [ + cython + pythonRelaxDepsHook + which + ]; + pythonRelaxDeps = [ + "hydra-core" + "omegaconf" + ]; + propagatedBuildInputs = [ + cffi + hydra-core + omegaconf + sacrebleu + numpy + regex + torch + tqdm + bitarray + torchaudio + scikit-learn + packaging + ]; + + nativeCheckInputs = [ + expecttest + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "fairseq" ]; + preCheck = '' + export HOME=$TMPDIR + cd tests + ''; + + pytestFlagsArray = [ + "--import-mode append" + ]; + disabledTests = [ + # this test requires xformers + "test_xformers_single_forward_parity" + # this test requires iopath + "test_file_io_async" + # these tests require network access + "test_s2s_transformer_checkpoint" + "test_librispeech_s2t_transformer_s_checkpoint" + "test_s2s_transformer_checkpoint" + "test_waitk_checkpoint" + "test_sotasty_es_en_600m_checkpoint" + "test_librispeech_s2t_conformer_s_checkpoint" + ]; + + meta = with lib; { + description = "Facebook AI Research Sequence-to-Sequence Toolkit"; + homepage = "https://github.com/pytorch/fairseq"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index 11a6ebb85be8..af8bc72fa51e 100644 --- a/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.12.1"; + version = "2.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-WF3dITWCrTQDORfaGWPpJBQFkPrUN6faHohjvBuOW7I="; + hash = "sha256-nDxuXDWnTt/ljd/M4pElo4U8jn91l+J9fPAfYpS0mOc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 299e34d6db14..7e7624020d5f 100644 --- a/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.2.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-jQgE/eR8Gd9nMGijH9unhHCrLUn7DbWFkTauoz3O/sM="; + hash = "sha256-yWDZPa9+DZh2Bj9IIeIVFpAt9nhQOk2tTZh02difsCs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index 4da7851a147f..71c700bdfe0a 100644 --- a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.12.0"; + version = "1.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-dtSGNLQUG4Co+p/sPBgKxMhB7drZAMxUas+eH6g/cS8="; + hash = "sha256-sDHqBGRJQuAj2zB7hcIy3u5iNCxBHO1ub0eHxfgd7kI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix b/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix index d158547750f0..52d3c4435724 100644 --- a/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix @@ -19,25 +19,23 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.2.8"; + version = "1.3.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sabuhish"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9u7+TYO0TmzyLcCxZL86ibC3hNH5b722t5fWimRHaW0="; + hash = "sha256-m8d4y75+mSh9A+YVaV/yZhN3ckOe2mV1jdtfeNFtU/w="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "1.2.2"' 'version = "${version}"' \ + --replace 'version = "1.2.5"' 'version = "${version}"' \ --replace 'aiosmtplib = "^2.0"' 'aiosmtplib = "*"' \ --replace 'pydantic = "^1.8"' 'pydantic = "*"' \ - --replace 'starlette = "^0.22.0"' 'starlette = "*"' \ - --replace 'black = "^22.12.0"' "" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fastavro/default.nix b/nixpkgs/pkgs/development/python-modules/fastavro/default.nix index 6cc980db09c6..85b9eecb57e8 100644 --- a/nixpkgs/pkgs/development/python-modules/fastavro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastavro/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.7.4"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oAOqViIBtIVYO0AN/Ug7I97QExhFaeFoNJ/7tpN/49w="; + hash = "sha256-UPnWVYiZJdP6r7Bm1H9DMXpLi26c9tpXeEkLXVJxWdM="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix b/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix index bc8eaa3588b9..a2b4b9c76be0 100644 --- a/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { description = "A fast native implementation of diff algorithm with a pure Python fallback"; homepage = "https://github.com/syrusakbary/fastdiff"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; # resulting compiled object panics at import broken = stdenv.is32bit; }; diff --git a/nixpkgs/pkgs/development/python-modules/faster-fifo/default.nix b/nixpkgs/pkgs/development/python-modules/faster-fifo/default.nix new file mode 100644 index 000000000000..1d77707b6aa5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/faster-fifo/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, cython +, setuptools + +# tests +, numpy +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "faster-fifo"; + version = "1.4.5"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "alex-petrenko"; + repo = "faster-fifo"; + rev = "v${version}"; + hash = "sha256-35kD+RWXwUXHG5leTVj4wY6hJAjDka69YczgSTIbCeg="; + }; + + nativeBuildInputs = [ + cython + setuptools + ]; + + pythonImportsCheck = [ + "faster_fifo" + ]; + + nativeCheckInputs = [ + numpy + unittestCheckHook + ]; + + meta = with lib; { + description = "Faster alternative to Python's multiprocessing.Queue (IPC FIFO queue"; + homepage = "https://github.com/alex-petrenko/faster-fifo"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix b/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix new file mode 100644 index 000000000000..563c4b7e4f48 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# dependencies +, av +, ctranslate2 +, huggingface-hub +, onnxruntime +, tokenizers + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "faster-whisper"; + version = "0.7.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "guillaumekln"; + repo = "faster-whisper"; + rev = "v${version}"; + hash = "sha256-NTk0S+dMChygnC7Wix62AFO4NNSPJuKXyqoEyWiQhII="; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "onnxruntime>=1.14,<2" "onnxruntime" + ''; + + propagatedBuildInputs = [ + av + ctranslate2 + huggingface-hub + onnxruntime + tokenizers + ]; + + pythonImportsCheck = [ + "faster_whisper" + ]; + + # all tests require downloads + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/v${version}"; + description = "Faster Whisper transcription with CTranslate2"; + homepage = "https://github.com/guillaumekln/faster-whisper"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix b/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix index e3a91b366d3f..7be3e25698ba 100644 --- a/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, fastnumbers , fetchFromGitHub , hypothesis , numpy @@ -43,6 +42,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--hypothesis-profile=standard" + ]; + pythonImportsCheck = [ "fastnumbers" ]; diff --git a/nixpkgs/pkgs/development/python-modules/filedepot/default.nix b/nixpkgs/pkgs/development/python-modules/filedepot/default.nix new file mode 100644 index 000000000000..a73c282c160f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/filedepot/default.nix @@ -0,0 +1,66 @@ +{ lib +, anyascii +, buildPythonPackage +, fetchFromGitHub +, flaky +, google-cloud-storage +, mock +, paste +, pillow +, pymongo +, pytestCheckHook +, pythonOlder +, requests +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "filedepot"; + version = "0.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "amol-"; + repo = "depot"; + rev = "refs/tags/${version}"; + hash = "sha256-vPceky5cvmy3MooWz7dRdy68VoAHN7i3a7egBs4dPE8="; + }; + + propagatedBuildInputs = [ + anyascii + google-cloud-storage + ]; + + nativeCheckInputs = [ + flaky + mock + paste + pillow + pymongo + pytestCheckHook + requests + sqlalchemy + ]; + + disabledTestPaths = [ + # The examples have tests + "examples" + # Missing dependencies (TurboGears2 and ming) + "tests/test_fields_ming.py" + "tests/test_wsgi_middleware.py" + ]; + + pythonImportsCheck = [ + "depot" + ]; + + meta = with lib; { + description = "Toolkit for storing files and attachments in web applications"; + homepage = "https://github.com/amol-/depot"; + changelog = "https://github.com/amol-/depot/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/filelock/default.nix b/nixpkgs/pkgs/development/python-modules/filelock/default.nix index 4b25ff52aad5..62a65cfbdf63 100644 --- a/nixpkgs/pkgs/development/python-modules/filelock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filelock/default.nix @@ -3,20 +3,21 @@ , fetchPypi , hatch-vcs , hatchling +, pytest-mock , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "filelock"; - version = "3.9.0"; + version = "3.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ezGfJDQLUfVaK/ehKsB1WpsD5xgxHaxWeg9Pf6vS9d4="; + hash = "sha256-/AOuQyiMAT0uqDyFlwAbESnbNRqtnFf+JAkyeRa45xg="; }; nativeBuildInputs = [ @@ -25,6 +26,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-mock pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/filterpy/default.nix b/nixpkgs/pkgs/development/python-modules/filterpy/default.nix index 86ea56f33347..7d45d7f979b4 100644 --- a/nixpkgs/pkgs/development/python-modules/filterpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filterpy/default.nix @@ -36,6 +36,6 @@ buildPythonPackage { homepage = "https://github.com/rlabbe/filterpy"; description = "Kalman filtering and optimal estimation library"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/findpython/default.nix b/nixpkgs/pkgs/development/python-modules/findpython/default.nix index 104400d5a6aa..68fb70cda533 100644 --- a/nixpkgs/pkgs/development/python-modules/findpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/findpython/default.nix @@ -4,7 +4,7 @@ , pythonOlder # build time -, pdm-pep517 +, pdm-backend # runtime , packaging @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.2.5"; + version = "0.3.1"; in buildPythonPackage { inherit pname version; @@ -25,11 +25,11 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-4P1HO0Jl5+DnhD7Hb+rIwMRBuGlXH0Zb7+nmlZSQaf4="; + hash = "sha256-diH4qcGZpw0hmDHN2uuEyn6D4guDWBcr/0eHGhil7aQ="; }; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix b/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix index 05affeb93cb5..ecda4d7959b8 100644 --- a/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix @@ -1,18 +1,18 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage , normality -, mypy -, coverage -, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "fingerprints"; version = "1.1.0"; - src = fetchPypi { - inherit pname version; - hash = "sha256-GZmurg3rpD081QZW/LUKWblhsQQSS6lg9O7y/kGy4To="; + src = fetchFromGitHub { + owner = "alephdata"; + repo = "fingerprints"; + rev = version; + hash = "sha256-rptBM08dvivfglPvl3PZd9V/7u2SHbJ/BxfVHNGMt3A="; }; propagatedBuildInputs = [ @@ -20,15 +20,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mypy - coverage - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - pythonImportsCheck = [ "fingerprints" ]; diff --git a/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix index 3e9430ef318b..edbd9433fb09 100644 --- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -19,17 +19,16 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.9.1"; + version = "1.9.4.post1"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchFromGitHub { owner = "Toblerity"; repo = "Fiona"; rev = "refs/tags/${version}"; - hash = "sha256-2CGLkgnpCAh9G+ILol5tmRj9S6/XeKk8eLzGEODiyP8="; + hash = "sha256-CeGdWAmWteVtL0BoBQ1sB/+1AWkmxogtK99bL5Fpdbw="; }; nativeBuildInputs = [ @@ -49,7 +48,6 @@ buildPythonPackage rec { cligj click-plugins munch - setuptools ]; passthru.optional-dependencies = { @@ -66,18 +64,33 @@ buildPythonPackage rec { rm -r fiona # prevent importing local fiona ''; + pytestFlagsArray = [ + # Tests with gdal marker do not test the functionality of Fiona, + # but they are used to check GDAL driver capabilities. + "-m 'not gdal'" + ]; + disabledTests = [ # Some tests access network, others test packaging - "http" "https" "wheel" + "http" + "https" + "wheel" + + # see: https://github.com/Toblerity/Fiona/issues/1273 + "test_append_memoryfile_drivers" + ]; + + pythonImportsCheck = [ + "fiona" ]; - pythonImportsCheck = [ "fiona" ]; + doInstallCheck = true; meta = with lib; { changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt"; description = "OGR's neat, nimble, no-nonsense API for Python"; homepage = "https://fiona.readthedocs.io/"; license = licenses.bsd3; - maintainers = with maintainers; [ knedlsepp ]; + maintainers = teams.geospatial.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/fipy/default.nix b/nixpkgs/pkgs/development/python-modules/fipy/default.nix index db11999a64c5..d8f7c808a9af 100644 --- a/nixpkgs/pkgs/development/python-modules/fipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fipy/default.nix @@ -13,17 +13,21 @@ , stdenv , openssh , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "fipy"; - version = "3.4.3"; + version = "3.4.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "usnistgov"; repo = "fipy"; - rev = version; - hash = "sha256-oTg/5fGXqknWBh1ShdAOdOwX7lVDieIoM5aALcOWFqY="; + rev = "refs/tags/${version}"; + hash = "sha256-XZpm+gzysR2OXBcxWUEjP1PlaLuOL2NpmeKMCH+OEb4="; }; propagatedBuildInputs = [ @@ -36,21 +40,28 @@ buildPythonPackage rec { future scikit-fmm openssh - ] ++ lib.optionals (!stdenv.isDarwin) [ gmsh ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ + gmsh + ]; - nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; + nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ + gmsh + ]; checkPhase = '' export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh ${python.interpreter} setup.py test --modules ''; - pythonImportsCheck = [ "fipy" ]; + pythonImportsCheck = [ + "fipy" + ]; meta = with lib; { homepage = "https://www.ctcms.nist.gov/fipy/"; description = "A Finite Volume PDE Solver Using Python"; + changelog = "https://github.com/usnistgov/fipy/blob/${version}/CHANGELOG.rst"; license = licenses.free; - maintainers = with maintainers; [ costrouc wd15 ]; + maintainers = with maintainers; [ wd15 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix index a3bdbab1712f..2e8935b078ca 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "23.5.9"; + version = "23.7.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qjR6WbgewVdmxubtEK6BdZv6zXgp0B9bQLxana3o+WU="; + hash = "sha256-pObZ3HvXuc9MabxY5XK2DPaGZXicH6zQ4RtfGpGdGBE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/nixpkgs/pkgs/development/python-modules/flake8/default.nix index d56d42abf2ea..860f449fd8b3 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -45,5 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/pycqa/flake8"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "flake8"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix b/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix index 2db849435b8e..61758ae482b8 100644 --- a/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix @@ -1,31 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi , numpy +, pandas +, pytestCheckHook , scipy +, setuptools , tables -, pandas -, nose -, configparser }: buildPythonPackage rec { pname = "flammkuchen"; - version = "1.0.2"; + version = "1.0.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-KtMGQftoYVNNMtfYeYiaQyMLAySpf9YXLMxj+e/CV5I="; + hash = "sha256-z68HBsU9J6oe8+YL4OOQiMYQRs3TZUDM+e2ssqo6BFI="; }; - nativeCheckInputs = [ - nose + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ numpy scipy tables + ]; + + nativeCheckInputs = [ pandas - ] ++ lib.optionals isPy27 [ configparser ]; + pytestCheckHook + ]; meta = { homepage = "https://github.com/portugueslab/flammkuchen"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix b/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix index b524a941f414..c77fc912cd77 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix @@ -108,6 +108,6 @@ buildPythonPackage rec { homepage = "https://github.com/flask-admin/flask-admin/"; changelog = "https://github.com/flask-admin/flask-admin/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index b4f5c63d643d..eaf132e943c3 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { homepage = "https://github.com/dpgaspar/flask-appbuilder/"; changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; # Support for flask-sqlalchemy >= 3.0 is missing, https://github.com/dpgaspar/Flask-AppBuilder/pull/1940 broken = true; }; diff --git a/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix b/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix index 5a6aca4978f3..7d3679e8f588 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Adds i18n/l10n support to Flask applications"; homepage = "https://github.com/mrjoes/flask-babelex"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix b/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix index a4bd3af49a1d..856c7f010bb0 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Brcrypt hashing for Flask"; homepage = "https://github.com/maxcountryman/flask-bcrypt"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix index 44c95940d19c..173b029d1533 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-jwt-extended"; - version = "4.4.4"; + version = "4.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-JWT-Extended"; inherit version; - hash = "sha256-YrUh11SUwpCmRq6KzHcSNyHkNkeQ8eZK8AONgjlh+/A="; + hash = "sha256-ulYkW6Q7cciuk2eEuGdiXc6LmVb67t7ClTIi5XlC+ws="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/vimalloc/flask-jwt-extended/releases/tag/${version}"; description = "JWT extension for Flask"; homepage = "https://flask-jwt-extended.readthedocs.io/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix b/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix index 9adecc5968d4..32a275177c2c 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/mongoengine/flask-mongoengine"; changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix b/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix index 4ae75839dc9a..c8d212368958 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "OpenID support for Flask"; homepage = "https://pythonhosted.org/Flask-OpenID/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flask-talisman/default.nix b/nixpkgs/pkgs/development/python-modules/flask-talisman/default.nix index 11488956bbd6..a719e453daba 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-talisman/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-talisman/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "flask-talisman"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-IF0958Xs+tZnyEEj9fvlgLH2jNmhsFjXNTzANI4Vsb8="; + hash = "sha256-xfSG9fVEIHKfhLPDhQzWP5bosDOpYpvuZsUk6jY3l/8="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flask-themes2/default.nix b/nixpkgs/pkgs/development/python-modules/flask-themes2/default.nix new file mode 100644 index 000000000000..56c03ca39e0c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/flask-themes2/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, flask, pythonOlder, pytestCheckHook }: + +buildPythonPackage rec { + pname = "flask-themes2"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "Flask-Themes2"; + inherit version; + hash = "sha256-0U0cSdBddb9+IG3CU6zUPlxaJhQlxOV6OLgxnNDChy8="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ flask ]; + + meta = with lib; { + description = "Easily theme your Flask app"; + homepage = "https://github.com/sysr-q/flask-themes2"; + license = licenses.mit; + maintainers = with maintainers; [ ruby0b ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/flask/default.nix b/nixpkgs/pkgs/development/python-modules/flask/default.nix index 4bcb02880671..b7914ad3777e 100644 --- a/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { Python web application frameworks. ''; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix b/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix index 3575f1c36137..ae5c7e309cd1 100644 --- a/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { inherit (flatbuffers) pname version src; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; # flatbuffers needs VERSION environment variable for setting the correct # version, otherwise it uses the current date. - VERSION = "${version}"; + VERSION = version; pythonImportsCheck = [ "flatbuffers" ]; diff --git a/nixpkgs/pkgs/development/python-modules/flet-core/default.nix b/nixpkgs/pkgs/development/python-modules/flet-core/default.nix index 1ed4f0625a3f..fae29247deab 100644 --- a/nixpkgs/pkgs/development/python-modules/flet-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flet-core/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "flet-core"; - version = "0.6.2"; + version = "0.7.4"; format = "pyproject"; src = fetchPypi { pname = "flet_core"; inherit version; - hash = "sha256-WMkm+47xhuYz1HsiPfF7YbOCg7Xlbj9oHI9nVtwAb/w="; + hash = "sha256-8WG7odYiGrew4GwD+MUuzQPmDn7V/GmocBproqsbCNw="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/development/python-modules/flet/default.nix b/nixpkgs/pkgs/development/python-modules/flet/default.nix index af5600e1c98b..95382a88c95c 100644 --- a/nixpkgs/pkgs/development/python-modules/flet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flet/default.nix @@ -6,17 +6,19 @@ buildPythonPackage rec { pname = "flet"; - version = "0.6.2"; + version = "0.7.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-EDNATwO2N4jXVC5H1VmXqC9XGTnQo8vLvTEozRYZuj4="; + hash = "sha256-vFPjN+5wIygtP035odAOSdF9PQe6eXz6CJ9Q0d8ScFo="; }; - patches = [ - ./pyproject.toml.patch - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'httpx = "^0.23' 'httpx = ">=0.23' \ + --replace 'watchdog = "^2' 'watchdog = ">=2' + ''; nativeBuildInputs = with python3.pkgs; [ poetry-core diff --git a/nixpkgs/pkgs/development/python-modules/flet/pyproject.toml.patch b/nixpkgs/pkgs/development/python-modules/flet/pyproject.toml.patch deleted file mode 100644 index 7f8a66f88967..000000000000 --- a/nixpkgs/pkgs/development/python-modules/flet/pyproject.toml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -20,7 +20,7 @@ flet-core = "0.6.2" - python = "^3.7" - typing-extensions = { version = "^4.4.0", python = "<3.8" } - websocket-client = "^1.4.2" --watchdog = "^2.2.1" -+watchdog = ">=2.2.1" - oauthlib = "^3.2.2" - websockets = "^10.4" - httpx = "^0.23.3" diff --git a/nixpkgs/pkgs/development/python-modules/flit-core/default.nix b/nixpkgs/pkgs/development/python-modules/flit-core/default.nix index d0b83d30ea27..c81a8567de2f 100644 --- a/nixpkgs/pkgs/development/python-modules/flit-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flit-core/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Distribution-building parts of Flit. See flit package for more information"; homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh SuperSandro2000 ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix b/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix index dd05212407bc..49d6ac89fce6 100644 --- a/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix @@ -5,7 +5,7 @@ , testpath }: -buildPythonPackage rec { +buildPythonPackage { pname = "flit-core"; inherit (flit-core) version; diff --git a/nixpkgs/pkgs/development/python-modules/flit/default.nix b/nixpkgs/pkgs/development/python-modules/flit/default.nix index 58e10e22a47c..43d8d8e90efc 100644 --- a/nixpkgs/pkgs/development/python-modules/flit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flit/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "A simple packaging tool for simple packages"; homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh SuperSandro2000 ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flower/default.nix b/nixpkgs/pkgs/development/python-modules/flower/default.nix index 1664b7214cc9..54da81e19e33 100644 --- a/nixpkgs/pkgs/development/python-modules/flower/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flower/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "flower"; - version = "1.2.0"; + version = "2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "46493c7e8d9ca2167e8a46eb97ae8d280997cb40a81993230124d74f0fe40bac"; + sha256 = "sha256-Vld4XXKKVJFCVsNP0FUf4tcVKqsIBi68ZFv4a5e4rsU="; }; postPatch = '' @@ -33,6 +33,8 @@ buildPythonPackage rec { tornado ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index 2e5502966f62..cdb7fd1ea9e1 100644 --- a/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.37"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-3SlgYENtyv0JdUwGFpT3lWUDOciAKThYGz/RV8z+tac="; + hash = "sha256-+eklvdmlWrwvdI6IwNyAIEI0kDlzIYh7bzNY94dzA+E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flyingsquid/default.nix b/nixpkgs/pkgs/development/python-modules/flyingsquid/default.nix new file mode 100644 index 000000000000..dcaf664e4acf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/flyingsquid/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pgmpy +, torch +}: +let + pname = "flyingsquid"; + version = "0.0.0a0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "HazyResearch"; + repo = pname; + rev = "28a713a9ac501b7597c2489468ae189943d00685"; + hash = "sha256-DPHTSxDD4EW3nrNk2fk0pKJI/8+pQ7Awywd8nxhBruo="; + }; + + propagatedBuildInputs = [ + pgmpy + torch + ]; + + pythonImportsCheck = [ "flyingsquid" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "More interactive weak supervision with FlyingSquid"; + homepage = "https://github.com/HazyResearch/flyingsquid"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix b/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix index b6fdb148edb3..2be3f227baf7 100644 --- a/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "fnv-hash-fast"; - version = "0.3.1"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "bdraco"; repo = "fnv-hash-fast"; rev = "v${version}"; - hash = "sha256-yApMUTO6Kq2YESGMpkU4/FlN57+hX0uQr2fGH7QIdUE="; + hash = "sha256-4JhzrRnpb9+FYXd0S2XcBelaHuRksm8RC29rxZqtlpw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix b/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix new file mode 100644 index 000000000000..2b001fecaf8c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "fontawesomefree"; + version = "6.4.0"; + format = "wheel"; + + # they only provide a wheel + src = fetchPypi { + inherit pname version format; + dist = "py3"; + python = "py3"; + hash = "sha256-4S7a1xts9pk/x8aupjZ+Ex8vJHtkNfrKmbEjKbrNKyc="; + }; + + pythonImportsCheck = [ + "fontawesomefree" + ]; + + meta = with lib; { + homepage = "https://github.com/FortAwesome/Font-Awesome"; + description = "Icon library and toolkit"; + license = with licenses; [ ofl cc-by-40 ]; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix index bdc0826ac87b..1f359dfdf7c3 100644 --- a/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.12.0"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1giXmmyuy+qrY6xV3yZn4kcDd6w6l8uCL4ozcZE4N00="; + hash = "sha256-e+w3ce6KdvbYzH48XPEQTiBgtjbKWNdQj8ie4yw0rzE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/nixpkgs/pkgs/development/python-modules/fsspec/default.nix index 970f04be62eb..e158692e9af7 100644 --- a/nixpkgs/pkgs/development/python-modules/fsspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fsspec/default.nix @@ -155,6 +155,6 @@ buildPythonPackage rec { homepage = "https://github.com/fsspec/filesystem_spec"; changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix b/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix index f8b0f7829927..61204104a96a 100644 --- a/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix +++ b/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads"; homepage = "https://github.com/kata198/func_timeout"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/funcy/default.nix b/nixpkgs/pkgs/development/python-modules/funcy/default.nix index 74c8b8ff4d67..bafaf0fdb1f1 100644 --- a/nixpkgs/pkgs/development/python-modules/funcy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/funcy/default.nix @@ -1,15 +1,19 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "funcy"; - version = "1.18"; + version = "2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FUSNGajrzHpYWv56OEoZGG0L1ny/VvtCzR/Q92MT+bI="; + hash = "sha256-OWMxXVnUHG8wwEvJEOEKtQo6xKIlhov6lv7tEz3wdcs="; }; # No tests @@ -18,7 +22,9 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of fancy functional tools focused on practicality"; homepage = "https://funcy.readthedocs.org/"; + changelog = "https://github.com/Suor/funcy/blob/2.0/CHANGELOG"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/furl/default.nix b/nixpkgs/pkgs/development/python-modules/furl/default.nix index 0f561573d581..3c9592c37d0d 100644 --- a/nixpkgs/pkgs/development/python-modules/furl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/furl/default.nix @@ -16,6 +16,13 @@ buildPythonPackage rec { sha256 = "5a6188fe2666c484a12159c18be97a1977a71d632ef5bb867ef15f54af39cc4e"; }; + # With python 3.11.4, invalid IPv6 address does throw ValueError + # https://github.com/gruns/furl/issues/164#issuecomment-1595637359 + postPatch = '' + substituteInPlace tests/test_furl.py \ + --replace '[0:0:0:0:0:0:0:1:1:1:1:1:1:1:1:9999999999999]' '[2001:db8::9999]' + ''; + propagatedBuildInputs = [ orderedmultidict six diff --git a/nixpkgs/pkgs/development/python-modules/fvcore/default.nix b/nixpkgs/pkgs/development/python-modules/fvcore/default.nix new file mode 100644 index 000000000000..884f50a0cb4a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fvcore/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +# build inputs +, numpy +, yacs +, pyyaml +, tqdm +, termcolor +, pillow +, tabulate +, iopath +, shapely +# check inputs +, torch +}: +let + pname = "fvcore"; + version = "0.1.5.post20221221"; + optional-dependencies = { + all = [ shapely ]; + }; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-8vsLuQVyrmUcEceOIEk+0ZsiQFUKfku7LW3oe90DeGA="; + }; + + propagatedBuildInputs = [ + numpy + yacs + pyyaml + tqdm + termcolor + pillow + tabulate + iopath + ]; + + nativeCheckInputs = [ + torch + ]; + + # TypeError: flop_count() missing 2 required positional arguments: 'model' and 'inputs' + doCheck = false; + + pythonImportsCheck = [ + "fvcore" + ]; + + passthru.optional-dependencies = optional-dependencies; + + meta = with lib; { + description = "Collection of common code that's shared among different research projects in FAIR computer vision team"; + homepage = "https://github.com/facebookresearch/fvcore"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/galois/default.nix b/nixpkgs/pkgs/development/python-modules/galois/default.nix index f0e07e6e2923..4012144710c8 100644 --- a/nixpkgs/pkgs/development/python-modules/galois/default.nix +++ b/nixpkgs/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.4"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-yvF57ErcaknKcK6UgINt65uASNZpEtXk+LOizYDH1Bo="; + hash = "sha256-4eYDaQwjnYCTnobXRtFrToRyxxH2N2n9sh8z7oPC2Wc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package that extends NumPy arrays to operate over finite fields"; homepage = "https://github.com/mhostetter/galois"; + changelog = "https://github.com/mhostetter/galois/releases/tag/v${version}"; downloadPage = "https://github.com/mhostetter/galois/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ chrispattison ]; diff --git a/nixpkgs/pkgs/development/python-modules/gaphas/default.nix b/nixpkgs/pkgs/development/python-modules/gaphas/default.nix index 20553c482b0b..ec57bfd114df 100644 --- a/nixpkgs/pkgs/development/python-modules/gaphas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.11.1"; + version = "3.11.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TqrrGu+jk6WNXUnXJao71JHEu7Is27UeHAG29/Jpqb8="; + hash = "sha256-NpmNIwZqvWAJDkUEb6+GpfQaRCVtjQk4odkaOd2D2ok="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gatt/default.nix b/nixpkgs/pkgs/development/python-modules/gatt/default.nix index 6242011b312f..3adaf2d70b82 100644 --- a/nixpkgs/pkgs/development/python-modules/gatt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gatt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "getsenic"; repo = "gatt-python"; - rev = "${version}"; + rev = version; hash = "sha256-GMLqQ9ojQ649hbbJB+KiQoOhiTWweOgv6zaCDzhIB5A="; }; @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Bluetooth (Generic Attribute Profile) GATT SDK for Python"; homepage = "https://github.com/getsenic/gatt-python/"; license = licenses.mit; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/gb-io/default.nix b/nixpkgs/pkgs/development/python-modules/gb-io/default.nix index 930aafc5ebf3..46c98cfc78c8 100644 --- a/nixpkgs/pkgs/development/python-modules/gb-io/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gb-io/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70="; }; - sourceRoot = "source"; + sourceRoot = src.name; nativeBuildInputs = [ setuptools-rust diff --git a/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix b/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix index eec5d27a2d31..ed42e3561141 100644 --- a/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "4.2.0"; + version = "4.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-Z5XRyhObREj38BWnexQnwHS1y2Ewyv5/KPkl/ybHvUE="; + hash = "sha256-+ysm3THUet2gKHyVq0QoOxDem7ik4BK7bxVos9thExM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix b/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix index 97f72a8c23a6..81a8e3678272 100644 --- a/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.11"; + version = "0.5.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iX8Vb6uUn1a7qVxwL6ZFy1YAANaSrucpOOijI1ufZco="; + hash = "sha256-5nu7pewkxCZ/F6m7xOwvMwuhFsanQKHtdwGqNto3/zk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/generic/default.nix b/nixpkgs/pkgs/development/python-modules/generic/default.nix index 5c4e01a749e8..77952b5046b4 100644 --- a/nixpkgs/pkgs/development/python-modules/generic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/generic/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "generic"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-UHz2v6K5lNYb7cxBViTfPkpu2M8LItApGoSg3Bb2bqI="; + hash = "sha256-NfUvmkUIAdm+UZqmBWh0MZTViLJSkeRonPNSnVd+RbA="; }; nativeBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { description = "Generic programming (Multiple dispatch) library for Python"; maintainers = with maintainers; [ wolfangaukang ]; homepage = "https://github.com/gaphor/generic"; - license = licenses.bsdOriginal; + changelog = "https://github.com/gaphor/generic/releases/tag/${version}"; + license = licenses.bsd3; }; } diff --git a/nixpkgs/pkgs/development/python-modules/genpy/default.nix b/nixpkgs/pkgs/development/python-modules/genpy/default.nix index 3de2bad0f4ad..7bb7458b0ccc 100644 --- a/nixpkgs/pkgs/development/python-modules/genpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/genpy/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "C/C++ source generation from an AST"; homepage = "https://github.com/inducer/genpy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index 0e18c64f44af..d216f43f76ac 100644 --- a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.13.1"; + version = "0.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "GeoAlchemy2"; inherit version; - hash = "sha256-VyRtRK6pC0xS+EwAb2dY0OGVHrkBjxBAmocUHwIVmxM="; + hash = "sha256-2Fp96qmiMJAXM/dBnWv/VnS4cwZR3hoH8rZCOqSSXQk="; }; nativeBuildInputs = [ @@ -64,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Toolkit for working with spatial databases"; homepage = "https://geoalchemy-2.readthedocs.io/"; + changelog = "https://github.com/geoalchemy/geoalchemy2/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/getjump/default.nix b/nixpkgs/pkgs/development/python-modules/getjump/default.nix new file mode 100644 index 000000000000..a3c4c4ffa6ec --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/getjump/default.nix @@ -0,0 +1,43 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchPypi +, pillow +, poetry-core +, requests +, rich +}: + +buildPythonPackage rec { + pname = "getjump"; + version = "2.4.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gu6h9Yb0xdfvdmoeZGQPFCJhBJxuQ4iWlQquig1ljnY="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + pillow + requests + rich + ]; + + pythonImportsCheck = [ + "getjump" + ]; + + meta = with lib; { + description = "Get and save images from jump web viewer"; + homepage = "https://github.com/eggplants/getjump"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + mainProgram = "jget"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix b/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix index f0d7e35179df..37a9d75beee7 100644 --- a/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "5.2.1"; + version = "5.3.0"; format = "flit"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pTP4WleVUmFDPCUHAUdjBMw3QDfAq2aw5TcrSEZ0nVw="; + hash = "sha256-ns59N/vOuBm4BWDn7Vj5NuSKZdN+xfVtt5FFFWtCaiU="; }; propagatedBuildInputs = [ @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "An async GitHub API library"; homepage = "https://github.com/brettcannon/gidgethub"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix b/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix index 4b956db88d59..7003443f1736 100644 --- a/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "gitignore-parser"; - version = "0.1.3"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mherrmann"; repo = "gitignore_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-AWLiwF+8CfiD4uT6uV5drCLtnQT+r5VTPo53T7w0SiM="; + hash = "sha256-Z2x09XwFDMf6sUoKXJ240abp7zctbVCN4dsoQmWVSn8="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gitpython/default.nix b/nixpkgs/pkgs/development/python-modules/gitpython/default.nix index 0915170bc7f6..79cefa48656c 100644 --- a/nixpkgs/pkgs/development/python-modules/gitpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.31"; + version = "3.1.32"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; rev = "refs/tags/${version}"; - hash = "sha256-lpx/vptFhz4WOkybJpqq1teMGgX6RQo/f2OTNEm5XJU="; + hash = "sha256-Bhgu57w5QYfq5hlTh5gCJhbdwUMU+u0nrova/2V2ed0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/glances-api/default.nix b/nixpkgs/pkgs/development/python-modules/glances-api/default.nix index c57cee073f7d..b0f54b53dc62 100644 --- a/nixpkgs/pkgs/development/python-modules/glances-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glances-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.4.2"; + version = "0.4.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = "refs/tags/${version}"; - hash = "sha256-fcQgwOYGhpwxSXfa1PYFOe2UDTEu+2YGIQmuSa5J0g4="; + hash = "sha256-VfiAJuSmzFVgDTThtsTy7/caRmJKZuD5YwHjMspeB0A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/glob2/default.nix b/nixpkgs/pkgs/development/python-modules/glob2/default.nix index 29028e6d32d8..83d6aa13cfa2 100644 --- a/nixpkgs/pkgs/development/python-modules/glob2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glob2/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Version of the glob module that can capture patterns and supports recursive wildcards"; homepage = "https://github.com/miracle2k/python-glob2/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 7480bd51eaf5..bdca6599f5c8 100644 --- a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , cryptography , fetchFromGitHub -, mypy , pyjwt , pytestCheckHook , pythonOlder @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.19.0"; + version = "3.23.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-xdzDKzlqQRBrKT/j6PWSgDu33XlVHKsHfv5AgrT6SB8="; + hash = "sha256-5Y5lRNsxOrsByZ7zUu+3O5UCzjvOjKvlZLDeK5EMcHY="; }; propagatedBuildInputs = [ @@ -34,7 +33,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mypy pytestCheckHook responses ]; diff --git a/nixpkgs/pkgs/development/python-modules/glymur/default.nix b/nixpkgs/pkgs/development/python-modules/glymur/default.nix index 7774b3c53804..4ff23443e40d 100644 --- a/nixpkgs/pkgs/development/python-modules/glymur/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glymur/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/quintusdias/glymur"; changelog = "https://github.com/quintusdias/glymur/blob/v${version}/CHANGES.txt"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix b/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix index 7c1aadb6be0a..1aae1c347e32 100644 --- a/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.2.2"; + version = "6.2.5"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-JY1Gs2RTjp7eCwyK9ZI2OpqExxYR8unt4DcjarXWiZk="; + hash = "sha256-El2hRY+ELzdW/Bv34JURsisRr74MEv19sFt9tWFHIes="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/goalzero/default.nix b/nixpkgs/pkgs/development/python-modules/goalzero/default.nix index 1f007c032eba..806d486d79cd 100644 --- a/nixpkgs/pkgs/development/python-modules/goalzero/default.nix +++ b/nixpkgs/pkgs/development/python-modules/goalzero/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "goalzero"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-PveHE317p5fGSxgx7LQkpRYF55HwdzpZFY8/F8s3CBQ="; + hash = "sha256-h/EaEOe0zvnO5BYfcIyC3Vq8sPED6ts1IeI/GM+vm7c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix b/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix new file mode 100644 index 000000000000..d2c6aebe221f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, six +, pytestCheckHook +, responses +, nose +}: + +buildPythonPackage rec { + pname = "gocardless-pro"; + version = "1.45.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gocardless"; + repo = "gocardless-pro-python"; + rev = "v${version}"; + hash = "sha256-mzIEHm8roiVtrh84Oc+J87anMpr4zMp5yLFCmuljg8k="; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + pythonImportsCheck = [ "gocardless_pro" ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + nose + ]; + + meta = with lib; { + description = "A client library for the GoCardless Pro API"; + homepage = "https://github.com/gocardless/gocardless-pro-python"; + changelog = "https://github.com/gocardless/gocardless-pro-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix new file mode 100644 index 000000000000..444b1cf1f5cd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-cloud-testutils +, grpcio +, grpcio-status +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-ai-generativelanguage"; + version = "0.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-DbtXyNBCew90y4RfJgHiolD9SIjZfX18wvo76xGA66k="; + }; + + propagatedBuildInputs = [ + google-api-core + grpcio + grpcio-status + proto-plus + protobuf + ]; + + nativeCheckInputs = [ + google-cloud-testutils + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.ai.generativelanguage" + "google.ai.generativelanguage_v1beta2" + ]; + + meta = with lib; { + description = "Google Ai Generativelanguage API client library"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-ai-generativelanguage"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-ai-generativelanguage-v${version}/packages/google-ai-generativelanguage/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix index c3839dc667c8..c4cf9b2e0767 100644 --- a/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix @@ -87,6 +87,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-api-core"; changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 5da821346e3f..c99ecbdcb465 100644 --- a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.84.0"; + version = "2.88.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w5j9b56tC+I6reOycExyxRRt8OM1LY/5EBKGB34bAQo="; + hash = "sha256-NwaEU/eeoo5TlKj+IKS6YgWU5/hUEGi+ouhE2s3MnTM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix index 40af6ed4a0b7..e185a88858d5 100644 --- a/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; changelog = "https://github.com/googleapis/google-auth-library-python-httplib2/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 134fb80d41a9..5d5c56188c88 100644 --- a/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Google Authentication Library: oauthlib integration"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 terlar ]; + maintainers = with maintainers; [ terlar ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index a3247b4ea938..13f0ea961f0d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.19.1"; + version = "2.21.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-qc+oiz4WGWhF5ko2WOuVOZISnROsczewZMZUb3fBcYM="; + hash = "sha256-so6ASOV3J+fPDlvY5ydrISrvR2ZUoJURNUqoJ1O0XGY="; }; propagatedBuildInputs = [ @@ -105,6 +105,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-auth-library-python"; changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index d96874aeebd2..1e37e3a9552d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-access-context-manager"; changelog = "https://github.com/googleapis/python-access-context-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; + maintainers = with maintainers; [ austinbutler ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index b0aca65e5ce4..0e9f76e4b6bf 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1S8U4empk3l6CG7/PUdy3qeQg5DGrWEtJigTQfF8mkk="; + hash = "sha256-s/X3l9a6zGBlTeIZAZAvinh49xaNdr5dR8d3X+DD4Kg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix new file mode 100644 index 000000000000..59fbcd9002ce --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, fetchPypi +, google-api-core +, grpc-google-iam-v1 +, lib +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-artifact-registry"; + version = "1.8.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kgbSwGR5ObkMbup4p4ePXnxl7uRn0nYeGCOU1LMPZSE="; + }; + + propagatedBuildInputs = [ + google-api-core + grpc-google-iam-v1 + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "google.cloud.artifactregistry" + "google.cloud.artifactregistry_v1" + "google.cloud.artifactregistry_v1beta2" + ]; + + meta = with lib; { + description = "Google Cloud Artifact Registry API client library"; + homepage = "https://github.com/googleapis/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index 1f8c9227492e..f38a83a2c087 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.19.0"; + version = "3.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oOGs6qAFq9Y17ktJeiQvd/UgUgV3nEt2m/dpZyRb0fs="; + hash = "sha256-Rmd01HHVOThqSwfnoIrTaMjxqHFuGcKAjwKp3hD4S5o="; }; propagatedBuildInputs = [ @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-asset"; changelog = "https://github.com/googleapis/python-asset/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 643098f1de5e..60515a9c65dc 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-audit-log"; changelog = "https://github.com/googleapis/python-audit-log/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index 64822d5f59e8..fcbddee2fdde 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.11.1"; + version = "2.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MFYWx791WDdZLClul+f/hNHeTEmlQWEJw5zLs5FVgh8="; + hash = "sha256-w4kzOe8az6zcMLoNYbfkvC5Aq5zCbSNw6+PHYZkEZqI="; }; propagatedBuildInputs = [ @@ -79,6 +79,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-automl"; changelog = "https://github.com/googleapis/python-automl/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 3be14ed4ec29..7c4a0df032e2 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.11.1"; + version = "3.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IRD02YbB3355uo/5+qCeRjQt4pU5NUuZ3tbTNZyc9lA="; + hash = "sha256-5jxcN69FPuAZ7xiBcBu5+aE+q4OU9OlM+i9bd6vMnJI="; }; propagatedBuildInputs = [ @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery-datatransfer"; changelog = "https://github.com/googleapis/python-bigquery-datatransfer/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 674fa63c86e4..2c7202be0d25 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zTVOt3175ruIHatHTemOAt9VF4pvJn/fQIvm/DXXw9M="; + hash = "sha256-e6ZCsdEstzxMjaJdubslQ4Lchr3FmBCdtTZ0xVsCl14="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index a23294a8cb7b..ce91fa6c6c05 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.20.0"; + version = "2.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F61ZHBaE8cEaQl0+7wyWcrjQlk66QHQiUbUasjyjfZw="; + hash = "sha256-9tjHs6ubV0xml3/O6dM24zStGjhDpyK+GRI2QOeAjqM="; }; propagatedBuildInputs = [ @@ -65,6 +65,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery-storage"; changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 4206c14e87c4..69a32d87a1f5 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.11.0"; + version = "3.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OhwbNWb58n6oOjaq9U64eURO5z70JFZ2QBigs7VW0Ps="; + hash = "sha256-aX3xFyQaIoO8u5OyHhC63BTlHJqQgA0qfho+HH2EKXQ="; }; propagatedBuildInputs = [ @@ -131,6 +131,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery"; changelog = "https://github.com/googleapis/python-bigquery/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix index b8d6bee573c2..773eea02e4b5 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.19.0"; + version = "2.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EebMccj9DmrPj+/GCECLkqplq3bSmRkNqlI3gYq0qzo="; + hash = "sha256-PUeEqed0crzfHLAHDDu4GgktMaNt11nuovfMIkz5iwk="; }; propagatedBuildInputs = [ @@ -65,6 +65,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigtable"; changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix index ebe12685998b..084612219e92 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.11.0"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0dBaSz7G+DC73Md5p0DpY6gNMkpP1u9Bp8JIoHz5ZIk="; + hash = "sha256-k7chKcZEPImNpaBg0gIbwtEcKlfvL7uTBq+7USajdrk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 0ebc4c15d505..db7ab280b4bd 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.23.0"; + version = "2.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yVyd5kowbHbs64EY5oMIa1sYIs/qShqzVdjfZ1VifA4="; + hash = "sha256-yML87bCWsuiV+jcznu6QDaLwKxSCb4Nd2BUm5f+wtRE="; }; propagatedBuildInputs = [ @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-container"; changelog = "https://github.com/googleapis/python-container/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix index 8d54e68bab72..091729e95f69 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.3.2"; + version = "2.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uVKe5wR/2NS/SiGC3mGRVCQN8X++YOrTmQeMGuFSr5o="; + hash = "sha256-N7gCc8jX7uGugWs6IK5DWF6lBQbLDmDzz1vl+H8Tc8s="; }; propagatedBuildInputs = [ @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-cloud-core"; changelog = "https://github.com/googleapis/python-cloud-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index cb6c238154c8..8787eed87a10 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.13.0"; + version = "3.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YdEMSLC6qz79t/caG2DUMhSxxjCh40Cu3+aABvVxQow="; + hash = "sha256-4+zlMv5GJCKuXTck2QmaEctu6mkZKXeiY4SgM+7RYSk="; }; propagatedBuildInputs = [ @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-datacatalog"; changelog = "https://github.com/googleapis/python-datacatalog/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 522d466bdad0..267ba36b91db 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.4.1"; + version = "5.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GJbhT2PBIaPx4sIhKHzH/QBlDSpz+LOPggQK5tWqt78="; + hash = "sha256-2cd8Uqpd31KuZXc22/tTEkApM/crq4SA/C0q/phpdAI="; }; propagatedBuildInputs = [ @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-dataproc"; changelog = "https://github.com/googleapis/python-dataproc/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix index 90d838434493..501afabbc367 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.15.2"; + version = "2.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PnPP7FRrxKyuYTcFuSZdwUs+Ff06yPyJ8Omk6Zaufv0="; + hash = "sha256-cQ7yfr37UDQPRnHFMq1MFSVmWYXpQhmE/81rlrV+NLs="; }; propagatedBuildInputs = [ @@ -71,6 +71,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-datastore"; changelog = "https://github.com/googleapis/python-datastore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index a0ed249d47bc..c7e75a8e8af0 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.12.1"; + version = "3.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KBqnGp56U2lGLo/2MWu5kfHr7pfIJJDT857+xnrK+iU="; + hash = "sha256-+Ab1XD45m3PqQ0LHBIRVId5wARJ9KOjClEk9C2c2NBY="; }; propagatedBuildInputs = [ @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-dlp"; changelog = "https://github.com/googleapis/python-dlp/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index b61f1b731749..ec554d61d32c 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-dns"; changelog = "https://github.com/googleapis/python-dns/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index ae30c9714922..4f2879196356 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.9.1"; + version = "1.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3N7LtFKvTdV0zBGIyUgi6tCVZX7+rbJD5Lb+xZafJNw="; + hash = "sha256-S+7x6gIxJDfV7Xe6DOBVbJNMREYlRFLyGo8BEpIdIow="; }; propagatedBuildInputs = [ @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-error-reporting"; changelog = "https://github.com/googleapis/python-error-reporting/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index 70570bfdced9..19b8c25f377c 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-firestore"; changelog = "https://github.com/googleapis/python-firestore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 9a1518b3cc00..abfffeb81bd2 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Xj7XJ/Wz9dmbqygKqjcvWn+zeGejYyqBzLkpNufX8lQ="; + hash = "sha256-R35MCPWM5wiJzlFHJuHOD5P6IthPtDjGtw5OhFlfhNc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index 26247453cc7a..ec412c732ddd 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lfT4lgW4n3k5Fs2Owng8JoHGYDwjoKTzaKhEf35O+VA="; + hash = "sha256-/lBwhUR+z0Ydr9LNS4AWxYmeWOUgvQS1G7Orb2sI+v8="; }; propagatedBuildInputs = [ @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-iam"; changelog = "https://github.com/googleapis/python-iam/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; + maintainers = with maintainers; [ austinbutler ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix index ba3cc3dfe246..3cd2f397a6b8 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.9.1"; + version = "2.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6+6EsRdj38jD+i3nhVHOI1wVGWYKMIGDILHgO3wN7zg="; + hash = "sha256-pLQgcwR89F+9jcSDtW/5+6Gy+Wk7XQf4iD49vDPkN9U="; }; propagatedBuildInputs = [ @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-iot"; changelog = "https://github.com/googleapis/python-iot/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 57390756eec6..9fa399d56f63 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.17.0"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AoIoGmOvL0mAD5dhsWxIkIFAw4G+1i9SyNF4D5I4Fz0="; + hash = "sha256-GqcYccqc6yAfuN3ntTypXvMNricr0cfCmCwnU0zJBoE="; }; propagatedBuildInputs = [ @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-kms"; changelog = "https://github.com/googleapis/python-kms/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix index 367987b82307..762ebe98fee8 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lC3Hp1fBK09aYUv4hO77FOlPOqQb+W2h/2MGJ9MhZ/Q="; + hash = "sha256-FAwHU1haRZd7ucfRxwfn+KtWM8/1a97Z74UvkBa3Mq8="; }; propagatedBuildInputs = [ @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-language"; changelog = "https://github.com/googleapis/python-language/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix index d167a07fa611..3de689ac1712 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8RVEoh6jVW9w66x7wzj/qKGXkTg07N2IU9F2uHCCOqo="; + hash = "sha256-QhNCI5VoUN3WSHfIgELTH3hljnsGelqOPdKCNrcfPDI="; }; propagatedBuildInputs = [ @@ -80,6 +80,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-logging"; changelog = "https://github.com/googleapis/python-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 66a49625d1a3..7f2b2f46d675 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.15.0"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w6BCbs0lpw2lOyqQedcXMSKahJak7a6NN4Xsy7+CjVs="; + hash = "sha256-CGqEWjSm4QWrijpICTkupjZ6ZbKLdWHCYQFTSocF7Tc="; }; propagatedBuildInputs = [ @@ -58,6 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-monitoring"; changelog = "https://github.com/googleapis/python-monitoring/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 2b54e9b8fdeb..2aa7834ace8a 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JVXRVq7yrRLj15ZMKVCBvCsrRP8KcRj9XNvfeH0rXVc="; + hash = "sha256-SJpjS72keOf9QF1imsWLbgMSzxCDloO4tuc4vUy8ZBk="; }; propagatedBuildInputs = [ @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-org-policy"; changelog = "https://github.com/googleapis/python-org-policy/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; + maintainers = with maintainers; [ austinbutler ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index 6333f2f72df0..a25ef3587d84 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.15.1"; + version = "1.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OaF1pzRY5k5SvXNCxTviP/2lhC7Up+oXaQB14f2tGj8="; + hash = "sha256-WgrqxnVsbA0ppvfcqxW+kA8vjn71bMU9qAyZraqYt8g="; }; propagatedBuildInputs = [ @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-os-config"; changelog = "https://github.com/googleapis/python-os-config/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 3a94d6d7ef29..501f1b7e92ff 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.17.1"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BZNCjsuwJJy150G0A+lcPUIbRpfIPrftTBaE3/F2x1M="; + hash = "sha256-SivzwE+CeFBPk0sr26/pJ/plDXxTl8djOgsw4QpRJ/M="; }; propagatedBuildInputs = [ @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-pubsub"; changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index f830ed3b6a6b..e935fc37e572 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BKDbtyn1wnzTXM6B7lgUCe17NLB9yaj1XhMbP4zE3Qo="; + hash = "sha256-UtT1z5zMzc7+Xhqcx5u77IS8GC8KaNOpYstZ8BlrFGc="; }; propagatedBuildInputs = [ @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-redis"; changelog = "https://github.com/googleapis/python-redis/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 5389fd3cce3e..5e47e53cd8fa 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.10.1"; + version = "1.10.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yXT7b5gQR2z3tj6ok5TBqN9H9/LcIwPnKLt0tQC83mc="; + hash = "sha256-+A786jbxDFqBiJr+k5EJJuOXi0sc7rgvVjovyGMHLRQ="; }; propagatedBuildInputs = [ @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-resource-manager"; changelog = "https://github.com/googleapis/python-resource-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index a9eb5f2ba7a6..67d050c2e722 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-runtimeconfig"; changelog = "https://github.com/googleapis/python-runtimeconfig/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 772ca69dda65..6791ad76a127 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.16.1"; + version = "2.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FJ0Rzpvn6oHUrDVE0/zUxxap7bLLd12cB1IxVwsHn7s="; + hash = "sha256-bKtcvxkno0xYbkr5BDfuo9RP9LQbmoLshvz/CaWsJuo="; }; propagatedBuildInputs = [ @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-secret-manager"; changelog = "https://github.com/googleapis/python-secret-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ siriobalmelli SuperSandro2000 ]; + maintainers = with maintainers; [ siriobalmelli ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 4118f7040b5f..4063ad21ae9c 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.21.0"; + version = "1.23.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zk5yZYevzpWmTOAAJgdNx9lnoTxjaq5XFJ+2hDQOBuc="; + hash = "sha256-3QdHomKKN8bSUtyFCZJliw/FxNixVj9pdkzMwJWT880="; }; propagatedBuildInputs = [ @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-securitycenter"; changelog = "https://github.com/googleapis/python-securitycenter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index 157e67030980..3e243e369fe5 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.36.0"; + version = "3.40.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zBKYxYvmUIAnC1StrhfzOSdkB4zhHlkds/6H5l1ZjG0="; + hash = "sha256-+dBve2hfb9paeIPlqY//VdXvnBq3tze4NiShNfrXgM0="; }; propagatedBuildInputs = [ @@ -80,6 +80,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-spanner"; changelog = "https://github.com/googleapis/python-spanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 224f98f47173..53b865bd75ad 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.20.0"; + version = "2.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5sW4b/6OR0ucgraZ75AvdclHjnfkTqOd45l7PvivPi4="; + hash = "sha256-Zhw5u7bysha6VqzjsIcmDpd43Rmt6e+jcAre6SWACa0="; }; propagatedBuildInputs = [ @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-speech"; changelog = "https://github.com/googleapis/python-speech/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index 6673c67227ae..ebcb32bf2b45 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m2rntQn8KUvay4TQ8+qOIOLFSotLvjnFcHY1/sIU7/M="; + hash = "sha256-k0sx6tXzmU5TYPn/V1CYLFtrEWBNwHK8RSwlll4Hbcc="; }; propagatedBuildInputs = [ @@ -89,6 +89,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-storage"; changelog = "https://github.com/googleapis/python-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index f69cb6709fda..fc00275aeeff 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.13.1"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mbhFBVx6Gye3M0lCny1vag659Am0ze7InfmeFr0ZeDM="; + hash = "sha256-yhqD33ORp4WS3Mp1FYOyLJB00KctyN69tKRof/mViik="; }; propagatedBuildInputs = [ @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-tasks"; changelog = "https://github.com/googleapis/python-tasks/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix index 390abd0a58ed..55577e6fef96 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-test-utils"; changelog ="https://github.com/googleapis/python-test-utils/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 3b67f04f6733..a1d430c022db 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-texttospeech"; changelog = "https://github.com/googleapis/python-texttospeech/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index 5cabd25b9af1..d7c11e3cad3b 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-twaJlx/2W1BQCWZMTQbZOp74oFecL2vwZkAxK/XwE8E="; + hash = "sha256-pn2ofYfcHBxAw7IK5lKqf1AGj8e+DU8W++9XVFPZ5Ws="; }; propagatedBuildInputs = [ @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-trace"; changelog = "https://github.com/googleapis/python-trace/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index efb8a4250cc8..0c487e19cb7f 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.11.1"; + version = "3.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-keQK0Lc34yphEQZFEU6T/7rfXS/9clwSreE0frWO+s8="; + hash = "sha256-LnjfcMGAMfF4ceLZdeeZjj3vyiL4JsjBsLiMlvXKVps="; }; propagatedBuildInputs = [ @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-translate"; changelog = "https://github.com/googleapis/python-translate/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 5f81eeb54991..b0c883a56bfd 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.11.2"; + version = "2.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WlBpQ234J1rCA1jpPPCxUa+k6+DAKivZV6kLknnUArw="; + hash = "sha256-qWpj8ATCcGj0WyJ6ZidfimqMPs0Gu1gfkvppiX1bF5c="; }; propagatedBuildInputs = [ @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-videointelligence"; changelog = "https://github.com/googleapis/python-videointelligence/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index 90390af239a5..91d97e68b096 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.4.2"; + version = "3.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uLKI2lY094rCMXPdXV69hrorN85cTLrbVkyqeBiOBRg="; + hash = "sha256-QFdErlCFIDTMR7MqmxuuUNP7Cc0eIWABQYKJHvV2ZpU="; }; propagatedBuildInputs = [ @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-vision"; changelog = "https://github.com/googleapis/python-vision/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 771cbcf01969..1ad657a827b6 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.12.1"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CCfxIwACFxMuFjxJG7v5e/WXvN0V4QysPYD2NtkKnEU="; + hash = "sha256-C2WQmyQjoe2t6RZ8HtnNkzN3V8FuYQwgtlhCOwaHNt8="; }; propagatedBuildInputs = [ @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-websecurityscanner"; changelog = "https://github.com/googleapis/python-websecurityscanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix b/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix index da7f93da9023..b1dc31da8733 100644 --- a/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-crc32c"; description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ freezeboy SuperSandro2000 ]; + maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix b/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix new file mode 100644 index 000000000000..ffab9af49802 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, google-ai-generativelanguage +, pythonOlder +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "google-generativeai"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "google"; + repo = "generative-ai-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-caFq7BZKRuNU7fKJWeWSbbDFNpav7OrIET4OQSHkPz4="; + }; + + pythonRelaxDeps = [ + "google-ai-generativelanguage" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + google-ai-generativelanguage + ]; + + # Issue with the google.ai module. Check with the next release + doCheck = false; + + pythonImportsCheck = [ + "google.generativeai" + ]; + + meta = with lib; { + description = "Python client library for Google's large language model PaLM API"; + homepage = "https://github.com/google/generative-ai-python"; + changelog = "https://github.com/google/generative-ai-python/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix b/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix index 3c9b8e6f0516..3cc5c3d43664 100644 --- a/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "google-i18n-address"; - version = "3.0.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = "google-i18n-address"; rev = "refs/tags/${version}"; - hash = "sha256-eh0NcGJfIjCmgTyfSOlDNLrCvMnZKzkJkQb3txVmFAo="; + hash = "sha256-dW/1wwnFDjYpym1ZaSZ7mOLpkHxsvuAHC8zBRekxWaw="; }; nativeBuildInputs = [ @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/mirumee/google-i18n-address"; changelog = "https://github.com/mirumee/google-i18n-address/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix index 5d2f1f1af3db..e62472f6bb2a 100644 --- a/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { requests-oauthlib ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ coreutils pytest-aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix index a93cc2441f5c..455a04d2cf06 100644 --- a/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; changelog = "https://github.com/googleapis/google-resumable-media-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/google/default.nix b/nixpkgs/pkgs/development/python-modules/google/default.nix new file mode 100644 index 000000000000..7dc34933d452 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/google/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google"; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FDUwEi7lEwUJrV6YnwUS98shiy1O3br7rUD9EOjYzL4="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "googlesearch" + ]; + + meta = with lib; { + description = "Python bindings to the Google search engine"; + homepage = "https://pypi.org/project/google/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix b/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix index 3b08b4619ce4..dbf098fae7be 100644 --- a/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Common protobufs used in Google APIs"; homepage = "https://github.com/googleapis/python-api-common-protos"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/gptcache/default.nix b/nixpkgs/pkgs/development/python-modules/gptcache/default.nix new file mode 100644 index 000000000000..9fd2c80c3c49 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gptcache/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cachetools +, numpy +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "gptcache"; + version = "0.1.37"; + format = "setuptools"; + + disabled = pythonOlder "3.8.1"; + + src = fetchFromGitHub { + owner = "zilliztech"; + repo = "GPTCache"; + rev = "refs/tags/${version}"; + hash = "sha256-eQu3O6jPL1BRObA99XA2EOznn9NaArVRouqD1Ypz/4w="; + }; + + propagatedBuildInputs = [ + cachetools + numpy + requests + ]; + + # many tests require network access and complicated dependencies + doCheck = false; + + pythonImportsCheck = [ "gptcache" ]; + + meta = with lib; { + description = "Semantic cache for LLMs and fully integrated with LangChain and llama_index"; + homepage = "https://github.com/zilliztech/GPTCache"; + changelog = "https://github.com/zilliztech/GPTCache/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix b/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix index bdfa8c0e49c0..8636a71ecdce 100644 --- a/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "grad-cam"; - version = "1.4.6"; + version = "1.4.8"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-sL4+UUfC60JWAgJPvXeVGUHAskuoceVYwYDrYlibUOE="; + hash = "sha256-BNcwDaEEmRsEoJ4nvvGfjZ9LdG0eRqZCFuY5/Gmp5N4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix b/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix index 069eae162bd6..68dc792aecfb 100644 --- a/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "3.1.1"; + version = "3.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xMEC2GEP39UVWqdLQMRjLOn93PY0aJWEnQRcn8YwxWo="; + hash = "sha256-VQwDK9FRbHy/AFbdZKmvl5e52smSCyWTrs00DvJqVmo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/nixpkgs/pkgs/development/python-modules/graphene/default.nix index 1ce628cc215e..e87dc333558f 100644 --- a/nixpkgs/pkgs/development/python-modules/graphene/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphene/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "graphene"; - version = "3.2.2"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = "graphene"; rev = "refs/tags/v${version}"; - hash = "sha256-kwF6oXp06w7r1PbPoJTCQ9teTExYMoqvIZDhtv5QNn8="; + hash = "sha256-DGxicCXZp9kW/OFkr0lAWaQ+GaECx+HD8+X4aW63vgQ="; }; propagatedBuildInputs = [ @@ -60,6 +60,6 @@ buildPythonPackage rec { homepage = "https://github.com/graphql-python/graphene"; changelog = "https://github.com/graphql-python/graphene/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix index f20e251fadd8..d80ed27297cc 100644 --- a/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix @@ -4,7 +4,7 @@ , python , cairocffi , django -, django_tagging +, django-tagging , fetchFromGitHub , fetchpatch , gunicorn @@ -49,7 +49,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cairocffi django - django_tagging + django-tagging gunicorn pyparsing python-memcached diff --git a/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix b/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix index 401214bc1c57..c751ba560bd3 100644 --- a/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "A library to help construct a graphql-py server supporting react-relay"; homepage = "https://github.com/graphql-python/graphql-relay-py/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/graphtage/default.nix b/nixpkgs/pkgs/development/python-modules/graphtage/default.nix index 53418f486da2..c33b1f603b1f 100644 --- a/nixpkgs/pkgs/development/python-modules/graphtage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphtage/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "graphtage"; - version = "0.2.7"; + version = "0.2.9"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3PJSjK8citdsfTyTLtDOlLeXWhkOW/4ajLC+j8F0BZw="; + hash = "sha256-GK83qSXFSCK/tiIfNfsaDfViDVzdhQNT90kB9wiTLbk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix b/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix index 2d84cd87e08e..de5e03d61321 100644 --- a/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { hash = "sha256-SQ+LcHeHDB1Hd5wXGDJBZmBG4KEZ3NsV4+4X9WgPb9E="; }; - sourceRoot = "source/gremlin-python/src/main/python"; + sourceRoot = "${src.name}/gremlin-python/src/main/python"; postPatch = '' sed -i '/pytest-runner/d' setup.py diff --git a/nixpkgs/pkgs/development/python-modules/grequests/default.nix b/nixpkgs/pkgs/development/python-modules/grequests/default.nix index 50c95df7dc91..e1dfe77d577e 100644 --- a/nixpkgs/pkgs/development/python-modules/grequests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grequests/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "grequests"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0rpnim3ppxjdsaa869h1jdimcyc66mamcs593rd7brk8cq68kv3x"; + sha256 = "sha256-XDPxQmjfW4+hEH2FN4Fb5v67rW7FYFJNakBLd3jPa6Y="; }; # No tests in archive diff --git a/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/nixpkgs/pkgs/development/python-modules/griffe/default.nix index cb04353ccf31..bff3045e5c6d 100644 --- a/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.29.0"; + version = "0.32.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WZJogwxhSScJpTFVJaMn6LyIyZtOAxTnY3232NW0bds="; + hash = "sha256-rPh4FtcigZzscm3y/BJ/0Q0wURlumowlHY15MiQw2B8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index 303d67c58ece..f5a25339def2 100644 --- a/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "GRPC library for the google-iam-v1 service"; homepage = "https://github.com/googleapis/googleapis"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix b/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix index 4aa8ffd4fe16..1dadad2238d7 100644 --- a/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "grpc-interceptor"; - version = "0.15.1"; + version = "0.15.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "d5h-foss"; repo = pname; - rev = "v${version}"; - sha256 = "md7pwlahF5kiaydLATdW7Yde8iVVcBEjCIGP5qRLwXw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zulK0SVehzHcrmgIyH0D5sUOiAN53eIg88IoVyF6/DA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix new file mode 100644 index 000000000000..cee3a2e159dc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, pythonRelaxDepsHook +, fetchPypi +, grpcio +, protobuf +}: + +buildPythonPackage rec { + pname = "grpcio-channelz"; + version = "1.56.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PlPGrD16Iy5vCsuVsFQ3FHd+wu0FJCFbo7isvYtVAQU="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "grpcio" + ]; + + propagatedBuildInputs = [ + grpcio + protobuf + ]; + + pythonImportsCheck = [ "grpc_channelz" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Channel Level Live Debug Information Service for gRPC"; + homepage = "https://pypi.org/project/grpcio-channelz"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix index 656e147ac50a..c45423ed95e0 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "gRPC extensions for Google Cloud Platform"; homepage = "https://grpc.io"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix new file mode 100644 index 000000000000..c202a1f7c659 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, pythonRelaxDepsHook +, fetchPypi +, grpcio +, protobuf +}: + +buildPythonPackage rec { + pname = "grpcio-health-checking"; + version = "1.56.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-XNodihNovizaBPkoSotzzuCf8+J37sjd2avPL+92s3I="; + }; + + propagatedBuildInputs = [ + grpcio + protobuf + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "grpcio" + ]; + + pythonImportsCheck = [ "grpc_health" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Standard Health Checking Service for gRPC"; + homepage = "https://pypi.org/project/grpcio-health-checking/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix new file mode 100644 index 000000000000..886df4537ed2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonRelaxDepsHook +, grpcio +, protobuf +}: + +buildPythonPackage rec { + pname = "grpcio-reflection"; + version = "1.56.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dKgXZq9jmrjxt/WVMdyBRkD0obzwEtwGzmviBbUKOUw="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "grpcio" + ]; + + propagatedBuildInputs = [ + grpcio + protobuf + ]; + + pythonImportsCheck = [ "grpc_reflection" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Standard Protobuf Reflection Service for gRPC"; + homepage = "https://pypi.org/project/grpcio-reflection"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix index a8dade04a36f..e8ea37c90448 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "HTTP/2-based RPC framework"; license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/nixpkgs/pkgs/development/python-modules/gsd/default.nix index 338471e56dcf..69ac2d4a6442 100644 --- a/nixpkgs/pkgs/development/python-modules/gsd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gsd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "2.8.1"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6Ixy62hHbSjArlDzBICdk0e8DDKxaHShamHpHEKOqqU="; + hash = "sha256-jfik8Rz4gqBNQn8cb20VcSUodupS/FNgpQJtW/DMzPY="; }; nativeBuildInputs = [ @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/glotzerlab/gsd"; changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/nixpkgs/pkgs/development/python-modules/gssapi/default.nix index 9b41e272b90a..30619532a4a5 100644 --- a/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5}"' ''; + env = lib.optionalAttrs (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) { + GSSAPI_SUPPORT_DETECT = "false"; + }; + nativeBuildInputs = [ cython krb5 diff --git a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix index 386dd82e8296..9814e11ff7e5 100644 --- a/nixpkgs/pkgs/development/python-modules/gst-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.22.3"; + version = "1.22.4"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-cL7T+r5jS8Yi723k5uscM7yc79ZL2rIA9voxa0aMcxw="; + hash = "sha256-4TAtzA8kUbZDgNzA3TuCc1eV6JUdyBLZONi6kfOIFj4="; }; # Python 2.x is not supported. diff --git a/nixpkgs/pkgs/development/python-modules/gudhi/default.nix b/nixpkgs/pkgs/development/python-modules/gudhi/default.nix index 392d6f9e8ceb..6fbba605da99 100644 --- a/nixpkgs/pkgs/development/python-modules/gudhi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gudhi/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "gudhi"; - version = "3.4.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "GUDHI"; repo = "gudhi-devel"; rev = "tags/gudhi-release-${version}"; fetchSubmodules = true; - sha256 = "1m03qazzfraxn62l1cb11icjz4x8q2sg9c2k3syw5v0yv9ndgx1v"; + sha256 = "sha256-f2ajy4muG9vuf4JarGWZmdk/LF9OYd2KLSaGyY6BQrY="; }; patches = [ ./remove_explicit_PYTHONPATH.patch ]; diff --git a/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch b/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch index da1bffb283b8..2b8284ba216d 100644 --- a/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch +++ b/nixpkgs/pkgs/development/python-modules/gudhi/remove_explicit_PYTHONPATH.patch @@ -1,173 +1,194 @@ diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 5c1402a..48a1250 100644 +index 86a409b6..09544fb5 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt -@@ -271,9 +271,6 @@ if(PYTHONINTERP_FOUND) +@@ -329,15 +329,6 @@ if(PYTHONINTERP_FOUND) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/setup.py" "build_ext" "--inplace") - add_custom_target(python ALL DEPENDS gudhi.so - COMMENT "Do not forget to add ${CMAKE_CURRENT_BINARY_DIR}/ to your PYTHONPATH before using examples or tests") - - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install)") - - # Documentation generation is available through sphinx - requires all modules -@@ -295,14 +292,14 @@ if(PYTHONINTERP_FOUND) - # sphinx target requires gudhi.so, because conf.py reads gudhi version from it - add_custom_target(sphinx - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${SPHINX_PATH} -b html ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/sphinx - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gudhi.so" - COMMENT "${GUDHI_SPHINX_MESSAGE}" VERBATIM) - - add_test(NAME sphinx_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${SPHINX_PATH} -b doctest ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doctest) - - # Set missing or not modules -@@ -346,13 +343,13 @@ if(PYTHONINTERP_FOUND) +- # Path separator management for windows +- if (WIN32) +- set(GUDHI_PYTHON_PATH_ENV "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR};$ENV{PYTHONPATH}") +- else(WIN32) +- set(GUDHI_PYTHON_PATH_ENV "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:$ENV{PYTHONPATH}") +- endif(WIN32) + # Documentation generation is available through sphinx - requires all modules + # Make it first as sphinx test is by far the longest test which is nice when testing in parallel + if(SPHINX_PATH) +@@ -358,13 +349,13 @@ if(PYTHONINTERP_FOUND) + # sphinx target requires gudhi.so, because conf.py reads gudhi version from it + add_custom_target(sphinx + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${SPHINX_PATH} -b html ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/sphinx + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/gudhi.so" + COMMENT "${GUDHI_SPHINX_MESSAGE}" VERBATIM) + add_test(NAME sphinx_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${SPHINX_PATH} -b doctest ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_CURRENT_BINARY_DIR}/doctest) + # Set missing or not modules + set(GUDHI_MODULES ${GUDHI_MODULES} "python-documentation" CACHE INTERNAL "GUDHI_MODULES") +@@ -408,13 +399,13 @@ if(PYTHONINTERP_FOUND) + # Cubical + add_test(NAME periodic_cubical_complex_barcode_persistence_from_perseus_file_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py" + --no-barcode -f ${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt) + + add_test(NAME random_cubical_complex_persistence_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/random_cubical_complex_persistence_example.py" + 10 10 10) + +@@ -426,7 +417,7 @@ if(PYTHONINTERP_FOUND) + + add_test(NAME cubical_complex_sklearn_itf_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/cubical_complex_sklearn_itf.py") + endif() + +@@ -435,7 +426,7 @@ if(PYTHONINTERP_FOUND) # Bottleneck and Alpha add_test(NAME alpha_rips_persistence_bottleneck_distance_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_rips_persistence_bottleneck_distance.py" -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -t 0.15 -d 3) + endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 5.1.0) +@@ -443,7 +434,7 @@ if(PYTHONINTERP_FOUND) # Tangential add_test(NAME tangential_complex_plain_homology_from_off_file_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/tangential_complex_plain_homology_from_off_file_example.py" --no-diagram -i 2 -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off) -@@ -361,13 +358,13 @@ if(PYTHONINTERP_FOUND) +@@ -452,13 +443,13 @@ if(PYTHONINTERP_FOUND) # Witness complex add_test(NAME euclidean_strong_witness_complex_diagram_persistence_from_off_file_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py" --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2) add_test(NAME euclidean_witness_complex_diagram_persistence_from_off_file_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py" --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 1.0 -n 20 -d 2) -@@ -379,7 +376,7 @@ if(PYTHONINTERP_FOUND) +@@ -467,7 +458,7 @@ if(PYTHONINTERP_FOUND) # Bottleneck add_test(NAME bottleneck_basic_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/bottleneck_basic_example.py") - if (PYBIND11_FOUND) -@@ -392,26 +389,26 @@ if(PYTHONINTERP_FOUND) - file(COPY ${CMAKE_SOURCE_DIR}/data/points/COIL_database/lucky_cat_PCA1 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) - add_test(NAME cover_complex_nerve_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/nerve_of_a_covering.py" - -f human.off -c 2 -r 10 -g 0.3) + add_gudhi_py_test(test_bottleneck_distance) +@@ -479,26 +470,26 @@ if(PYTHONINTERP_FOUND) + file(COPY ${CMAKE_SOURCE_DIR}/data/points/COIL_database/lucky_cat_PCA1 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) + add_test(NAME cover_complex_nerve_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/nerve_of_a_covering.py" + -f human.off -c 2 -r 10 -g 0.3) - add_test(NAME cover_complex_coordinate_gic_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/coordinate_graph_induced_complex.py" - -f human.off -c 0 -v) + add_test(NAME cover_complex_coordinate_gic_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/coordinate_graph_induced_complex.py" + -f human.off -c 0 -v) - add_test(NAME cover_complex_functional_gic_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/functional_graph_induced_complex.py" - -o lucky_cat.off - -f lucky_cat_PCA1 -v) + add_test(NAME cover_complex_functional_gic_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/functional_graph_induced_complex.py" + -o lucky_cat.off + -f lucky_cat_PCA1 -v) - add_test(NAME cover_complex_voronoi_gic_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/voronoi_graph_induced_complex.py" - -f human.off -n 700 -v) + add_test(NAME cover_complex_voronoi_gic_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/voronoi_graph_induced_complex.py" + -f human.off -n 700 -v) -@@ -422,11 +419,11 @@ if(PYTHONINTERP_FOUND) +@@ -506,15 +497,15 @@ if(PYTHONINTERP_FOUND) # Alpha add_test(NAME alpha_complex_from_points_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_points_example.py") + add_test(NAME alpha_complex_from_generated_points_on_sphere_example_py_test + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" ++ COMMAND ${CMAKE_COMMAND} -E env + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_generated_points_on_sphere_example.py") add_test(NAME alpha_complex_diagram_persistence_from_off_file_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_diagram_persistence_from_off_file_example.py" - --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -a 0.6) + --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off) add_gudhi_py_test(test_alpha_complex) -@@ -441,13 +438,13 @@ if(PYTHONINTERP_FOUND) - # Cubical - add_test(NAME periodic_cubical_complex_barcode_persistence_from_perseus_file_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py" - --no-barcode -f ${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt) - - add_test(NAME random_cubical_complex_persistence_example_py_test - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" -+ COMMAND ${CMAKE_COMMAND} -E env - ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/random_cubical_complex_persistence_example.py" - 10 10 10) - -@@ -456,19 +453,19 @@ if(PYTHONINTERP_FOUND) +@@ -532,19 +523,19 @@ if(PYTHONINTERP_FOUND) # Rips add_test(NAME rips_complex_diagram_persistence_from_distance_matrix_file_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py" - --no-diagram -f ${CMAKE_SOURCE_DIR}/data/distance_matrix/lower_triangular_distance_matrix.csv -e 12.0 -d 3) + --no-diagram -f ${CMAKE_SOURCE_DIR}/data/distance_matrix/lower_triangular_distance_matrix.csv -s , -e 12.0 -d 3) add_test(NAME rips_complex_diagram_persistence_from_off_file_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_diagram_persistence_from_off_file_example.py --no-diagram -f ${CMAKE_SOURCE_DIR}/data/points/tore3D_300.off -e 0.25 -d 3) add_test(NAME rips_complex_from_points_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/rips_complex_from_points_example.py) add_gudhi_py_test(test_rips_complex) -@@ -476,7 +473,7 @@ if(PYTHONINTERP_FOUND) +@@ -552,7 +543,7 @@ if(PYTHONINTERP_FOUND) # Simplex tree add_test(NAME simplex_tree_example_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/simplex_tree_example.py) add_gudhi_py_test(test_simplex_tree) -@@ -485,7 +482,7 @@ if(PYTHONINTERP_FOUND) +@@ -565,7 +556,7 @@ if(PYTHONINTERP_FOUND) # Witness add_test(NAME witness_complex_from_nearest_landmark_table_py_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}" +- COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}" + COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example/witness_complex_from_nearest_landmark_table.py) diff --git a/nixpkgs/pkgs/development/python-modules/guidance/default.nix b/nixpkgs/pkgs/development/python-modules/guidance/default.nix new file mode 100644 index 000000000000..7cd557d394ef --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/guidance/default.nix @@ -0,0 +1,80 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, aiohttp +, diskcache +, gptcache +, msal +, nest-asyncio +, numpy +, openai +, platformdirs +, pygtrie +, pyparsing +, requests +, tiktoken +, torch +}: + +buildPythonPackage rec { + pname = "guidance"; + version = "0.0.64"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "guidance"; + rev = "refs/tags/${version}"; + hash = "sha256-tQpDJprxctKI88F+CZ9aSJbVo7tjmI4+VrI+WO4QlxE="; + }; + + propagatedBuildInputs = [ + aiohttp + diskcache + gptcache + msal + nest-asyncio + numpy + openai + platformdirs + pygtrie + pyparsing + requests + tiktoken + ]; + + nativeCheckInputs = [ + pytestCheckHook + torch + ]; + + disabledTests = [ + # require network access + "test_each_parallel_with_gen_openai" + ]; + + disabledTestPaths = [ + # require network access + "tests/library/test_gen.py" + "tests/library/test_include.py" + "tests/library/test_select.py" + "tests/llms/test_openai.py" + "tests/llms/test_transformers.py" + "tests/test_program.py" + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + pythonImportsCheck = [ "guidance" ]; + + meta = with lib; { + description = "A guidance language for controlling large language models"; + homepage = "https://github.com/microsoft/guidance"; + changelog = "https://github.com/microsoft/guidance/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix index 7bd347d750f8..8c543bce8571 100644 --- a/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/benoitc/gunicorn"; description = "gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and sleepy applications"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix b/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix index 67f0ad094557..9926b3cfe915 100644 --- a/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "gymnasium"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = pname; - rev = "v${version}"; - hash = "sha256-7rRF21H3IxbgmqxvtC370kr0exLgfg3e2tA3J49xuao="; + rev = "refs/tags/v${version}"; + hash = "sha256-4YaEFEWSOTEdGgO1kSOleZQp7OrcOf+WAT/E0BWeoKI="; }; format = "pyproject"; diff --git a/nixpkgs/pkgs/development/python-modules/h11/default.nix b/nixpkgs/pkgs/development/python-modules/h11/default.nix index 50682ec31aa9..872ef1ab4358 100644 --- a/nixpkgs/pkgs/development/python-modules/h11/default.nix +++ b/nixpkgs/pkgs/development/python-modules/h11/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1"; homepage = "https://github.com/python-hyper/h11"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/h2/default.nix b/nixpkgs/pkgs/development/python-modules/h2/default.nix index 8c6dde1803d8..bb37c4d1607b 100644 --- a/nixpkgs/pkgs/development/python-modules/h2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/h2/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "HTTP/2 State-Machine based protocol implementation"; homepage = "https://github.com/python-hyper/h2"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix b/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix index 4b8b02e91209..0f1af2dee46c 100644 --- a/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "3.0.1"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5SneI1aZiUyLGYmtRXJYPBUtQR08fV+MWkjIQXt208s="; + hash = "sha256-VwgcN9DXzuWp6J3joswXEwRKJI499LNY7MAVBWBBEbM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 1f2ca0e0f7c2..ffeab054f9ea 100644 --- a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.6.0"; + version = "2023.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xpkQSQGwf4RZHKwLdrOLW4yzECKY1vwxHYo+o3eOrhE="; + hash = "sha256-5J/arrr8ymODSqtATJZuKsuOsCDKV9P2v8vN6D22FuE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hap-python/default.nix b/nixpkgs/pkgs/development/python-modules/hap-python/default.nix index c198103f6310..c40d1633eaed 100644 --- a/nixpkgs/pkgs/development/python-modules/hap-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hap-python/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , base36 , chacha20poly1305-reuseable @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.6.0"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,11 +25,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-fAJB1gk8zTS/mW5KzWr3z26qctZc/EQlk//WM1Xwpl0="; + rev = "refs/tags/${version}"; + hash = "sha256-M/STfco+Bx+KxBT1lUIrYyGSjBcPw2UVX02gNOROke4="; }; propagatedBuildInputs = [ + async-timeout chacha20poly1305-reuseable cryptography h11 @@ -72,7 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "HomeKit Accessory Protocol implementation"; homepage = "https://github.com/ikalchev/HAP-python"; - changelog = "https://github.com/ikalchev/HAP-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ikalchev/HAP-python/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ oro ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index c317dc2a7bd7..96297616d7b6 100644 --- a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.67.1"; + version = "0.69.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/cu7+fMbe9kyWGGBGBwjsiA6PXoUJZ7IFzpEcnVSLn0="; + hash = "sha256-7FO/z5AseP80y74e4ivLXlwB9t5jJf2bCaNp6HfqZ1c="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/hassil/default.nix b/nixpkgs/pkgs/development/python-modules/hassil/default.nix index 1b80c9a4986e..6059ce3cb5e6 100644 --- a/nixpkgs/pkgs/development/python-modules/hassil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hassil/default.nix @@ -13,7 +13,7 @@ let pname = "hassil"; - version = "1.0.6"; + version = "1.2.5"; in buildPythonPackage { inherit pname version; @@ -21,7 +21,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-rCSVKFIkfPg2aYFwuYVLMxMO8S11dV8f4eckpFbNB3k="; + hash = "sha256-udOkZILoba2+eR8oSFThsB846COaIXawwRYhn261mCA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/nixpkgs/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 16bbe3092dac..63789c90debd 100644 --- a/nixpkgs/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "hatch-fancy-pypi-readme"; - version = "22.8.0"; + version = "23.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-2pEoLKCWAcGK3tjjeNr4tXjHAhSGbwlxFW7pu5zmwmo="; + hash = "sha256-sd9EBjCUrx6CSM6s1HqSyc8xPWuYI79mr4qSfDlgKH0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 85f9bf40f02c..9a1ecc429430 100644 --- a/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.19.0"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IKgK8UQYVPV8zm0wqmVyFDeRv0h9+1iwJ3Ih6yrXIOM="; + hash = "sha256-siyPuSLqzH30bdY1y+VaBBCjOU1YLtBgPpTvZCJtcXc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix index cc953aa696e3..59ca3e5b6117 100644 --- a/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/daleroberts/hdmedians"; description = "High-dimensional medians"; license = licenses.gpl3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/heatshrink2/default.nix b/nixpkgs/pkgs/development/python-modules/heatshrink2/default.nix index 4edc94167c9e..dd37c7c0c0ad 100644 --- a/nixpkgs/pkgs/development/python-modules/heatshrink2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/heatshrink2/default.nix @@ -1,24 +1,30 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, pythonOlder }: buildPythonPackage rec { pname = "heatshrink2"; - version = "0.11.0"; + version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eerimoq"; repo = "pyheatshrink"; - rev = version; + rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-P3IofGbW4x+erGCyxIPvD9aNHIJ/GjjWgno4n95SQoQ="; + hash = "sha256-JthHYq78SYr49+sTNtLZ8GjtrHcr1dzXcPskTrb4M3o="; }; - pythonImportsCheck = [ "heatshrink2" ]; + pythonImportsCheck = [ + "heatshrink2" + ]; meta = with lib; { - description = "Compression using the Heatshrink algorithm in Python 3."; + description = "Compression using the Heatshrink algorithm"; homepage = "https://github.com/eerimoq/pyheatshrink"; license = licenses.isc; maintainers = with maintainers; [ prusnak ]; diff --git a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix index f1a867984f47..2928be6ede9a 100644 --- a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, pytest -, mock +, pythonOlder +, pytestCheckHook +, datalad +, git , dcm2niix , nibabel , pydicom @@ -14,35 +15,39 @@ }: buildPythonPackage rec { - version = "0.12.2"; + version = "0.13.1"; pname = "heudiconv"; + format = "pyproject"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - #sha256 = "0gzqqa4pzhywdbvks2qjniwhr89sgipl5k7h9hcjs7cagmy9gb05"; - sha256 = "sha256-cYr74mw7tXRJRr8rXlu1UMZuU3YXXfDzhuc+vaa+7PQ="; + sha256 = "sha256-UUBRC6RToj4XVbJnxG+EKdue4NVpTAW31RNm9ieF1lU="; }; - postPatch = '' - # doesn't exist as a separate package with Python 3: - substituteInPlace heudiconv/info.py --replace "'pathlib'," "" - ''; - propagatedBuildInputs = [ - dcm2niix nibabel pydicom nipype dcmstack etelemetry filelock + nibabel + pydicom + nipype + dcmstack + etelemetry + filelock ]; - nativeCheckInputs = [ dcm2niix pytest mock ]; + nativeCheckInputs = [ + datalad + dcm2niix + pytestCheckHook + git + ]; - # test_monitor and test_dlad require 'inotify' and 'datalad' respectively, - # and these aren't in Nixpkgs - checkPhase = "pytest -k 'not test_dlad and not test_monitor' heudiconv/tests"; + preCheck = ''export HOME=$(mktemp -d)''; meta = with lib; { homepage = "https://heudiconv.readthedocs.io"; description = "Flexible DICOM converter for organizing imaging data"; + changelog = "https://github.com/nipy/heudiconv/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix b/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix index d0b57d105963..9bfb9918bf32 100644 --- a/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "hexbytes"; - version = "0.3.0"; - disabled = pythonOlder "3.6"; + version = "0.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ethereum"; repo = "hexbytes"; - rev = "v${version}"; - hash = "sha256-EDFE5MUc+XMwe8BaXkz/DRchAZbS86X+AcShi5rx83M="; + rev = "refs/tags/v${version}"; + hash = "sha256-19oY/VPP6qkxHCkIgpC28fOOYKEYcNbVVGoHJmMmOl8="; }; nativeCheckInputs = [ @@ -25,12 +27,15 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "hexbytes" ]; + pythonImportsCheck = [ + "hexbytes" + ]; meta = with lib; { description = "`bytes` subclass that decodes hex, with a readable console output"; homepage = "https://github.com/ethereum/hexbytes"; + changelog = "https://github.com/ethereum/hexbytes/blob/v${version}/docs/release_notes.rst"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hexdump/default.nix b/nixpkgs/pkgs/development/python-modules/hexdump/default.nix index 9b8487ffa8e7..c00d7d5b4680 100644 --- a/nixpkgs/pkgs/development/python-modules/hexdump/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hexdump/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { }; # the source zip has no prefix, so everything gets unpacked to /build otherwise - sourceRoot = "source"; unpackPhase = '' runHook preUnpack mkdir source @@ -21,6 +20,8 @@ buildPythonPackage rec { runHook postUnpack ''; + sourceRoot = "source"; + pythonImportsCheck = [ "hexdump" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/hfst/default.nix b/nixpkgs/pkgs/development/python-modules/hfst/default.nix new file mode 100644 index 000000000000..b865c4c84d63 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hfst/default.nix @@ -0,0 +1,45 @@ +{ lib +, pkgs +, stdenv +, buildPythonPackage +, foma +, icu +, swig +}: + +buildPythonPackage rec { + pname = "hfst"; + inherit (pkgs.hfst) version src; + + sourceRoot = "${src.name}/python"; + + postPatch = '' + # omorfi-python looks for 'hfst' Python package + sed -i 's/libhfst_swig/hfst/' setup.py; + ''; + + nativeBuildInputs = [ + swig + ]; + + buildInputs = [ + icu + pkgs.hfst + ]; + + setupPyBuildFlags = [ + "--inplace" + ]; + + # Find foma in Darwin tests + preCheck = lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH="${foma}/lib" + ''; + + meta = with lib; { + description = "Python bindings for HFST"; + homepage = "https://github.com/hfst/hfst"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 5b65426e15f5..1e914096f7d5 100644 --- a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.0.1"; + version = "11.0.2"; src = fetchPypi { inherit pname version; - hash = "sha256-gupC35pLQOJgSmXiBp+KxqWuMX3iKSX9xDUtEaB/wFQ="; + hash = "sha256-qDURFcDm7zvDEv1Z+aoXtFfbilul6q6KlkjBvhkeYkM="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hid-parser/default.nix b/nixpkgs/pkgs/development/python-modules/hid-parser/default.nix new file mode 100644 index 000000000000..56aeb503b49c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hid-parser/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytestCheckHook +, hypothesis +}: + +buildPythonPackage rec { + pname = "hid-parser"; + version = "0.0.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zbm+h+ieDmd1K0uH+9B8EWtYScxqYJXVpY9bXdBivA4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportsCheck = [ "hid_parser" ]; + + meta = with lib; { + description = "Typed pure Python library to parse HID report descriptors"; + homepage = "https://github.com/usb-tools/python-hid-parser"; + license = licenses.mit; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hist/default.nix b/nixpkgs/pkgs/development/python-modules/hist/default.nix index df7f447a0444..07f8035fb2a2 100644 --- a/nixpkgs/pkgs/development/python-modules/hist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hist/default.nix @@ -8,16 +8,19 @@ , numpy , pytestCheckHook , pytest-mpl +, pythonOlder }: buildPythonPackage rec { pname = "hist"; - version = "2.6.3"; + version = "2.7.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "dede097733d50b273af9f67386e6dcccaab77e900ae702e1a9408a856e217ce9"; + hash = "sha256-/74xTCvQPDQrnxaNznFa2PNigesjFyoAlwiCqTRP6Yg="; }; buildInputs = [ @@ -38,7 +41,8 @@ buildPythonPackage rec { meta = with lib; { description = "Histogramming for analysis powered by boost-histogram"; - homepage = "https://hist.readthedocs.io/en/latest/"; + homepage = "https://hist.readthedocs.io/"; + changelog = "https://github.com/scikit-hep/hist/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/hnswlib/default.nix b/nixpkgs/pkgs/development/python-modules/hnswlib/default.nix new file mode 100644 index 000000000000..c3dab17f5336 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hnswlib/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, hnswlib +, numpy +, pybind11 +, setuptools +, unittestCheckHook +}: + +buildPythonPackage { + pname = "hnswlib"; + inherit (hnswlib) version src meta; + format = "pyproject"; + + nativeBuildInputs = [ + numpy + setuptools + pybind11 + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ + "tests/python" + "--pattern 'bindings_test*.py'" + ]; + + pythonImportsCheck = [ + "hnswlib" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/nixpkgs/pkgs/development/python-modules/holidays/default.nix index 0f7774ca26f0..0f3f8ae66054 100644 --- a/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.26"; + version = "0.29"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v.${version}"; - hash = "sha256-4kRIhIjOQB23ihZBs6J6/ZriLiMD87m/xOqMXga5Ypw="; + hash = "sha256-ijhqu0LzQzpjDSe9ZjNhgdjq/DJuD7oVbRTLX97nGHM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hologram/default.nix b/nixpkgs/pkgs/development/python-modules/hologram/default.nix new file mode 100644 index 000000000000..0964bbf89ca4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hologram/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, pytestCheckHook +, python-dateutil +, setuptools +}: + +buildPythonPackage rec { + pname = "hologram"; + version = "0.0.16"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-DboVCvByI8bTThamGBwSiQADGxIaEnTMmwmVI+4ARgc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + jsonschema + python-dateutil + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hologram" + ]; + + meta = with lib; { + description = "A library for automatically generating Draft 7 JSON Schemas from Python dataclasses"; + homepage = "https://github.com/dbt-labs/hologram"; + license = licenses.mit; + maintainers = with maintainers; [ mausch tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index 9dcf25f26e8e..538a6b489c44 100644 --- a/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.16.0"; + version = "1.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E0FqJRhY6tAwSVcNnns5zfGRjTnmRTChjlUrZ3ERWho="; + hash = "sha256-RcVorlekOvc4k6CT5vrelrdxPLsP5v/0ZCamthMSJ0Y="; }; propagatedBuildInputs = [ @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Python data analysis and visualization seamless and simple"; homepage = "https://www.holoviews.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 85a6b7b5a0ed..bae4dc5a71d9 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.10.0"; + version = "1.10.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g8vdg7YU3rkXW85U4w9Hvb6u9uvoDphbkIlVXchCRxQ="; + hash = "sha256-zNhqiWYZ3tv6lwYgmi6Yue+mFcgk7Y1dDMbzWlsvVJM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 663d4e4c0b3b..d91b01f52cc9 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.5.3"; + version = "2023.6.0"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-g3Hj21UPkHKKRXPewKLivWaUn1kXnVebayJYOmZfLBY="; + hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 23f48886daa3..ea6dc79d51d9 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -8,6 +8,7 @@ , autoPatchelfHook # runtime +, libnl , openssl_1_1 # propagates @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.5.3"; + version = "2023.6.0"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -36,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-rGBlzYUydgFrt40UQTFlXMUOsEYlgGnvKrfT5WEZrAQ="; + hash = "sha256-fR+ea25SqOMksBJXgSjuVvv2xSBoadZmPWP0IwxpiMA="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-8F5z1PAlfJidNeaiT0PN5odyTs99WN0rirXcUpH1mP0="; + hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { @@ -58,6 +59,7 @@ buildPythonPackage rec { ]; buildInputs = [ + libnl openssl_1_1 ]; diff --git a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix index f726340b7c88..421ef73275c9 100644 --- a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "HOOMD-blue is a general-purpose particle simulation toolkit"; license = licenses.bsdOriginal; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix b/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix index 775ff1a50f5e..ae09ccfdf9f2 100644 --- a/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Implementation of HopcroftKarp's algorithm"; homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp"; license = licenses.gpl3Only; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index 7a4d32374b44..4a910af1b988 100644 --- a/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -3,6 +3,7 @@ , appdirs , buildPythonPackage , cachelib +, colorama , cssselect , fetchFromGitHub , keep @@ -10,13 +11,14 @@ , pygments , pyquery , requests +, rich , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "howdoi"; - version = "2.0.19"; + version = "2.0.20"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,18 +27,20 @@ buildPythonPackage rec { owner = "gleitz"; repo = pname; rev = "v${version}"; - hash = "sha256-uLAc6E8+8uPpo070vsG6Od/855N3gTQMf5pSUvtlh0I="; + hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0="; }; propagatedBuildInputs = [ appdirs cachelib + colorama cssselect keep lxml pygments pyquery requests + rich ]; nativeCheckInputs = [ @@ -48,20 +52,7 @@ buildPythonPackage rec { ''; disabledTests = [ - # AssertionError: "The... - "test_get_text_with_one_link" - "test_get_text_without_links" - # Those tests are failing in the sandbox - # OSError: [Errno 24] Too many open files - "test_answers" - "test_answers_bing" "test_colorize" - "test_json_output" - "test_missing_pre_or_code_query" - "test_multiple_answers" - "test_position" - "test_unicode_answer" - "test_answer_links_using_l_option" ]; pythonImportsCheck = [ @@ -69,10 +60,11 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; + changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt"; description = "Instant coding answers via the command line"; homepage = "https://github.com/gleitz/howdoi"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hpack/default.nix b/nixpkgs/pkgs/development/python-modules/hpack/default.nix index 41b2a5522ea6..ba819ba3882c 100644 --- a/nixpkgs/pkgs/development/python-modules/hpack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hpack/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Pure-Python HPACK header compression"; homepage = "https://github.com/python-hyper/hpack"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index eacca2b85140..68508b655e4c 100644 --- a/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Chromium HSTS Preload list as a Python package and updated daily"; homepage = "https://github.com/sethmlarson/hstspreload"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix b/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix index 4c75a2cbb3f0..c640ee8a106d 100644 --- a/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix @@ -1,22 +1,31 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling , lxml , beautifulsoup4 , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "html-sanitizer"; - version = "1.9.3"; + version = "2.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "matthiask"; repo = pname; - rev = version; - hash = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw="; + rev = "refs/tags/${version}"; + hash = "sha256-WU5wdTvCzYEw1eiuTLcFImvydzxWANfmDQCmEgyU9h4="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ lxml beautifulsoup4 @@ -43,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allowlist-based and very opinionated HTML sanitizer"; homepage = "https://github.com/matthiask/html-sanitizer"; + changelog = "https://github.com/matthiask/html-sanitizer/blob/${version}/CHANGELOG.rst"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/httplib2/default.nix b/nixpkgs/pkgs/development/python-modules/httplib2/default.nix index cbc536b1ffbb..99dd53ddd0a9 100644 --- a/nixpkgs/pkgs/development/python-modules/httplib2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httplib2/default.nix @@ -10,6 +10,7 @@ , pytest-randomly , pytest-timeout , pytestCheckHook +, pythonAtLeast , six }: @@ -39,8 +40,8 @@ buildPythonPackage rec { pytestCheckHook ]; - # Don't run tests for Python 2.7 - doCheck = !isPy27; + # Don't run tests for older Pythons + doCheck = pythonAtLeast "3.9"; postPatch = '' sed -i "/--cov/d" setup.cfg diff --git a/nixpkgs/pkgs/development/python-modules/httptools/default.nix b/nixpkgs/pkgs/development/python-modules/httptools/default.nix index 1b34c071879c..308a2dd08ff6 100644 --- a/nixpkgs/pkgs/development/python-modules/httptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httptools/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "A collection of framework independent HTTP protocol utils"; homepage = "https://github.com/MagicStack/httptools"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix b/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix index 3ac4635ab71f..996db8ec1b30 100644 --- a/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix @@ -12,16 +12,19 @@ , pytestCheckHook , python-socks , pythonOlder +, setuptools , sniffio , starlette +, tiny-proxy , trio +, trustme , yarl }: buildPythonPackage rec { pname = "httpx-socks"; - version = "0.7.5"; - format = "setuptools"; + version = "0.7.6"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,9 +32,13 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HwLJ2pScgiNmM/l14aKp47MMuGW1qSaIq7ujpCSRtqA="; + hash = "sha256-rLcYC8IO2eCWAL4QIiUg/kyigybq6VNTUjNDXx4KPHc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ httpx httpcore @@ -54,6 +61,8 @@ buildPythonPackage rec { pytest-trio pytestCheckHook starlette + tiny-proxy + trustme yarl ]; diff --git a/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 90b11bbc5975..ffbea1b67c8e 100644 --- a/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -125,6 +125,6 @@ buildPythonPackage rec { description = "The next generation HTTP client"; homepage = "https://github.com/encode/httpx"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc fab ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/huawei-lte-api/default.nix b/nixpkgs/pkgs/development/python-modules/huawei-lte-api/default.nix index 237878d240e5..3bde42f186d1 100644 --- a/nixpkgs/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.6.11"; + version = "1.7.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Salamek"; repo = "huawei-lte-api"; rev = "refs/tags/${version}"; - hash = "sha256-pOBYMSORgT8WOnhCdazuKucjPoOywnrWa+qCYR5qSls="; + hash = "sha256-a01oNfUivbCzTd5auu+EXj+yvcC1vKyktIFK+zPQGy4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/nixpkgs/pkgs/development/python-modules/humanize/default.nix index 13ed586c3787..9854e428a57a 100644 --- a/nixpkgs/pkgs/development/python-modules/humanize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/humanize/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , freezegun , gettext -, importlib-metadata , pytestCheckHook , pythonOlder , hatch-vcs @@ -12,16 +11,16 @@ buildPythonPackage rec { pname = "humanize"; - version = "4.6.0"; + version = "4.7.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-humanize"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sI773uzh+yMiyu1ebsk6zutfyt+tfx/zT/X2AdH5Fyg="; + hash = "sha256-ofRdrFVxIxAtv8WopJDX8Te8yaaJTnDbRM56V7pm/NM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,10 +31,6 @@ buildPythonPackage rec { gettext ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - postBuild = '' scripts/generate-translation-binaries.sh ''; diff --git a/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/nixpkgs/pkgs/development/python-modules/hvac/default.nix index a9da2ef29ca3..732496cdee88 100644 --- a/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -3,32 +3,37 @@ , fetchPypi , pyhcl , requests -, six +, poetry-core , pythonOlder }: buildPythonPackage rec { pname = "hvac"; - version = "1.1.0"; - format = "setuptools"; + version = "1.1.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-B53KWIVt7mZG7VovIoOAnBbS3u3eHp6WFbKRAySkuWk="; + hash = "sha256-+dvMRrmLJQx4XrEFCqEe40oMi2YWt1IYzxNGqYF5kvk="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ pyhcl requests - six ]; # Requires running a Vault server doCheck = false; - pythonImportsCheck = [ "hvac" ]; + pythonImportsCheck = [ + "hvac" + ]; meta = with lib; { description = "HashiCorp Vault API client"; diff --git a/nixpkgs/pkgs/development/python-modules/hvplot/default.nix b/nixpkgs/pkgs/development/python-modules/hvplot/default.nix index 8f1fd2236904..39e7f5835965 100644 --- a/nixpkgs/pkgs/development/python-modules/hvplot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hvplot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.8.3"; + version = "0.8.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JiuN5WNEcN4jaUgVgvoHjx5Zj9fldYwoPhuGBawuhiM="; + hash = "sha256-7/X9qXExNKwN89JkihGJfuQKCbGiVhrTMBiALhi4fCI="; }; propagatedBuildInputs = [ @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://hvplot.pyviz.org"; changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix b/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix index 8a6b7c8ac652..4da98f083c37 100644 --- a/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hydra-check/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hydra-check"; - version = "1.3.4"; + version = "1.3.5"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nix-community"; repo = pname; - rev = "v${version}"; - hash = "sha256-voSbpOPJUPjwzdMLVt2TC/FIi6LKk01PLd/GczOAUR8="; + rev = "refs/tags/v${version}"; + hash = "sha256-fRSC+dfZZSBBeN6YidXRKc1kPUbBKz5OiFSHGOSikgI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix b/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix index 5bf37b45394b..436a4e7e6213 100644 --- a/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix @@ -1,9 +1,9 @@ -{ stdenv -, lib +{ lib , antlr4 , antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub +, fetchpatch , importlib-resources , jre_headless , omegaconf @@ -32,6 +32,12 @@ buildPythonPackage rec { src = ./antlr4.patch; antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) + # https://github.com/facebookresearch/hydra/pull/2731 + (fetchpatch { + name = "setuptools-67.5.0-test-compatibility.patch"; + url = "https://github.com/facebookresearch/hydra/commit/25873841ed8159ab25a0c652781c75cc4a9d6e08.patch"; + hash = "sha256-oUfHlJP653o3RDtknfb8HaaF4fpebdR/OcbKHzJFK/Q="; + }) ]; postPatch = '' @@ -76,7 +82,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A framework for configuring complex applications"; homepage = "https://hydra.cc"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix b/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix index bfa7f8c91cc7..17449fdf66ce 100644 --- a/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hydrus-api"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hydrus_api"; inherit version; - hash = "sha256-s6gS1rVcbg7hcE63hGdPhJCcgS4N4d58MpSrECAfe0U="; + hash = "sha256-3Roeab9/woGF/aZYm9nbqrcyYN8CKA1k66cTRxx6jM4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix b/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix index 3673b50bb8a6..d4d45fa2e775 100644 --- a/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "HTTP/2 framing layer for Python"; homepage = "https://github.com/python-hyper/hyperframe/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hyperpyyaml/default.nix b/nixpkgs/pkgs/development/python-modules/hyperpyyaml/default.nix new file mode 100644 index 000000000000..d66d16dc42f3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hyperpyyaml/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pytestCheckHook +, pyyaml +, ruamel-yaml +}: + +buildPythonPackage rec { + pname = "hyperpyyaml"; + version = "1.2.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "speechbrain"; + repo = "hyperpyyaml"; + rev = "refs/tags/v${version}"; + hash = "sha256-tC4kLJAY9MVgjWwU2Qu0rPCVDw7CjKVIciRZgYhnR9I="; + }; + + propagatedBuildInputs = [ + pyyaml + ruamel-yaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "hyperpyyaml" ]; + + meta = with lib; { + description = "Extensions to YAML syntax for better python interaction"; + homepage = "https://github.com/speechbrain/HyperPyYAML"; + changelog = "https://github.com/speechbrain/HyperPyYAML/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix index bfa2ca0dc87e..a5692c631508 100644 --- a/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -8,21 +8,21 @@ , doCheck ? true , pytestCheckHook , pytest-xdist +, python , sortedcontainers +, stdenv , pythonOlder , sphinxHook , sphinx-rtd-theme , sphinx-hoverxref , sphinx-codeautolink , tzdata -# Used to break internal dependency loop. -, enableDocumentation ? true }: buildPythonPackage rec { pname = "hypothesis"; version = "6.68.2"; - outputs = [ "out" ] ++ lib.optional enableDocumentation "doc"; + outputs = [ "out" ]; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,13 +49,6 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - nativeBuildInputs = lib.optionals enableDocumentation [ - sphinxHook - sphinx-rtd-theme - sphinx-hoverxref - sphinx-codeautolink - ]; - propagatedBuildInputs = [ attrs sortedcontainers @@ -67,7 +60,7 @@ buildPythonPackage rec { pexpect pytest-xdist pytestCheckHook - ] ++ lib.optionals (isPyPy) [ + ] ++ lib.optionals isPyPy [ tzdata ]; @@ -86,11 +79,35 @@ buildPythonPackage rec { "hypothesis" ]; + passthru = { + doc = stdenv.mkDerivation { + # Forge look and feel of multi-output derivation as best as we can. + # + # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. + name = "${pname}-${version}-doc"; + inherit src pname version; + + postInstallSphinx = '' + mv $out/share/doc/* $out/share/doc/python$pythonVersion-$pname-$version + ''; + + nativeBuildInputs = [ + sphinxHook + sphinx-rtd-theme + sphinx-hoverxref + sphinx-codeautolink + ]; + + inherit (python) pythonVersion; + inherit meta; + }; + }; + meta = with lib; { description = "Library for property based testing"; homepage = "https://github.com/HypothesisWorks/hypothesis"; changelog = "https://hypothesis.readthedocs.io/en/latest/changes.html#v${lib.replaceStrings [ "." ] [ "-" ] version}"; license = licenses.mpl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix b/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix index a9c3af6c32e3..61aae4e4f74e 100644 --- a/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { description = "Hypothesis strategies for generating Python programs, something like CSmith"; homepage = "https://github.com/Zac-HD/hypothesmith"; license = licenses.mpl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/iammeter/default.nix b/nixpkgs/pkgs/development/python-modules/iammeter/default.nix new file mode 100644 index 000000000000..7747e53f5bab --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/iammeter/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "iammeter"; + version = "0.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Q0o392Xf3cY5BkX4ic6pE3XKMSgek5cpW4TMqSh+Ew8="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "iammeter" + ]; + + meta = with lib; { + description = "Module to work with the IamMeter API"; + homepage = "https://pypi.org/project/iammeter/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix b/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix index 10e3838da176..8ac76ae26d06 100644 --- a/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix @@ -210,6 +210,6 @@ buildPythonPackage rec { homepage = "https://github.com/ibis-project/ibis"; changelog = "https://github.com/ibis-project/ibis/blob/${version}/docs/release_notes.md"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc cpcloud ]; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ibis/default.nix b/nixpkgs/pkgs/development/python-modules/ibis/default.nix index 8bb64ba4e1e1..e012ca20e2d7 100644 --- a/nixpkgs/pkgs/development/python-modules/ibis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibis/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Lightweight template engine"; homepage = "https://github.com/dmulholland/ibis"; license = licenses.publicDomain; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 962658a15f2b..c228a934bd7a 100644 --- a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.16.6"; + version = "3.16.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lFpaMteVj8TBpcK1zLV95TwG3zY3PZG7QUzY0/LSF/c="; + hash = "sha256-qYXxR+jXjMfqrxJ62j5do33EbjfeoYSq+IeMrO14FnQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ical/default.nix b/nixpkgs/pkgs/development/python-modules/ical/default.nix index b2d5cc0bd86c..2f539c87524d 100644 --- a/nixpkgs/pkgs/development/python-modules/ical/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ical/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , freezegun , tzdata -, py , pyparsing , pydantic , pytest-asyncio @@ -13,23 +12,32 @@ , pytest-golden , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pyyaml }: buildPythonPackage rec { pname = "ical"; - version = "4.5.3"; + version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CHo6khJ8Bqej/OdQBtcfa/luO1Gj8cu7h//MwPhWrMU="; + hash = "sha256-6xDbr/y9ZNT9thWMLHPi9/EXVXrUdMCVJdQAcd3G2vo="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "tzdata" + ]; + propagatedBuildInputs = [ emoji python-dateutil @@ -40,7 +48,6 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - py pytest-asyncio pytest-benchmark pytest-golden diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index d7637d6503d8..2bc949f040d2 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.24"; + version = "2.5.26"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; - rev = "v${version}"; - hash = "sha256-L73M+lWonuT7sSk+piBkZZJtxxeBvZ1XUXUypvS65G0="; + rev = "refs/tags/v${version}"; + hash = "sha256-gpvfj9XwhErMPXWygZb5QMHDwCK7ZhGw6L86ttRoP/Y="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix index abe6836b59ce..77f6283e4be3 100644 --- a/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = "https://github.com/pydron/ifaddr"; description = "Enumerates all IP addresses on all network adapters of the system"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix b/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix index 3d17085a0e31..e2c945c2834e 100644 --- a/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , gcc10 , cmake -, boost17x +, boost179 , icu , swig , pcre @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ gcc10 cmake ]; buildInputs = [ - boost17x + boost179 icu pcre libxml2 diff --git a/nixpkgs/pkgs/development/python-modules/igraph/default.nix b/nixpkgs/pkgs/development/python-modules/igraph/default.nix index b8f02166f330..6f7f5d256202 100644 --- a/nixpkgs/pkgs/development/python-modules/igraph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.10.4"; + version = "0.10.6"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-DR4D12J/BKFpF4hMHfitNmwDZ7UEo+pI0tvEa1T5GTY="; + hash = "sha256-xdzk/gcHL/kFpZabdP7Cq4lUv0aEwpevgLJYqfb2KGY="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/nixpkgs/pkgs/development/python-modules/ijson/default.nix index 78a5d59e9a54..99184c046719 100644 --- a/nixpkgs/pkgs/development/python-modules/ijson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ijson/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "3.2.0.post0"; + version = "3.2.3"; src = fetchPypi { inherit pname version; - hash = "sha256-gKW9fpkjyrIAcB9nrSNyEEMouZ3fJJ276INBAshS0xY="; + hash = "sha256-EClOm/ictxPaBbxHkL3/YWYQQy21YZZIJwdImOF0+Rc="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/image-diff/default.nix b/nixpkgs/pkgs/development/python-modules/image-diff/default.nix new file mode 100644 index 000000000000..d120737c3ffc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/image-diff/default.nix @@ -0,0 +1,39 @@ +{ lib +, python +, buildPythonPackage +, fetchFromGitHub +, pillow +, click +, click-default-group +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "image-diff"; + version = "0.2.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = "image-diff"; + rev = version; + hash = "sha256-AQykJNvBgVjmPVTwJOX17eKWelqvZZieq/giid8GYAY="; + }; + + propagatedBuildInputs = [ + pillow + click + click-default-group + ]; + + pythonImportsCheck = [ "image_diff" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "CLI tool for comparing images"; + homepage = "https://github.com/simonw/image-diff"; + license = licenses.asl20; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/image-match/default.nix b/nixpkgs/pkgs/development/python-modules/image-match/default.nix deleted file mode 100644 index 799f7888cfb2..000000000000 --- a/nixpkgs/pkgs/development/python-modules/image-match/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikit-image }: - -buildPythonPackage { - pname = "image-match"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "ascribe"; - repo = "image-match"; - rev = "1c5f3170555540bdf43ff8b8189c4e8c13a8b950"; - sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; - }; - - buildInputs = [ pytest-runner ]; - - propagatedBuildInputs = [ - scikit-image - ]; - - # remove elasticsearch requirement due to version incompatibility - postPatch = '' - substituteInPlace setup.py --replace "'elasticsearch>=5.0.0,<6.0.0'," "" - ''; - - # tests cannot work without elasticsearch - doCheck = false; - pythonImportsCheck = [ "image_match" ]; - - meta = with lib; { - homepage = "https://github.com/ascribe/image-match"; - description = "Quickly search over billions of images"; - license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index e302731825de..b7d2811fbd10 100644 --- a/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , pytestCheckHook }: buildPythonPackage rec { pname = "imap-tools"; - version = "1.0.0"; + version = "1.2.0"; - disabled = isPy27; + disabled = pythonOlder "3.5"; format = "setuptools"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-JAMEJv0Vc5iunuKusyD+rxLiubEIDgHsr7FrMZgLy9Q="; + hash = "sha256-FC4uvBqQ9Lqpvj94ByM7LYiqqjAQQljYduBxwum49lI="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index 834dce891c7e..b93c304a5c7e 100644 --- a/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.10.1"; + version = "0.11.0"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - hash = "sha256-vHYJYZ7Dw4xEIpKSgjmtPRC13rCviinIOCK3tXsxn4s="; + hash = "sha256-dYKuiFjm2wuS/vl90IZgoYKX7hKNeMKr3ABri9hrj9w="; }; propagatedBuildInputs = [ scikit-learn ]; diff --git a/nixpkgs/pkgs/development/python-modules/imgaug/default.nix b/nixpkgs/pkgs/development/python-modules/imgaug/default.nix deleted file mode 100644 index c67f7fa5b949..000000000000 --- a/nixpkgs/pkgs/development/python-modules/imgaug/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ buildPythonPackage -, fetchFromGitHub -, imageio -, imagecorruptions -, numpy -, opencv3 -, pytestCheckHook -, scikit-image -, scipy -, shapely -, six -, lib -}: - -buildPythonPackage rec { - pname = "imgaug"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "aleju"; - repo = "imgaug"; - rev = version; - sha256 = "17hbxndxphk3bfnq35y805adrfa6gnm5x7grjxbwdw4kqmbbqzah"; - }; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace "opencv-python-headless" "" - substituteInPlace setup.py \ - --replace "opencv-python-headless" "" - substituteInPlace pytest.ini \ - --replace "--xdoctest --xdoctest-global-exec=\"import imgaug as ia\nfrom imgaug import augmenters as iaa\"" "" - ''; - - propagatedBuildInputs = [ - imageio - imagecorruptions - numpy - opencv3 - scikit-image - scipy - shapely - six - ]; - - nativeCheckInputs = [ - opencv3 - pytestCheckHook - ]; - - disabledTests = [ - # Tests are outdated - "test_quokka_segmentation_map" - "test_pool" - "test_avg_pool" - "test_max_pool" - "test_min_pool" - "est_median_pool" - "test_alpha_is_080" - "test_face_and_lines_at_half_visibility" - "test_polygon_fully_inside_image__no_rectangular_shape" - # flaky due to timing-based assertions - "test_imap_batches_output_buffer_size" - "test_imap_batches_unordered_output_buffer_size" - ]; - - disabledTestPaths = [ - # TypeError: int() argument must be a string, a bytes-like object or a number, not 'NoneType' - "test/augmenters/test_pooling.py" - ]; - - pythonImportsCheck = [ "imgaug" ]; - - meta = with lib; { - homepage = "https://github.com/aleju/imgaug"; - description = "Image augmentation for machine learning experiments"; - license = licenses.mit; - maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; - platforms = platforms.linux; - # Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0 - # and https://github.com/scikit-image/scikit-image/issues/6093 - broken = lib.versionAtLeast scikit-image.version "0.19"; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/imgdiff/default.nix b/nixpkgs/pkgs/development/python-modules/imgdiff/default.nix new file mode 100644 index 000000000000..586ed19b2572 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/imgdiff/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, mock +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "imgdiff"; + version = "1.7.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mgedmin"; + repo = "imgdiff"; + rev = version; + hash = "sha256-Y5nUnjihRpVVehhP1LUgfuJN5nCxEJu6P1w99Igpxjs="; + }; + + propagatedBuildInputs = [ + pillow + ]; + + pythonImportsCheck = [ "imgdiff" ]; + + nativeCheckInputs = [ + mock + unittestCheckHook + ]; + + meta = with lib; { + description = "Compare two images side-by-side"; + homepage = "https://github.com/mgedmin/imgdiff"; + changelog = "https://github.com/mgedmin/imgdiff/blob/${src.rev}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix b/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix index 249f789513d2..555fa80acd64 100644 --- a/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.2.4"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "corenting"; repo = "immutabledict"; - rev = "v${version}"; - hash = "sha256-cykTZw3p6P35rHaJmfmiXIqybc+ZeqUkxneoPot7E9Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-DsvKtiy9sawGKpQu3f5OMUtE2Emq3Br8FupopUcLVew="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/immutables/default.nix b/nixpkgs/pkgs/development/python-modules/immutables/default.nix index a490d7ac8ce5..02f89f237b74 100644 --- a/nixpkgs/pkgs/development/python-modules/immutables/default.nix +++ b/nixpkgs/pkgs/development/python-modules/immutables/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder -, mypy , typing-extensions }: @@ -21,12 +20,15 @@ buildPythonPackage rec { hash = "sha256-yW+pmAryBp6bvjolN91ACDkk5zxvKfu4nRLQSy71kqs="; }; + postPatch = '' + rm tests/conftest.py + ''; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; nativeCheckInputs = [ - mypy pytestCheckHook ]; @@ -35,6 +37,11 @@ buildPythonPackage rec { "testMypyImmu" ]; + disabledTestPaths = [ + # avoid dependency on mypy + "tests/test_mypy.py" + ]; + pythonImportsCheck = [ "immutables" ]; diff --git a/nixpkgs/pkgs/development/python-modules/impacket/default.nix b/nixpkgs/pkgs/development/python-modules/impacket/default.nix index cc957ac156aa..3e5db5b39678 100644 --- a/nixpkgs/pkgs/development/python-modules/impacket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/impacket/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/SecureAuthCorp/impacket"; # Modified Apache Software License, Version 1.1 license = licenses.free; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix index bb9a8990868a..b4c20163cb7a 100644 --- a/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "6.0.0"; + version = "6.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-41S+3rYO+mr/3MiuEhtzVEp6p0FW0EcxGUj21xHNN40="; + hash = "sha256-26zniS2MDErBrQlmYiMvgx1OZPTEVFvVMBaj6dRlR0M="; }; nativeBuildInputs = [ @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Read metadata from Python packages"; homepage = "https://importlib-metadata.readthedocs.io/"; license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab AndersonTorres ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/imutils/default.nix b/nixpkgs/pkgs/development/python-modules/imutils/default.nix index 53294680df9e..74336bf5d808 100644 --- a/nixpkgs/pkgs/development/python-modules/imutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imutils/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/jrosebr1/imutils"; description = "A series of convenience functions to make basic image processing functions"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix b/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix index f431ced8efe3..baffe42e0f36 100644 --- a/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix +++ b/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix @@ -6,27 +6,28 @@ , pytestCheckHook , pythonAtLeast , pythonOlder -, setuptools -, setuptools-scm +, hatchling +, hatch-vcs , toolz }: buildPythonPackage rec { pname = "in-n-out"; - version = "0.1.7"; - format = "setuptools"; + version = "0.1.8"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-g4Dw0ejB6BxcMpRZGgxNDeAyuY93UROVsIrAwv6vSqY="; + pname = "in_n_out"; + inherit version; + hash = "sha256-gWKvh4fmgutLNtBH+RQZnYDxEk46QUIM1T3mgOfQolQ="; }; nativeBuildInputs = [ cython_3 - setuptools - setuptools-scm + hatchling + hatch-vcs ]; propagatedBuildInputs = [ @@ -52,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for dependency injection and result processing"; - homepage = "https://app-model.readthedocs.io/"; + homepage = "https://github.com/pyapp-kit/in-n-out"; changelog = "https://github.com/pyapp-kit/in-n-out/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; diff --git a/nixpkgs/pkgs/development/python-modules/incremental/default.nix b/nixpkgs/pkgs/development/python-modules/incremental/default.nix index 8fabae484d91..3498b4935ce8 100644 --- a/nixpkgs/pkgs/development/python-modules/incremental/default.nix +++ b/nixpkgs/pkgs/development/python-modules/incremental/default.nix @@ -39,6 +39,6 @@ let incremental = buildPythonPackage rec { homepage = "https://github.com/twisted/incremental"; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in incremental diff --git a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 7e858003d02f..699cd2945d73 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.36.1"; + version = "1.37.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-O10q/ResES3mE26LZQLgGPSLjhUCEOwZpm6vZj6H5mQ="; + hash = "sha256-paS+/miraJ9vRL1ZEAWJRSVd1hGvrYJe+0YD/F4sGDs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index a44a2e300429..e2bacd522922 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { msgpack ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytestCheckHook requests-mock diff --git a/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix b/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix index a36a11ac6038..e62e7f17e874 100644 --- a/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/weblyzard/inscriptis"; changelog = "https://github.com/weblyzard/inscriptis/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/insightface/default.nix b/nixpkgs/pkgs/development/python-modules/insightface/default.nix new file mode 100644 index 000000000000..6d5c4a66239c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/insightface/default.nix @@ -0,0 +1,77 @@ +{ lib +, albumentations +, buildPythonPackage +, cython +, easydict +, fetchPypi +, insightface +, matplotlib +, mxnet +, numpy +, onnx +, onnxruntime +, opencv4 +, prettytable +, pythonOlder +, scikit-image +, scikit-learn +, tensorboard +, testers +, tqdm +}: + +buildPythonPackage rec { + pname = "insightface"; + version = "0.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + easydict + matplotlib + mxnet + numpy + onnx + onnxruntime + opencv4 + scikit-learn + scikit-image + tensorboard + tqdm + albumentations + prettytable + ]; + + pythonImportsCheck = [ + "insightface" + "insightface.app" + "insightface.data" + ]; + + passthru.tests.version = testers.testVersion { + package = insightface; + command = "insightface-cli --help"; + # Doesn't support --version but we still want to make sure the cli is executable + # and returns the help output + version = "help"; + }; + + doCheck = false; # Upstream has no tests + + meta = with lib; { + description = "State-of-the-art 2D and 3D Face Analysis Project"; + homepage = "https://github.com/deepinsight/insightface"; + license = licenses.mit; + maintainers = with maintainers; [ oddlama ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/intake/default.nix b/nixpkgs/pkgs/development/python-modules/intake/default.nix index 2dd71b515a00..98450dd31ea9 100644 --- a/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -121,6 +121,6 @@ buildPythonPackage rec { homepage = "https://github.com/ContinuumIO/intake"; changelog = "https://github.com/intake/intake/blob/${version}/docs/source/changelog.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/invoke/default.nix b/nixpkgs/pkgs/development/python-modules/invoke/default.nix index 3b154063404f..e388cccf5932 100644 --- a/nixpkgs/pkgs/development/python-modules/invoke/default.nix +++ b/nixpkgs/pkgs/development/python-modules/invoke/default.nix @@ -2,7 +2,7 @@ , bash , buildPythonPackage , fetchPypi -, pythonOlder +, stdenv }: buildPythonPackage rec { @@ -26,6 +26,13 @@ buildPythonPackage rec { "invoke" ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mkdir -p $out/share/{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + $out/bin/inv --print-completion-script=zsh >$out/share/zsh/site-functions/_inv + $out/bin/inv --print-completion-script=bash >$out/share/bash-completion/completions/inv.bash + $out/bin/inv --print-completion-script=fish >$out/share/fish/vendor_completions.d/inv.fish + ''; + meta = with lib; { description = "Pythonic task execution"; homepage = "https://www.pyinvoke.org/"; diff --git a/nixpkgs/pkgs/development/python-modules/iocextract/default.nix b/nixpkgs/pkgs/development/python-modules/iocextract/default.nix index 9a2f5a2ec410..5831ab80e14b 100644 --- a/nixpkgs/pkgs/development/python-modules/iocextract/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iocextract/default.nix @@ -4,11 +4,12 @@ , pytestCheckHook , pythonOlder , regex +, requests }: buildPythonPackage rec { pname = "iocextract"; - version = "1.15.2"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,11 +18,12 @@ buildPythonPackage rec { owner = "InQuest"; repo = "python-iocextract"; rev = "refs/tags/v${version}"; - hash = "sha256-l0TGi3Y3/Dcwyp80eRWYYlDaDDJdpc31fcxdYEVvQas="; + hash = "sha256-jwMu4G146FpH6aFCiZK9tI/3CKnZYC2RCtO9QXXaquQ="; }; propagatedBuildInputs = [ regex + requests ]; nativeCheckInputs = [ @@ -36,6 +38,11 @@ buildPythonPackage rec { "tests.py" ]; + disabledTests = [ + # AssertionError: 'http://exampledotcom/test' != 'http://example.com/test' + "test_refang_data" + ]; + meta = with lib; { description = "Module to extract Indicator of Compromises (IOC)"; homepage = "https://github.com/InQuest/python-iocextract"; diff --git a/nixpkgs/pkgs/development/python-modules/iopath/default.nix b/nixpkgs/pkgs/development/python-modules/iopath/default.nix new file mode 100644 index 000000000000..0a85de0fc9ec --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/iopath/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# build inputs +, tqdm +, portalocker +, boto3 +# check inputs +, pytestCheckHook +, torch +}: +let + pname = "iopath"; + version = "0.1.9"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "iopath"; + rev = "refs/tags/v${version}"; + hash = "sha256-Qubf/mWKMgYz9IVoptMZrwy4lQKsNGgdqpJB1j/u5s8="; + }; + + propagatedBuildInputs = [ + tqdm + portalocker + ]; + + nativeCheckInputs = [ + pytestCheckHook + torch + ]; + + disabledTests = [ + # requires network access + "test_download" + "test_bad_args" + ]; + + disabledTestPaths = [ + # flakey + "tests/async_torch_test.py" + "tests/async_writes_test.py" + ]; + + pythonImportsCheck = [ + "iopath" + ]; + + passthru.optional-dependencies = { + aws = [ boto3 ]; + }; + + meta = with lib; { + description = "A python library that provides common I/O interface across different storage backends."; + homepage = "https://github.com/facebookresearch/iopath"; + changelog = "https://github.com/facebookresearch/iopath/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix index 7bd161a5ae32..4aec18990732 100644 --- a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { homepage = "https://github.com/gotcha/ipdb"; description = "IPython-enabled pdb"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix index 9788fd8a5440..c4e9e17988bf 100644 --- a/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { homepage = "https://github.com/flavioamieiro/nose-ipdb/tree/master"; description = "Nose plugin to use iPdb instead of Pdb when tests fail"; license = licenses.lgpl2; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix b/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix index 09a7ddab4746..df7fe7ac3fc2 100644 --- a/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.3.3"; + version = "4.3.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-T7LOaT+yaM2ukAN0z6GpFkHiLZUU0eweYtp0cFCST3Y="; + hash = "sha256-OU8kiVdlh8/XVTd6CaBn9GytIggZZQkgIf0avL54Uqg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix b/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix index 49208b30fe37..edbb13912ad9 100644 --- a/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix @@ -10,11 +10,10 @@ }: -buildPythonPackage rec { +buildPythonPackage { pname = "ipykernel-tests"; - inherit (ipykernel) version; - - src = ipykernel.src; + inherit (ipykernel) version src; + format = "other"; dontBuild = true; dontInstall = true; diff --git a/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix b/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix index da55df0ac3ee..a126030d0cb1 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ipyniivue"; - version = "1.0.2"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vFbEV/ZMXvKZeQUR536OZQ/5uIkt4tOWcCGRPMdc34I"; + hash = "sha256-kym7949VI6C+62p3IOQ2QIzWnuSBcrmySb83oqUwhjI="; }; nativeBuildInputs = [ hatchling hatch-jupyter-builder ]; diff --git a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix index e9eda5a0d041..272a192e3ada 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix @@ -6,9 +6,7 @@ , hatchling , ipykernel , ipython -, ipython_genutils , jupyter-client -, packaging , psutil , python-dateutil , pythonOlder @@ -39,9 +37,7 @@ buildPythonPackage rec { entrypoints ipykernel ipython - ipython_genutils jupyter-client - packaging psutil python-dateutil pyzmq diff --git a/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix b/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix index 1444418c6625..e71c3e845424 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.9.1"; + version = "1.9.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-QhHWFb+OHRXoguqTN5+W7X1YaK0xyn4Ja+1M52fFees="; + hash = "sha256-2j8qYRXR8nmV5++g4OJn65dq3lypgqo9oxBscNb4eNs="; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/nixpkgs/pkgs/development/python-modules/irc/default.nix b/nixpkgs/pkgs/development/python-modules/irc/default.nix index 99525060c51a..e252987e3fb0 100644 --- a/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools-scm, jaraco_collections, importlib-metadata +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, six +, jaraco-logging +, jaraco-text +, jaraco-stream +, pytz +, jaraco-itertools +, setuptools-scm +, jaraco-collections +, importlib-metadata }: buildPythonPackage rec { @@ -20,12 +30,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ six importlib-metadata - jaraco_logging - jaraco_text - jaraco_stream + jaraco-logging + jaraco-text + jaraco-stream pytz - jaraco_itertools - jaraco_collections + jaraco-itertools + jaraco-collections ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/nixpkgs/pkgs/development/python-modules/islpy/default.nix index e0667bb5b7dc..149aa4c9c14a 100644 --- a/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2023.1"; + version = "2023.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QLkpCBF95OBOzPrBXmlzyhFMfq1bs2+S/8Z5n4oMekg="; + sha256 = "sha256-NsNI1N9ZuNYWr1i3dl7hSaTP3jdsTYsIpoF98vrZG9Y="; }; postConfigure = '' @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Python wrapper around isl, an integer set library"; homepage = "https://github.com/inducer/islpy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/iso8601/default.nix b/nixpkgs/pkgs/development/python-modules/iso8601/default.nix index af90e739163c..c3e022cdb38b 100644 --- a/nixpkgs/pkgs/development/python-modules/iso8601/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iso8601/default.nix @@ -25,8 +25,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - # "hypothesis" indirectly depends on iso8601 to build its documentation - (hypothesis.override { enableDocumentation = false; }) + hypothesis pytestCheckHook pytz ]; diff --git a/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix b/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix index 417fca817f69..860b237c3de5 100644 --- a/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "Python package for conversion and transliteration of unicode into ascii or iso-8859-1"; homepage = "https://github.com/redvasily/isounidecode"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/iwlib/default.nix b/nixpkgs/pkgs/development/python-modules/iwlib/default.nix new file mode 100644 index 000000000000..2f556e1717d2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/iwlib/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, wirelesstools, cffi, pytest }: +buildPythonPackage rec { + pname = "iwlib"; + version = "1.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "a805f6597a70ee3001aba8f039fb7b2dcb75dc15c4e7852f5594fd6379196da1"; + }; + + propagatedBuildInputs = [ wirelesstools cffi ]; + nativeBuildInputs = [ pytest ]; + pythonImportsCheck = [ "iwlib" ]; + + doCheck = true; + checkInputs = [ pytest ]; + checkPhase = "python iwlib/_iwlib_build.py; pytest -v"; + + meta = with lib; { + homepage = "https://github.com/nhoad/python-iwlib"; + description = "Python interface for the Wireless Tools utility collection"; + changelog = "https://github.com/nhoad/python-iwlib#change-history"; + maintainers = with maintainers; [ jcspeegs ]; + license = licenses.gpl2Only; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix index 053f77cddfb4..cbd739d5a955 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix @@ -1,41 +1,40 @@ { lib , buildPythonPackage -, pythonOlder +, bx-py-utils +, colorlog , fetchFromGitHub , fetchPypi -, setuptools -, setuptools-scm -, requests -, lomond -, colorlog -, keyring -, requests-toolbelt -, jaraco_collections +, importlib-resources +, jaraco-classes +, jaraco-collections +, jaraco-itertools , jaraco-context -, jaraco_classes , jaraco-net +, keyring +, lomond , more-itertools -, importlib-resources -, bx-py-utils , platformdirs -, jaraco_itertools , pytestCheckHook +, pythonOlder +, requests , requests-mock +, requests-toolbelt +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "jaraco-abode"; - version = "5.0.1"; + version = "5.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.abode"; rev = "refs/tags/v${version}"; - hash = "sha256-vKlvZrgRKv2C43JLfl4Wum4Icz9yOKEaB6qKapZ0rwQ="; + hash = "sha256-guLgmhjFgYLRZsQ0j92NXkktZ80bwVvMUJLZeg3dgxE="; }; postPatch = '' @@ -56,24 +55,26 @@ buildPythonPackage rec { colorlog keyring requests-toolbelt - jaraco_collections + jaraco-collections jaraco-context - jaraco_classes + jaraco-classes jaraco-net more-itertools importlib-resources bx-py-utils platformdirs - jaraco_itertools + jaraco-itertools ]; - pythonImportsCheck = [ "jaraco.abode" ]; - nativeCheckInputs = [ pytestCheckHook requests-mock ]; + pythonImportsCheck = [ + "jaraco.abode" + ]; + preCheck = '' export HOME=$TEMP ''; @@ -83,10 +84,12 @@ buildPythonPackage rec { "test_cookies" "test_empty_cookies" "test_invalid_cookies" + # Issue with the regex + "test_camera_capture_no_control_URLs" ]; meta = with lib; { - changelog = "https://github.com/jaraco/jaraco.abode/blob/${src.rev}/CHANGES.rst"; + 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"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-classes/default.nix index 5fd16f1f505a..8c9b32fb11ee 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-classes/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - pname = "jaraco.classes"; + pname = "jaraco-classes"; version = "3.1.1"; disabled = isPy27; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix index e60da3771297..1d8f9a8f2241 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix @@ -1,19 +1,21 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , setuptools-scm -, jaraco_classes -, jaraco_text +, jaraco-classes +, jaraco-text }: buildPythonPackage rec { - pname = "jaraco.collections"; - version = "3.8.0"; + pname = "jaraco-collections"; + version = "4.3.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA="; + pname = "jaraco.collections"; + inherit version; + hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ="; }; postPatch = '' @@ -22,12 +24,15 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + setuptools setuptools-scm ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ - jaraco_classes - jaraco_text + jaraco-classes + jaraco-text ]; pythonNamespaces = [ "jaraco" ]; @@ -39,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Models and classes to supplement the stdlib 'collections' module"; homepage = "https://github.com/jaraco/jaraco.collections"; + changelog = "https://github.com/jaraco/jaraco.collections/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix index b99eff746f47..b23d9504dea1 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix @@ -3,10 +3,11 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , setuptools , setuptools-scm -, jaraco_text -, jaraco_collections +, jaraco-text +, jaraco-collections , keyring , pytestCheckHook }: @@ -26,6 +27,19 @@ buildPythonPackage rec { hash = "sha256-MR/SX5jmZvEMULgvQbh0JBZjIosNCPWl1wvEoJbdw4Y="; }; + 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 @@ -34,8 +48,8 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ - jaraco_text - jaraco_collections + jaraco-text + jaraco-collections keyring ]; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix index c0a373c8b686..9cd5e9988f66 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix @@ -6,12 +6,13 @@ }: buildPythonPackage rec { - pname = "jaraco.functools"; + pname = "jaraco-functools"; version = "3.6.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "jaraco.functools"; + inherit version; hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M="; }; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-itertools/default.nix index fa652a5355f1..906733508c25 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-itertools/default.nix @@ -3,12 +3,13 @@ }: buildPythonPackage rec { - pname = "jaraco.itertools"; + pname = "jaraco-itertools"; version = "6.2.1"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "jaraco.itertools"; + inherit version; hash = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; }; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix index e6cd8e253dd8..e6cd8e253dd8 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix diff --git a/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix index 86a8c63e19ad..565395d84023 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix @@ -11,11 +11,11 @@ , keyring , requests , feedparser -, jaraco_text -, jaraco_logging +, jaraco-text +, jaraco-logging , jaraco-email -, jaraco_functools -, jaraco_collections +, jaraco-functools +, jaraco-collections , path , python-dateutil , pathvalidate @@ -58,11 +58,11 @@ buildPythonPackage rec { keyring requests feedparser - jaraco_text - jaraco_logging + jaraco-text + jaraco-logging jaraco-email - jaraco_functools - jaraco_collections + jaraco-functools + jaraco-collections path python-dateutil pathvalidate @@ -92,6 +92,9 @@ buildPythonPackage rec { "tests/test_cookies.py" ]; + # cherrypy does not support Python 3.11 + doCheck = pythonOlder "3.11"; + meta = { changelog = "https://github.com/jaraco/jaraco.net/blob/${src.rev}/CHANGES.rst"; description = "Networking tools by jaraco"; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-stream/default.nix index 48a5085f7928..b7befef92757 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-stream/default.nix @@ -1,11 +1,12 @@ { buildPythonPackage, fetchPypi, setuptools-scm, six }: buildPythonPackage rec { - pname = "jaraco.stream"; + pname = "jaraco-stream"; version = "3.0.3"; src = fetchPypi { - inherit pname version; + pname = "jaraco.stream"; + inherit version; sha256 = "3af4b0441090ee65bd6dde930d29f93f50c4a2fe6048e2a9d288285f5e4dc441"; }; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix index fa4efeb53afc..cba2f375af35 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix @@ -5,10 +5,10 @@ , setuptools , setuptools-scm , toml -, jaraco_functools +, jaraco-functools , jaraco-context , more-itertools -, jaraco_collections +, jaraco-collections , pytestCheckHook }: @@ -32,10 +32,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ toml - jaraco_functools + jaraco-functools jaraco-context more-itertools - jaraco_collections + jaraco-collections ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-text/default.nix index 38febd83f49b..eacbf2cbfd96 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-text/default.nix @@ -4,7 +4,7 @@ , pythonOlder , autocommand , importlib-resources -, jaraco_functools +, jaraco-functools , jaraco-context , inflect , pathlib2 @@ -13,14 +13,15 @@ }: buildPythonPackage rec { - pname = "jaraco.text"; + pname = "jaraco-text"; version = "3.11.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "jaraco.text"; + inherit version; hash = "sha256-Mzpd8hSPcTlxhgfN81L+HZUWKXGnKZw4Dcwk2rAWiYA="; }; @@ -35,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ autocommand jaraco-context - jaraco_functools + jaraco-functools inflect ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources diff --git a/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index c7e84e4c11a2..b3d3138ab443 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -27,7 +27,7 @@ , scipy , stdenv # Options: -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages ? {} }: diff --git a/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix index 2bcf5e9c17c3..bf93bf1a5a26 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix @@ -40,8 +40,9 @@ , snappy , zlib +, config # CUDA flags: -, cudaSupport ? false +, cudaSupport ? config.cudaSupport , cudaPackages ? {} # MKL: diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix index f7e0c302465e..5fdc44912319 100644 --- a/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.23.2"; + version = "1.23.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nj7HyYjo5jDnA+H5/er/GPgC/bUR0UYBqu5zOSDA4p0="; + hash = "sha256-d0KONiYS/5JXrl5izFSTYeABEhCW+W9cKpMgk9o9LB4="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; @@ -35,5 +35,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ atemu ]; changelog = "https://github.com/kellyjonbrazil/jc/blob/v${version}/CHANGELOG"; + mainProgram = "jc"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jello/default.nix b/nixpkgs/pkgs/development/python-modules/jello/default.nix new file mode 100644 index 000000000000..01525078bcaa --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jello/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, installShellFiles +, pygments +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "jello"; + version = "1.6.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "kellyjonbrazil"; + repo = "jello"; + rev = "v${version}"; + hash = "sha256-EN09Kcnw4HNT2roCoQyZkoHEfkM9qxqtneZPuBg46z4="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = [ + pygments + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "jello" ]; + + postInstall = '' + installManPage man/jello.1 + ''; + + meta = with lib; { + description = "CLI tool to filter JSON and JSON Lines data with Python syntax"; + homepage = "https://github.com/kellyjonbrazil/jello"; + changelog = "https://github.com/kellyjonbrazil/jello/blob/${src.rev}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index 5e5cf339b74d..5d8e36519e8c 100644 --- a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,17 +9,21 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "4.3.0"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - hash = "sha256-pvka8TLMEclzJ2Iw4iLSiR1ioV3frzQStLu21+kSSHI="; + hash = "sha256-9SrFF1QAEpbS5WWBhOA1p8/YyToSbUb69vINUMQ1cug="; }; postPatch = '' # relax version constraint, https://storyboard.openstack.org/#!/story/2009723 substituteInPlace requirements.txt --replace 'PyYAML>=3.10.0,<6' 'PyYAML>=3.10.0' + # Allow building with setuptools from nixpkgs. + # Related: https://github.com/NixOS/nixpkgs/issues/238226. + substituteInPlace requirements.txt --replace 'setuptools<=65.7.0' 'setuptools' + export HOME=$TMPDIR ''; diff --git a/nixpkgs/pkgs/development/python-modules/jira/default.nix b/nixpkgs/pkgs/development/python-modules/jira/default.nix index afc51331e64d..a25690408dca 100644 --- a/nixpkgs/pkgs/development/python-modules/jira/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jira/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jira"; - version = "3.5.1"; + version = "3.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pycontribs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-n0V9FZ1agzvzqCriqls8C2IKhHKOmOAWqa8iCnXHKY4="; + hash = "sha256-9hzKN57OHi2be9C2mtHZU1KcpbcKxiiYDj9Vw7MxTK4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jiwer/default.nix b/nixpkgs/pkgs/development/python-modules/jiwer/default.nix index 94d92579d7ab..b92d1e71755a 100644 --- a/nixpkgs/pkgs/development/python-modules/jiwer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jiwer/default.nix @@ -5,18 +5,21 @@ , pythonRelaxDepsHook , rapidfuzz , click +, pythonOlder }: buildPythonPackage rec { pname = "jiwer"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "jitsi"; repo = pname; - rev = "v${version}"; - hash = "sha256-bH5TE6mcSG+WqvjW8Sd/o5bCBJmv9zurFEG2cVY/vYQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-z+M0/mftitLV2OaaQvTdRehtt16FFeBjqR//S5ad1XE="; }; nativeBuildInputs = [ @@ -33,11 +36,14 @@ buildPythonPackage rec { "rapidfuzz" ]; - pythonImportsCheck = [ "jiwer" ]; + pythonImportsCheck = [ + "jiwer" + ]; meta = with lib; { description = "A simple and fast python package to evaluate an automatic speech recognition system"; homepage = "https://github.com/jitsi/jiwer"; + changelog = "https://github.com/jitsi/jiwer/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ GaetanLepage ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/nixpkgs/pkgs/development/python-modules/joblib/default.nix index 2a2389cf8277..7317ee8fc144 100644 --- a/nixpkgs/pkgs/development/python-modules/joblib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/joblib/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Lightweight pipelining: using Python functions as pipeline jobs"; homepage = "https://joblib.readthedocs.io/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix index 94d67e131c04..4cd2a2886d6c 100644 --- a/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jsbeautifier"; - version = "1.14.8"; + version = "1.14.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1MTiY6Qt1hlK+52+VHEL48VgRJLL7D6JyS3ZhRP5i58="; + hash = "sha256-xzjrw2tHvZTkym3RepAEw8x07a1YLKHWDg5dWUWmPLk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix b/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix index 1846bfc596da..582248ca32ff 100644 --- a/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "JSON Merge Patch library"; homepage = "https://github.com/open-contracting/json-merge-patch"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix b/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix index 6c36533f8c6f..a1037f573dbd 100644 --- a/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix @@ -4,11 +4,11 @@ let pythonEnv = lib.optional isPy27 mock; in buildPythonPackage rec { pname = "json-rpc"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - hash = "sha256-/13xx/2G4dvQJZ8GWZdRzpGnx5DykEFHk6Vlq1ht3FI="; + hash = "sha256-5kQdVsHc1UJByTfQotzRk73wvcU5tTFlJHE/VUt/hbk="; }; nativeCheckInputs = pythonEnv ++ [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix b/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix index 54cfac9c259c..40a6fed91682 100644 --- a/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.44.5"; + version = "0.45.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+RsJdlGMrjW2GFFLUcQBMwBnBlhST0knCleh2e3d10A="; + hash = "sha256-9dX9+YwJdJpgU3cZkxk7+CgdRFgcVhrvU0amO8zHZhs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/jsonable/default.nix b/nixpkgs/pkgs/development/python-modules/jsonable/default.nix new file mode 100644 index 000000000000..705087674adb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jsonable/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jsonable"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "halfak"; + repo = "python-jsonable"; + rev = "refs/tags/${version}"; + hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA="; + }; + + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "jsonable" ]; + + meta = with lib; { + description = "Provides an abstract base class and utilities for defining trivially JSONable python objects"; + homepage = "https://github.com/halfak/python-jsonable"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix b/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix index 6dfa6914f426..83275f54a9b4 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix @@ -7,22 +7,19 @@ buildPythonPackage rec { pname = "jsonmerge"; - version = "1.9.0"; + version = "1.9.2"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0="; + hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM="; }; propagatedBuildInputs = [ jsonschema ]; nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # Fails with "Unresolvable JSON pointer" - "test_local_reference_in_meta" - ]; - meta = with lib; { description = "Merge a series of JSON documents"; homepage = "https://github.com/avian2/jsonmerge"; diff --git a/nixpkgs/pkgs/development/python-modules/jsonref/default.nix b/nixpkgs/pkgs/development/python-modules/jsonref/default.nix index abd3fad2fd4c..dc12c60aed48 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonref/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonref/default.nix @@ -1,24 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, pdm-backend +, pdm-pep517 , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "jsonref"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "gazpachoking"; repo = "jsonref"; rev = "refs/tags/v${version}"; - hash = "sha256-8p0BmDZGpQ6Dl9rkqRKZKc0doG5pyXpfcVpemmetLhs="; + hash = "sha256-tOhabmqCkktJUZjCrzjOjUGgA/X6EVz0KqehyLtigfc="; }; nativeBuildInputs = [ - poetry-core + pdm-backend + pdm-pep517 ]; nativeCheckInputs = [ @@ -29,11 +34,15 @@ buildPythonPackage rec { "tests.py" ]; + pythonImportsCheck = [ + "jsonref" + ]; + meta = with lib; { description = "An implementation of JSON Reference for Python"; - homepage = "https://github.com/gazpachoking/jsonref"; - license = licenses.mit; + homepage = "https://github.com/gazpachoking/jsonref"; + changelog = "https://github.com/gazpachoking/jsonref/releases/tag/v${version}"; + license = licenses.mit; maintainers = with maintainers; [ ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jsonschema/3_x.nix b/nixpkgs/pkgs/development/python-modules/jsonschema/3_x.nix deleted file mode 100644 index b86c5abda6be..000000000000 --- a/nixpkgs/pkgs/development/python-modules/jsonschema/3_x.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, attrs -, functools32 -, importlib-metadata -, mock -, nose -, pyperf -, pyrsistent -, setuptools-scm -, twisted -, vcversioner -}: - -buildPythonPackage rec { - pname = "jsonschema"; - version = "3.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; - nativeCheckInputs = [ nose mock pyperf twisted vcversioner ]; - - # zope namespace collides on py27 - doCheck = !isPy27; - checkPhase = '' - nosetests - ''; - - meta = with lib; { - homepage = "https://github.com/Julian/jsonschema"; - description = "An implementation of JSON Schema validation for Python"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix b/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix index f60b693a8287..52bc89511d23 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix @@ -7,6 +7,7 @@ , hatchling , importlib-metadata , importlib-resources +, pkgutil-resolve-name , pyrsistent , pythonOlder , twisted @@ -54,6 +55,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources + pkgutil-resolve-name ]; passthru.optional-dependencies = { diff --git a/nixpkgs/pkgs/development/python-modules/jug/default.nix b/nixpkgs/pkgs/development/python-modules/jug/default.nix index a26e98a7b172..6388dfc15401 100644 --- a/nixpkgs/pkgs/development/python-modules/jug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jug/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jug"; - version = "2.2.2"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Jug"; inherit version; - hash = "sha256-3uK6mWaLEGPFoPuznU+OcnkjFZ+beDoIw0vOC4l5gRg="; + hash = "sha256-JWE0eSCAaAJ2vyiKGksYUzS3enCIJYCaT3tVV7fP1BA="; }; propagatedBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Task-Based Parallelization Framework"; homepage = "https://jug.readthedocs.io/"; + changelog = "https://github.com/luispedro/jug/blob/v${version}/ChangeLog"; license = licenses.mit; maintainers = with maintainers; [ luispedro ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-c-kernel/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-c-kernel/default.nix index 0cc232bd7064..a6fe574a9bac 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-c-kernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-c-kernel/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Minimalistic C kernel for Jupyter"; homepage = "https://github.com/brendanrius/jupyter-c-kernel/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-contrib-core/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-contrib-core/default.nix new file mode 100644 index 000000000000..0f9c573e3007 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jupyter-contrib-core/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jupyter-core +, notebook +}: + +buildPythonPackage rec { + pname = "jupyter-contrib-core"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "jupyter-contrib"; + repo = "jupyter_contrib_core"; + rev = "refs/tags/${version}"; + hash = "sha256-UTtK+aKxBFkqKuHrt1ox8vdHyFz/9HiKFl7U4UQcG88="; + }; + + propagatedBuildInputs = [ + jupyter-core + notebook + ]; + + pythonImportsCheck = [ "jupyter_contrib_core" ]; + + meta = with lib; { + description = "Common utilities for jupyter-contrib projects"; + homepage = "https://github.com/jupyter-contrib/jupyter_contrib_core"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix new file mode 100644 index 000000000000..f95493513e67 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jupyter-contrib-core +, jupyter-highlight-selected-word +, jupyter-nbextensions-configurator +, lxml +}: + +buildPythonPackage rec { + pname = "jupyter-contrib-nbextensions"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "ipython-contrib"; + repo = "jupyter_contrib_nbextensions"; + rev = "refs/tags/${version}"; + hash = "sha256-1o8tBfRw6jNcKfNE7xXrQaEhx+KOv7mLOruvuMDtJ1Q="; + }; + + propagatedBuildInputs = [ + jupyter-contrib-core + jupyter-highlight-selected-word + jupyter-nbextensions-configurator + lxml + ]; + + pythonImportsCheck = [ "jupyter_contrib_nbextensions" ]; + + meta = with lib; { + description = "A collection of various notebook extensions for Jupyter"; + homepage = "https://github.com/ipython-contrib/jupyter_contrib_nbextensions"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix new file mode 100644 index 000000000000..a069ecf948f5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "jupyter-highlight-selected-word"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "jcb91"; + repo = "jupyter_highlight_selected_word"; + rev = "refs/tags/${version}"; + hash = "sha256-KgM//SIfES46uZySwNR4ZOcolnJORltvThsmEvxXoIs="; + }; + + pythonImportsCheck = [ "jupyter_highlight_selected_word" ]; + + meta = with lib; { + description = "Jupyter notebook extension that enables highlighting every instance of the current word in the notebook"; + homepage = "https://github.com/jcb91/jupyter_highlight_selected_word"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix new file mode 100644 index 000000000000..ef0ff175268f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jupyter-contrib-core +}: + +buildPythonPackage rec { + pname = "jupyter-nbextensions-configurator"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "jupyter-contrib"; + repo = "jupyter_nbextensions_configurator"; + rev = "refs/tags/${version}"; + hash = "sha256-ovKYHATRAC5a5qTMv32ohU2gJd15/fRKXa5HI0zGp/0="; + }; + + propagatedBuildInputs = [ jupyter-contrib-core ]; + + pythonImportsCheck = [ "jupyter_nbextensions_configurator" ]; + + meta = with lib; { + description = "A jupyter notebook serverextension providing config interfaces for nbextensions"; + homepage = "https://github.com/jupyter-contrib/jupyter_nbextensions_configurator"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix index b889b7bf6204..0d39b868c132 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "Turn code repositories into Jupyter enabled Docker Images"; homepage = "https://repo2docker.readthedocs.io/"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-server-ydoc/default.nix index 0a94adc31860..a60f74aefbdd 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-server-ydoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , hatchling +, pythonRelaxDepsHook , jupyter-server-fileid , jupyter-ydoc , ypy-websocket @@ -31,6 +32,11 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "ypy-websocket" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix index b8ecde78eda7..317b42d8a17c 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix @@ -16,7 +16,6 @@ , tornado , pyzmq , ipykernel -, ipython_genutils , traitlets , jupyter-core , jupyter-client @@ -30,7 +29,6 @@ , anyio , websocket-client , requests -, requests-unixsocket }: buildPythonPackage rec { @@ -55,7 +53,6 @@ buildPythonPackage rec { jinja2 tornado pyzmq - ipython_genutils traitlets jupyter-core jupyter-client @@ -68,7 +65,6 @@ buildPythonPackage rec { prometheus-client anyio websocket-client - requests-unixsocket ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 7aeaa6cdb237..9907122b1135 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "JupyterHub Spawner using systemd for resource isolation"; homepage = "https://github.com/jupyterhub/systemdspawner"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 0e7a283b5da2..2418b8db4d35 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Jupyter Widgets JupyterLab Extension"; homepage = "https://github.com/jupyter-widgets/ipywidgets"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer SuperSandro2000 ]; + maintainers = with maintainers; [ jonringer ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index e15858ec3771..433031d73065 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -72,6 +72,6 @@ buildPythonPackage rec { description = "Jupyter lab environment notebook server extension"; license = with licenses; [ bsd3 ]; homepage = "https://jupyter.org/"; - maintainers = with maintainers; [ zimbatm costrouc ]; + maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index 1c1ea206e433..b766f6d42e0f 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -77,6 +77,6 @@ buildPythonPackage rec { homepage = "https://jupyterlab-server.readthedocs.io/"; changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix b/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix index 3ff7cb5f039c..2061f788c05b 100644 --- a/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "jwcrypto"; - version = "1.4.2"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gKNentGzssQ84D2SxdSObQtmR+KqJhjkljRIkj14o3s="; + hash = "sha256-LB3FHPjjjd8yR5Xf6UJt7p3UbK9H9TXMvBh4H7qBC40="; }; propagatedBuildInputs = [ @@ -30,7 +30,8 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of JOSE Web standards"; homepage = "https://github.com/latchset/jwcrypto"; + changelog = "https://github.com/latchset/jwcrypto/releases/tag/v${version}"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/k5test/default.nix b/nixpkgs/pkgs/development/python-modules/k5test/default.nix index 7b5889692bef..a4620c14882d 100644 --- a/nixpkgs/pkgs/development/python-modules/k5test/default.nix +++ b/nixpkgs/pkgs/development/python-modules/k5test/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "k5test" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "Library for setting up self-contained Kerberos 5 environment"; homepage = "https://github.com/pythongssapi/k5test"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix b/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix index bb59fde71865..689d67d50910 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "karton-classifier"; - version = "1.4.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TRmAin0TAOIwR5EBMwTOJ9QaHO+mOx/eAjgqvyQZDj4="; + hash = "sha256-DH8I4Lbbs2TVMvYlvh/P2I/7O4+VechP2JDDVHNsTSg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index 0c2a44aa3e6b..8805636080cd 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -2,6 +2,7 @@ , boto3 , buildPythonPackage , fetchFromGitHub +, orjson , unittestCheckHook , pythonOlder , redis @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.0.1"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,11 +19,12 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-TKO0l0AKsC9MMB58ao/EXcJ9k/J3y3S9tc127H7vA6w="; + hash = "sha256-1Bv0e218cvLuv/go0L13C39fFAeo0FJeCoU+XFUBhzk="; }; propagatedBuildInputs = [ boto3 + orjson redis ]; diff --git a/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix b/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix index a055c423374b..60e21e63b116 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , flask , karton-core , mistune @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "karton-dashboard"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,18 +21,9 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XMyQ0mRF4y61hqlqdxC+He+697P1URfOXQUMnV0pT7o="; + hash = "sha256-O7Wrl9+RWkHPO0+9aue1Nlv0263qX8Thnh5FmnoKjxU="; }; - patches = [ - # Allow later mistune, https://github.com/CERT-Polska/karton-dashboard/pull/68 - (fetchpatch { - name = "update-mistune.patch"; - url = "https://github.com/CERT-Polska/karton-dashboard/commit/d0a2a1ffd21e9066acca77434acaff7b20e460d0.patch"; - hash = "sha256-LOqeLWoCXmVTthruBiQUYR03yPOPHhgYF/fJMhhT6Wo="; - }) - ]; - pythonRelaxDeps = [ "Flask" "mistune" diff --git a/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index abc6ab5030cc..090b19f02ce7 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "karton-mwdb-reporter"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QVxczXT74Xt0AtCSDm4nhIK4qtHQ6bqmVNb/CALZSE4="; + hash = "sha256-KJh9uJzVGYEEk1ed56ynKA/+dK9ouDB7L06xERjfjdc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix b/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix index f85c756b811e..2c6dc57d9966 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "karton-yaramatcher"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; + hash = "sha256-URGW8FyJZ3ktrwolls5ElSWn8FD6vWCA+Eu0aGtPh6U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix b/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix new file mode 100644 index 000000000000..a9b15b4390d1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, poetry-core +, pytestCheckHook +, setuptools +, pythonOlder +}: + +buildPythonPackage rec { + pname = "kasa-crypt"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "kasa-crypt"; + rev = "refs/tags/v${version}"; + hash = "sha256-w0LdGPVsxTi7jlfS/HSBEZdjL9ZKclucnBVViwrVC6Y="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=kasa_crypt --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + cython + poetry-core + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kasa_crypt" + ]; + + meta = with lib; { + description = "Fast kasa crypt"; + homepage = "https://github.com/bdraco/kasa-crypt"; + changelog = "https://github.com/bdraco/kasa-crypt/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/keepalive/default.nix b/nixpkgs/pkgs/development/python-modules/keepalive/default.nix index 6a4fcdb265f4..94a9b413c4fd 100644 --- a/nixpkgs/pkgs/development/python-modules/keepalive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keepalive/default.nix @@ -1,25 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch }: buildPythonPackage rec { pname = "keepalive"; version = "0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1"; + hash = "sha256-PGuW+QYqWnYCLwydQenvVVLYCxyt1PzMG/jxg7odHsE="; }; + patches = [ + # https://github.com/wikier/keepalive/pull/11 + (fetchpatch { + name = "remove-use_2to3.patch"; + url = "https://github.com/wikier/keepalive/commit/64393f6c5bf9c69d946b584fd664dd4df72604e6.patch"; + hash = "sha256-/G1eEt8a4Qz7x5oQnDZZD/PIQwo9+oPZoy9OrXGHvR4="; + excludes = ["README.md"]; + }) + ]; + # No tests included doCheck = false; meta = with lib; { - description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive"; + description = "An HTTP handler for `urllib` that supports HTTP 1.1 and keepalive"; homepage = "https://github.com/wikier/keepalive"; - license = licenses.asl20; - broken = true; # uses use_2to3, which is no longer supported for setuptools>=58 + license = licenses.lgpl21Plus; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/nixpkgs/pkgs/development/python-modules/keyring/default.nix index f0989d493d9e..c729e1da5362 100644 --- a/nixpkgs/pkgs/development/python-modules/keyring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyring/default.nix @@ -6,7 +6,7 @@ , setuptools-scm , importlib-metadata , dbus-python -, jaraco_classes +, jaraco-classes , jeepney , secretstorage , pytestCheckHook @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jaraco_classes + jaraco-classes ] ++ lib.optionals stdenv.isLinux [ jeepney secretstorage diff --git a/nixpkgs/pkgs/development/python-modules/kmapper/default.nix b/nixpkgs/pkgs/development/python-modules/kmapper/default.nix index a3788cb123fd..86d9f2b5f798 100644 --- a/nixpkgs/pkgs/development/python-modules/kmapper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kmapper/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { description = "Python implementation of Mapper algorithm for Topological Data Analysis"; homepage = "https://kepler-mapper.scikit-tda.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; + broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/kneed/default.nix b/nixpkgs/pkgs/development/python-modules/kneed/default.nix index 1e4bc851968f..4510aaa1cac0 100644 --- a/nixpkgs/pkgs/development/python-modules/kneed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kneed/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "kneed"; - version = "0.8.3"; + version = "0.8.5"; format = "pyproject"; src = fetchFromGitHub { owner = "arvkevi"; repo = "kneed"; - rev = "v${version}"; - sha256 = "K742mOnwTUY09EtbDYM9guqszK1wxgkofPhSjDyB8Ss="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oakP6NkdvTzMZcoXS6cKNsRo//K+CoPLlhvbQLGij00="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix b/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix index 15797260ad3d..ff8b8f587ce4 100644 --- a/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix +++ b/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2023.5.31.141540"; + version = "2023.6.23.191712"; format = "pyproject"; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-j0p3PUYnKsyuDaN+nMrIHhxLYhNXVkZQkgsp//ZTsXE="; + hash = "sha256-MeurZ6731qjeBK6HTwXYLVs6+nXF9Hf1p8/NNwxmae4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/nixpkgs/pkgs/development/python-modules/kombu/default.nix index 28b9a3f840de..9ba249f52816 100644 --- a/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -1,10 +1,13 @@ { lib , amqp +, azure-identity , azure-servicebus +, backports-zoneinfo , buildPythonPackage , cached-property , case , fetchPypi +, hypothesis , importlib-metadata , pyro4 , pytestCheckHook @@ -15,14 +18,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.2.4"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N87j7nJflOqLsXPqq3wXYCA+pTu+uuImMoYA+dJ5lhA="; + hash = "sha256-0ITsH5b3p8N7qegWgjvbwI8Px92zpb5VWAXmkhAil9g="; }; postPatch = '' @@ -33,14 +36,18 @@ buildPythonPackage rec { propagatedBuildInputs = [ amqp vine + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ] ++ lib.optionals (pythonOlder "3.8") [ cached-property importlib-metadata ]; nativeCheckInputs = [ + azure-identity azure-servicebus case + hypothesis pyro4 pytestCheckHook pytz diff --git a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index 5b1860585221..8e97d083cd9e 100644 --- a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { description = "Kubernetes Python client"; homepage = "https://github.com/kubernetes-client/python"; license = licenses.asl20; - maintainers = with maintainers; [ lsix SuperSandro2000 ]; + maintainers = with maintainers; [ lsix ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/langchain/default.nix b/nixpkgs/pkgs/development/python-modules/langchain/default.nix index e30c1a528d08..a2471639bd2f 100644 --- a/nixpkgs/pkgs/development/python-modules/langchain/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langchain/default.nix @@ -17,6 +17,7 @@ , bash # optional dependencies , anthropic +, clarifai , cohere , openai , nlpcloud @@ -35,6 +36,7 @@ , faiss , spacy , nltk +, wikipedia , beautifulsoup4 , tiktoken , jinja2 @@ -44,6 +46,7 @@ , google-api-python-client , pypdf , networkx +, pgvector , psycopg2 , boto3 , pyowm @@ -59,13 +62,14 @@ , chardet , requests-toolbelt , neo4j -, langchainplus-sdk +, langsmith # test dependencies , pytest-vcr , pytest-asyncio , pytest-mock , pytest-socket , pandas +, syrupy , toml , freezegun , responses @@ -76,7 +80,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.195"; + version = "0.0.247"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -85,9 +89,11 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-PUBFAAqCAshUkASsGnFNQ5+Xh6416ISkMqJ0bYcx7WI="; + hash = "sha256-Eq9jXfVJuoiNWkJanol/tqQU+kOrftMii90743DeI3Y="; }; + sourceRoot = "source/libs/langchain"; + postPatch = '' substituteInPlace langchain/utilities/bash.py \ --replace '"env", ["-i", "bash", ' '"${lib.getExe bash}", [' @@ -122,6 +128,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { llms = [ anthropic + clarifai cohere openai nlpcloud @@ -139,6 +146,9 @@ buildPythonPackage rec { text_helpers = [ chardet ]; + clarifai = [ + clarifai + ]; cohere = [ cohere ]; @@ -156,6 +166,7 @@ buildPythonPackage rec { ]; all = [ anthropic + clarifai cohere openai nlpcloud @@ -170,7 +181,7 @@ buildPythonPackage rec { transformers spacy nltk - # wikipedia + wikipedia beautifulsoup4 tiktoken torch @@ -188,7 +199,7 @@ buildPythonPackage rec { # nomic # aleph-alpha-client # deeplake - # pgvector + pgvector psycopg2 boto3 pyowm @@ -218,14 +229,10 @@ buildPythonPackage rec { # azure-ai-formrecognizer # azure-ai-vision # azure-cognitiveservices-speech - langchainplus-sdk + langsmith ]; }; - pythonRelaxDeps = [ - "langchainplus-sdk" - ]; - nativeCheckInputs = [ pytestCheckHook pytest-vcr @@ -233,6 +240,7 @@ buildPythonPackage rec { pytest-socket pytest-asyncio pandas + syrupy toml freezegun responses diff --git a/nixpkgs/pkgs/development/python-modules/langchainplus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/langchainplus-sdk/default.nix index fc1cf5430327..1ea97ccdb11e 100644 --- a/nixpkgs/pkgs/development/python-modules/langchainplus-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langchainplus-sdk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "langchainplus-sdk"; - version = "0.0.6"; + version = "0.0.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "langchainplus_sdk"; - hash = "sha256-yRGpj9LQK6pI90K31wD9alXxHJpUXuXWawiCWUDJoy4="; + hash = "sha256-PTAOLjKQ9ozJ2ELAWflFjeumDndsnnkDCWiMrRv7shk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/langsmith/default.nix b/nixpkgs/pkgs/development/python-modules/langsmith/default.nix new file mode 100644 index 000000000000..af1a1c1afeac --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/langsmith/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, requests +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage { + pname = "langsmith"; + version = "0.0.14"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchainplus-sdk"; + # there are no correct tags + # https://github.com/langchain-ai/langchainplus-sdk/issues/105 + rev = "092f67222e4beabca0f51ba03f1ee028f916da63"; + hash = "sha256-U8fs16Uq80EB7Ey5YuQhUKKI9DOXJWlabM5JdoDnWP0="; + }; + + sourceRoot = "source/python"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pydantic + requests + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # these tests require network access + "integration_tests" + ]; + + pythonImportsCheck = [ "langsmith" ]; + + meta = with lib; { + description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; + homepage = "https://github.com/langchain-ai/langchainplus-sdk"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/lanms-neo/default.nix b/nixpkgs/pkgs/development/python-modules/lanms-neo/default.nix new file mode 100644 index 000000000000..149f98a608ae --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/lanms-neo/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nix-update-script +, pythonOlder +, pybind11 +, numpy +}: +let + pname = "lanms-neo"; + version = "1.0.2"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "gen-ko"; + repo = pname; + rev = "6510e19e731a1e105d42b2fbda64de41c169ce2e"; + hash = "sha256-0fs4RNN1ptiir7GfR9B8HK0VqTkk5PbVJxgKiDId3po="; + }; + + propagatedBuildInputs = [ + pybind11 + numpy + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Standalone module for Locality-Aware NMS"; + homepage = "https://github.com/gen-ko/lanms-neo"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/larynx-train/default.nix b/nixpkgs/pkgs/development/python-modules/larynx-train/default.nix deleted file mode 100644 index 6e31d660cca9..000000000000 --- a/nixpkgs/pkgs/development/python-modules/larynx-train/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, buildPythonPackage -, larynx - -# build -, cython -, python - -# propagates -, espeak-phonemizer -, librosa -, numpy -, onnxruntime -, pytorch-lightning -, torch -}: - -buildPythonPackage rec { - inherit (larynx) version src meta; - - pname = "larynx-train"; - format = "setuptools"; - - sourceRoot = "source/src/python"; - - nativeBuildInputs = [ - cython - ]; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace "onnxruntime~=1.11.0" "onnxruntime" \ - --replace "pytorch-lightning~=1.7.0" "pytorch-lightning" \ - --replace "torch~=1.11.0" "torch" - ''; - - postBuild = '' - make -C larynx_train/vits/monotonic_align - ''; - - postInstall = '' - export MONOTONIC_ALIGN=$out/${python.sitePackages}/larynx_train/vits/monotonic_align/monotonic_align - mkdir -p $MONOTONIC_ALIGN - cp -v ./larynx_train/vits/monotonic_align/larynx_train/vits/monotonic_align/core.*.so $MONOTONIC_ALIGN/ - ''; - - propagatedBuildInputs = [ - espeak-phonemizer - librosa - numpy - onnxruntime - pytorch-lightning - torch - ]; - - pythonImportsCheck = [ - "larynx_train" - ]; - - doCheck = false; # no tests -} diff --git a/nixpkgs/pkgs/development/python-modules/laspy/default.nix b/nixpkgs/pkgs/development/python-modules/laspy/default.nix index 43366105532a..69b4af29f01b 100644 --- a/nixpkgs/pkgs/development/python-modules/laspy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/laspy/default.nix @@ -3,28 +3,33 @@ , fetchPypi , numpy , laszip +, setuptools , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "laspy"; - version = "2.4.1"; - format = "setuptools"; + version = "2.5.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E8rsxzJcsiQsslOUmE0hs7X3lsiLy0S8LtLTzxuXKsQ="; + hash = "sha256-uqPJxswVVjbxYRSREfnPwkPb0U9synKclLNWsxxmjy4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy laszip ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interface for reading/modifying/creating .LAS LIDAR files"; homepage = "https://github.com/laspy/laspy"; - changelog = "https://github.com/laspy/laspy/blob/2.4.1/CHANGELOG.md"; + changelog = "https://github.com/laspy/laspy/blob/${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ matthewcroughan ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/laszip/default.nix b/nixpkgs/pkgs/development/python-modules/laszip/default.nix index cefd2d5f6e1a..2c6f4196595f 100644 --- a/nixpkgs/pkgs/development/python-modules/laszip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/laszip/default.nix @@ -1,48 +1,44 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , scikit-build-core -, distlib -, pytestCheckHook -, pyproject-metadata -, pathspec , pybind11 , cmake , LASzip +, pythonOlder }: buildPythonPackage rec { pname = "laszip-python"; - version = "0.2.1"; + version = "0.2.3"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "tmontaigu"; repo = pname; rev = version; - sha256 = "sha256-ujKoUm2Btu25T7ZrSGqjRc3NR1qqsQU8OwHQDSx8grY="; + hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw="; }; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c++17"; + nativeBuildInputs = [ + cmake + pybind11 scikit-build-core scikit-build-core.optional-dependencies.pyproject - cmake ]; + dontUseCmakeConfigure = true; + buildInputs = [ - pybind11 LASzip ]; - checkInputs = [ - pytestCheckHook - ]; - - preBuild = '' - cd .. - ''; - # There are no tests doCheck = false; @@ -51,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unofficial bindings between Python and LASzip made using pybind11"; homepage = "https://github.com/tmontaigu/laszip-python"; + changelog = "https://github.com/tmontaigu/laszip-python/blob/${src.rev}/Changelog.md"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/layoutparser/default.nix b/nixpkgs/pkgs/development/python-modules/layoutparser/default.nix new file mode 100644 index 000000000000..391cb7a235ae --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/layoutparser/default.nix @@ -0,0 +1,100 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# build inputs +, numpy +, opencv4 +, scipy +, pandas +, pillow +, pyyaml +, iopath +, pdfplumber +, pdf2image +, google-cloud-vision +, pytesseract +, torch +, torchvision +, effdet +# check inputs +, pytestCheckHook +}: +let + pname = "layoutparser"; + version = "0.3.4"; + optional-dependencies = { + ocr = [ google-cloud-vision pytesseract ]; + gcv = [ google-cloud-vision ]; + tesseract = [ pytesseract ]; + layoutmodels = [ torch torchvision effdet ]; + effdet = [ torch torchvision effdet ]; + # paddledetection = [ paddlepaddle ] + }; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Layout-Parser"; + repo = "layout-parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-qBzcIUmgnGy/Xn/B+7UrLrRhCvCkapL+ymqGS2sMVgA="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "opencv-python" "opencv" + ''; + + propagatedBuildInputs = [ + numpy + opencv4 + scipy + pandas + pillow + pyyaml + iopath + pdfplumber + pdf2image + ]; + + pythonImportsCheck = [ + "layoutparser" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.ocr; + + disabledTests = [ + "test_PaddleDetectionModel" # requires paddlepaddle not yet packaged + # requires detectron2 not yet packaged + "test_Detectron2Model" + "test_AutoModel" + # requires effdet (disable for now until effdet builds on darwin) + "test_EffDetModel" + # problems with google-cloud-vision + # AttributeError: module 'google.cloud.vision' has no attribute 'types' + "test_gcv_agent" + "test_viz" + # - Failed: DID NOT RAISE <class 'ImportError'> + "test_when_backends_are_not_loaded" + ]; + + disabledTestPaths = [ + "tests_deps/test_only_detectron2.py" # requires detectron2 not yet packaged + "tests_deps/test_only_effdet.py" # requires effdet (disable for now until effdet builds on darwin) + "tests_deps/test_only_paddledetection.py" # requires paddlepaddle not yet packaged + ]; + + passthru.optional-dependencies = optional-dependencies; + + meta = with lib; { + description = "A unified toolkit for Deep Learning Based Document Image Analysis"; + homepage = "https://github.com/Layout-Parser/layout-parser"; + changelog = "https://github.com/Layout-Parser/layout-parser/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix b/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix index f045c6e1a355..e118b3bd649f 100644 --- a/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "lazy-loader"; - version = "0.2"; + version = "0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "scientific-python"; repo = "lazy_loader"; rev = "refs/tags/v${version}"; - hash = "sha256-QiRJt2aR2mY1f9ci/p6jOyMeyrHPqRdh43l4Th5PYf8="; + hash = "sha256-Ky9EwPYt/wBqWXopH5WFjlVG+/Rd2gc+mlCeWqG7mZg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/lazy_imports/default.nix b/nixpkgs/pkgs/development/python-modules/lazy_imports/default.nix new file mode 100644 index 000000000000..31aabf305ca7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/lazy_imports/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, packaging +}: +let + pname = "lazy_imports"; + version = "0.3.1"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "telekom"; + repo = "lazy-imports"; + rev = "refs/tags/${version}"; + hash = "sha256-i+VPlBoxNqk56U4oiEgS1Ayhi1t2O8PtLZ/bzEurUY8="; + }; + + pythonImportsCheck = [ + "lazy_imports" + ]; + + nativeCheckInputs = [ + pytestCheckHook + packaging + ]; + + meta = with lib; { + description = "Python tool to support lazy imports."; + homepage = "https://github.com/telekom/lazy-imports"; + changelog = "https://github.com/telekom/lazy-imports/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix b/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix index a7e8a5de4a65..5f8941047bb2 100644 --- a/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/dirkjanm/ldapdomaindump/"; changelog = "https://github.com/dirkjanm/ldapdomaindump/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix b/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix index edbcc2c11084..e100690e6b7a 100644 --- a/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "A Pure-Python Twisted library for LDAP"; homepage = "https://github.com/twisted/ldaptor"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/lektor/default.nix b/nixpkgs/pkgs/development/python-modules/lektor/default.nix deleted file mode 100644 index 1a3ad1b7f268..000000000000 --- a/nixpkgs/pkgs/development/python-modules/lektor/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, babel -, buildPythonPackage -, click -, deprecated -, exifread -, fetchFromGitHub -, filetype -, flask -, importlib-metadata -, inifile -, jinja2 -, markupsafe -, marshmallow -, marshmallow-dataclass -, mistune -, pip -, pyopenssl -, pytest-click -, pytest-mock -, pytest-pylint -, pytestCheckHook -, python -, pythonOlder -, python-slugify -, pytz -, requests -, setuptools -, typing-inspect -, watchdog -, werkzeug -}: - -buildPythonPackage rec { - pname = "lektor"; - version = "3.4.0b4"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "lektor"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-O0bTmJqRymrQuHW19Y7/Kp+2XlbmDzcjl/jDACDlCSk="; - }; - - propagatedBuildInputs = [ - babel - click - deprecated - exifread - filetype - flask - inifile - jinja2 - markupsafe - marshmallow - marshmallow-dataclass - mistune - pip - pyopenssl - python-slugify - pytz - requests - setuptools - typing-inspect - watchdog - werkzeug - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - nativeCheckInputs = [ - pytest-click - pytest-mock - pytestCheckHook - ]; - - postInstall = '' - cp -r lektor/translations "$out/${python.sitePackages}/lektor/" - ''; - - pythonImportsCheck = [ - "lektor" - ]; - - disabledTests = [ - # Test requires network access - "test_path_installed_plugin_is_none" - ]; - - meta = with lib; { - description = "A static content management system"; - homepage = "https://www.getlektor.com/"; - changelog = "https://github.com/lektor/lektor/blob/v${version}/CHANGES.md"; - license = licenses.bsd0; - maintainers = with maintainers; [ costrouc ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/nixpkgs/pkgs/development/python-modules/libcst/default.nix index 6f3f2d3def64..991a51203d72 100644 --- a/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -19,31 +19,31 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.4.9"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "instagram"; - repo = pname; + repo = "libcst"; rev = "refs/tags/v${version}"; - hash = "sha256-ikddvKsvXMNHMfA9jUhvyiDXII0tTs/rE97IGI/azgA="; + hash = "sha256-FgQE8ofRXQs/zHh7AKscXu0deN3IG+Nk/h+a09Co5R8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/${cargoRoot}"; + sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-FWQGv3E5X+VEnTYD0uKN6W4USth8EQlEGbYgUAWZ5EQ="; + hash = "sha256-rPB3bAMdvjgsT3jkEDoWatW8LPwgIaFSbFPqiqANtBY="; }; cargoRoot = "native"; postPatch = '' - # test try to format files, which isn't necessary when consuming releases - sed -i libcst/codegen/generate.py \ - -e '/ufmt/c\ pass' + # avoid infinite recursion by not formatting the release files + substituteInPlace libcst/codegen/generate.py \ + --replace '"ufmt"' '"true"' ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -70,8 +70,12 @@ buildPythonPackage rec { ]; preCheck = '' + # otherwise import libcst.native fails + cp build/lib.*/libcst/native.* libcst/ + ${python.interpreter} -m libcst.codegen.generate visitors ${python.interpreter} -m libcst.codegen.generate return_types + # Can't run all tests due to circular dependency on hypothesmith -> libcst rm -r {libcst/tests,libcst/codegen/tests,libcst/m*/tests} ''; @@ -89,6 +93,6 @@ buildPythonPackage rec { description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; homepage = "https://github.com/Instagram/libcst"; license = with licenses; [ mit asl20 psfl ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/libgpiod/default.nix b/nixpkgs/pkgs/development/python-modules/libgpiod/default.nix new file mode 100644 index 000000000000..56f225d283ba --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/libgpiod/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, libgpiod +}: +buildPythonPackage { + inherit (libgpiod) pname version src; + format = "setuptools"; + + buildInputs = [ libgpiod ]; + + preConfigure = '' + cd bindings/python + ''; + + # Requires libgpiod built with --enable-tests + doCheck = false; + pythonImportsCheck = [ "gpiod" ]; + + meta = with lib; { + description = "Python bindings for libgpiod"; + homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ lopsided98 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix index 6b141af3c96d..699bbabdfc76 100644 --- a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix @@ -9,7 +9,9 @@ , six , nose , mako -, cudaSupport ? false, cudaPackages +, config +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } , openclSupport ? true, ocl-icd, clblas }: diff --git a/nixpkgs/pkgs/development/python-modules/librespot/default.nix b/nixpkgs/pkgs/development/python-modules/librespot/default.nix new file mode 100644 index 000000000000..21a25729fa4b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/librespot/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, defusedxml +, protobuf +, pythonRelaxDepsHook +, websocket-client +, pyogg +, zeroconf +, requests +, pycryptodomex +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "librespot"; + version = "0.0.9"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "kokarare1212"; + repo = "librespot-python"; + rev = "v${version}"; + hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + defusedxml + protobuf + pycryptodomex + pyogg + requests + websocket-client + zeroconf + ]; + + pythonRelaxDeps = [ + "protobuf" + "pyogg" + "requests" + "zeroconf" + ]; + + # Doesn't include any tests + doCheck = false; + + pythonImportsCheck = [ + "librespot" + ]; + + meta = with lib; { + description = "Open Source Spotify Client"; + homepage = "https://github.com/kokarare1212/librespot-python"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix b/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix new file mode 100644 index 000000000000..12e33f45895f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix @@ -0,0 +1,94 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, argostranslate +, flask +, flask-swagger +, flask-swagger-ui +, flask-limiter +, flask-babel +, flask-session +, waitress +, expiringdict +, ltpycld2 +, morfessor +, appdirs +, apscheduler +, translatehtml +, argos-translate-files +, requests +, redis +, prometheus-client +, polib +, python +}: + +buildPythonPackage rec { + pname = "libretranslate"; + version = "1.3.11"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "LibreTranslate"; + repo = "LibreTranslate"; + rev = "refs/tags/v${version}"; + hash = "sha256-S2J7kcoZFHOjVm2mb3TblWf9/FzkxZEB3h27BCaPYgY="; + }; + + propagatedBuildInputs = [ + argostranslate + flask + flask-swagger + flask-swagger-ui + flask-limiter + flask-babel + flask-session + waitress + expiringdict + ltpycld2 + morfessor + appdirs + apscheduler + translatehtml + argos-translate-files + requests + redis + prometheus-client + polib + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "==" ">=" + + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + postInstall = '' + # expose static files to be able to serve them via web-server + mkdir -p $out/share/libretranslate + ln -s $out/${python.sitePackages}/libretranslate/static $out/share/libretranslate/static + ''; + + doCheck = false; # needs network access + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # required for import check to work (argostranslate) + env.HOME = "/tmp"; + + pythonImportsCheck = [ "libretranslate" ]; + + meta = with lib; { + description = "Free and Open Source Machine Translation API. Self-hosted, no limits, no ties to proprietary services"; + homepage = "https://libretranslate.com"; + changelog = "https://github.com/LibreTranslate/LibreTranslate/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/libsass/default.nix b/nixpkgs/pkgs/development/python-modules/libsass/default.nix index 341066452536..8a6bc5106636 100644 --- a/nixpkgs/pkgs/development/python-modules/libsass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libsass/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Python binding for libsass to compile Sass/SCSS"; homepage = "https://sass.github.io/libsass-python/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index b3ad5d6cd689..f27a5ac6e221 100644 --- a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.21.1"; + version = "0.22.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mWujuw2n5PfGdVnORTyYe83BGnwwZ/BFxt9BR5udZDA="; + hash = "sha256-tz7Pynm/xHx2X3QjXkvFlX6sVlsVKqrsS1CVmqlqfj0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index 9f34ffcf348f..e83778c9a4eb 100644 --- a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "9.2.0"; + version = "9.4.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-htJPNFiY0WuQlgfFkLh3RUmnx2X4aQ0+iUQgZ1+HDp0="; + hash = "sha256-P5IfH93qCEIJScDRkSOAnA5D82PV1T1eUlPCQYbK0d8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/life360/default.nix b/nixpkgs/pkgs/development/python-modules/life360/default.nix index cb61561eacd5..e3fd2a8ecbae 100644 --- a/nixpkgs/pkgs/development/python-modules/life360/default.nix +++ b/nixpkgs/pkgs/development/python-modules/life360/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "life360"; - version = "5.5.0"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-F/j3qIdz63pEQ+nj1poP3lBFWSpSq4nLseYg+N2tykU="; + hash = "sha256-GRQPH7fp8YkkCEpXtvgFxJO6VLFQK/PBaRe0Tfg3KdU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix index a313aa2233ec..38ec2aaa5b40 100644 --- a/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { homepage = "https://github.com/Microsoft/LightGBM"; changelog = "https://github.com/microsoft/LightGBM/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ teh costrouc ]; + maintainers = with lib.maintainers; [ teh ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix b/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix index 22a312d26630..e03e005ad7b2 100644 --- a/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-uwmX+/SK2zBkZQbN/t/DZ3i+XbdAJ/RM+Q649QwMUz0="; + hash = "sha256-vSeHtvsIt4L4qJCVlTPVjIjd62+08JWBnr9+9+ujOfw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/lime/default.nix b/nixpkgs/pkgs/development/python-modules/lime/default.nix new file mode 100644 index 000000000000..a3296f09c52c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/lime/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchPypi +, buildPythonPackage + +, matplotlib +, numpy +, scipy +, tqdm +, scikit-learn +, scikit-image + +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lime"; + version = "0.2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dpYOTwVf61Pom1AiODuvyHtj8lusYmWYSwozPRpX94E="; + }; + + propagatedBuildInputs = [ + matplotlib + numpy + scipy + tqdm + scikit-learn + scikit-image + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # touches network + "lime/tests/test_lime_text.py" + ]; + + pythonImportsCheck = [ + "lime.exceptions" + "lime.explanation" + "lime.lime_base" + "lime.lime_image" + "lime.lime_text" + ]; + + meta = with lib; { + description = "Local Interpretable Model-Agnostic Explanations for machine learning classifiers"; + homepage = "https://github.com/marcotcr/lime"; + changelog = "https://github.com/marcotcr/lime/releases/tag/${version}"; + license = licenses.bsd2; + maintainers = with lib.maintainers; [ khaser ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/limits/default.nix b/nixpkgs/pkgs/development/python-modules/limits/default.nix index aa1b4a697f6f..8ee100670418 100644 --- a/nixpkgs/pkgs/development/python-modules/limits/default.nix +++ b/nixpkgs/pkgs/development/python-modules/limits/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , etcd3 , hiro +, importlib-resources , packaging , pymemcache , pymongo @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "limits"; - version = "3.2.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,11 +34,12 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-zMU2MU7MFTWSig2j1PaBLPtKM5/7gNkFajKXw3A+fIQ="; + hash = "sha256-O4yENynvon9xM8F/r0NMSpSh6Hl2EoTcXgldrwzo24M="; }; propagatedBuildInputs = [ deprecated + importlib-resources packaging setuptools typing-extensions diff --git a/nixpkgs/pkgs/development/python-modules/litemapy/default.nix b/nixpkgs/pkgs/development/python-modules/litemapy/default.nix new file mode 100644 index 000000000000..6040cb1f47f1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/litemapy/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nbtlib +}: + +buildPythonPackage rec { + pname = "litemapy"; + version = "0.7.2b0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "SmylerMC"; + repo = "litemapy"; + rev = "v${version}"; + hash = "sha256-VfEo/JLeU17bEkvc8oZYfq19RsHl6QvKv0sGZYQjYhE="; + }; + + propagatedBuildInputs = [ + nbtlib + ]; + + pythonImportsCheck = [ "litemapy" ]; + + meta = with lib; { + description = "A Python library to read and edit Litematica's schematic file format"; + homepage = "https://github.com/SmylerMC/litemapy"; + changelog = "https://github.com/SmylerMC/litemapy/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ gdd ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/lmfit/default.nix b/nixpkgs/pkgs/development/python-modules/lmfit/default.nix index bed095186ec9..d96eb4d4c9ad 100644 --- a/nixpkgs/pkgs/development/python-modules/lmfit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lmfit/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "lmfit"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-AM71vRRb+BtzYwt4kmrySyTxgFQh5iEcpYVYiqfMQVs="; + hash = "sha256-BEoFKhGmHaBXYnRQTBfrfigDtBEo4lgh6WYyIH8jyIw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix b/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix index 9b802df67289..6e78dc850ed0 100644 --- a/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix +++ b/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "logical-unification"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "pythological"; repo = "unification"; - rev = "707cf4a39e27a4a8bf06b7e7dce7223085574e65"; - hash = "sha256-3wqO0pWWFRQeoGNvbSDdLNYFyjNnv+O++F7+vTBUJoI="; + rev = "refs/tags/v${version}"; + hash = "sha256-uznmlkREFONU1YoI/+mcfb+Yg30NinWvsMxTfHCXzOU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/nixpkgs/pkgs/development/python-modules/loguru/default.nix index f89741e527af..75cc1f9b2c61 100644 --- a/nixpkgs/pkgs/development/python-modules/loguru/default.nix +++ b/nixpkgs/pkgs/development/python-modules/loguru/default.nix @@ -1,48 +1,44 @@ { lib , stdenv -, aiocontextvars , buildPythonPackage , colorama -, fetchpatch , fetchFromGitHub , freezegun -, mypy , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "loguru"; - # No release since Jan 2022, only master is compatible with Python 3.11 - # https://github.com/Delgan/loguru/issues/740 - version = "unstable-2023-01-20"; + version = "0.7.0"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Delgan"; repo = pname; - rev = "07f94f3c8373733119f85aa8b9ca05ace3325a4b"; - hash = "sha256-lMGyQbBX3z6186ojs/iew7JMrG91ivPA679T9r+7xYw="; + rev = "refs/tags/${version}"; + hash = "sha256-JwhJPX58KrPdX237L43o77spycLAVFv3K9njJiRK30Y="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ - aiocontextvars - ]; - nativeCheckInputs = [ pytestCheckHook colorama freezegun - mypy ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = [ + "tests/test_type_hinting.py" # avoid dependency on mypy + ] ++ lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # fails on some machine configurations + # AssertionError: assert '' != '' + "test_file_buffering" + ] ++ lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" @@ -54,8 +50,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/Delgan/loguru"; description = "Python logging made (stupidly) simple"; + homepage = "https://github.com/Delgan/loguru"; + changelog = "https://github.com/delgan/loguru/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum rmcgibbo ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/loopy/default.nix b/nixpkgs/pkgs/development/python-modules/loopy/default.nix index 75d250ad03da..8bdde865df9b 100644 --- a/nixpkgs/pkgs/development/python-modules/loopy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/loopy/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "A code generator for array-based code on CPUs and GPUs"; homepage = "https://github.com/inducer/loopy"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/looseversion/default.nix b/nixpkgs/pkgs/development/python-modules/looseversion/default.nix index 84c64a3d54e0..19b5d10ca0e1 100644 --- a/nixpkgs/pkgs/development/python-modules/looseversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/looseversion/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "looseversion"; - version = "1.2.0"; + version = "1.3.0"; format = "flit"; src = fetchPypi { inherit version pname; - sha256 = "sha256-xk5xwLKQMGg7Tqda7kMdstJcTm5TNZDlISnx2eUd4gQ="; + sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index 3ac79c8341c3..7f0231c7d357 100644 --- a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.17.4"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-/7k2IYoP4z9ub89wNzDfzyA520CNzn3L68yMWgApz34="; + hash = "sha256-wl8L+ZQQgzWb7QUHWHSOT3meCn1baE7Prs1nWAOvnKo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix b/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix index 75921e8a8518..7ce32f9cdef5 100644 --- a/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix @@ -2,19 +2,22 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: let pname = "lru-dict"; - version = "1.1.8"; + version = "1.2.0"; in buildPythonPackage { inherit pname version; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-h4vI70Bz5c+5U9/Bz0WF20HouBTAEGq9400A7g0LMRU="; + hash = "sha256-E8VngvGdaN302NsBcAQRkoWWFlFMcGsSbQ3y7HKhG9c="; }; nativeCheckInputs = [ @@ -28,6 +31,7 @@ buildPythonPackage { meta = with lib; { description = "Fast and memory efficient LRU cache for Python"; homepage = "https://github.com/amitdev/lru-dict"; + changelog = "https://github.com/amitdev/lru-dict/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix b/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix index 8e945b841091..a2e17eb40042 100644 --- a/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lsprotocol"; - version = "2023.0.0a1"; + version = "2023.0.0a2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gfsqn9NtO7meMks4dUhrTYVlr69Ffh339GD9FvCJvJM="; + hash = "sha256-AEvs2fb8nhWEFMyLvwNv9HoxxxE50/KW3TGZ5pDf4dc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ltpycld2/default.nix b/nixpkgs/pkgs/development/python-modules/ltpycld2/default.nix new file mode 100644 index 000000000000..558dab085dd9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ltpycld2/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "LTpycld2"; + version = "0.42"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "948d0c1ab5518ab4efcbcc3cd73bb29f809f1dfb30f4d2fbd81b175a1ffeb516"; + }; + + doCheck = false; # completely broken tests + + pythonImportsCheck = [ "pycld2" ]; + + meta = with lib; { + description = "Python bindings around Google Chromium's embedded compact language detection library (CLD2)"; + homepage = "https://github.com/LibreTranslate/pycld2"; + license = licenses.asl20; + maintainers = with maintainers; [ misuzu ]; + broken = stdenv.isDarwin; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/luqum/default.nix b/nixpkgs/pkgs/development/python-modules/luqum/default.nix new file mode 100644 index 000000000000..2c9f78fc583c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/luqum/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# dependencies +, ply +# test dependencies +, elasticsearch-dsl +}: +let + pname = "luqum"; + version = "0.13.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jurismarches"; + repo = pname; + rev = version; + hash = "sha256-lcJCLl0crCl3Y5UlWBMZJR2UtVP96gaJNRxwY9Xn7TM="; + }; + + propagatedBuildInputs = [ + ply + ]; + + nativeCheckInputs = [ + elasticsearch-dsl + ]; + + meta = with lib; { + description = "A lucene query parser generating ElasticSearch queries and more !"; + homepage = "https://github.com/jurismarches/luqum"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/lz4/default.nix b/nixpkgs/pkgs/development/python-modules/lz4/default.nix index e172cf2f97cd..ed06dca7c4c5 100644 --- a/nixpkgs/pkgs/development/python-modules/lz4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lz4/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-lz4/python-lz4"; changelog = "https://github.com/python-lz4/python-lz4/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/lzallright/default.nix b/nixpkgs/pkgs/development/python-modules/lzallright/default.nix new file mode 100644 index 000000000000..a82a7980c70f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/lzallright/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, buildPythonPackage +, callPackage +, fetchFromGitHub +, rustPlatform +, libiconv +}: + +buildPythonPackage rec { + pname = "lzallright"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "vlaci"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Zzif6WtecgAkNmml0kt0Z+Ewx0L30ahr+kwzYR5aUAM="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-+pV9q2QM6qFA1a5E10OAsE7KJEUsTiEiU1KqO4/2rFw="; + }; + + format = "pyproject"; + + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + pythonImportsCheck = [ "lzallright" ]; + + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + + meta = with lib; { + description = '' + A Python 3.8+ binding for lzokay library which is an MIT licensed + a minimal, C++14 implementation of the LZO compression format. + ''; + homepage = "https://github.com/vlaci/lzallright"; + license = licenses.mit; + maintainers = with maintainers; [ vlaci ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/lzallright/tests.nix b/nixpkgs/pkgs/development/python-modules/lzallright/tests.nix new file mode 100644 index 000000000000..1093fc3c79e9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/lzallright/tests.nix @@ -0,0 +1,15 @@ +{ lzallright, buildPythonPackage, pytestCheckHook }: + +buildPythonPackage { + inherit (lzallright) version src; + pname = "lzallright-tests"; + format = "other"; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + lzallright + pytestCheckHook + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/m2r/default.nix b/nixpkgs/pkgs/development/python-modules/m2r/default.nix index 5ef3111d86ec..942699156a93 100644 --- a/nixpkgs/pkgs/development/python-modules/m2r/default.nix +++ b/nixpkgs/pkgs/development/python-modules/m2r/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { homepage = "https://github.com/miyakogi/m2r"; description = "Markdown to reStructuredText converter"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres SuperSandro2000 ]; + maintainers = with maintainers; [ AndersonTorres ]; # https://github.com/miyakogi/m2r/issues/66 broken = versionAtLeast mistune.version "2"; }; diff --git a/nixpkgs/pkgs/development/python-modules/macaddress/default.nix b/nixpkgs/pkgs/development/python-modules/macaddress/default.nix new file mode 100644 index 000000000000..2849506671b2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/macaddress/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, hypothesis +, reprshed +}: + +buildPythonPackage rec { + pname = "macaddress"; + version = "2.0.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mentalisttraceur"; + repo = "python-macaddress"; + rev = "v${version}"; + hash = "sha256-2eD5Ui8kUduKLJ0mSiwaz7TQSeF1+2ASirp70V/8+EA="; + }; + + pythonImportsCheck = [ + "macaddress" + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + reprshed + ]; + + pytestFlagsArray = [ + "$src/test.py" + ]; + + meta = with lib; { + homepage = "https://github.com/mentalisttraceur/python-macaddress"; + description = "A module for handling hardware identifiers like MAC addresses"; + license = licenses.bsd0; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/macropy/default.nix b/nixpkgs/pkgs/development/python-modules/macropy/default.nix index 9345573e9a24..d7b122396e0e 100644 --- a/nixpkgs/pkgs/development/python-modules/macropy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/macropy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { homepage = "https://github.com/lihaoyi/macropy"; description = "Macros in Python: quasiquotes, case classes, LINQ and more"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; broken = pythonAtLeast "3.8"; # see https://github.com/lihaoyi/macropy/issues/103 }; } diff --git a/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 1d7e6eb92250..3e871a90562b 100644 --- a/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -27,16 +27,16 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.7.3"; + version = "1.8.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-HOM7BlrKpqm16plTMLFpC6VScEoMlxCJFhZ0mcIFIcE="; + hash = "sha256-YYbdd0GLVKE7+Oi0mpQjqhFdjdlquk/XnIg5WrtKcfI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix b/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix new file mode 100644 index 000000000000..8a3a0fff574d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, hatchling +}: + +buildPythonPackage rec { + pname = "magic-filter"; + version = "1.0.10"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aiogram"; + repo = "magic-filter"; + rev = "v${version}"; + hash = "sha256-mHqq/ci8uMACNutwmxKX1nrl3nTSnSyU2x1VxzWxqzM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "magic_filter" ]; + + meta = with lib; { + description = "Magic filter based on dynamic attribute getter"; + homepage = "https://github.com/aiogram/magic-filter"; + changelog = "https://github.com/aiogram/magic-filter/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 0a9e26771c4a..e47f27d806cb 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index a47322fdc647..76eaca6be65b 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Transit Relay server for Magic-Wormhole"; homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix index 07732774897d..f462793266b9 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole"; license = licenses.mit; - maintainers = with maintainers; [ asymmetric SuperSandro2000 ]; + maintainers = with maintainers; [ asymmetric ]; mainProgram = "wormhole"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/magicgui/default.nix b/nixpkgs/pkgs/development/python-modules/magicgui/default.nix index 2cd9fd90fe4a..ef327dd0f08b 100644 --- a/nixpkgs/pkgs/development/python-modules/magicgui/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magicgui/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , setuptools-scm , pytestCheckHook -, pytest-mypy-plugins , typing-extensions , qtpy , pyside2 @@ -27,7 +26,7 @@ nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; - nativeCheckInputs = [ pytestCheckHook pytest-mypy-plugins ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; # Reports "Fatal Python error" diff --git a/nixpkgs/pkgs/development/python-modules/malduck/default.nix b/nixpkgs/pkgs/development/python-modules/malduck/default.nix index b3ca15ee3c63..0ae7abb72143 100644 --- a/nixpkgs/pkgs/development/python-modules/malduck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/malduck/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "malduck"; - version = "4.3.0"; + version = "4.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1gwJhlhRLnh01AIJj07Wpba8X7V5AfACuJmZX+cfT6Y="; + hash = "sha256-3joIfhQBJzKdoU3FNW/yAHsQa/lMMbw3wGEQTyOBrOQ="; }; propagatedBuildInputs = [ @@ -60,8 +60,5 @@ buildPythonPackage rec { changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; - # Compatibility issues with yara-python v4.3.0 - # https://github.com/CERT-Polska/malduck/issues/88 - broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix b/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix deleted file mode 100644 index 59f4eaf83bae..000000000000 --- a/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, markdown, - pytest, pytest-runner, pytest-cov, coverage }: - -buildPythonPackage rec { - pname = "MarkdownSuperscript"; - version = "2.1.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2c255b5959c1f5dd364ae80762bd0a568a0fcc9fd4e4a3d7e7b192e88adf8900"; - }; - - propagatedBuildInputs = [ markdown ]; - - postPatch = '' - # remove version bounds for Markdown dependency - sed 's/\["Markdown.*"\]/["Markdown"]/' -i setup.py - - # remove version bounds for test dependencies - sed 's/=.*//' -i requirements/*.txt - ''; - - nativeCheckInputs = [ pytest pytest-runner pytest-cov coverage ]; - - meta = with lib; { - description = "An extension to the Python Markdown package enabling superscript text"; - homepage = "https://github.com/jambonrose/markdown_superscript_extension"; - license = licenses.bsd2; - broken = true; # unmaintained in nixpkgs, barely maintained in pypi, added 2020-11-29 - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix index 7f2ae8af89ac..e63af344a3a0 100644 --- a/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "2.1.2"; + version = "2.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "MarkupSafe"; inherit version; - hash = "sha256-q8q8jCsmA21i1MdGOBpvfPYKr8xlMZitZ4MGmGsJRQ0="; + hash = "sha256-r1mO0y1q6G8bdHuCeDlYsaSrj2F7Bv5oeVx/Amq73K0="; }; nativeCheckInputs = [ @@ -25,6 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "markupsafe" ]; meta = with lib; { + changelog = "https://markupsafe.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${replaceStrings [ "." ] [ "-" ] version}"; description = "Implements a XML/HTML/XHTML Markup safe string"; homepage = "https://palletsprojects.com/p/markupsafe/"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix index b2559c6c3e2c..1d108b36867b 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Enum field for Marshmallow"; homepage = "https://github.com/justanr/marshmallow_enum"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix b/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix new file mode 100644 index 000000000000..f7c47b25401e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, typing-extensions +, orjson +, msgpack +, pyyaml +, tomli-w +, tomli +, pytestCheckHook +, ciso8601 +, pendulum +, pytest-mock +}: + +buildPythonPackage rec { + pname = "mashumaro"; + version = "3.8.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Fatal1ty"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-WDKohmcdVlQR/6AMSISN0y6UQx4tmOf1fANCPLRYiqI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + passthru.optional-dependencies = { + orjson = [ orjson ]; + msgpack = [ msgpack ]; + yaml = [ pyyaml ]; + toml = [ tomli-w ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + }; + + nativeCheckInputs = [ + ciso8601 + pendulum + pytest-mock + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "mashumaro" + ]; + + meta = with lib; { + description = "Fast and well tested serialization library on top of dataclasses"; + homepage = "https://github.com/Fatal1ty/mashumaro"; + changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix b/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix deleted file mode 100644 index 471b1fa61d42..000000000000 --- a/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ buildPythonPackage -, cython -, fetchFromGitHub -, fetchpatch -, h5py -, imgaug -, ipython -, keras -, lib -, matplotlib -, numpy -, opencv3 -, pillow -, scikit-image -, scipy -, tensorflow -}: - -buildPythonPackage rec { - pname = "mask-rcnn"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "matterport"; - repo = "Mask_RCNN"; - rev = "3deaec5d902d16e1daf56b62d5971d428dc920bc"; - sha256 = "13s3q9yh2q9m9vyksd269mww3bni4q2w7q5l419q70ca075qp8zp"; - }; - - patches = [ - # Fix for TF2: - # https://github.com/matterport/Mask_RCNN/issues/2734 - (fetchpatch { - url = "https://github.com/BupyeongHealer/Mask_RCNN_tf_2.x/commit/7957839fe2b248f2f22c7e991ead12068ddc6cfc.diff"; - excludes = [ "mrcnn/model.py" ]; - hash = "sha256-70BGrx6X1uJDA2025f0YTlreT2uB3n35yIzuhf+ypVc="; - }) - ]; - - # Fix for recent Keras - postPatch = '' - substituteInPlace mrcnn/model.py \ - --replace "KE." "KL." - ''; - - nativeBuildInputs = [ cython ]; - - propagatedBuildInputs = [ - h5py - imgaug - ipython - keras - matplotlib - numpy - opencv3 - pillow - scikit-image - scipy - tensorflow - ]; - - meta = with lib; { - description = "Mask R-CNN for object detection and instance segmentation on Keras and TensorFlow"; - homepage = "https://github.com/matterport/Mask_RCNN"; - license = licenses.mit; - maintainers = with maintainers; [ rakesh4g ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/nixpkgs/pkgs/development/python-modules/mat2/default.nix index 3737bea08243..97b9090cc250 100644 --- a/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.3"; + version = "0.13.4"; disabled = pythonOlder "3.5"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-x3vGltGuFjI435lEXZU3p4eQcgRm0Oodqd6pTWO7ZX8="; + hash = "sha256-SuN62JjSb5O8gInvBH+elqv/Oe7j+xjCo+dmPBU7jEY="; }; patches = [ @@ -97,6 +97,7 @@ buildPythonPackage rec { homepage = "https://0xacab.org/jvoisin/mat2"; changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md"; license = licenses.lgpl3Plus; + mainProgram = "mat2"; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/matchpy/default.nix b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix index cd11d89c7d66..57e7728b1aa3 100644 --- a/nixpkgs/pkgs/development/python-modules/matchpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "A library for pattern matching on symbolic expressions"; homepage = "https://github.com/HPAC/matchpy"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib-sixel/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib-sixel/default.nix new file mode 100644 index 000000000000..451f2a1a3dbe --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/matplotlib-sixel/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, imagemagick +, matplotlib +}: + +buildPythonPackage rec { + pname = "matplotlib-sixel"; + version = "0.0.2"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JXOb1/IacJV8bhDvF+OPs2Yg1tgRDOqwiAQfiSKTlew="; + }; + + propagatedBuildInputs = [ matplotlib ]; + + postPatch = '' + substituteInPlace sixel/sixel.py \ + --replace 'Popen(["convert",' 'Popen(["${imagemagick}/bin/convert",' + ''; + + pythonImportsCheck = [ "sixel" ]; + + meta = with lib; { + description = "A sixel graphics backend for matplotlib"; + homepage = "https://github.com/jonathf/matplotlib-sixel"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index d71b9cce7af9..dbc8c1da31d4 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -3,12 +3,14 @@ , fetchPypi , writeText , buildPythonPackage +, isPyPy , pythonOlder # https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst # build-system , pkg-config , pybind11 +, setuptools , setuptools-scm # native libraries @@ -39,7 +41,8 @@ , pygobject3 # Tk -, enableTk ? !stdenv.isDarwin # darwin has its own "MacOSX" backend +# Darwin has its own "MacOSX" backend, PyPy has tkagg backend and does not support tkinter +, enableTk ? (!stdenv.isDarwin && !isPyPy) , tcl , tk , tkinter @@ -115,7 +118,9 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config pybind11 + setuptools setuptools-scm + numpy ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/matplotx/default.nix b/nixpkgs/pkgs/development/python-modules/matplotx/default.nix new file mode 100644 index 000000000000..f20812606869 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/matplotx/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, setuptools +, matplotlib +, numpy +, networkx +, pypng +, scipy +}: + +buildPythonPackage rec { + pname = "matplotx"; + version = "0.3.10"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "nschloe"; + repo = "matplotx"; + rev = "v${version}"; + hash = "sha256-EWEiEY23uFwd/vgWVLCH/buUmgRqz1rqqlJEdXINYMg="; + }; + + propagatedBuildInputs = [ + setuptools + matplotlib + numpy + ]; + + passthru.optional-dependencies = { + all = [ + networkx + pypng + scipy + ]; + contour = [ networkx ]; + spy = [ + pypng + scipy + ]; + }; + + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.all; + + disabledTestPaths = [ + "tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged) + ]; + + pythonImportsCheck = [ "matplotx" ]; + + meta = { + homepage = "https://github.com/nschloe/matplotx"; + description = "More styles and useful extensions for Matplotlib"; + changelog = "https://github.com/nschloe/matplotx/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ swflint ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index b97730fbd4d1..4b83afc5d31a 100644 --- a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -15,22 +15,21 @@ , pytestCheckHook , pytest-asyncio , aiosqlite -, sqlalchemy , asyncpg }: buildPythonPackage rec { pname = "mautrix"; - version = "0.19.16"; + version = "0.20.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-aZlc4+J5Q+N9qEzGUMhsYguPdUy+E5I06wrjVyqvVDk="; + hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; }; propagatedBuildInputs = [ @@ -57,17 +56,9 @@ buildPythonPackage rec { checkInputs = [ pytest-asyncio aiosqlite - sqlalchemy asyncpg ] ++ passthru.optional-dependencies.encryption; - SQLALCHEMY_SILENCE_UBER_WARNING = 1; - - disabledTestPaths = [ - # sqlalchemy 2 unsupported - "mautrix/client/state_store/tests/store_test.py" - ]; - pythonImportsCheck = [ "mautrix" ]; diff --git a/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix index b9ff8bf437bb..b5f7fb9d5db0 100644 --- a/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix @@ -1,34 +1,44 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage -, pythonOlder -, pythonAtLeast , fetchPypi , libmaxminddb -, mock -, nose +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "maxminddb"; - version = "2.3.0"; - disabled = pythonOlder "3.6"; + version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Egkg3d2VXzKuSMIHxs72/V3Ih0qIm6lLDywfc27N8wg="; + hash = "sha256-geVOU0CL1QJlDllpzLoWeAr2WewdscRLLJl+QzCl7ZY="; }; - buildInputs = [ libmaxminddb ]; + buildInputs = [ + libmaxminddb + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ nose mock ]; + pythonImportsCheck = [ + "maxminddb" + ]; - # Tests are broken for macOS on python38 - doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8"); + # The multiprocessing tests fail on Darwin because multiprocessing uses spawn instead of fork, + # resulting in an exception when it can’t pickle the `lookup` local function. + disabledTests = lib.optionals stdenv.isDarwin [ "multiprocessing" ]; meta = with lib; { description = "Reader for the MaxMind DB format"; homepage = "https://github.com/maxmind/MaxMind-DB-Reader-python"; + changelog = "https://github.com/maxmind/MaxMind-DB-Reader-python/blob/v${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix b/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix index e43c4dbfce81..550c69ba006c 100644 --- a/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mbstrdecoder/default.nix @@ -1,6 +1,7 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, setuptools , chardet , pytestCheckHook , faker @@ -8,19 +9,31 @@ buildPythonPackage rec { pname = "mbstrdecoder"; - version = "1.1.2"; + version = "1.1.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vLlCS5gnc7NgDN4cEZSxxInzbEq4HXAXmvlVfwn3cSM="; + hash = "sha256-GcAxXcCYC2XAE8xu/jdDxjPxkLJzbmvWZ3OgmcvQcmk="; }; - propagatedBuildInputs = [ chardet ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ faker ]; + propagatedBuildInputs = [ + chardet + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + faker + ]; meta = with lib; { homepage = "https://github.com/thombashi/mbstrdecoder"; diff --git a/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index 9b9eef88eae1..9643dc014061 100644 --- a/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -4,16 +4,16 @@ , click , dnspython , fetchFromGitHub -, mock , poetry-core , pytest-asyncio +, pytest-rerunfailures , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "mcstatus"; - version = "10.0.3"; + version = "11.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,9 +22,15 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LHcLqP9IGqi0YmjgFoTwojyS+IZmBOBujYWMPuqNc6w="; + hash = "sha256-+r6WL59T9rNAKl3r4Hef75uJoD7DRYA23uS/OlzRyRk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace " --cov=mcstatus --cov-append --cov-branch --cov-report=term-missing -vvv --no-cov-on-fail" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -36,19 +42,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock pytest-asyncio + pytest-rerunfailures pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace " --cov=mcstatus --cov-append --cov-branch --cov-report=term-missing -vvv --no-cov-on-fail" "" \ - --replace 'asyncio-dgram = "2.1.2"' 'asyncio-dgram = ">=2.1.2"' \ - --replace 'dnspython = "2.2.1"' 'dnspython = ">=2.2.0"' - ''; - pythonImportsCheck = [ "mcstatus" ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-admon/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-admon/default.nix new file mode 100644 index 000000000000..1d285d89c70b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-admon/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mdformat +, python3 +, pythonOlder +}: + +let + python = python3.override { + packageOverrides = self: super: { + mdit-py-plugins = super.mdit-py-plugins.overridePythonAttrs (_prev: rec { + version = "0.4.0"; + doCheck = false; + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "mdit-py-plugins"; + rev = "refs/tags/v${version}"; + hash = "sha256-YBJu0vIOD747DrJLcqiZMHq34+gHdXeGLCw1OxxzIJ0="; + }; + }); + }; + }; +in python.pkgs.buildPythonPackage rec { + pname = "mdformat-admon"; + version = "1.0.2"; + format = "flit"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "KyleKing"; + repo = pname; + rev = "v${version}"; + hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU="; + }; + + buildInputs = with python.pkgs; [ + mdformat + ]; + + propagatedBuildInputs = with python.pkgs; [ + mdit-py-plugins + ]; + + meta = with lib; { + description = "mdformat plugin for admonitions"; + homepage = "https://github.com/KyleKing/mdformat-admon"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-beautysh/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-beautysh/default.nix new file mode 100644 index 000000000000..522494f783fe --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-beautysh/default.nix @@ -0,0 +1,46 @@ +{ lib +, beautysh +, buildPythonPackage +, fetchFromGitHub +, mdformat +, mdformat-gfm +, mdit-py-plugins +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdformat-beautysh"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hukkin"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-mH9PN6QsPmnIzh/0vxa+5mYLzANUHRruXC0ql4h8myw="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + mdformat + mdformat-gfm + mdit-py-plugins + ]; + + propagatedBuildInputs = [ + beautysh + ]; + + meta = with lib; { + description = "Mdformat plugin to beautify Bash scripts"; + homepage = "https://github.com/hukkin/mdformat-beautysh"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix new file mode 100644 index 000000000000..cee0e1bd5e59 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, linkify-it-py +, markdown-it-py +, mdformat +, mdit-py-plugins +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdformat-footnote"; + version = "0.1.1"; + format = "flit"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo="; + }; + + buildInputs = [ + mdformat + mdit-py-plugins + ]; + + pythonImportsCheck = [ + "mdformat_footnote" + ]; + + meta = with lib; { + description = "Footnote format addition for mdformat"; + homepage = "https://github.com/executablebooks/mdformat-footnote"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix new file mode 100644 index 000000000000..67e0634fa1d2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, linkify-it-py +, markdown-it-py +, mdformat +, mdit-py-plugins +, ruamel-yaml +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdformat-frontmatter"; + version = "2.0.1"; + format = "flit"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "butler54"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-PhT5whtvvcYSs5gHQEsIvV1evhx7jR+3DWFMHrF0uMw="; + }; + + buildInputs = [ + mdformat + mdit-py-plugins + ]; + + propagatedBuildInputs = [ + ruamel-yaml + ]; + + pythonImportsCheck = [ + "mdformat_frontmatter" + ]; + + meta = with lib; { + description = "mdformat plugin to ensure frontmatter is respected"; + homepage = "https://github.com/butler54/mdformat-frontmatter"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero polarmutex ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix new file mode 100644 index 000000000000..2b48bcfa45de --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, linkify-it-py +, markdown-it-py +, mdformat +, mdformat-gfm +, mdformat-tables +, mdit-py-plugins +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdformat-gfm"; + version = "0.3.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hukkin"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-7sIa50jCN+M36Y0C05QaAL+TVwLzKxJ0gzpZI1YQFxg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + mdformat + markdown-it-py + mdit-py-plugins + ]; + + propagatedBuildInputs = [ + mdformat-tables + linkify-it-py + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mdformat_gfm" + ]; + + meta = with lib; { + description = "Mdformat plugin for GitHub Flavored Markdown compatibility"; + homepage = "https://github.com/hukkin/mdformat-gfm"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero polarmutex ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix new file mode 100644 index 000000000000..5df491ea8575 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mdformat +, mdformat-gfm +, mdit-py-plugins +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdformat-mkdocs"; + version = "1.0.2"; + format = "flit"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "KyleKing"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-H+wqgcXNrdrZ5aQvZ7XM8YpBpVZM6pFtsANC00UZ0jM="; + }; + + buildInputs = [ + mdformat + mdformat-gfm + mdit-py-plugins + ]; + + pythonImportsCheck = [ + "mdformat_mkdocs" + ]; + + meta = with lib; { + description = "mdformat plugin for MkDocs"; + homepage = "https://github.com/KyleKing/mdformat-mkdocs"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix new file mode 100644 index 000000000000..6323312072ff --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mdformat +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdformat-nix-alejandra"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aldoborrero"; + repo = pname; + rev = "${version}"; + hash = "sha256-jUXApGsxCA+pRm4m4ZiHWlxmVkqCPx3A46oQdtyKz5g="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + mdformat + ]; + + pythonImportsCheck = [ + "mdformat_nix_alejandra" + ]; + + meta = with lib; { + description = "Mdformat plugin format Nix code blocks with alejandra"; + homepage = "https://github.com/aldoborrero/mdformat-nix-alejandra"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix new file mode 100644 index 000000000000..b4d293f6368f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mdformat +, mdit-py-plugins +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdformat-simple-breaks"; + version = "0.0.1"; + format = "flit"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "csala"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0="; + }; + + buildInputs = [ + mdformat + ]; + + pythonImportsCheck = [ + "mdformat_simple_breaks" + ]; + + meta = with lib; { + description = "mdformat plugin to render thematic breaks using three dashes"; + homepage = "https://github.com/csala/mdformat-simple-breaks"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix new file mode 100644 index 000000000000..747029eab276 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mdformat +, mdit-py-plugins +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdformat-tables"; + version = "0.4.1"; + format = "flit"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Q61GmaRxjxJh9GjyR8QCZOH0njFUtAWihZ9lFQJ2nQQ="; + }; + + buildInputs = [ + mdformat + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mdformat_tables" + ]; + + meta = with lib; { + description = "An mdformat plugin for rendering tables"; + homepage = "https://github.com/executablebooks/mdformat-tables"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero polarmutex ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix new file mode 100644 index 000000000000..56d7ce69a0d4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mdformat +, mdit-py-plugins +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdformat-toc"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hukkin"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-3EX6kGez408tEYiR9VSvi3GTrb4ds+HJwpFflv77nkg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + mdformat + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mdformat_toc" + ]; + + meta = with lib; { + description = "Mdformat plugin to generate a table of contents"; + homepage = "https://github.com/hukkin/mdformat-toc"; + license = licenses.mit; + maintainers = with maintainers; [ aldoborrero polarmutex ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix index ed6fdfa95f70..2891cd430803 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -1,63 +1,100 @@ { lib +, buildPythonApplication , buildPythonPackage , fetchFromGitHub , importlib-metadata +, makeWrapper , markdown-it-py , poetry-core , pytestCheckHook +, python3 , pythonOlder , setuptools , tomli , typing-extensions }: -buildPythonPackage rec { - pname = "mdformat"; - version = "0.7.16"; - format = "pyproject"; +let + withPlugins = plugins: buildPythonApplication { + pname = "${package.pname}"; + inherit (package) version; + format = "other"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "executablebooks"; - repo = pname; - rev = version; - hash = "sha256-6MWUkvZp5CYUWsbMGXM2gudjn5075j5FIuaNnCrgRNs="; + dontUnpack = true; + dontBuild = true; + doCheck = false; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + makeWrapper ${package}/bin/mdformat $out/bin/mdformat \ + --prefix PYTHONPATH : "${package}/${python3.sitePackages}:$PYTHONPATH" + ln -sfv ${package}/lib $out/lib + ''; + + propagatedBuildInputs = package.propagatedBuildInputs ++ plugins; + + passthru = package.passthru // { + withPlugins = morePlugins: withPlugins (morePlugins ++ plugins); + }; + + meta.mainProgram = "mdformat"; }; - nativeBuildInputs = [ - poetry-core - setuptools - ]; - - propagatedBuildInputs = [ - markdown-it-py - tomli - ] ++ lib.optionals (pythonOlder "3.10") [ - importlib-metadata - ] ++ lib.optionals (pythonOlder "3.7") [ - typing-extensions - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - # AssertionError - "test_no_codeblock_trailing_newline" - # Issue with upper/lower case - "default_style.md-options0" - ]; - - pythonImportsCheck = [ - "mdformat" - ]; - - meta = with lib; { - description = "CommonMark compliant Markdown formatter"; - homepage = "https://mdformat.rtfd.io/"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + package = buildPythonPackage rec { + pname = "mdformat"; + version = "0.7.16"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = pname; + rev = version; + hash = "sha256-6MWUkvZp5CYUWsbMGXM2gudjn5075j5FIuaNnCrgRNs="; + }; + + nativeBuildInputs = [ + poetry-core + setuptools + ]; + + propagatedBuildInputs = [ + markdown-it-py + tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ] ++ lib.optionals (pythonOlder "3.7") [ + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError + "test_no_codeblock_trailing_newline" + # Issue with upper/lower case + "default_style.md-options0" + ]; + + pythonImportsCheck = [ + "mdformat" + ]; + + passthru = {inherit withPlugins;}; + + meta = with lib; { + description = "CommonMark compliant Markdown formatter"; + homepage = "https://mdformat.rtfd.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab aldoborrero ]; + }; }; -} +in package diff --git a/nixpkgs/pkgs/development/python-modules/mechanicalsoup/default.nix b/nixpkgs/pkgs/development/python-modules/mechanicalsoup/default.nix index 4d68f71d2b06..93b61a40972d 100644 --- a/nixpkgs/pkgs/development/python-modules/mechanicalsoup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mechanicalsoup/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mechanicalsoup"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,16 +21,26 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MechanicalSoup"; repo = "MechanicalSoup"; - rev = "v${version}"; - hash = "sha256-Q5oDAgAZYYUYqjDByXNXFNVKmRyjzIGVE4LN9j8vk4c="; + rev = "refs/tags/v${version}"; + hash = "sha256-iZ2nwBxikf0cTTlxzcGvHJim4N6ZEqIhlK7t1WAYdms="; }; + postPatch = '' + # Is in setup_requires but not used in setup.py + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + substituteInPlace setup.cfg \ + --replace " --cov --cov-config .coveragerc --flake8" "" + ''; + propagatedBuildInputs = [ beautifulsoup4 lxml requests ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-httpbin pytest-mock @@ -38,14 +48,6 @@ buildPythonPackage rec { requests-mock ]; - postPatch = '' - # Is in setup_requires but not used in setup.py - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - substituteInPlace setup.cfg \ - --replace " --cov --cov-config .coveragerc --flake8" "" - ''; - pythonImportsCheck = [ "mechanicalsoup" ]; @@ -53,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for automating interaction with websites"; homepage = "https://github.com/hickford/MechanicalSoup"; + changelog = "https://github.com/MechanicalSoup/MechanicalSoup/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jgillich fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mediapy/default.nix b/nixpkgs/pkgs/development/python-modules/mediapy/default.nix index 563c37a042da..28f754e98edf 100644 --- a/nixpkgs/pkgs/development/python-modules/mediapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mediapy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.1.6"; + version = "1.1.8"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-n0S3YEAJZNi+pRIaIT+U3JoiXQJtaoGZASg6aV5YVjQ="; + hash = "sha256-mVhBM+NQEkLYByp/kCPFJCAY26La5CWjcPl6PgclA9A="; }; propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; diff --git a/nixpkgs/pkgs/development/python-modules/meeko/default.nix b/nixpkgs/pkgs/development/python-modules/meeko/default.nix new file mode 100644 index 000000000000..14162af458fc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/meeko/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, numpy +, pytestCheckHook +, pythonOlder +, rdkit +, scipy +}: + +buildPythonPackage rec { + pname = "meeko"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "forlilab"; + repo = "Meeko"; + rev = "refs/tags/v${version}"; + hash = "sha256-pngFu6M63W26P7wd6FUNLuf0NikxtRtVR/pnR5PR6Wo="; + }; + + patches = [ + # https://github.com/forlilab/Meeko/issues/60 + (fetchpatch { + name = "fix-unknown-sidechains.patch"; + url = "https://github.com/forlilab/Meeko/commit/28c9fbfe3b778aa1bd5e8d7e4f3e6edf44633a0c.patch"; + hash = "sha256-EJbLnbKTTOsTxKtLiU7Af07yjfY63ungGUHbGvrm0AU="; + }) + (fetchpatch { + name = "add-test-data.patch"; + url = "https://github.com/forlilab/Meeko/commit/57b52e3afffb82685cdd1ef1bf6820d55924b97a.patch"; + hash = "sha256-nLnyIjT68iaY3lAEbH9EJ5jZflhxABBwDqw8kaRKf3k="; + }) + ]; + + propagatedBuildInputs = [ + # setup.py only requires numpy but others are needed at runtime + numpy + rdkit + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "meeko" + ]; + + meta = { + description = "Python package for preparing small molecule for docking"; + homepage = "https://github.com/forlilab/Meeko"; + changelog = "https://github.com/forlilab/Meeko/releases/tag/${src.rev}"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix b/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix index 42d54fb63975..88ca28f4896b 100644 --- a/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.28.0"; + version = "0.28.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-gSJ7B2QaO6ei1wJwxpN/ciZ7VH6Bg1Qp8bUlrdLxtCs="; + hash = "sha256-S1ZBSkWqCU6EpFqLpxCN1ZNswJroF86+26WeyYPD0S0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/meraki/default.nix b/nixpkgs/pkgs/development/python-modules/meraki/default.nix index 58c130c3bd21..ba70066bfff4 100644 --- a/nixpkgs/pkgs/development/python-modules/meraki/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meraki/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.33.0"; + version = "1.34.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-uzrnKYCythDa+DK1X87zcL9O4cmjRDqxR2hXoN286KQ="; + hash = "sha256-rAFoIKHrhHRqcXmvbzlFKFIaHxVLp6CJUhNASwHhpPk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index bbe1f86eaaff..ff223339b433 100644 --- a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.1.8"; + version = "2.1.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-ZIUR9YMoXhbpIDWXxKr6TyNkANuRiJvhkJILx7mWSrw="; + hash = "sha256-nYbnOlD3yC3aoSSY4jwSgTv/m56I+ral2GwmoyQij1M="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix b/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix index 2c0ba1756798..58ddc57bfe7e 100644 --- a/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix @@ -5,6 +5,7 @@ , ninja , setuptools , toml +, wheel }: # TODO: offer meson as a Python package so we have dist-info folder. @@ -19,19 +20,21 @@ buildPythonPackage rec { hash = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw="; }; + # Applies the following merge request, which doesn't apply cleanly: + # https://gitlab.com/thiblahute/mesonpep517/-/merge_requests/25 + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'backend-path = "."' 'backend-path = ["."]' + ''; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ toml ]; - # postPatch = '' - # # Meson tries to detect ninja as well, so we should patch meson as well. - # substituteInPlace mesonpep517/buildapi.py \ - # --replace "'meson'" "'${meson}/bin/meson'" \ - # --replace "'ninja'" "'${ninja}/bin/ninja'" - # ''; - propagatedNativeBuildInputs = [ meson ninja ]; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix index 748de6f67541..6d5f85acb481 100644 --- a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.29.4"; + version = "0.29.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kxrF/Msxjht7zGs0aEcL/Sf0qwcLiSoDPDUlE7Lrcmg="; + hash = "sha256-tGp8CHQ1Ekn/2KiGZGd/8V6NdWMseDSETZ/Z3T3P91U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/metar/default.nix b/nixpkgs/pkgs/development/python-modules/metar/default.nix index dca7c5359a04..b130672810ec 100644 --- a/nixpkgs/pkgs/development/python-modules/metar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/metar/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "metar"; - version = "1.10.0"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "python-metar"; repo = "python-metar"; rev = "refs/tags/v${version}"; - hash = "sha256-53vgnViEYuMVKEnIZ2BNyIUrURR2rwopx7RWyFmF5PA="; + hash = "sha256-ZDjlXcSTUcSP7oRdhzLpXf/fLUA7Nkc6nj2I6vovbHg="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/metawear/default.nix b/nixpkgs/pkgs/development/python-modules/metawear/default.nix new file mode 100644 index 000000000000..96f8c9434500 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/metawear/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, gcc +, cython +, boost +, bluez +, nlohmann_json +, pyserial +, requests +, warble +}: + +buildPythonPackage rec { + pname = "metawear"; + version = "1.0.8"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gNEI6P6GslNd1DzFwCFndVIfUvSTPYollGdqkZhQ4Y8="; + }; + + nativeBuildInputs = [ + cython + ]; + + buildInputs = [ + boost + bluez + nlohmann_json + ]; + + postPatch = '' + # remove vendored nlohmann_json + rm MetaWear-SDK-Cpp/src/metawear/dfu/cpp/json.hpp + substituteInPlace MetaWear-SDK-Cpp/src/metawear/dfu/cpp/file_operations.cpp \ + --replace '#include "json.hpp"' '#include <nlohmann/json.hpp>' + ''; + + propagatedBuildInputs = [ + pyserial + requests + warble + ]; + + enableParallelBuilding = true; + + pythonImportsCheck = [ "mbientlab" "mbientlab.metawear" ]; + + meta = with lib; { + description = "Python bindings for the MetaWear C++ SDK by MbientLab"; + homepage = "https://github.com/mbientlab/metawear-sdk-python"; + license = with licenses; [ unfree ]; + maintainers = with maintainers; [ stepbrobd ]; + platforms = platforms.linux; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix b/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix index d9e537b057df..9eda32b4e48a 100644 --- a/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage , chardet , django -, django_contrib_comments +, django-contrib-comments , fetchPypi , filebrowser_safe , future @@ -42,7 +42,7 @@ buildPythonPackage rec { bleach chardet django - django_contrib_comments + django-contrib-comments filebrowser_safe future grappelli_safe diff --git a/nixpkgs/pkgs/development/python-modules/mf2py/default.nix b/nixpkgs/pkgs/development/python-modules/mf2py/default.nix index 7990ee730868..b39989bf322e 100644 --- a/nixpkgs/pkgs/development/python-modules/mf2py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mf2py/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mf2py"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "microformats"; repo = "mf2py"; - rev = version; - hash = "sha256-9pAD/eCmc/l7LGmKixDhZy3hhj1jCmcyo9wbqgtz/wI="; + rev = "refs/tags/v${version}"; + hash = "sha256-Ya8DND1Dqbygbf1hjIGMlPwyc/MYIWIj+KnWB6Bqu1k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix b/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix new file mode 100644 index 000000000000..6ade4b8ecb2e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix @@ -0,0 +1,99 @@ +{ appdirs +, buildPythonPackage +, fetchFromGitHub +, keras +, lib +, mhcgnomes +, nose +, pandas +, pytestCheckHook +, pythonRelaxDepsHook +, pyyaml +, scikit-learn +, tensorflow +, tqdm +}: + +buildPythonPackage rec { + pname = "mhcflurry"; + version = "2.0.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "openvax"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Cr7L6uo6Kc1PSeG5nK6zQSD7eeCFcUJUzhsX+waz7og="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRemoveDeps = [ + # See https://github.com/openvax/mhcflurry/issues/216. + "np-utils" + ]; + + # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run. + propagatedBuildInputs = [ + appdirs + keras + mhcgnomes + pandas + pyyaml + scikit-learn + tensorflow + tqdm + ]; + + nativeCheckInputs = [ nose pytestCheckHook ]; + + disabledTests = [ + # RuntimeError: Missing MHCflurry downloadable file: /homeless-shelter/.local... + "test_a1_mage_epitope_downloaded_models" + "test_a1_titin_epitope_downloaded_models" + "test_a2_hiv_epitope_downloaded_models" + "test_basic" + "test_caching" + "test_class1_neural_network_a0205_training_accuracy" + "test_commandline_sequences" + "test_correlation" + "test_csv" + "test_downloaded_predictor_gives_percentile_ranks" + "test_downloaded_predictor_invalid_peptides" + "test_downloaded_predictor_is_savable" + "test_downloaded_predictor_is_serializable" + "test_downloaded_predictor_small" + "test_downloaded_predictor" + "test_fasta_50nm" + "test_fasta_best" + "test_fasta" + "test_merge" + "test_no_csv" + "test_on_hpv" + "test_run_cluster_parallelism" + "test_run_parallel" + "test_run_serial" + "test_speed_allele_specific" + "test_speed_pan_allele" + + # See https://github.com/openvax/mhcflurry/issues/217 + "test_more" + "test_small" + ]; + + disabledTestPaths = [ + # RuntimeError: Missing MHCflurry downloadable file: /homeless-shelter/.local... + "test/test_changing_allele_representations.py" + "test/test_class1_affinity_predictor.py" + "test/test_class1_pan.py" + ]; + + pythonImportsCheck = [ "mhcflurry" ]; + + meta = with lib; { + description = "Peptide-MHC I binding affinity prediction"; + homepage = "https://github.com/openvax/mhcflurry"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mhcgnomes/default.nix b/nixpkgs/pkgs/development/python-modules/mhcgnomes/default.nix new file mode 100644 index 000000000000..4c5d1f6faac9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mhcgnomes/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pandas +, pyyaml +, serializable +}: + +buildPythonPackage rec { + pname = "mhcgnomes"; + version = "1.8.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pirl-unc"; + repo = pname; + # See https://github.com/pirl-unc/mhcgnomes/issues/20. As of 2023-07-13, + # they do no have version tags. + rev = "c7e779b60e35a031f6e0f0ea6ae70e8a8e7671c6"; + hash = "sha256-KKiBlnFlavRnaQnOpAzG0dyxmFB+zF9L6t/H05LkFZE="; + }; + + propagatedBuildInputs = [ pandas pyyaml serializable ]; + + pythonImportsCheck = [ "mhcgnomes" ]; + + meta = with lib; { + description = "Parsing MHC nomenclature in the wild"; + homepage = "https://github.com/pirl-unc/mhcgnomes"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/micawber/default.nix b/nixpkgs/pkgs/development/python-modules/micawber/default.nix index a7956241adf2..0a4decb49e4d 100644 --- a/nixpkgs/pkgs/development/python-modules/micawber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/micawber/default.nix @@ -1,19 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, beautifulsoup4 }: +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, pythonOlder +}: buildPythonPackage rec { pname = "micawber"; - version = "0.5.4"; + version = "0.5.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "003c5345aafe84f6b60fd289c003e8b1fef04c14e015c2d52d792a6b88135c89"; + sha256 = "sha256-CsWBS2X/KngfsTlLkaI6ipX3NJK2u49wW67q2C6t1UM="; }; - propagatedBuildInputs = [ beautifulsoup4 ]; + propagatedBuildInputs = [ + beautifulsoup4 + ]; meta = with lib; { homepage = "https://micawber.readthedocs.io/en/latest/"; - description = "A small library for extracting rich content from urls"; + description = "Module for extracting rich content from URLs"; license = licenses.mit; longDescription = '' micawber supplies a few methods for retrieving rich metadata diff --git a/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/nixpkgs/pkgs/development/python-modules/millheater/default.nix index 369947d7dde5..fb4f054cd212 100644 --- a/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -2,29 +2,27 @@ , aiohttp , async-timeout , buildPythonPackage -, cryptography , fetchFromGitHub , pythonOlder }: buildPythonPackage rec { pname = "millheater"; - version = "0.10.0"; + version = "0.11.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; - rev = version; - hash = "sha256-ImEg+VEiASQPnMeZzbYMMb+ZgcsxagQcN9IDFGO05Vw="; + rev = "refs/tags/${version}"; + hash = "sha256-NECGUosjrhRCVGHOFV+YjY8o3heoA7qi9kKsgXpeHh0="; }; propagatedBuildInputs = [ aiohttp async-timeout - cryptography ]; # Project has no tests @@ -37,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Mill heater devices"; homepage = "https://github.com/Danielhiversen/pymill"; + changelog = "https://github.com/Danielhiversen/pymill/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix b/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix index 80ebef1c23ed..973d4b40822e 100644 --- a/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix @@ -10,6 +10,17 @@ , CoreAudio }: +let + # TODO: recheck after 1.59 + miniaudio' = miniaudio.overrideAttrs (oldAttrs: rec { + version = "0.11.16"; # cffi breakage with 0.11.17 + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/${version}"; + hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM="; + }; + }); +in buildPythonPackage rec { pname = "miniaudio"; version = "1.59"; @@ -27,7 +38,7 @@ buildPythonPackage rec { postPatch = '' rm -r miniaudio - ln -s ${miniaudio} miniaudio + ln -s ${miniaudio'} miniaudio substituteInPlace build_ffi_module.py \ --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; substituteInPlace miniaudio.c \ diff --git a/nixpkgs/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix b/nixpkgs/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix new file mode 100644 index 000000000000..a15f81014cfa --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, six +}: + +buildPythonPackage rec { + pname = "minimal-snowplow-tracker"; + version = "0.0.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-rKv3Vy2w5/XL9pg9SV7vVAgfcb45IzDrOq25zLOdqqQ="; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "snowplow_tracker" + ]; + + meta = with lib; { + description = "Minimal snowplow event tracker"; + homepage = "https://github.com/dbt-labs/snowplow-python-tracker"; + license = licenses.asl20; + maintainers = with maintainers; [ mausch tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mir_eval/default.nix b/nixpkgs/pkgs/development/python-modules/mir_eval/default.nix new file mode 100644 index 000000000000..eaf4a9e4f535 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mir_eval/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, future +, six +, numpy +, scipy +, matplotlib +}: + +buildPythonPackage rec { + pname = "mir_eval"; + version = "0.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4f66pXZsZadUXCoXCyQUkPR6mJhzcLHgZ0JCTF3r5l4="; + }; + + propagatedBuildInputs = [ + future + six + numpy + scipy + matplotlib + ]; + + pythonImportsCheck = [ + "mir_eval" + ]; + + meta = with lib; { + description = "Common metrics for common audio/music processing tasks"; + homepage = "https://github.com/craffel/mir_eval"; + license = licenses.mit; + maintainers = with maintainers; [ carlthome ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mitogen/default.nix b/nixpkgs/pkgs/development/python-modules/mitogen/default.nix index 073ad71cfe08..167378cecbbb 100644 --- a/nixpkgs/pkgs/development/python-modules/mitogen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mitogen/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = pname; rev = "v${version}"; - hash = "sha256-cx0q2Y9A6UzpdD1kuGBtXIs9oBGFpkIyvPfN2hj+A1g="; + hash = "sha256-tMpjmSqZffFGbo06W/FAut584F8eOPrcLKjj2bnB+Zo="; }; # Tests require network access and Docker support diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix new file mode 100644 index 000000000000..cd40bb14b1c9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, mkdocs +}: + +buildPythonPackage rec { + pname = "mkdocs-git-authors-plugin"; + version = "0.7.2"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "timvink"; + repo = "mkdocs-git-authors-plugin"; + rev = "v${version}"; + hash = "sha256-jhYwi9HO6kxOS1QmEKb1YnXGSJ4Eyo4Sm07jI4lxXnA="; + }; + + propagatedBuildInputs = [ mkdocs ]; + + pythonImportsCheck = [ "mkdocs_git_authors_plugin" ]; + + meta = with lib; { + description = "Lightweight MkDocs plugin to display git authors of a markdown page"; + homepage = "https://github.com/timvink/mkdocs-git-authors-plugin"; + license = licenses.mit; + maintainers = with maintainers; [ totoroot ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-linkcheck/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-linkcheck/default.nix new file mode 100644 index 000000000000..540640e14beb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-linkcheck/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pythonPackages +}: + +buildPythonPackage rec { + pname = "mkdocs-linkcheck"; + version = "unstable-2021-08-24"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "byrnereese"; + repo = "linkchecker-mkdocs"; + rev = "a75d765b0ec564e5ed0218880ed0b5ab4b973917" ; + hash = "sha256-z59F7zUKZKIQSiTlE6wGbGDecPMeruNgltWUYfDf8jY="; + }; + + propagatedBuildInputs = with pythonPackages; [ + aiohttp + requests + ]; + + pythonImportsCheck = [ "mkdocs_linkcheck" ]; + + meta = with lib; { + description = "Validate links in Markdown files for static site generators like MkDocs, Hugo or Jekyll"; + 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. + ''; + homepage = "https://github.com/byrnereese/mkdocs-linkcheck"; + license = licenses.mit; + maintainers = with maintainers; [ totoroot ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix index 9a428f158e6c..878117c6b60a 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mkdocs-redirects"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mkdocs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+Ti+Z5gL5vVlQDt+KRw9nNHHKhRtEfguQe1K001DK9E="; + hash = "sha256-zv/tCsC2wrD0iH7Kvlq4nXJMPMGQ7+l68Y/q/x66LBg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index d4c3690b4765..a7b109d127eb 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FBrAZ9MhPGPwJhVXslu5mvVIJ7gPDiCK/3EuPAq6RNw="; + hash = "sha256-H/eqrwlZntEYoKkJZKiRV+KyzkrDKRirMDDSciFNIGo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index 656bde232a4c..dcd7a15fa7db 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.10.1"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocstrings"; repo = "python"; - rev = version; - hash = "sha256-VGPlOHQNtXrfmcne93xDIxN20KDGlTQrjeAKhX/L6K0="; + rev = "refs/tags/${version}"; + hash = "sha256-65c63K8u3aWJFeMIi0jOeRA7RXc1OWumys0LUOvgBEU="; }; nativeBuildInputs = [ @@ -37,11 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'license = "ISC"' 'license = {text = "ISC"}' \ - ''; - pythonImportsCheck = [ "mkdocstrings_handlers" ]; diff --git a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index c6d61a98f28c..152c36848a9e 100644 --- a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.3.2"; + version = "2.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bSsP/An+WMm1I9Xqex/Uq2RmTiYW0tIEDZ6WeW32620="; + hash = "sha256-CxpxsP9Gedzo/yrpcz6ZbsC2wQbbk0EuDfhgb3kYZ8g="; }; # Remove currently broken dependency `shap`, a model explainability package. diff --git a/nixpkgs/pkgs/development/python-modules/mmcif-pdbx/default.nix b/nixpkgs/pkgs/development/python-modules/mmcif-pdbx/default.nix new file mode 100644 index 000000000000..05d43d54f25d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mmcif-pdbx/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mmcif-pdbx"; + version = "2.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "Electrostatics"; + repo = "mmcif_pdbx"; + rev = "refs/tags/v${version}"; + hash = "sha256-ymMQ/q4IMoq+B8RvIdL0aqolKxyE/4rnVfd4bUV5OUY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pdbx" + ]; + + meta = with lib; { + description = "Yet another version of PDBx/mmCIF Python implementation"; + homepage = "https://github.com/Electrostatics/mmcif_pdbx"; + changelog = "https://github.com/Electrostatics/mmcif_pdbx/releases/tag/v${version}"; + license = licenses.cc0; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mmengine/default.nix b/nixpkgs/pkgs/development/python-modules/mmengine/default.nix index 3771cfc77f50..8d9c41bd7a71 100644 --- a/nixpkgs/pkgs/development/python-modules/mmengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mmengine/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mmengine"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "open-mmlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ook85XWosxbvshsQxZEoAWI/Ugl2uSO8zoNJ5EuuW1E="; + hash = "sha256-eridbYHagwAyXX3/JggfvC0vuy6nBAIISRy1ARrQ7Kk="; }; # tests are disabled due to sandbox env. diff --git a/nixpkgs/pkgs/development/python-modules/mmh3/default.nix b/nixpkgs/pkgs/development/python-modules/mmh3/default.nix index 07cd6d159024..9a2c9a5906fb 100644 --- a/nixpkgs/pkgs/development/python-modules/mmh3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mmh3/default.nix @@ -1,22 +1,30 @@ { lib , fetchPypi , buildPythonPackage +, pythonOlder }: buildPythonPackage rec { pname = "mmh3"; - version = "3.1.0"; + version = "4.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mw8rKrSpFTM8nRCJVy4pCgIeu1uQC7f3EU3MwDmV1zI="; + hash = "sha256-BWuD0E5ZVUfQQHzI5apdi6iAKor6QXtkwcMCNbU4njA="; }; - pythonImportsCheck = [ "mmh3" ]; + pythonImportsCheck = [ + "mmh3" + ]; meta = with lib; { description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions"; - homepage = "https://pypi.org/project/mmh3/"; + homepage = "https://github.com/hajimes/mmh3"; + changelog = "https://github.com/hajimes/mmh3/blob/v${version}/CHANGELOG.md"; license = licenses.cc0; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mmtf-python/default.nix b/nixpkgs/pkgs/development/python-modules/mmtf-python/default.nix new file mode 100644 index 000000000000..197d0cf3e65b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mmtf-python/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msgpack +, numpy +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "mmtf-python"; + version = "1.1.3"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EqAv4bcTHworjORbRvHgzdKLmBj+RJlVTCaISYfqDDI="; + }; + + propagatedBuildInputs = [ + msgpack + numpy + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ + "-s mmtf/tests" + "-p \"*_tests.py\"" + ]; + + pythonImportsCheck = [ + "mmtf" + ]; + + meta = { + description = "The python implementation of the MMTF API, decoder and encoder"; + homepage = "https://github.com/rcsb/mmtf-python"; + changelog = "https://github.com/rcsb/mmtf-python/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/modeled/default.nix b/nixpkgs/pkgs/development/python-modules/modeled/default.nix index b9f0174bb59f..f9b94a05065e 100644 --- a/nixpkgs/pkgs/development/python-modules/modeled/default.nix +++ b/nixpkgs/pkgs/development/python-modules/modeled/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Universal data modeling for Python"; homepage = "https://github.com/modeled/modeled"; license = licenses.lgpl3Only; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix b/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix index 36294fab76fe..e2d498bc4215 100644 --- a/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix +++ b/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , isPy3k @@ -11,14 +12,14 @@ }: buildPythonPackage rec { - pname = "moderngl_window"; - version = "2.4.2"; + pname = "moderngl-window"; + version = "2.4.4"; src = fetchFromGitHub { owner = "moderngl"; - repo = pname; + repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; + hash = "sha256-mg3j5ZoMwdk39L5xjcoEJo9buqssM1VLJtndSFsuCB0="; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; @@ -28,11 +29,14 @@ buildPythonPackage rec { # Tests need a display to run. doCheck = false; + pythonImportsCheck = [ "moderngl_window" ]; + meta = with lib; { homepage = "https://github.com/moderngl/moderngl_window"; description = "Cross platform helper library for ModernGL making window creation and resource loading simple"; license = licenses.mit; - platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks. + broken = stdenv.isDarwin; # darwin build breaks + platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ c0deaddict ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/monai/default.nix b/nixpkgs/pkgs/development/python-modules/monai/default.nix index df8f7492f63a..9e896e81e6f5 100644 --- a/nixpkgs/pkgs/development/python-modules/monai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/monai/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "monai"; - version = "1.1.0"; - disabled = pythonOlder "3.7"; + version = "1.2.0"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Project-MONAI"; repo = "MONAI"; rev = "refs/tags/${version}"; - hash = "sha256-XTjZhynIiFtFjJSW6rRAnpErZvf6QHkuK4e2L6l3naM="; + hash = "sha256-nMxROOBkLPmw1GRKiZq6WGJq93LOpSg/7zIVOg+WzC8="; }; # Ninja is not detected by setuptools for some reason even though it's present: @@ -37,7 +37,7 @@ buildPythonPackage rec { BUILD_MONAI = 1; - doCheck = false; # takes too long; numerous dependencies, some not in Nixpkgs + doCheck = false; # takes too long; tries to download data pythonImportsCheck = [ "monai" @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytorch framework (based on Ignite) for deep learning in medical imaging"; homepage = "https://github.com/Project-MONAI/MONAI"; + changelog = "https://github.com/Project-MONAI/MONAI/releases/tag/${version}"; license = licenses.asl20; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix b/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix index a0d8cf600d19..cb0be3e5ea9f 100644 --- a/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB"; homepage = "http://mongoengine.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/moreorless/default.nix b/nixpkgs/pkgs/development/python-modules/moreorless/default.nix new file mode 100644 index 000000000000..8f849b42f137 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/moreorless/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, parameterized +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "moreorless"; + version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "thatch"; + repo = "moreorless"; + rev = "refs/tags/v${version}"; + hash = "sha256-N11iqsxMGgzwW2QYeOoHQaR/aDEuoUnnd/2Mc5culN0="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + ]; + + nativeCheckInputs = [ + parameterized + pytestCheckHook + ]; + + pythonImportsCheck = [ + "moreorless" + ]; + + pytestFlagsArray = [ + "moreorless/tests/click.py" + "moreorless/tests/general.py" + "moreorless/tests/patch.py" + ]; + + meta = with lib; { + description = "Wrapper to make difflib.unified_diff more fun to use"; + homepage = "https://github.com/thatch/moreorless/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/morfessor/default.nix b/nixpkgs/pkgs/development/python-modules/morfessor/default.nix new file mode 100644 index 000000000000..5301438d4ecd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/morfessor/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "Morfessor"; + version = "2.0.6"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "bb3beac234341724c5f640f65803071f62373a50dba854d5a398567f9aefbab2"; + }; + + checkPhase = "python -m unittest -v morfessor/test/*"; + + pythonImportsCheck = [ "morfessor" ]; + + meta = with lib; { + description = "A tool for unsupervised and semi-supervised morphological segmentation"; + homepage = "https://github.com/aalto-speech/morfessor"; + license = licenses.bsd2; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mplhep-data/default.nix b/nixpkgs/pkgs/development/python-modules/mplhep-data/default.nix new file mode 100644 index 000000000000..12ec813f12b9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mplhep-data/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "mplhep-data"; + version = "0.0.3"; + format = "pyproject"; + + src = fetchPypi { + pname = "mplhep_data"; + inherit version; + hash = "sha256-tU0lfz9TyTpELNp6ZoHOJnJ34JFzwLQf14gg94Mhdy8="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + pythonImportsCheck = [ + "mplhep_data" + ]; + + meta = with lib; { + description = "Sub-package to hold data (fonts) for mplhep"; + homepage = "https://github.com/scikit-hep/mplhep_data"; + license = with licenses; [ mit gfl ofl ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mplhep/default.nix b/nixpkgs/pkgs/development/python-modules/mplhep/default.nix new file mode 100644 index 000000000000..63a81c47e303 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mplhep/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hist +, matplotlib +, mplhep-data +, pytestCheckHook +, pytest-mock +, pytest-mpl +, scipy +, setuptools +, setuptools-scm +, uhi +, uproot +}: + +buildPythonPackage rec { + pname = "mplhep"; + version = "0.3.28"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-/7nfjIdlYoouDOI1vXdr9BSml5gpE0gad7ONAUmOCiE="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + matplotlib + uhi + mplhep-data + ]; + + nativeCheckInputs = [ + hist + pytestCheckHook + pytest-mock + pytest-mpl + scipy + uproot + ]; + + disabledTests = [ + # requires uproot4 + "test_inputs_uproot" + "test_uproot_versions" + ]; + + pythonImportsCheck = [ + "mplhep" + ]; + + meta = with lib; { + description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)"; + homepage = "https://github.com/scikit-hep/mplhep"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mpv/default.nix b/nixpkgs/pkgs/development/python-modules/mpv/default.nix index c79842de3db9..c956bb90aa8f 100644 --- a/nixpkgs/pkgs/development/python-modules/mpv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mpv/default.nix @@ -1,19 +1,27 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27 +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub , mpv +, setuptools }: buildPythonPackage rec { pname = "mpv"; - version = "1.0.1"; - disabled = isPy27; + version = "1.0.4"; + format = "pyproject"; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - hash = "sha256-UCJ1PknnWQiFciTEMxTUqDzz0Z8HEWycLuQqYeyQhoM="; + hash = "sha256-qP5Biw4sTLioAhmMZX+Pemue2PWc3N7afAe38dwJv3U="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ mpv ]; postPatch = '' @@ -30,5 +38,6 @@ buildPythonPackage rec { description = "A python interface to the mpv media player"; homepage = "https://github.com/jaseg/python-mpv"; license = licenses.agpl3Plus; + maintainers = with maintainers; [ onny ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mqtt2influxdb/default.nix b/nixpkgs/pkgs/development/python-modules/mqtt2influxdb/default.nix new file mode 100644 index 000000000000..a2d7fa25fe0d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mqtt2influxdb/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, influxdb +, jsonpath-ng +, paho-mqtt +, py-expression-eval +, pyaml +, pycron +, schema +}: +buildPythonPackage rec { + pname = "mqtt2influxdb"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "hardwario"; + repo = "bch-mqtt2influxdb"; + rev = "v${version}"; + sha256 = "YDgMoxnH4vCCa7b857U6iVBhYLxk8ZjytGziryn24bg="; + }; + + propagatedBuildInputs = [ + influxdb + jsonpath-ng + paho-mqtt + py-expression-eval + pyaml + pycron + schema + ]; + + pythonImportsCheck = [ "mqtt2influxdb" ]; + + meta = with lib; { + homepage = "https://github.com/hardwario/bch-mqtt2influxdb"; + description = "Flexible MQTT to InfluxDB Bridge"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mrkd/default.nix b/nixpkgs/pkgs/development/python-modules/mrkd/default.nix deleted file mode 100644 index 0d97a91a16f3..000000000000 --- a/nixpkgs/pkgs/development/python-modules/mrkd/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, jinja2 -, mistune -, pygments -, setuptools -}: - -buildPythonPackage rec { - pname = "mrkd"; - version = "0.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "456f8c1be99da268554b29c6b5383532e58119def5a65d85270bc6a0ecc26aaf"; - }; - - propagatedBuildInputs = [ jinja2 mistune pygments setuptools ]; - - pythonImportsCheck = [ "mrkd" ]; - - meta = with lib; { - description = "Write man pages using Markdown, and convert them to Roff or HTML"; - homepage = "https://github.com/refi64/mrkd"; - license = licenses.bsd2; - # https://github.com/refi64/mrkd/pull/6 - broken = versionAtLeast mistune.version "2"; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/msg-parser/default.nix b/nixpkgs/pkgs/development/python-modules/msg-parser/default.nix new file mode 100644 index 000000000000..9670403e640e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/msg-parser/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# dependencies +, olefile +# test dependencies +, pytestCheckHook +}: +let + pname = "msg-parser"; + version = "1.2.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "vikramarsid"; + repo = "msg_parser"; + rev = "4100b553b24895b489ebd414c771933fc1e558d3"; + hash = "sha256-srDk6w8nzt0dyGCFQWfVCnKb4LawHoqoHX6d1l1dAmM="; + }; + + propagatedBuildInputs = [ + olefile + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python module to read, parse and converting Microsoft Outlook MSG E-Mail files."; + homepage = "https://github.com/vikramarsid/msg_parser"; + license = licenses.bsd2; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/msgpack/default.nix b/nixpkgs/pkgs/development/python-modules/msgpack/default.nix index 7832a46d368b..18287c641989 100644 --- a/nixpkgs/pkgs/development/python-modules/msgpack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msgpack/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "msgpack"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-9dhpwY8DAgLrQS8Iso0q/upVPWYTruieIA16yn7wH18="; + hash = "sha256-wHVUQoTq3Fzdxw9HVzMdmdy8FrK71ISdFfiq5M820xw="; }; nativeBuildInputs = [ @@ -33,8 +33,8 @@ buildPythonPackage rec { meta = with lib; { description = "MessagePack serializer implementation"; homepage = "https://github.com/msgpack/msgpack-python"; - changelog = "https://github.com/msgpack/msgpack-python/blob/master/ChangeLog.rst"; + changelog = "https://github.com/msgpack/msgpack-python/blob/v${version}/ChangeLog.rst"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/msgspec/default.nix b/nixpkgs/pkgs/development/python-modules/msgspec/default.nix index 133d2edc39cb..b83a6b8a068b 100644 --- a/nixpkgs/pkgs/development/python-modules/msgspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.15.1"; + version = "0.17.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-U3mCnp7MojWcw1pZExG6pYAToVjzGXqc2TeDyhm39TY="; + hash = "sha256-hxXywlDZoQ1DUL/03UngIdlHke8Ey4rDbEV4JKxiGps="; }; # Requires libasan to be accessible diff --git a/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix index 47a65bf0cfe8..3f3cc47351bc 100644 --- a/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.0.1"; + version = "5.1.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nolze"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OrGgY+CEhAHGOOIPYK8OijRdoh0PRelnsKB++ksUIXY="; + hash = "sha256-A1TeTE4TMHAb+KtFxTi+b4yTfuEFya8iyzy92dzQ0Z4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/msprime/default.nix b/nixpkgs/pkgs/development/python-modules/msprime/default.nix new file mode 100644 index 000000000000..d33adc13080a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/msprime/default.nix @@ -0,0 +1,81 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pythonOlder +, gsl +, numpy +, newick +, tskit +, demes +, pytest +, pytest-xdist +, scipy +}: + +buildPythonPackage rec { + pname = "msprime"; + version = "1.2.0"; + format = "pyproject"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-YAJa2f0w2CenKubnYLbP8HodDhabLB2hAkyw/CPkp6o="; + }; + + nativeBuildInputs = [ + setuptools-scm + gsl + ]; + + buildInputs = [ + gsl + ]; + + propagatedBuildInputs = [ + numpy + newick + tskit + demes + ]; + + nativeCheckInputs = [ + pytest + pytest-xdist + scipy + ]; + + checkPhase = '' + runHook preCheck + + # avoid adding the current directory to sys.path + # https://docs.pytest.org/en/7.1.x/explanation/pythonpath.html#invoking-pytest-versus-python-m-pytest + # need pythonPackages.stdpopsim + # need pythonPackages.bintrees + # need pythonPachages.python_jsonschema_objects + # ModuleNotFoundError: No module named 'lwt_interface.dict_encoding_testlib' + # fails for python311 + # fails for python311 + pytest -v --import-mode append \ + --ignore=tests/test_demography.py \ + --ignore=tests/test_algorithms.py \ + --ignore=tests/test_provenance.py \ + --ignore=tests/test_dict_encoding.py \ + --deselect=tests/test_ancestry.py::TestSimulator::test_debug_logging \ + --deselect=tests/test_ancestry.py::TestSimulator::test_debug_logging_dtwf + + runHook postCheck + ''; + + pythonImportsCheck = [ + "msprime" + ]; + + meta = with lib; { + description = "Simulate genealogical trees and genomic sequence data using population genetic models"; + homepage = "https://github.com/tskit-dev/msprime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ alxsimon ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mss/default.nix b/nixpkgs/pkgs/development/python-modules/mss/default.nix index a707ccefda1a..6a82bffaa6c0 100644 --- a/nixpkgs/pkgs/development/python-modules/mss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mss/default.nix @@ -6,22 +6,24 @@ buildPythonPackage rec { pname = "mss"; - version = "7.0.1"; + version = "9.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI="; + hash = "sha256-bre5AIzydCiBH6M66zXzM024Hj98wt1J7HxuWpSznxI="; }; - # By default it attempts to build Windows-only functionality prePatch = '' - rm mss/windows.py + # By default it attempts to build Windows-only functionality + rm src/mss/windows.py ''; # Skipping tests due to most relying on DISPLAY being set + doCheck = false; + pythonImportsCheck = [ "mss" ]; @@ -29,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cross-platform multiple screenshots module"; homepage = "https://github.com/BoboTiG/python-mss"; + changelog = "https://github.com/BoboTiG/python-mss/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ austinbutler ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mt-940/default.nix b/nixpkgs/pkgs/development/python-modules/mt-940/default.nix index ae455229035d..e8a032142254 100644 --- a/nixpkgs/pkgs/development/python-modules/mt-940/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mt-940/default.nix @@ -1,31 +1,49 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, enum34, pyyaml, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pyyaml +, setuptools }: buildPythonPackage rec { - version = "4.28.0"; pname = "mt-940"; + version = "4.30.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ydTOaijDmA2ogIONzRMMoz+5jr99qxWM1zzGGzg7f2Q="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wolph"; + repo = "mt940"; + rev = "refs/tags/v${version}"; + hash = "sha256-t6FOMu+KcEib+TZAv5uVAzvrUSt/k/RQn28jpdAY5Y0="; }; - propagatedBuildInputs = lib.optional (!isPy3k) enum34; + postPatch = '' + sed -i "/--cov/d" pytest.ini + sed -i "/--no-cov/d" pytest.ini + ''; - nativeCheckInputs = [ pyyaml pytest ]; + nativeBuildInputs = [ + setuptools + ]; - # requires tests files that are not present - doCheck = false; - checkPhase = '' - py.test - ''; + nativeCheckInputs = [ + pyyaml + pytestCheckHook + ]; - pythonImportsCheck = [ "mt940" ]; + pythonImportsCheck = [ + "mt940" + ]; meta = with lib; { - description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; + description = "Module to parse MT940 files and returns smart Python collections for statistics and manipulation"; homepage = "https://github.com/WoLpH/mt940"; + changelog = "https://github.com/wolph/mt940/releases/tag/v${version}"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mullvad-closest/default.nix b/nixpkgs/pkgs/development/python-modules/mullvad-closest/default.nix new file mode 100644 index 000000000000..c5d45dfd1751 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mullvad-closest/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, setuptools +, click +, geopy +, ping3 +, requests +, tabulate +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "mullvad-closest"; + version = "unstable-2023-07-09"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Ch00k"; + repo = "mullvad-closest"; + rev = "894d2075a520fcad238256725245030374693a16"; + hash = "sha256-scJiYjEmnDDElE5rHdPbnnuNjjRB0/X3vNGLoi2MAmo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + click + geopy + ping3 + requests + tabulate + ]; + + pythonImportsCheck = [ "mullvad_closest" ]; + + meta = with lib; { + description = "Find Mullvad servers with the lowest latency at your location"; + homepage = "https://github.com/Ch00k/mullvad-closest"; + license = licenses.unlicense; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/multiset/default.nix b/nixpkgs/pkgs/development/python-modules/multiset/default.nix index a64a3e928c80..6d9a28e564ba 100644 --- a/nixpkgs/pkgs/development/python-modules/multiset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/multiset/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "An implementation of a multiset"; homepage = "https://github.com/wheerd/multiset"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/music-tag/default.nix b/nixpkgs/pkgs/development/python-modules/music-tag/default.nix new file mode 100644 index 000000000000..f997ca47253c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/music-tag/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mutagen +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "music-tag"; + version = "0.4.3"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Cqtubu2o3w9TFuwtIZC9dFYbfgNWKrCRzo1Wh828//Y="; + }; + + propagatedBuildInputs = [ + mutagen + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "test" ]; + + # Tests fail: ModuleNotFoundError: No module named '_test_common' + doCheck = false; + + pythonImportsCheck = [ + "music_tag" + ]; + + meta = with lib; { + description = "Simple interface to edit audio file metadata"; + homepage = "https://github.com/KristoforMaynard/music-tag"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mwcli/default.nix b/nixpkgs/pkgs/development/python-modules/mwcli/default.nix new file mode 100644 index 000000000000..cc58e46d20c1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mwcli/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonRelaxDepsHook +, docopt +, para +}: + +buildPythonPackage rec { + pname = "mwcli"; + version = "0.0.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ADMb0P8WtXIcnGJ02R4l/TVfRewHc8ig45JurAWHGaA="; + }; + + # Prevent circular dependency + pythonRemoveDeps = [ + "mwxml" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + docopt + para + ]; + + # Tests require mwxml which itself depends on this package (circular dependency) + doCheck = false; + + meta = with lib; { + description = "A set of helper functions and classes for mediawiki-utilities command-line utilities"; + homepage = "https://github.com/mediawiki-utilities/python-mwcli"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix b/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix index 738e36dfe3e5..28e7f8c89f8a 100644 --- a/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mwdblib"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WwSKWfnSDJT8kIAk4e8caeL2UztFaIpNCDy1j46IbzM="; + hash = "sha256-+hh7SJFITpLumIuzNgBbXtFh+26tUG66UFv6DLDk5ag="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mwtypes/default.nix b/nixpkgs/pkgs/development/python-modules/mwtypes/default.nix new file mode 100644 index 000000000000..89e693dda89a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mwtypes/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonable +, nose +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mwtypes"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3BF2xZZWKcEj6FmzGa5hUdTjhVMemngWBMDUyjQ045k="; + }; + + propagatedBuildInputs = [ jsonable ]; + + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + disabledTests = [ + "test_normalize_path_bad_extension" + "test_open_file" + ]; + + pythonImportsCheck = [ "mwtypes" ]; + + meta = with lib; { + description = "A set of classes for working with MediaWiki data types."; + homepage = "https://github.com/mediawiki-utilities/python-mwtypes"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mwxml/default.nix b/nixpkgs/pkgs/development/python-modules/mwxml/default.nix new file mode 100644 index 000000000000..792b52f01abc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mwxml/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonschema +, mwcli +, mwtypes +, nose +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mwxml"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-CEjfDPLik3GPVUMRrPRxW9Z59jn05Sy+R9ggZYnbHTE="; + }; + + propagatedBuildInputs = [ + jsonschema + mwcli + mwtypes + ]; + + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + disabledTests = [ + "test_page_with_discussion" + ]; + + pythonImportsCheck = [ "mwxml" ]; + + meta = with lib; { + description = "A set of utilities for processing MediaWiki XML dump data"; + homepage = "https://github.com/mediawiki-utilities/python-mwxml"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mxnet/default.nix b/nixpkgs/pkgs/development/python-modules/mxnet/default.nix index a9e778bdd8c6..8b386a425a0e 100644 --- a/nixpkgs/pkgs/development/python-modules/mxnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mxnet/default.nix @@ -20,6 +20,9 @@ buildPythonPackage { doCheck = !isPy3k; postPatch = '' + # Required to support numpy >=1.24 where np.bool is removed in favor of just bool + substituteInPlace python/mxnet/numpy/utils.py \ + --replace "bool = onp.bool" "bool = bool" substituteInPlace python/setup.py \ --replace "graphviz<0.9.0," "graphviz" ''; diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 5920c2985c4f..239dccb7e2a0 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -2,6 +2,7 @@ , black , boto3 , buildPythonPackage +, cryptography , fetchFromGitHub , isort , jinja2 @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.14.5"; + version = "7.17.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-T8BIfopprCfcOpv92soTD3S4eYoAdT70pSMSHlFbBuE="; + hash = "sha256-YuHq3pfx3dNgi9M4dGSmIOC3iZaLe9lqrRL0q3ggCTs="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ black boto3 + cryptography isort jinja2 md-toc diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix index 228ceab3134d..62b26ff2d21b 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-ebs"; - version = "1.26.0"; + version = "1.28.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w15SM5F1IFtX4qDrMv5B7PItaTnXOOABg0aUU24onBk="; + hash = "sha256-GhOEPhx4zD5jXyTMH75DOq0UL4LgOMkJn0U5nKciNMI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index ca37e05ee6a1..2dadaefe38cf 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,18 +8,19 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.26.127"; + version = "1.28.16"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DlSLl8aiWJ97/10mocoQFiJ0l3E3kibjrQgiYp0GE8U="; + hash = "sha256-TlX9rXKbbm9FIR41S9Ggp0WlZf6dHkYnN/d1wohJz7U="; }; propagatedBuildInputs = [ boto3 + ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; @@ -33,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Type annotations for boto3.s3"; homepage = "https://github.com/youtype/mypy_boto3_builder"; + changelog = "https://github.com/youtype/mypy_boto3_builder/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 012c952a9800..141caaad1928 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # build-system @@ -32,7 +31,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.0.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,24 +40,9 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-vxPEUDC6fkYYiOl5nHf0qwMgPDC+9Vw56eTUQ174raQ="; + hash = "sha256-dfKuIyzgZo5hAZHighpXH78dHJ1PMbyCakyxF34CnMQ="; }; - patches = [ - # Fix compatibility with setupptools>=67.4.0 - (fetchpatch { - # https://github.com/python/mypy/pull/14781 - url = "https://github.com/python/mypy/commit/ab7b69a0532a5fe976c9c2a1b713d82d630692a4.patch"; - hash = "sha256-dtzmoOZP3tOtxrBVhgqpdv+rnrTjTKHxQhBieuJXRtA="; - }) - (fetchpatch { - # https://github.com/python/mypy/pull/14787 - url = "https://github.com/python/mypy/commit/243f584d43e6eb316920f3155067ce7c1b65d473.patch"; - hash = "sha256-uuh3S5ZyuJeTXyMvav2uSEao2qq23xMjK8rJjkY8RCY="; - includes = [ "mypyc/build.py" ]; - }) - ]; - nativeBuildInputs = [ mypy-extensions setuptools @@ -130,6 +114,6 @@ buildPythonPackage rec { description = "Optional static typing for Python"; homepage = "https://www.mypy-lang.org"; license = licenses.mit; - maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ]; + maintainers = with maintainers; [ martingms lnl7 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix b/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix index c1f75bb76bb3..bdd6c63da6fc 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "mypy-extensions"; - version = "0.4.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "python"; repo = "mypy_extensions"; rev = version; - hash = "sha256-JjhbxX5DBAbcs1o2fSWywz9tot792q491POXiId+NyI="; + hash = "sha256-gOfHC6dUeBE7SsWItpUHHIxW3wzhPM5SuGW1U8P7DD0="; }; propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Experimental type system extensions for programs checked with the mypy typechecker"; homepage = "https://www.mypy-lang.org"; license = licenses.mit; - maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ]; + maintainers = with maintainers; [ martingms lnl7 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix b/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix index a5694987abd5..6ede481fba85 100644 --- a/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , flit-core , importlib-metadata , ipython @@ -30,6 +31,27 @@ buildPythonPackage rec { hash = "sha256-D2E4ZRX6sHxzZGrcqX//L2n0HpDTE6JgIXxbvkGdhYs="; }; + patches = [ + # Fix compatiblity with myst-parser 1.0. Remove with the next release. + (fetchpatch { + url = "https://github.com/executablebooks/MyST-NB/commit/48c45c6a8c4501005766c2d821b5e9ddfbedd5fa.patch"; + hash = "sha256-jGL2MjZArvPtbiaR/rRGCIi0QwYO0iTIK26GLuTrBM8="; + excludes = [ + "myst_nb/__init__.py" + "docs/authoring/custom-formats.Rmd" + "docs/authoring/jupyter-notebooks.md" + "docs/index.md" + "pyproject.toml" + "tests/nb_fixtures/reporter_warnings.txt" + ]; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "myst-parser~=0.18.0" "myst-parser" + ''; + nativeBuildInputs = [ flit-core pythonRelaxDepsHook @@ -53,7 +75,10 @@ buildPythonPackage rec { "myst-parser" ]; - pythonImportsCheck = [ "myst_nb" ]; + pythonImportsCheck = [ + "myst_nb" + "myst_nb.sphinx_ext" + ]; meta = with lib; { description = "A Jupyter Notebook Sphinx reader built on top of the MyST markdown parser"; diff --git a/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix b/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix index dacfc5f2847e..fc81042527b8 100644 --- a/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "napari-npe2"; - version = "0.6.2"; + version = "0.7.0"; format = "pyproject"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "napari"; repo = "npe2"; rev = "refs/tags/v${version}"; - hash = "sha256-f4mSsURcf2xvvO/mrsLVpUt+ws73QHk2Ng/NwCR5Q48="; + hash = "sha256-6kHyz7jMZO3385XaNJ4zFBoQiU1SIRyYZsUeMH5EBXo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/natsort/default.nix b/nixpkgs/pkgs/development/python-modules/natsort/default.nix index 975e4a8d2eca..fc5d5ab4d590 100644 --- a/nixpkgs/pkgs/development/python-modules/natsort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/natsort/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "natsort"; - version = "8.3.1"; + version = "8.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UXWVSS3eVwpP1ranb2REQMG6UeIzjIpnHX8Edf2o+f0="; + hash = "sha256-RTEsSg5VB1k9oZPe3QSrsUaSU7YB7K9jRFrYDwoepYE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix b/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix index bba04a69685c..6f17d83524c2 100644 --- a/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyter lab environment notebook server extension"; - homepage = "https://github.com/jupyterlab/nbclassic"; + homepage = "https://github.com/jupyter/nbclassic"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix b/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix index 2de84cf20eae..c986085a61e3 100644 --- a/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix @@ -16,14 +16,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Valassis-Digital-Media"; repo = "nbconflux"; - rev = version; - sha256 = "1708qkb275d6f7b4b5zmqx3i0jh56nrx2n9rwwp5nbaah5p2wwlh"; + rev = "refs/tags/${version}"; + hash = "sha256-kHIuboFKLVsu5zlZ0bM1BUoQR8f1l0XWcaaVI9bECJw="; }; propagatedBuildInputs = [ nbconvert requests ]; nativeCheckInputs = [ pytestCheckHook responses ]; + patches = [ + # The original setup.py file is missing commas in the install_requires list + ./setup-py.patch + ]; + JUPYTER_PATH="${nbconvert}/share/jupyter"; disabledTests = [ "test_post_to_confluence" diff --git a/nixpkgs/pkgs/development/python-modules/nbconflux/setup-py.patch b/nixpkgs/pkgs/development/python-modules/nbconflux/setup-py.patch new file mode 100644 index 000000000000..1e92e2dd11c2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nbconflux/setup-py.patch @@ -0,0 +1,16 @@ +diff --git a/setup.py b/setup.py +index 26f882d..b7ccf67 100644 +--- a/setup.py ++++ b/setup.py +@@ -27,8 +27,8 @@ setup( + ] + }, + install_requires=[ +- 'nbconvert>=5.3' +- 'requests' +- 'traitlets' ++ 'nbconvert>=5.3', ++ 'requests', ++ 'traitlets', + ], + ) diff --git a/nixpkgs/pkgs/development/python-modules/nbexec/default.nix b/nixpkgs/pkgs/development/python-modules/nbexec/default.nix new file mode 100644 index 000000000000..5eec122cdc59 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nbexec/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# build inputs +, jupyter-client +, nbformat +, nbconvert +# check inputs +, unittestCheckHook +, ipykernel +}: +let + pname = "nbexec"; + version = "0.2.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "jsvine"; + repo = "nbexec"; + rev = "refs/tags/v${version}"; + hash = "sha256-Vv6EHX6WlnSmzQAYlO1mHnz5t078z3RQfVfte1+X2pw="; + }; + + propagatedBuildInputs = [ + jupyter-client + nbformat + nbconvert + ]; + + # TODO there is a warning about debugpy_stream missing + nativeCheckInputs = [ + unittestCheckHook + ipykernel + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + unittestFlagsArray = [ + "-s" "test" "-v" + ]; + + pythonImportsCheck = [ + "nbexec" + ]; + + meta = with lib; { + description = "A dead-simple tool for executing Jupyter notebooks from the command line."; + homepage = "https://github.com/jsvine/nbexec"; + changelog = "https://github.com/jsvine/nbexec/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix b/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix index 7d1d827cc20f..58b02546f7e7 100644 --- a/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Basic notebook checks and linting"; homepage = "https://github.com/pyviz/nbsmoke"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index 5b19602f92d0..74018b75e93d 100644 --- a/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://nbsphinx.readthedocs.io/"; changelog = "https://github.com/spatialaudio/nbsphinx/blob/${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nbtlib/default.nix b/nixpkgs/pkgs/development/python-modules/nbtlib/default.nix new file mode 100644 index 000000000000..b70259c9c76d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nbtlib/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, numpy +}: + +buildPythonPackage rec { + pname = "nbtlib"; + version = "2.0.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "vberlier"; + repo = "nbtlib"; + rev = "v${version}"; + hash = "sha256-L8eX6/0qiQ4UxbmDicLedzj+oBjYmlK96NpljE/A3eI="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" "poetry-core" \ + --replace "poetry.masonry" "poetry.core.masonry" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "nbtlib" ]; + + meta = with lib; { + description = "A python library to read and edit nbt data"; + homepage = "https://github.com/vberlier/nbtlib"; + changelog = "https://github.com/vberlier/nbtlib/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ gdd ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nbval/default.nix b/nixpkgs/pkgs/development/python-modules/nbval/default.nix index 8fa86e50d1ff..9eaa2c60de29 100644 --- a/nixpkgs/pkgs/development/python-modules/nbval/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbval/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { description = "A py.test plugin to validate Jupyter notebooks"; homepage = "https://github.com/computationalmodelling/nbval"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index bd8691857fa8..a6001ecd2f31 100644 --- a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.2.2"; + version = "4.3.1"; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = version; - hash = "sha256-ZTX8plcsO4zE7ruLtWIvsagQUvwPHuKdPKRwCrFwvgc="; + hash = "sha256-8Fh4sgQps6zUEN8o5ljrDIbRlbSZIMncbqh/qAnyOkw="; }; format = "pyproject"; diff --git a/nixpkgs/pkgs/development/python-modules/nclib/default.nix b/nixpkgs/pkgs/development/python-modules/nclib/default.nix index 244f49a48e5b..e6db538859fc 100644 --- a/nixpkgs/pkgs/development/python-modules/nclib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nclib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nclib"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-rA8oeYvMhw8HURxPLBRqpMHnAez/xBjyPFoKXIIvBjg="; + hash = "sha256-26KjYMxJMj5ANb2ej9hVl689sAcGHp89QUkH2xiLhZk="; }; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index ae665301c590..1447ceb9bcf1 100644 --- a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.9.0"; + version = "5.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-HyoIr2ZIOAzFlMrkIDV71JJAFwrxCqExMFXF3U2p9Po="; + hash = "sha256-xPMO1Db1+TwOT+JsBGJcTc7BL2B8Eb1K3kqKMGnsUmE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix index 43253eecdc73..fcd74efe9237 100644 --- a/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Patch asyncio to allow nested event loops"; homepage = "https://github.com/erdewit/nest_asyncio"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/netapp-lib/default.nix b/nixpkgs/pkgs/development/python-modules/netapp-lib/default.nix new file mode 100644 index 000000000000..b84ff5613ecc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/netapp-lib/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, six +, xmltodict +}: + +buildPythonPackage rec { + pname = "netapp-lib"; + version = "2021.6.25"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-1g4FCSMyS8T6F/T8BOqak4h1nJis8g9jaOluA4FTNpA="; + }; + + propagatedBuildInputs = [ + lxml + six + xmltodict + ]; + + # no tests in sdist and no other download available + doCheck = false; + + pythonImportsCheck = [ "netapp_lib" ]; + + meta = with lib; { + description = "netapp-lib is required for Ansible deployments to interact with NetApp storage systems"; + homepage = "https://netapp.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/netapp-ontap/default.nix b/nixpkgs/pkgs/development/python-modules/netapp-ontap/default.nix new file mode 100644 index 000000000000..28a953f29f13 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/netapp-ontap/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cliche +, marshmallow +, pytestCheckHook +, recline +, requests +, requests-toolbelt +, urllib3 +}: + +buildPythonPackage rec { + pname = "netapp-ontap"; + version = "9.13.1.0"; + format = "setuptools"; + + src = fetchPypi { + pname = "netapp_ontap"; + inherit version; + sha256 = "sha256-jPKfPJXtzARRlSuwkfJeZueQouwaaa0D6rZ+BcpILq0="; + }; + + propagatedBuildInputs = [ + marshmallow + requests + requests-toolbelt + urllib3 + # required for cli + cliche + recline + ]; + + # no tests in sdist and no other download available + doCheck = false; + + pythonImportsCheck = [ "netapp_ontap" ]; + + meta = with lib; { + description = "A library for working with ONTAP's REST APIs simply in Python"; + homepage = "https://devnet.netapp.com/restapi.php"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/netio/default.nix b/nixpkgs/pkgs/development/python-modules/netio/default.nix index 46186fbab750..82e5d1641fd8 100644 --- a/nixpkgs/pkgs/development/python-modules/netio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netio/default.nix @@ -1,35 +1,34 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pyopenssl , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "netio"; - version = "1.0.7"; - format = "setuptools"; + version = "1.0.10"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "netioproducts"; - repo = "PyNetio"; - rev = "v${version}"; - hash = "sha256-07GzT9j27KmrTQ7naIdlIz7HB9knHpjH4mQhlwUKucU="; + src = fetchPypi { + pname ="Netio"; + inherit version; + hash = "sha256-+fGs7ZwvspAW4GlO5Hx+gNb+7Mhl9HC4pijHyk+8PYs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests pyopenssl ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "import py2exe" "" - ''; - pythonImportsCheck = [ "Netio" ]; diff --git a/nixpkgs/pkgs/development/python-modules/newick/default.nix b/nixpkgs/pkgs/development/python-modules/newick/default.nix new file mode 100644 index 000000000000..317a9c582b3d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/newick/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "newick"; + version = "1.9.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "dlce-eva"; + repo = "python-newick"; + rev = "v${version}"; + hash = "sha256-TxyR6RYvy2oIcDNZnHrExtPYGspyWOtZqNy488OmWwk="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + postPatch = '' + # remove coverage arguments to pytest + sed -i '/--cov/d' setup.cfg + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "newick" + ]; + + meta = with lib; { + description = "A python package to read and write the Newick format"; + homepage = "https://github.com/dlce-eva/python-newick"; + license = licenses.asl20; + maintainers = with maintainers; [ alxsimon ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nexia/default.nix b/nixpkgs/pkgs/development/python-modules/nexia/default.nix index b804251ebc23..c5a5a2d00601 100644 --- a/nixpkgs/pkgs/development/python-modules/nexia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nexia/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , orjson , fetchFromGitHub +, pytest-asyncio , pytestCheckHook , pythonOlder , requests @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "2.0.6"; + version = "2.0.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VBK+h5K/irI0T0eUaYC1iouzMUo/lJshLTe0h5CtnAQ="; + hash = "sha256-1uCmlFkha5oaNm5N0/8402ulBr7fNRUbDDASECfN9r8="; }; propagatedBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses requests-mock + pytest-asyncio pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/nextcord/default.nix b/nixpkgs/pkgs/development/python-modules/nextcord/default.nix index 8f77faaab18a..04fa54a28d6a 100644 --- a/nixpkgs/pkgs/development/python-modules/nextcord/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.4.2"; + version = "2.5.0"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = "refs/tags/v${version}"; - hash = "sha256-n73F5y922rsu0YFjAwQlUVpSa6Scs/xyfZHREmqKiHU="; + hash = "sha256-Oo1C2tasuNIpUaKACbapnoZs7WVS1uncS1akErzQrqI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/nh3/default.nix b/nixpkgs/pkgs/development/python-modules/nh3/default.nix new file mode 100644 index 000000000000..2bcdb6d49cde --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nh3/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, rustPlatform +, libiconv +, fetchFromGitHub +, darwin +}: +let + pname = "nh3"; + version = "0.2.13"; + src = fetchFromGitHub { + owner = "messense"; + repo = pname; + rev = "v${version}"; + hash = "sha256-NILPy+lC0jhOF6ykriUPZWHLlSYBC00tpDdfJ6XjcjA="; + }; +in +buildPythonPackage { + inherit pname version src; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-Ror2KcIdSeXHa44eUWGiPsKiD935hsBREREySbGedxA="; + }; + + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + ]; + + pythonImportsCheck = [ "nh3" ]; + + meta = with lib; { + description = "Python binding to Ammonia HTML sanitizer Rust crate"; + homepage = "https://github.com/messense/nh3"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nibe/default.nix b/nixpkgs/pkgs/development/python-modules/nibe/default.nix index ee167fbc9882..48a9365f8f26 100644 --- a/nixpkgs/pkgs/development/python-modules/nibe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nibe/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wuW8No3G+l5rG2xoqBi1lhIcqqgfrQ5CrkaEtSct38k="; + hash = "sha256-IrPEXrrnbxJcIuy+Xq4iVEEblJ85d7M99zGr1DDJS2M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ninja/default.nix b/nixpkgs/pkgs/development/python-modules/ninja/default.nix new file mode 100644 index 000000000000..d3ab12c29a55 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ninja/default.nix @@ -0,0 +1,72 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchurl +, cmake +, setuptools-scm +, scikit-build +, pytestCheckHook +, pytest-virtualenv +}: +let + # these must match NinjaUrls.cmake + ninja_src_url = "https://github.com/Kitware/ninja/archive/v1.11.1.g95dee.kitware.jobserver-1.tar.gz"; + ninja_src_sha256 = "7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db"; + ninja_src = fetchurl { + url = ninja_src_url; + sha256 = ninja_src_sha256; + }; +in +buildPythonPackage rec { + pname = "ninja"; + version = "1.11.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "scikit-build"; + repo = "ninja-python-distributions"; + rev = version; + hash = "sha256-scCYsSEyN+u3qZhNhWYqHpJCl+JVJJbKz+T34gOXGJM="; + }; + patches = [ + # make sure cmake doesn't try to download the ninja sources + ./no-download.patch + ]; + + inherit ninja_src; + postUnpack = '' + # assume that if the hash matches, the source should be fine + if ! grep "${ninja_src_sha256}" $sourceRoot/NinjaUrls.cmake; then + echo "ninja_src_sha256 doesn't match the hash in NinjaUrls.cmake!" + exit 1 + fi + mkdir -p "$sourceRoot/Ninja-src" + pushd "$sourceRoot/Ninja-src" + tar -xavf ${ninja_src} --strip-components 1 + popd + ''; + + postPatch = '' + sed -i '/cov/d' setup.cfg + ''; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + setuptools-scm + scikit-build + cmake + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-virtualenv + ]; + + meta = with lib; { + description = "A small build system with a focus on speed"; + homepage = "https://github.com/scikit-build/ninja-python-distributions"; + license = licenses.asl20; + maintainers = with maintainers; [ _999eagle ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ninja/no-download.patch b/nixpkgs/pkgs/development/python-modules/ninja/no-download.patch new file mode 100644 index 000000000000..0937a5fde1ea --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ninja/no-download.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,6 +64,7 @@ + # Download selected source archive + ExternalProject_add(download_ninja_source + SOURCE_DIR ${Ninja_SOURCE_DIR} ++ DOWNLOAD_COMMAND "" + URL ${${src_archive}_url} + URL_HASH SHA256=${${src_archive}_sha256} + DOWNLOAD_DIR ${ARCHIVE_DOWNLOAD_DIR} diff --git a/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix b/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix index 972b1a10b0b0..f4e8fbcdae07 100644 --- a/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "22.0.0"; + version = "23.0.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c="; + hash = "sha256-Lty4aPzSlwRJSqCXeIVICF+gudYqto1OS4cVZyrB2nY="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix b/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix index 5758e60fa3fc..8ec80af0736b 100644 --- a/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Simple jupyter kernel for nix-repl"; homepage = "https://github.com/GTrunSec/nix-kernel"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix b/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix index 7746444fd30e..ec967493d080 100644 --- a/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "6.0.1"; + version = "7.0.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "tvoDSqg4g517c1w0VcsVm3r4mBFG3RHaOTAJAv1ooc4="; + hash = "sha256-oIR2iEiOBQ1VKouJTLqEiWWNzrMSJcnxK+m/j9Ia/m8="; }; nativeCheckInputs = [ unittestCheckHook git which ]; diff --git a/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix index 401c48141160..e0af4c496993 100644 --- a/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Tools for removing the tedious nature of creating nixpkgs derivations"; homepage = "https://github.com/nix-community/nixpkgs-pytools"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nlpcloud/default.nix b/nixpkgs/pkgs/development/python-modules/nlpcloud/default.nix index 81dfbc6714a3..a1874aef4066 100644 --- a/nixpkgs/pkgs/development/python-modules/nlpcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nlpcloud/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nlpcloud"; - version = "1.0.41"; + version = "1.0.43"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LtwN1fF/lfvXrB30P0VvuVGnsG8p1ZAalDCYL/a9uGE="; + hash = "sha256-WLbmPFBiZ7utFo0cqiBKsetlhtgun/YMGTEIvMUhRnc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix b/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix index b1135eba7de4..596468f83ca2 100644 --- a/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Noise Protocol Framework"; homepage = "https://github.com/plizonczyk/noiseprotocol/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix b/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix index da294bf88297..786820b1adf4 100644 --- a/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Nose plugin to randomly order tests and control random.seed"; homepage = "https://github.com/adamchainz/nose-randomly"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nose3/default.nix b/nixpkgs/pkgs/development/python-modules/nose3/default.nix new file mode 100644 index 000000000000..c452a3431cf5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nose3/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, coverage +, fetchPypi +, isPyPy +, isPy311 +, python +, stdenv +}: + +buildPythonPackage rec { + pname = "nose3"; + version = "1.3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-diquIsrbiYsAudT0u7n46H+ODd5sSaiM0MVU9OWSW3Y="; + }; + + propagatedBuildInputs = [ coverage ]; + + # PyPy hangs for unknwon reason + # Darwin and python 3.11 fail at various assertions and I didn't find an easy way to find skip those tests + doCheck = !isPyPy && !stdenv.isDarwin && !isPy311; + + checkPhase = '' + ${python.pythonForBuild.interpreter} selftest.py + ''; + + meta = with lib; { + description = "Fork of nose v1 not using lib2to3 for compatibility with Python 3"; + homepage = "https://github.com/jayvdb/nose3"; + license = licenses.lgpl3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/nixpkgs/pkgs/development/python-modules/notebook/default.nix index 37cc248a20a1..9cd1e9c37a1e 100644 --- a/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; - homepage = "https://jupyter.org/"; + homepage = "https://github.com/jupyter/notebook"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; mainProgram = "jupyter-notebook"; diff --git a/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix index b41cc4344c49..2f2eceb788c1 100644 --- a/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "notifications-python-client"; - version = "8.0.0"; + version = "8.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "alphagov"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-feATZS7PG9IKY6ooPztA49WykQ/Bt67frSe3PpbiCLc="; + hash = "sha256-ZDqUJljCZnGmm0TRclv23I+I9egFdF25P0wIYAQkOVI="; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'" "" + --replace "pytest-runner" "" ''; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix b/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix index 70c422b08b27..af288e2a1393 100644 --- a/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix @@ -1,6 +1,5 @@ { stdenv , lib - , buildPythonPackage , notmuch , python @@ -13,7 +12,12 @@ buildPythonPackage { sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi"; - buildInputs = [ python notmuch cffi ]; + nativeBuildInputs = [ + cffi + ]; + buildInputs = [ + python notmuch cffi + ]; # since notmuch 0.35, this package expects _notmuch_config.py that is # generated by notmuch's configure script diff --git a/nixpkgs/pkgs/development/python-modules/nptyping/default.nix b/nixpkgs/pkgs/development/python-modules/nptyping/default.nix index c449c8b0ec17..ac823c2e45ad 100644 --- a/nixpkgs/pkgs/development/python-modules/nptyping/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nptyping/default.nix @@ -5,7 +5,6 @@ , pytestCheckHook , beartype , invoke -, mypy , numpy , pandas , feedparser @@ -34,7 +33,6 @@ buildPythonPackage rec { beartype feedparser invoke - mypy pandas pytestCheckHook typeguard diff --git a/nixpkgs/pkgs/development/python-modules/nsz/default.nix b/nixpkgs/pkgs/development/python-modules/nsz/default.nix index 266fb868641a..88402b340a12 100644 --- a/nixpkgs/pkgs/development/python-modules/nsz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nsz/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nsz"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "nicoboss"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-It815Uxxs4T9BM9EypAfPuq4Oy8rgGLpKA79m2xM8N4="; + hash = "sha256-azmUJ3ofLdNwNeIQL/TuPYE98FZ8yXwbJx3wHCo8lw4="; }; propagatedBuildInputs = [pycryptodome enlighten zstandard ] diff --git a/nixpkgs/pkgs/development/python-modules/numba/default.nix b/nixpkgs/pkgs/development/python-modules/numba/default.nix index fae84969a661..d503307ce67a 100644 --- a/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -14,12 +14,14 @@ , runCommand , fetchpatch +, config + # CUDA-only dependencies: , addOpenGLRunpath ? null , cudaPackages ? {} # CUDA flags: -, cudaSupport ? false +, cudaSupport ? config.cudaSupport }: let diff --git a/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix b/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix index 54fb320caf92..d5722053c6e1 100644 --- a/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , isPy27 @@ -37,6 +38,10 @@ buildPythonPackage rec { msgpack ]; + preBuild = if (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) then '' + export DISABLE_NUMCODECS_AVX2= + '' else null; + nativeCheckInputs = [ pytestCheckHook ]; @@ -61,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/zarr-developers/numcodecs"; license = licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix b/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix index 8e2f630fdba6..64d6d291633e 100644 --- a/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "http://pypi.python.org/pypi/numericalunits"; description = "A package that lets you define quantities with unit"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 401a1120527a..65a077392ff9 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -1,5 +1,7 @@ { lib +, stdenv , fetchPypi +, fetchpatch , python , buildPythonPackage , gfortran @@ -18,7 +20,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); let cfg = writeTextFile { name = "site.cfg"; - text = (lib.generators.toINI {} { + text = lib.generators.toINI {} { ${blas.implementation} = { include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; library_dirs = "${blas}/lib:${lapack}/lib"; @@ -35,9 +37,9 @@ let library_dirs = "${blas}/lib"; runtime_library_dirs = "${blas}/lib"; }; - }); + }; }; -in buildPythonPackage rec { +in buildPythonPackage (rec { pname = "numpy"; version = "1.24.2"; format = "setuptools"; @@ -54,8 +56,38 @@ in buildPythonPackage rec { # Patching of numpy.distutils is needed to prevent it from undoing the # patch to distutils. ./numpy-distutils-C++.patch + ] + ++ lib.optionals stdenv.cc.isClang [ + # f2py.f90mod_rules generates code with invalid function pointer conversions, which are + # clang 16 makes an error by default. + (fetchpatch { + url = "https://github.com/numpy/numpy/commit/609fee4324f3521d81a3454f5fcc33abb0d3761e.patch"; + hash = "sha256-6Dbmf/RWvQJPTIjvchVaywHGcKCsgap/0wAp5WswuCo="; + }) + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Backport from 1.25. `platform.machine` returns `arm64` on aarch64-darwin, which causes + # differing results between `_selected_real_kind_func` and Fortran’s `selected_real_kind`. + (fetchpatch { + url = "https://github.com/numpy/numpy/commit/afcedf4b63f4a94187e6995c2adea0da3bb18e83.patch"; + hash = "sha256-cxBoimX5a9wC2qUIGAo5o/M2E9+eV63bV2/wLmfDYKg="; + }) + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` + # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and + # 80-bit long double complex numbers. + ./disable-failing-long-double-test-Rosetta-2.patch ]; + postPatch = '' + # fails with multiple errors because we are not using the pinned setuptools version + # see https://github.com/numpy/numpy/blob/v1.25.0/pyproject.toml#L7 + # error: option --single-version-externally-managed not recognized + # TypeError: dist must be a Distribution instance + rm numpy/core/tests/test_cython.py + ''; + nativeBuildInputs = [ gfortran cython ]; buildInputs = [ blas lapack ]; @@ -76,15 +108,14 @@ in buildPythonPackage rec { nativeCheckInputs = [ pytest - # "hypothesis" indirectly depends on numpy to build its documentation. - (hypothesis.override { enableDocumentation = false; }) + hypothesis typing-extensions ]; checkPhase = '' runHook preCheck pushd "$out" - ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' + ${python.interpreter} -c 'import numpy, sys; sys.exit(numpy.test("fast", verbose=10) is False)' popd runHook postCheck ''; @@ -106,4 +137,7 @@ in buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} +} // lib.optionalAttrs stdenv.cc.isClang { + # Causes `error: argument unused during compilation: '-fno-strict-overflow'` due to `-Werror`. + hardeningDisable = [ "strictoverflow" ]; +}) diff --git a/nixpkgs/pkgs/development/python-modules/numpy/disable-failing-long-double-test-Rosetta-2.patch b/nixpkgs/pkgs/development/python-modules/numpy/disable-failing-long-double-test-Rosetta-2.patch new file mode 100644 index 000000000000..3e446745f58c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/numpy/disable-failing-long-double-test-Rosetta-2.patch @@ -0,0 +1,23 @@ +diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py +index 6951d41e4..eefe86ad4 100644 +--- a/numpy/core/tests/test_umath.py ++++ b/numpy/core/tests/test_umath.py +@@ -4180,7 +4180,17 @@ def test_against_cmath(self): + ) + @pytest.mark.xfail(IS_MUSL, reason="gh23049") + @pytest.mark.xfail(IS_WASM, reason="doesn't work") +- @pytest.mark.parametrize('dtype', [np.complex64, np.complex_, np.longcomplex]) ++ @pytest.mark.parametrize('dtype', [ ++ np.complex64, ++ np.complex_, ++ pytest.param( ++ np.longcomplex, ++ marks=pytest.mark.skipif( ++ sys.platform == "darwin" and platform.machine() == "x86_64", ++ reason="doesn’t work under Rosetta 2", ++ ), ++ ), ++ ]) + def test_loss_of_precision(self, dtype): + """Check loss of precision in complex arc* functions""" + diff --git a/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index d3e05097fb02..d2b341f5e3bc 100644 --- a/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nunavut"; - version = "2.1.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-L4FbPhhhmgjkL1c3qnSJDK+4NBO2DUqeW6WGt9MBTbg="; + hash = "sha256-ENP1uhzQwFEk990b1RX2wNVpInaSSH80KNihX6XpQtU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/nutils/default.nix b/nixpkgs/pkgs/development/python-modules/nutils/default.nix index 9a3cfb2b48e4..da52ca153e48 100644 --- a/nixpkgs/pkgs/development/python-modules/nutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nutils/default.nix @@ -5,14 +5,16 @@ , numpy , treelog , stringly +, flit-core +, bottombar , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "nutils"; - version = "7.2"; - format = "setuptools"; + version = "7.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +22,18 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-KCvUBE3qbX6v1HahBj4/jjM8ujvFGtWNuH1D+bTHrQ0="; + hash = "sha256-3VtQFnR8vihxoIyRkbE1a1Rs8Np3/79PWNKReTBZDg8="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ numpy treelog stringly + bottombar ]; nativeCheckInputs = [ @@ -44,9 +51,9 @@ buildPythonPackage rec { meta = with lib; { description = "Numerical Utilities for Finite Element Analysis"; + changelog = "https://github.com/evalf/nutils/releases/tag/v${version}"; homepage = "https://www.nutils.org/"; license = licenses.mit; - broken = stdenv.hostPlatform.isAarch64; maintainers = with maintainers; [ Scriptkiddi ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix index 0053b81d9a07..20802a73176f 100644 --- a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.11"; + version = "2.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - hash = "sha256-b/EGn26gTpnYuy2h6shnJI1dRwhl41eKJHzDJoFG1YI="; + hash = "sha256-6mhVDC2jpIIOZeoKz4AxxU7jj8dqPVBKRWupbuY/T7E="; }; nativeBuildInputs = [ @@ -44,8 +44,9 @@ buildPythonPackage rec { pycurl setuptools structlog - tomli tornado + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ @@ -73,8 +74,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/lilydjwg/nvchecker"; description = "New version checker for software"; + homepage = "https://github.com/lilydjwg/nvchecker"; + changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix b/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix index 218b62330711..8894de41d561 100644 --- a/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "11.525.112"; + version = "12.535.77"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-xk5HOVO2XsDMx2zzYBwxMKCsgGC7yuqRLMAPqOTJho0="; + hash = "sha256-jYHl7Zk8hABkVBAq+ExL/99yulxRIStsASHGVoiYPhQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix index 880111a4ed75..fb953bce13dd 100644 --- a/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nxt-python/default.nix @@ -1,30 +1,49 @@ { lib , buildPythonPackage -, fetchgit -, isPy3k -, pyusb +, fetchFromGitHub , pybluez -, pytest -, git +, pytestCheckHook +, pythonOlder +, pyusb }: buildPythonPackage rec { - version = "3.0.1"; pname = "nxt-python"; + version = "3.2.0"; format = "setuptools"; - src = fetchgit { - url = "https://github.com/schodet/nxt-python.git"; - rev = version; - sha256 = "004c0dr6767bjiddvp0pchcx05falhjzj33rkk03rrl0ha2nhxvz"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "schodet"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-PWeR8xteLMxlOHcJJCtTI0o8QNzwGJVkUACmvf4tXWY="; }; - propagatedBuildInputs = [ pyusb pybluez pytest git ]; + propagatedBuildInputs = [ + pyusb + ]; + + passthru.optional-dependencies = { + bluetooth = [ + pybluez + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nxt" + ]; meta = with lib; { description = "Python driver/interface for Lego Mindstorms NXT robot"; homepage = "https://github.com/schodet/nxt-python"; - license = licenses.gpl3; + changelog = "https://github.com/schodet/nxt-python/releases/tag/${version}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ ibizaman ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/objgraph/default.nix b/nixpkgs/pkgs/development/python-modules/objgraph/default.nix index ec75d9c452ae..445cc705fac9 100644 --- a/nixpkgs/pkgs/development/python-modules/objgraph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/objgraph/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "objgraph"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.5" || isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-R1LKW8wOBRLkG4zE0ngKwv07PqvQO36VClWUwGID38Q="; + hash = "sha256-NpVnw3tPL5KBYLb27e3L6o/H6SmDGHf9EFbHipAMF9M="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/oci/default.nix b/nixpkgs/pkgs/development/python-modules/oci/default.nix index b145d6c399e2..611d89b43442 100644 --- a/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.100.0"; + version = "2.107.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-hzuuYRf9D0nWSyAPC66umDD2fKYZ+khHd6281UW6u9M="; + hash = "sha256-GeZCA5Bg3qSL3VRWh3Dvh9+4+3RgwuRVXR8LM/eKed4="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix b/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix index 5925a706bc1d..a9eeef0c55de 100644 --- a/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.2.0"; + version = "14.3.0"; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-vbNYCnC71l+8omttCGK7+4i3WBiAyb9C5pfApm+SsC0="; + hash = "sha256-OUz19N2YIl7iwayjulx0v1K00jB5SdWo8m5XiJ9BDSs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix b/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix index 1ad03a48a957..99c3f9e46990 100644 --- a/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "odp-amsterdam"; - version = "5.1.0"; + version = "5.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-ECRm9I/wHb82F8UBqPQWd60wLybIloCJiTxXDb3GnGs="; + hash = "sha256-DaL2CTrhWqBwl3kktF1wndxzrreA24C3zXmp4ghf/4s="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix b/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix index d874935cf544..130b45d631e6 100644 --- a/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix @@ -6,47 +6,38 @@ , pytestCheckHook , aiohttp , dask +, distributed , fsspec , numpy , requests , scikit-image -, s3fs , toolz , zarr }: buildPythonPackage rec { pname = "ome-zarr"; - version = "0.6.1"; + version = "0.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ome"; repo = "ome-zarr-py"; rev = "refs/tags/v${version}"; - hash = "sha256-dpweOuqruh7mAqmSaNbehLCr8OCLe1IZNWV4bpHpTl0="; + hash = "sha256-DMBTrDyUmNsrjOsFKrqukJNZ1f/mAjz4aunNUcwVMKg="; }; - patches = [ - # remove after next release: - (fetchpatch { - name = "fix-writer-bug"; - url = "https://github.com/ome/ome-zarr-py/commit/c1302e05998dfe2faf94b0f958c92888681f5ffa.patch"; - hash = "sha256-1WANObABUXkjqeGdnmg0qJ48RcZcuAwgitZyMwiRYUw="; - }) - ]; - propagatedBuildInputs = [ numpy dask + distributed zarr fsspec aiohttp requests - s3fs scikit-image toolz - ]; + ] ++ fsspec.passthru.optional-dependencies.s3; nativeCheckInputs = [ pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix b/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix new file mode 100644 index 000000000000..39adbdc7cc3e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, cryptography, protobuf }: + +buildPythonPackage rec { + pname = "omemo-dr"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sP5QI+lHoXt0D7ftSqJGEg1vIdgZtYEulN/JVwUgvmE="; + }; + + propagatedBuildInputs = [ + cryptography + protobuf + ]; + + meta = { + description = "OMEMO Double Ratchet"; + license = lib.licenses.lgpl3; + homepage = "https://dev.gajim.org/gajim/omemo-dr/"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/omorfi/default.nix b/nixpkgs/pkgs/development/python-modules/omorfi/default.nix new file mode 100644 index 000000000000..6bbe964de734 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/omorfi/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, pkgs +, lib +, stdenv +, hfst +}: + +buildPythonPackage rec { + pname = "omorfi"; + inherit (pkgs.omorfi) src version; + + sourceRoot = "${src.name}/src/python"; + + propagatedBuildInputs = [ + hfst + ]; + + # Fixes some improper import paths + patches = [ ./importfix.patch ]; + + # Apply patch relative to source/src + patchFlags = [ "-p3" ]; + + meta = with lib; { + description = "Python interface for Omorfi"; + homepage = "https://github.com/flammie/omorfi"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + # Ofborg build error (hfst not found?) + broken = stdenv.isDarwin; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/omorfi/importfix.patch b/nixpkgs/pkgs/development/python-modules/omorfi/importfix.patch new file mode 100644 index 000000000000..67a54363c7b1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/omorfi/importfix.patch @@ -0,0 +1,76 @@ +diff --git a/src/python/omorfi/entryguessing/gradation.py b/src/python/omorfi/entryguessing/gradation.py +index 7d3ed8cb..825d7ead 100755 +--- a/src/python/omorfi/entryguessing/gradation.py ++++ b/src/python/omorfi/entryguessing/gradation.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-from .omorfi.error_logging import fail_guess_because +-from .omorfi.string_mangling import replace_rightmost, replace_rightmosts ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import replace_rightmost, replace_rightmosts + + + def gradation_make_morphophonemes(wordmap): +diff --git a/src/python/omorfi/entryguessing/guess_new_class.py b/src/python/omorfi/entryguessing/guess_new_class.py +index 1884716b..3a781bfc 100755 +--- a/src/python/omorfi/entryguessing/guess_new_class.py ++++ b/src/python/omorfi/entryguessing/guess_new_class.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-from .error_logging import fail_guess_because +-from .string_manglers import three_syllable ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import three_syllable + + + def guess_new_class(wordmap): +diff --git a/src/python/omorfi/entryguessing/plurale_tantum.py b/src/python/omorfi/entryguessing/plurale_tantum.py +index a8af81fb..95fc4b7b 100755 +--- a/src/python/omorfi/entryguessing/plurale_tantum.py ++++ b/src/python/omorfi/entryguessing/plurale_tantum.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-from .error_logging import fail_guess_because +-from .omorfi.string_manglers import replace_rightmost, replace_rightmosts ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import replace_rightmost, replace_rightmosts + + + def plurale_tantum_get_singular_stem(wordmap): +diff --git a/src/python/omorfi/formats/experimental_xml_formatter.py b/src/python/omorfi/formats/experimental_xml_formatter.py +index abccbff5..11b0f518 100755 +--- a/src/python/omorfi/formats/experimental_xml_formatter.py ++++ b/src/python/omorfi/formats/experimental_xml_formatter.py +@@ -19,9 +19,9 @@ + + from xml.sax.saxutils import escape as xml_escape + +-from ftb3_formatter import Ftb3Formatter ++from .ftb3_formatter import Ftb3Formatter + +-from .settings import version_id_easter_egg ++from omorfi.settings import version_id_easter_egg + + + def make_xmlid(s): +diff --git a/src/python/omorfi/formats/lexc_formatter.py b/src/python/omorfi/formats/lexc_formatter.py +index 4ec616b7..b146129f 100755 +--- a/src/python/omorfi/formats/lexc_formatter.py ++++ b/src/python/omorfi/formats/lexc_formatter.py +@@ -19,8 +19,8 @@ + + # functions for formatting the database data to lexc + +-from .settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary +-from .string_manglers import lexc_escape ++from omorfi.settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary ++from omorfi.string_manglers import lexc_escape + + + def format_copyright_lexc(): diff --git a/nixpkgs/pkgs/development/python-modules/onnxmltools/default.nix b/nixpkgs/pkgs/development/python-modules/onnxmltools/default.nix new file mode 100644 index 000000000000..97eaf68254b6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/onnxmltools/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, onnx +, skl2onnx +# native check inputs +, pytestCheckHook +, pandas +, xgboost +, onnxruntime +, scikit-learn +, pyspark +, lightgbm +}: + +buildPythonPackage rec { + pname = "onnxmltools"; + version = "1.11.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "onnx"; + repo = "onnxmltools"; + rev = "v${version}"; + hash = "sha256-uLFAGtCDLdMd0SMoonMXFE0kGHuDpwp6IrIbD0t8l4M="; + }; + + propagatedBuildInputs = [ + numpy + onnx + skl2onnx + ]; + + pythonImportsCheck = [ "onnxmltools" ]; + + # there are still some dependencies that need to be packaged for the tests to run + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + pandas + xgboost + onnxruntime + scikit-learn + pyspark + lightgbm + # coremltools + # libsvm + # h20 + ]; + + meta = with lib; { + description = "ONNXMLTools enables conversion of models to ONNX"; + homepage = "https://github.com/onnx/onnxmltools"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/onnxruntime-tools/default.nix b/nixpkgs/pkgs/development/python-modules/onnxruntime-tools/default.nix new file mode 100644 index 000000000000..6f8a5001b1ff --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/onnxruntime-tools/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, coloredlogs +, numpy +, onnx +, packaging +, psutil +, py-cpuinfo +, py3nvml +, sympy +}: + +buildPythonPackage rec { + pname = "onnxruntime-tools"; + version = "1.7.0"; + format = "wheel"; + + # the build distribution doesn't work at all, it seems to expect the same structure + # as the github source repo. + # The github source wasn't immediately obvious how to build for this subpackage. + src = fetchPypi { + pname = "onnxruntime_tools"; + inherit version; + format = "wheel"; + dist = "py3"; + python = "py3"; + hash = "sha256-Hf+Ii1xIKsW8Yn8S4QhEX+/LPWAMQ/Y2M5dTFv5hetg="; + }; + + propagatedBuildInputs = [ + coloredlogs + numpy + onnx + packaging + psutil + py-cpuinfo + py3nvml + sympy + ]; + + pythonImportsCheck = [ "onnxruntime_tools" ]; + + meta = with lib; { + description = "Transformers Model Optimization Tool of ONNXRuntime"; + homepage = "https://pypi.org/project/onnxruntime-tools/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix b/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix index af369b0d82d1..8fea2e6d9117 100644 --- a/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , autoPatchelfHook , pythonRelaxDepsHook @@ -7,6 +8,7 @@ , numpy , packaging , oneDNN +, re2 }: @@ -34,8 +36,9 @@ buildPythonPackage { ''; nativeBuildInputs = [ - autoPatchelfHook pythonRelaxDepsHook + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook ]; # This project requires fairly large dependencies such as sympy which we really don't always need. @@ -48,6 +51,7 @@ buildPythonPackage { # Libraries are not linked correctly. buildInputs = [ oneDNN + re2 onnxruntime.protobuf ]; diff --git a/nixpkgs/pkgs/development/python-modules/onvif-zeep-async/default.nix b/nixpkgs/pkgs/development/python-modules/onvif-zeep-async/default.nix index e4befe938454..3d70ef77fb86 100644 --- a/nixpkgs/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/nixpkgs/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "3.1.9"; + version = "3.1.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-szvRN2EmBV4BEM7EuL/Db5hwBtXwbn7M21h9NzS8l3k="; + hash = "sha256-TXSwrWnDXzntXZN/u09QB3BsIa6tpf6LpGFKEyA/GH8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/openai/default.nix b/nixpkgs/pkgs/development/python-modules/openai/default.nix index 4ccdbd94c128..2865da5cd7aa 100644 --- a/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.27.7"; + version = "0.27.8"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-C952ZBp458kPge9ZTUBY6EoPh6Vrq9D2y1WQpCG1rEQ="; + hash = "sha256-7D7oi3NCqq0QSW66MqYMmc9ga02T5G4xFVic4PjgFRA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix b/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix index a50fd9baad87..68eead616b47 100644 --- a/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix @@ -1,21 +1,28 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , requests }: buildPythonPackage rec { pname = "openaiauth"; - version = "0.3.6"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; pname = "OpenAIAuth"; - hash = "sha256-SaiTqs2HVv5ajUkrLJv24ed1+iJg5HqsCNe0IETkA00="; + hash = "sha256-wmVR+cN/uJ75l62uzmHqpvEcnjzi6CU0kQ2e/5LxkBw="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -23,10 +30,10 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A Python library for authenticating with the OpenAI API"; - license = licenses.mit; - maintainers = with maintainers; [ realsnick ]; + description = "Library for authenticating with the OpenAI API"; homepage = "https://github.com/acheong08/OpenAIAuth"; changelog = "https://github.com/acheong08/OpenAIAuth/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ realsnick ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/openhomedevice/default.nix b/nixpkgs/pkgs/development/python-modules/openhomedevice/default.nix index 533a6f66f7f0..2e7ddf92a1d6 100644 --- a/nixpkgs/pkgs/development/python-modules/openhomedevice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openhomedevice/default.nix @@ -1,14 +1,16 @@ { lib +, aioresponses , async-upnp-client , buildPythonPackage , fetchFromGitHub , lxml +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "openhomedevice"; - version = "2.0.2"; + version = "2.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -16,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bazwilliams"; repo = pname; - rev = version; - hash = "sha256-D4n/fv+tgdKiU7CemI+12cqoox2hsqRYlCHY7daD5fM="; + rev = "refs/tags/${version}"; + hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; }; propagatedBuildInputs = [ @@ -25,17 +27,23 @@ buildPythonPackage rec { lxml ]; - # Tests are currently outdated - # https://github.com/bazwilliams/openhomedevice/issues/20 - doCheck = false; + nativeCheckInputs = [ + aioresponses + pytestCheckHook + ]; pythonImportsCheck = [ "openhomedevice" ]; + pytestFlagsArray = [ + "tests/*.py" + ]; + meta = with lib; { description = "Python module to access Linn Ds and Openhome devices"; homepage = "https://github.com/bazwilliams/openhomedevice"; + changelog = "https://github.com/bazwilliams/openhomedevice/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix index 257fb589ba7b..13e7a870b00c 100644 --- a/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix +++ b/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix @@ -12,7 +12,7 @@ in buildPythonPackage (common // { pname = "openrazer"; - sourceRoot = "source/pylib"; + sourceRoot = "${common.src.name}/pylib"; propagatedBuildInputs = [ dbus-python diff --git a/nixpkgs/pkgs/development/python-modules/openrgb-python/default.nix b/nixpkgs/pkgs/development/python-modules/openrgb-python/default.nix new file mode 100644 index 000000000000..106a2f7533ea --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openrgb-python/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "openrgb-python"; + version = "0.2.15"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-rTfpqMM+IUd8rMmw/r15sICLoPHL6KLaRrmUjWTfUkA="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "openrgb" + ]; + + meta = with lib; { + description = "Module for the OpenRGB SDK"; + homepage = "https://openrgb-python.readthedocs.io/"; + changelog = "https://github.com/jath03/openrgb-python/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openshift/default.nix b/nixpkgs/pkgs/development/python-modules/openshift/default.nix index 72578e1825a1..9950b6af1620 100644 --- a/nixpkgs/pkgs/development/python-modules/openshift/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openshift/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "openshift"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "openshift"; repo = "openshift-restclient-python"; - rev = "v${version}"; - hash = "sha256-9mMHih2xuQve8hEnc5x4f9Pd4wX7IMy3vrxxGFCG+8o="; + rev = "refs/tags/v${version}"; + hash = "sha256-uLfewj7M8KNs3oL1AM18sR/WhAR2mvBfqadyhR73FP0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix index 8969fc97bf8d..2b66b67b4406 100644 --- a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "1.2.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-vEs0D96AUDuDm9pyoy631jDM3lwsH/SVKEDXn8pbzn8="; + hash = "sha256-+g/YOGv311SaOs65xOKai3BJp4GbhkD1awEFL4oQLMo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix b/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix index aa96ed5ae843..148f76d03529 100644 --- a/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix @@ -15,11 +15,9 @@ buildPythonPackage { pname = "openstacksdk-tests"; - inherit (openstacksdk) version; + inherit (openstacksdk) version src; format = "other"; - src = openstacksdk.src; - dontBuild = true; dontInstall = true; diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix index c38fb19faf36..2a4de0a92cc9 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -8,6 +8,7 @@ , opentelemetry-test-utils , setuptools , pytestCheckHook +, pythonRelaxDepsHook }: let @@ -16,18 +17,21 @@ let version = "1.18.0"; disabled = pythonOlder "3.7"; + # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${self.version}"; - hash = "sha256-h6XDzM29wYiC51S7OpBXvWFCfZ7DmIyGMG2pFjJV7pI="; - sparseCheckout = [ "/${self.pname}" ]; - } + "/${self.pname}"; + hash = "sha256-8xf4TqEkBeueejQBckFGwBNN4Gyo+/7/my6Z1Mnei5Q="; + }; + + sourceRoot = "source/opentelemetry-api"; format = "pyproject"; nativeBuildInputs = [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -36,6 +40,10 @@ let setuptools ]; + pythonRelaxDeps = [ + "importlib-metadata" + ]; + nativeCheckInputs = [ opentelemetry-test-utils pytestCheckHook @@ -49,10 +57,11 @@ let passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; meta = with lib; { - homepage = "https://opentelemetry.io"; + homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; description = "OpenTelemetry Python API"; + changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${self.src.rev}"; license = licenses.asl20; - maintainers = teams.deshaw.members; + maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; }; in self diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 2cfd38f2d1b7..a786318a58ba 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -1,26 +1,20 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling +, opentelemetry-api , opentelemetry-proto , opentelemetry-sdk , opentelemetry-test-utils , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-common"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-HNlkbDyYnr0/lDeY1xt0pRxqk+977ljgPdfJzAxL3AQ="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-common"; format = "pyproject"; @@ -40,10 +34,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.common" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-common"; description = "OpenTelemetry Protobuf encoding"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index 1b12b8f265ef..d4f2f4c4305b 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -1,29 +1,23 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , backoff , googleapis-common-protos , grpcio , hatchling +, opentelemetry-api , opentelemetry-test-utils , opentelemetry-exporter-otlp-proto-common , pytest-grpc , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-grpc"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-feAmPL/G3ABIY5tBODlMJIBzxqg6Bl7imJB2EYtEp2o="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-grpc"; format = "pyproject"; @@ -49,10 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc"; description = "OpenTelemetry Collector Protobuf over gRPC Exporter"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index ccf4cc7a2101..6d7bf23dafa3 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , backoff , googleapis-common-protos , hatchling +, opentelemetry-api , opentelemetry-exporter-otlp-proto-common , opentelemetry-test-utils , requests @@ -12,18 +12,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-http"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-r4jvIhRM9E4CuZyS/XvvYO+F9cPxip8ab57CUfip47Q="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-http"; format = "pyproject"; @@ -46,10 +40,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.http" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-http"; description = "OpenTelemetry Collector Protobuf over HTTP Exporter"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index 278298be1217..a3606148883f 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -1,26 +1,20 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , backoff , hatchling +, opentelemetry-api , opentelemetry-exporter-otlp-proto-grpc , opentelemetry-exporter-otlp-proto-http , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-ph9ahT6M8UBvuUJjk6nug68Ou/D7XuuXkfnKHEdD8x8="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp"; format = "pyproject"; @@ -39,10 +33,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp"; description = "OpenTelemetry Collector Exporters"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index 003241d74c1c..1e74b3fd502f 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-sdk @@ -10,18 +9,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-prometheus"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-vWVLUt3Ett04kqUyoTOBNvRj51/M35X83saBBxeOTZI="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-prometheus"; format = "pyproject"; @@ -42,10 +35,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.prometheus" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-prometheus"; description = "Prometheus Metric Exporter for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix new file mode 100644 index 000000000000..de0823c0aac9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, pythonOlder +, hatchling +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, opentelemetry-util-http +, wrapt +, pytestCheckHook +, aiohttp +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-aiohttp-client"; + disabled = pythonOlder "3.7"; + + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-aiohttp-client"; + + format = "pyproject"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + opentelemetry-util-http + wrapt + aiohttp + ]; + + # missing https://github.com/ezequielramos/http-server-mock + # which looks unmaintained + doCheck = false; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.aiohttp_client" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-aiohttp-client"; + description = "OpenTelemetry Instrumentation for aiohttp-client"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 3fb18175ab22..5777498873b7 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , asgiref , hatchling , opentelemetry-api @@ -12,18 +11,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-asgi"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-BfNrbOQwyApdcKOVGF0LqzWOxzLkHZYiYdYVVPkGmdQ="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-asgi"; format = "pyproject"; @@ -46,10 +39,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-asgi"; description = "ASGI instrumentation for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 2d8536a9037d..ec19eacf0e3d 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , django , hatchling , opentelemetry-api @@ -14,18 +13,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-django"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-5tyLFQTYuJBFAFZirqsaHXCw72Q3TigDctZZFi/2zdI="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-django"; format = "pyproject"; @@ -50,10 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-django"; description = "OpenTelemetry Instrumentation for Django"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix new file mode 100644 index 000000000000..8313faa8d6dd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, pythonOlder +, hatchling +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-sdk +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, wrapt +, pytestCheckHook +, grpcio +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-grpc"; + disabled = pythonOlder "3.7"; + + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-grpc"; + + format = "pyproject"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-sdk + opentelemetry-semantic-conventions + wrapt + ]; + + passthru.optional-dependencies = { + instruments = [ grpcio ]; + }; + + nativeCheckInputs = [ + opentelemetry-test-utils + grpcio + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc"; + description = "OpenTelemetry Instrumentation for grpc"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index b50674ea1b68..408cfb692329 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-instrumentation @@ -11,18 +10,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-wsgi"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-DBZGXY8Y208YC/guk0qUB04UA/JFAtiv3kjsikskTRs="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-wsgi"; format = "pyproject"; @@ -44,10 +37,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.wsgi" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-wsgi"; description = "WSGI Middleware for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 140ca386554c..8716ef4efede 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -16,13 +16,15 @@ buildPythonPackage rec { version = "0.39b0"; disabled = pythonOlder "3.7"; + # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-+zk76A640nyd1L0I55JrMMs7EnQ+SPQdYGAFIyQFc6E="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc="; + }; + + sourceRoot = "source/opentelemetry-instrumentation"; format = "pyproject"; @@ -47,7 +49,8 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; + changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}"; license = licenses.asl20; - maintainers = teams.deshaw.members; + maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-proto/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-proto/default.nix index b3df8b893989..c673dee3986b 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -1,24 +1,18 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling +, opentelemetry-api , protobuf , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-proto"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-6iB+QlBUqRvIJ9p38NYgP4icW2rYs1P3bNCxI95cOvs="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + sourceRoot = "source/opentelemetry-proto"; format = "pyproject"; @@ -36,10 +30,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.proto" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-proto"; description = "OpenTelemetry Python Proto"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix index 6ac7b8037fb7..1b4683137d95 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , flaky , hatchling , opentelemetry-api @@ -14,17 +13,11 @@ let self = buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-sdk"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${self.version}"; - hash = "sha256-YMFSmzuvm/VA9Fpe7pbF9mnGQHOQpobWMb1iGRt+d3w="; - sparseCheckout = [ "/${self.pname}" ]; - } + "/${self.pname}"; + sourceRoot = "source/opentelemetry-sdk"; format = "pyproject"; @@ -56,11 +49,9 @@ let # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; - meta = with lib; { - homepage = "https://opentelemetry.io"; - description = "OpenTelemetry Python API and SDK"; - license = licenses.asl20; - maintainers = teams.deshaw.members; + meta = opentelemetry-api.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-sdk"; + description = "OpenTelemetry Python SDK"; }; }; in self diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix index d9743975bf6c..0ae9fb34d06f 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix @@ -1,23 +1,17 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling +, opentelemetry-api , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-semantic-conventions"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-82L/tDoWgu0r+Li3CS3hjVR99DQQmA5yt3y85+37imI="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + sourceRoot = "source/opentelemetry-semantic-conventions"; format = "pyproject"; @@ -31,10 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.semconv" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-semantic-conventions"; description = "OpenTelemetry Semantic Conventions"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index 0f78e511a885..71e87b0737a9 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -2,25 +2,18 @@ , callPackage , buildPythonPackage , pythonOlder -, fetchFromGitHub , asgiref , hatchling , opentelemetry-api , opentelemetry-sdk }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-test-utils"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-WRcKTE3eVqOSQUi5gZ3du+RGw8CrMazXHrctdrjgzHo="; - sparseCheckout = [ "/tests/${pname}" ]; - } + "/tests/${pname}"; + sourceRoot = "source/tests/opentelemetry-test-utils"; format = "pyproject"; @@ -36,10 +29,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.test" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/tests/opentelemetry-test-utils"; description = "Test utilities for OpenTelemetry unit tests"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix index ddd25dccb784..49ec52a380b0 100644 --- a/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-instrumentation , opentelemetry-sdk @@ -10,18 +9,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-util-http"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-C20/M5wimQec/8tTKx7+jkIYgfgNPtU9lkPKliIM3Uk="; - sparseCheckout = [ "/util/${pname}" ]; - } + "/util/${pname}"; + sourceRoot = "source/util/opentelemetry-util-http"; format = "pyproject"; @@ -42,10 +35,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.util.http" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http"; description = "Web util for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opower/default.nix b/nixpkgs/pkgs/development/python-modules/opower/default.nix new file mode 100644 index 000000000000..299de618087f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, arrow +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, setuptools +}: + +buildPythonPackage rec { + pname = "opower"; + version = "0.0.20"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tronikos"; + repo = "opower"; + rev = "refs/tags/v${version}"; + hash = "sha256-hb+TVnCAAnsoKPk9N1bDXj463CErp7nn2cteOumKhLs="; + }; + + pythonRemoveDeps = [ + # https://github.com/tronikos/opower/pull/4 + "asyncio" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + arrow + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "opower" + ]; + + meta = with lib; { + description = "Module for getting historical and forecasted usage/cost from utilities that use opower.com"; + homepage = "https://github.com/tronikos/opower"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/optax/default.nix b/nixpkgs/pkgs/development/python-modules/optax/default.nix index cd30ec18152b..b693afc4771c 100644 --- a/nixpkgs/pkgs/development/python-modules/optax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/optax/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "optax"; - version = "0.1.5"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "deepmind"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vhPpynKq0dboSt+fQ4lvVv9ytDXnZKRrc7lF03Mm39g="; + hash = "sha256-zSMJxagPe2rkhrawJ+TWXUzk6V58IY6MhWmEqLVtOoA="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/optax/tests.nix b/nixpkgs/pkgs/development/python-modules/optax/tests.nix index 59fed40bdf08..1ab548f2f399 100644 --- a/nixpkgs/pkgs/development/python-modules/optax/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/optax/tests.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , dm-haiku , pytest-xdist , pytestCheckHook @@ -9,7 +8,7 @@ , optax }: -buildPythonPackage rec { +buildPythonPackage { pname = "optax-tests"; inherit (optax) version; @@ -31,5 +30,4 @@ buildPythonPackage rec { # See https://github.com/deepmind/optax/issues/323 "examples/lookahead_mnist_test.py" ]; - } diff --git a/nixpkgs/pkgs/development/python-modules/optuna/default.nix b/nixpkgs/pkgs/development/python-modules/optuna/default.nix index deea9fecbf50..e9e60f8c9fbc 100644 --- a/nixpkgs/pkgs/development/python-modules/optuna/default.nix +++ b/nixpkgs/pkgs/development/python-modules/optuna/default.nix @@ -88,6 +88,6 @@ buildPythonPackage rec { description = "A hyperparameter optimization framework"; homepage = "https://optuna.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/opuslib/default.nix b/nixpkgs/pkgs/development/python-modules/opuslib/default.nix index 4ea7c8e7ba8f..d023c570bcbb 100644 --- a/nixpkgs/pkgs/development/python-modules/opuslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opuslib/default.nix @@ -28,6 +28,12 @@ buildPythonPackage rec { url = "https://github.com/orion-labs/opuslib/commit/8aee916e4da4b3183d49cff5a986dc2408076d8d.patch"; hash = "sha256-oa1HCFHNS3ejzSf0jxv9NueUKOZgdCtpv+xTrjYW5os="; }) + # https://github.com/orion-labs/opuslib/pull/25 + (fetchpatch { + name = "fix-tests-when-using-libopus-1.4.patch"; + url = "https://github.com/orion-labs/opuslib/commit/87a214fc98c1dcae38035e99fe8e279a160c4a52.patch"; + hash = "sha256-UoOafyTFvWLY7ErtBhkXTZSgbMZFrg5DGxjbhqEI7wo="; + }) (substituteAll { src = ./opuslib-paths.patch; opusLibPath = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/nixpkgs/pkgs/development/python-modules/oracledb/default.nix b/nixpkgs/pkgs/development/python-modules/oracledb/default.nix index b48f1110eefc..cd7f6ad1b8ff 100644 --- a/nixpkgs/pkgs/development/python-modules/oracledb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oracledb/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "1.3.0"; + version = "1.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8QWkcFkWoo0z4pGPo2NAl/6DVSv16oGvw6emhSjJ4vM="; + hash = "sha256-uzw5HBZ7V3jdsVp1OKKzbbXJuIpQyGxheByp/zArtkM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/nixpkgs/pkgs/development/python-modules/orjson/default.nix index dc081c385d6c..bdcd70526869 100644 --- a/nixpkgs/pkgs/development/python-modules/orjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orjson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.8.11"; + version = "3.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "ijl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TFoagWUtd/nJceNaptgPp4aTR/tBCmxpiZIVJwOlia4="; + hash = "sha256-uEwlrWPQbctCMiIz4fdXe2GDr2SSHaMzmYzzrECerxg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-/x+0/I3WFxPwVu2LliTgr42SuJX7VjOLe/SGai5OgAw="; + hash = "sha256-U/WenkO7ecZQOGEppBlLtlXGtbpbS7e+Ic1hg/AnKSk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/orm/default.nix b/nixpkgs/pkgs/development/python-modules/orm/default.nix index a1d738890b30..1b3ed285029f 100644 --- a/nixpkgs/pkgs/development/python-modules/orm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orm/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "An async ORM"; homepage = "https://github.com/encode/orm"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix b/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix index 5958d824d58d..a0996765cb6b 100644 --- a/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix @@ -7,11 +7,10 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { pname = "os-service-types-tests"; - inherit (os-service-types) version; - - src = os-service-types.src; + inherit (os-service-types) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix b/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix index b2a730928b8f..0540760e57a0 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix @@ -9,11 +9,10 @@ , testscenarios }: -buildPythonPackage rec { - pname = "oslo-config-tests"; - inherit (oslo-config) version; - - src = oslo-config.src; +buildPythonPackage { +pname = "oslo-config-tests"; + inherit (oslo-config) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix index 751160ed74fa..09b76eb27cb6 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "5.2.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "oslo.log"; @@ -48,6 +48,8 @@ buildPythonPackage rec { disabledTests = [ # not compatible with sandbox "test_logging_handle_error" + # File which is used doesn't seem not to be present + "test_log_config_append_invalid" ]; pythonImportsCheck = [ @@ -55,10 +57,10 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "oslo.log library"; homepage = "https://github.com/openstack/oslo.log"; license = licenses.asl20; maintainers = teams.openstack.members; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix b/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix index fb18e64bb9d9..f80073e1c1bd 100644 --- a/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix @@ -4,11 +4,10 @@ , stestr }: -buildPythonPackage rec { +buildPythonPackage { pname = "oslotest-tests"; - inherit (oslotest) version; - - src = oslotest.src; + inherit (oslotest) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/nixpkgs/pkgs/development/python-modules/packaging/default.nix index 408a3ba0c312..e77c715e45ab 100644 --- a/nixpkgs/pkgs/development/python-modules/packaging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/packaging/default.nix @@ -40,7 +40,7 @@ let description = "Core utilities for Python packages"; homepage = "https://github.com/pypa/packaging"; license = with licenses; [ bsd2 asl20 ]; - maintainers = with maintainers; [ bennofs SuperSandro2000 ]; + maintainers = with maintainers; [ bennofs ]; }; }; in diff --git a/nixpkgs/pkgs/development/python-modules/paddle-bfloat/default.nix b/nixpkgs/pkgs/development/python-modules/paddle-bfloat/default.nix new file mode 100644 index 000000000000..a1d6c591fcf2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/paddle-bfloat/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pythonAtLeast +, numpy +}: +let + pname = "paddle-bfloat"; + version = "0.1.7"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + pname = "paddle_bfloat"; + inherit version; + hash = "sha256-mrjQCtLsXOvqeHHMjuMx65FvMfZ2+wTh1ao9ZJE+9xw="; + }; + + postPatch = '' + sed '1i#include <memory>' -i bfloat16.cc # gcc12 + # replace deprecated function for python3.11 + substituteInPlace bfloat16.cc \ + --replace "Py_TYPE(&NPyBfloat16_Descr) = &PyArrayDescr_Type" "Py_SET_TYPE(&NPyBfloat16_Descr, &PyArrayDescr_Type)" + ''; + + disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "paddle_bfloat" ]; + +# upstream has no tests + doCheck = false; + + meta = with lib; { + description = "Paddle numpy bfloat16 package"; + homepage = "https://pypi.org/project/paddle-bfloat"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix b/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix new file mode 100644 index 000000000000..171940104444 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, python +, onnx +, isPy311 +}: +let + pname = "paddle2onnx"; + version = "1.0.6"; + format = "wheel"; + pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; + src = fetchPypi { + inherit pname version format; + dist = pyShortVersion; + python = pyShortVersion; + abi = pyShortVersion; + platform = "manylinux_2_12_x86_64.manylinux2010_x86_64"; + hash = "sha256-qHy6+RKh/gjy1mBmIj+1ENcHuIERkOeM6rrd5GNfX+Q="; + }; +in +buildPythonPackage { + inherit pname version src format; + + disabled = pythonOlder "3.8" || isPy311; + + propagatedBuildInputs = [ + onnx + ]; + + meta = with lib; { + description = "ONNX Model Exporter for PaddlePaddle"; + homepage = "https://github.com/PaddlePaddle/Paddle2ONNX"; + changelog = "https://github.com/PaddlePaddle/Paddle2ONNX/releases/tag/v${version}"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pamela/default.nix b/nixpkgs/pkgs/development/python-modules/pamela/default.nix index 7fd62dae2cd9..eb1ebff48137 100644 --- a/nixpkgs/pkgs/development/python-modules/pamela/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pamela/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pamela"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c"; + sha256 = "sha256-1LE5/mAOGS4Xaio2gFkgemv/oOeHmHmxP0/LoBY0gb4="; }; postUnpack = '' diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 68d925cc2a9f..d74c63b1030b 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -44,8 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ glibcLocales - # hypothesis indirectly depends on pandas to build its documentation - (hypothesis.override { enableDocumentation = false; }) + hypothesis jinja2 pytest-asyncio pytest-xdist diff --git a/nixpkgs/pkgs/development/python-modules/panel/default.nix b/nixpkgs/pkgs/development/python-modules/panel/default.nix index e2cd47fa47a8..0af1060b5d00 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/holoviz/panel"; changelog = "https://github.com/holoviz/panel/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/nixpkgs/pkgs/development/python-modules/papermill/default.nix index f1c26beaa64c..d5c2f3018d30 100644 --- a/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -84,6 +84,6 @@ buildPythonPackage rec { description = "Parametrize and run Jupyter and interact with notebooks"; homepage = "https://github.com/nteract/papermill"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/para/default.nix b/nixpkgs/pkgs/development/python-modules/para/default.nix new file mode 100644 index 000000000000..e1f3f828120f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/para/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "para"; + version = "0.0.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-RsMjKunY6p2IbP0IzdESiSICvthkX0C2JVWXukz+8hc="; + }; + + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "para" ]; + + meta = with lib; { + description = "A set utilities that ake advantage of python's 'multiprocessing' module to distribute CPU-intensive tasks"; + homepage = "https://pypi.org/project/para"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/param/default.nix b/nixpkgs/pkgs/development/python-modules/param/default.nix index a24e6aec8e1b..a37cf7c7f03d 100644 --- a/nixpkgs/pkgs/development/python-modules/param/default.nix +++ b/nixpkgs/pkgs/development/python-modules/param/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://param.holoviz.org/"; changelog = "https://github.com/holoviz/param/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/parameterized/default.nix b/nixpkgs/pkgs/development/python-modules/parameterized/default.nix index a6083836714b..fb08e07ec04b 100644 --- a/nixpkgs/pkgs/development/python-modules/parameterized/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parameterized/default.nix @@ -2,26 +2,36 @@ , buildPythonPackage , fetchPypi , mock -, nose , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "parameterized"; - version = "0.8.1"; - format = "setuptools"; + version = "0.9.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w="; + hash = "sha256-f8kFJyzvpPNkwaNCnLvpwPmLeTmI77W/kKrIDwjbCbE="; }; + postPatch = '' + # broken with pytest 7 + # https://github.com/wolever/parameterized/issues/167 + substituteInPlace parameterized/test.py \ + --replace 'assert_equal(missing, [])' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ mock - nose pytestCheckHook ]; @@ -29,14 +39,6 @@ buildPythonPackage rec { "parameterized/test.py" ]; - disabledTests = [ - # Tests seem outdated - "test_method" - "test_with_docstring_0_value1" - "test_with_docstring_1_v_l_" - "testCamelCaseMethodC" - ]; - pythonImportsCheck = [ "parameterized" ]; diff --git a/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix index a578566019aa..278556fe4885 100644 --- a/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. ''; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/parfive/default.nix b/nixpkgs/pkgs/development/python-modules/parfive/default.nix index 74d6d186bc2b..c30dc40891bd 100644 --- a/nixpkgs/pkgs/development/python-modules/parfive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parfive/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "A HTTP and FTP parallel file downloader"; homepage = "https://parfive.readthedocs.io/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/parver/default.nix b/nixpkgs/pkgs/development/python-modules/parver/default.nix index 925fa6febfa1..d69a9a54e501 100644 --- a/nixpkgs/pkgs/development/python-modules/parver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parver/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Allows parsing and manipulation of PEP 440 version numbers"; homepage = "https://github.com/RazerM/parver"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/patator/default.nix b/nixpkgs/pkgs/development/python-modules/patator/default.nix index 95bbc785db92..9083f197aae3 100644 --- a/nixpkgs/pkgs/development/python-modules/patator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/patator/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "Multi-purpose brute-forcer"; homepage = "https://github.com/lanjelot/patator"; license = licenses.gpl2Only; - maintainers = with maintainers; [ y0no SuperSandro2000 ]; + maintainers = with maintainers; [ y0no ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pathlib/default.nix b/nixpkgs/pkgs/development/python-modules/pathlib/default.nix index 4ec9da43a563..6bf24b8f15ef 100644 --- a/nixpkgs/pkgs/development/python-modules/pathlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathlib/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Object-oriented filesystem paths"; homepage = "https://pathlib.readthedocs.org/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix b/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix index 43eff770c1a3..b844a1528b5c 100644 --- a/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; homepage = "https://pypi.org/project/pathlib2/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pathy/default.nix b/nixpkgs/pkgs/development/python-modules/pathy/default.nix index feb347b797c7..5ec592d53a44 100644 --- a/nixpkgs/pkgs/development/python-modules/pathy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.10.1"; + version = "0.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TNbnG0zV/4dc+7lJrZ+lUZ2NHb5p1fwdGyOqPLBJYYs="; + hash = "sha256-ecVyq3/thNxGg3NG7a5YVlmS0Ed6eJzUaRpB2Oq5kX0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pbr/tests.nix b/nixpkgs/pkgs/development/python-modules/pbr/tests.nix index 47be8ef19f07..05266a0eb7df 100644 --- a/nixpkgs/pkgs/development/python-modules/pbr/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/pbr/tests.nix @@ -10,11 +10,10 @@ , virtualenv }: -buildPythonPackage rec { +buildPythonPackage { pname = "pbr"; - inherit (pbr) version; - - src = pbr.src; + inherit (pbr) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/nixpkgs/pkgs/development/python-modules/pdb2pqr/default.nix b/nixpkgs/pkgs/development/python-modules/pdb2pqr/default.nix new file mode 100644 index 000000000000..e7d6e462c622 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pdb2pqr/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pythonRelaxDepsHook +, mmcif-pdbx +, numpy +, propka +, requests +, docutils +, pytestCheckHook +, pandas +, testfixtures +}: + +buildPythonPackage rec { + pname = "pdb2pqr"; + version = "3.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wFak5tKOsPYRflBW8viWEjM6Cku5JkWB6mWVyINYh1g="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "docutils" + ]; + + propagatedBuildInputs = [ + mmcif-pdbx + numpy + propka + requests + docutils + ]; + + nativeCheckInputs = [ + pytestCheckHook + pandas + testfixtures + ]; + + disabledTests = [ + # these tests have network access + "test_short_pdb" + "test_basic_cif" + "test_long_pdb" + "test_ligand_biomolecule" + "test_log_output_in_pqr_location" + "test_propka_apo" + "test_propka_pka" + "test_basic" + ]; + + pythonImportsCheck = [ + "pdb2pqr" + ]; + + meta = with lib; { + description = "Software for determining titration states, adding missing atoms, and assigning charges/radii to biomolecules"; + homepage = "https://www.poissonboltzmann.org/"; + changelog = "https://github.com/Electrostatics/pdb2pqr/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix index 14f82b6ce3a9..19353e781a67 100644 --- a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.16.2"; + version = "1.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hnYQke7jX0ZB6pjf3bJUJUNh0Bi+aYoZmv98HTczGAM="; + hash = "sha256-dCCIEMLO9NnjR3abjmKlIwOYLdtPLf10THq0uUCuKH4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix b/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix new file mode 100644 index 000000000000..a4dbe9dfb184 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# build inputs +, pdfminer-six +, pillow +, wand +# check inputs +, pytestCheckHook +, pytest-cov +, pytest-parallel +, flake8 +, black +, isort +, pandas +, mypy +, pandas-stubs +, types-pillow +, jupyterlab +, nbexec +}: +let + pname = "pdfplumber"; + version = "0.9.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jsvine"; + repo = "pdfplumber"; + rev = "refs/tags/v${version}"; + hash = "sha256-cGTn1JTSp1YvksemjlvvToZcVauZ7GKINiNmG5f4zKg="; + }; + + propagatedBuildInputs = [ + pdfminer-six + pillow + wand + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + pytest-parallel + flake8 + black + isort + pandas + mypy + pandas-stubs + types-pillow + jupyterlab + nbexec + ]; + + pythonImportsCheck = [ + "pdfplumber" + ]; + + disabledTests = [ + # flaky + "test__repr_png_" + ]; + + meta = with lib; { + description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables."; + homepage = "https://github.com/jsvine/pdfplumber"; + changelog = "https://github.com/jsvine/pdfplumber/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix b/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix deleted file mode 100644 index e2f5211ecaf4..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pypdf2 }: - -buildPythonPackage rec { - pname = "pdftools.pdfposter"; - version = "0.8.1"; - format = "setuptools"; - - propagatedBuildInputs = [ pypdf2 ]; - - src = fetchPypi { - inherit pname version; - hash = "sha256-yWFtHgVKAWs4dRlSk8t8cB2KBJeBOa0Frh3BLR9txS0="; - }; - - pythonImportsCheck = [ - "pdftools.pdfposter" - "pdftools.pdfposter.cmd" - ]; - - meta = with lib; { - description = "Split large pages of a PDF into smaller ones for poster printing"; - homepage = "https://pdfposter.readthedocs.io"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ wamserma ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix b/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix index 19ba24ef6991..eb1d1f3df3a1 100644 --- a/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.0"; + version = "2.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-asW5L9jS++9ovq7WFh0rU7aB7R2rwi5ce80Hxk9NrI4="; + hash = "sha256-g8VL5nO180XplMgbbeeJIp6lmbWcMKdY/IftlkL6e5U="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pdoc/default.nix b/nixpkgs/pkgs/development/python-modules/pdoc/default.nix index cb3062b72971..fc9ce57cde03 100644 --- a/nixpkgs/pkgs/development/python-modules/pdoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdoc/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -14,17 +13,16 @@ buildPythonPackage rec { pname = "pdoc"; - version = "13.0.0"; - disabled = pythonOlder "3.7"; + version = "14.0.0"; + disabled = pythonOlder "3.8"; format = "pyproject"; - # the Pypi version does not include tests src = fetchFromGitHub { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-UzUAprvBimk2POi0QZdFuRWEeGDp+MLmdUYR0UiIubs="; + hash = "sha256-rMHp0diXvWIOyucuTAXO/IOljKhDYOZKtkih5+rUJCM="; }; nativeBuildInputs = [ @@ -42,13 +40,13 @@ buildPythonPackage rec { hypothesis ]; disabledTestPaths = [ - # "test_snapshots" tries to match generated output against stored snapshots. - # They are highly sensitive dep versions, which we unlike upstream do not pin. + # "test_snapshots" tries to match generated output against stored snapshots, + # which are highly sensitive to dep versions. "test/test_snapshot.py" ]; pytestFlagsArray = [ - ''-m "not slow"'' # skip tests marked slow + ''-m "not slow"'' # skip slow tests ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 3ae1a2149a65..eebea069de04 100644 --- a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "18.1.7"; + version = "19.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-inu0lTY2JQhlFEgJOejMhcHJhYvH6OzYo8qmAy9xBFo="; + hash = "sha256-Ju+vKKNmRCRLYSOXNmCdBR8Ce1Xw3BA7IMMCRBSFhKQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/nixpkgs/pkgs/development/python-modules/pecan/default.nix index c0954ec3ca31..1de099579de3 100644 --- a/nixpkgs/pkgs/development/python-modules/pecan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pecan/default.nix @@ -3,34 +3,35 @@ , buildPythonPackage , logutils , mako +, webob , webtest , pythonOlder , pytestCheckHook , genshi , gunicorn , jinja2 -, six , sqlalchemy , virtualenv +, setuptools }: buildPythonPackage rec { pname = "pecan"; - version = "1.4.2"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SbJV5wHD8UYWBfWw6PVPDCGSLXhF1BTCTdZAn+aV1VA="; + hash = "sha256-YGMnLV+GB3P7tLSyrhsJ2oyVQGLvhxFQwGz9sjkdk1U="; }; propagatedBuildInputs = [ logutils mako - webtest - six + webob + setuptools ]; nativeCheckInputs = [ @@ -40,20 +41,11 @@ buildPythonPackage rec { jinja2 sqlalchemy virtualenv + webtest ]; pytestFlagsArray = [ "--pyargs pecan" - # tests fail with sqlalchemy 2.0 - ] ++ lib.optionals (lib.versionAtLeast sqlalchemy.version "2.0") [ - # The 'sqlalchemy.orm.mapper()' function is removed as of SQLAlchemy - # 2.0. Use the 'sqlalchemy.orm.registry.map_imperatively()` method - # of the ``sqlalchemy.orm.registry`` class to perform classical - # mapping. - # https://github.com/pecan/pecan/issues/143 - "--deselect=pecan/tests/test_jsonify.py::TestJsonifySQLAlchemyGenericEncoder::test_result_proxy" - "--deselect=pecan/tests/test_jsonify.py::TestJsonifySQLAlchemyGenericEncoder::test_row_proxy" - "--deselect=pecan/tests/test_jsonify.py::TestJsonifySQLAlchemyGenericEncoder::test_sa_object" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix index 2ea6f43a0810..da6f60403c33 100644 --- a/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "peewee-migrate"; - version = "1.10.0"; + version = "1.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "klen"; repo = "peewee_migrate"; rev = "refs/tags/${version}"; - hash = "sha256-YDL7J/LmCRz6kRHQ0NrnVnvtS3rFkH08umjPI95mn6w="; + hash = "sha256-SBHeXHfhYjyXr+tODryKQfxZKy7l4ez5C6eU6FjS2qI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/peft/default.nix b/nixpkgs/pkgs/development/python-modules/peft/default.nix index 54b93e69f11e..8bd8b1a924f6 100644 --- a/nixpkgs/pkgs/development/python-modules/peft/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peft/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pytestCheckHook , setuptools , numpy , packaging @@ -15,16 +14,16 @@ buildPythonPackage rec { pname = "peft"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7j//SDuld2ANxEcG4R0rK5vEaTX7gQwWRH56PO2KqAY="; + hash = "sha256-riOCe43/2xUpE6TTCEpMndeFTbaBN4JFDlv90tqVO4Y="; }; nativeBuildInputs = [ setuptools ]; @@ -39,7 +38,7 @@ buildPythonPackage rec { accelerate ]; - doCheck = false; # tried to download pretrained model + doCheck = false; # tries to download pretrained models pythonImportsCheck = [ "peft" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pem/default.nix b/nixpkgs/pkgs/development/python-modules/pem/default.nix new file mode 100644 index 000000000000..3ef5b7ffc75c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pem/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, certifi +, cryptography +, pretend +, pyopenssl +, twisted +}: + +buildPythonPackage rec { + pname = "pem"; + version = "21.2.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hynek"; + repo = pname; + rev = version; + hash = "sha256-mftLdgtgb5J4zwsb1F/4v4K7XTy4VSZBMy3zPV2f1uA="; + }; + + nativeCheckInputs = [ + certifi + cryptography + pretend + pyopenssl + pytestCheckHook + twisted + twisted.optional-dependencies.tls + ]; + + pythonImportsCheck = [ + "pem" + ]; + + meta = with lib; { + homepage = "https://pem.readthedocs.io/"; + description = "Easy PEM file parsing in Python."; + license = licenses.mit; + maintainers = with maintainers; [ nyanotech ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/perfplot/default.nix b/nixpkgs/pkgs/development/python-modules/perfplot/default.nix index 574bffb88b6c..1dfc78ffca46 100644 --- a/nixpkgs/pkgs/development/python-modules/perfplot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/perfplot/default.nix @@ -1,12 +1,11 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , flit-core -, dufte , matplotlib +, matplotx , numpy -, pipdate -, tqdm , rich , pytestCheckHook , pythonOlder @@ -16,6 +15,7 @@ buildPythonPackage rec { pname = "perfplot"; version = "0.10.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -30,25 +30,29 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - dufte matplotlib + matplotx numpy - pipdate rich - tqdm ]; + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "perfplot" ]; + pythonImportsCheck = [ + "perfplot" + ]; meta = with lib; { description = "Performance plots for Python code snippets"; homepage = "https://github.com/nschloe/perfplot"; + changelog = "https://github.com/nschloe/perfplot/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; - broken = true; # missing matplotx dependency + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/persim/default.nix b/nixpkgs/pkgs/development/python-modules/persim/default.nix index 7cf199eee079..09feb66549a4 100644 --- a/nixpkgs/pkgs/development/python-modules/persim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/persim/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { homepage = "https://persim.scikit-tda.org"; changelog = "https://github.com/scikit-tda/persim/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/python-modules/persist-queue/default.nix b/nixpkgs/pkgs/development/python-modules/persist-queue/default.nix index 4a34e6e7eb72..6d29659f8ffd 100644 --- a/nixpkgs/pkgs/development/python-modules/persist-queue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/persist-queue/default.nix @@ -2,24 +2,26 @@ , buildPythonPackage , fetchPypi , pythonOlder -, msgpack , nose2 +, msgpack +, cbor2 }: buildPythonPackage rec { pname = "persist-queue"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vapNz8SyCpzh9cttoxFrbLj+N1J9mR/SQoVu8szNIY4="; + sha256 = "sha256-4ZONOsbZthaSwRX43crajZox8iUGeCWF45WIpB7Ppao="; }; disabled = pythonOlder "3.6"; nativeCheckInputs = [ - msgpack nose2 + msgpack + cbor2 ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index ec6a850eb826..cafca7c29e09 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.137"; + version = "2.1.141"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ywzmz2R1fdW6TzTEYHq0hfeQnmwkzUecoozlIgXw7es="; + hash = "sha256-EsIurZNgWslUciz5Pc2hj2F4tAJ8hQydRWnVIWdryDc="; }; nativeBuildInputs = [ @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/pantsbuild/pex"; changelog = "https://github.com/pantsbuild/pex/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; + maintainers = with maintainers; [ copumpkin phaer ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/nixpkgs/pkgs/development/python-modules/pglast/default.nix index b96c884d458b..0c0b611fbb06 100644 --- a/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.2"; + version = "5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zj7/WGECL5Ou4F2FdFaA3M9F92ETZbhEXbZJ628gg0o="; + hash = "sha256-fiNd+11hqMHgzSMNT7fgne3pTeJ4nu5krA48LCgIaIQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pgmpy/default.nix b/nixpkgs/pkgs/development/python-modules/pgmpy/default.nix new file mode 100644 index 000000000000..6fef789e9b40 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pgmpy/default.nix @@ -0,0 +1,78 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# build inputs +, networkx +, numpy +, scipy +, scikit-learn +, pandas +, pyparsing +, torch +, statsmodels +, tqdm +, joblib +, opt-einsum +# check inputs +, pytestCheckHook +, pytest-cov +, coverage +, mock +, black +}: +let + pname = "pgmpy"; + version = "0.1.23"; + # optional-dependencies = { + # all = [ daft ]; + # }; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pgmpy"; + repo = pname; + rev = "v${version}"; + hash = "sha256-4NY37Awhu2mnfZQ/biN1wa9rkGHhTxfZm0+V7D83NR0="; + }; + + propagatedBuildInputs = [ + networkx + numpy + scipy + scikit-learn + pandas + pyparsing + torch + statsmodels + tqdm + joblib + opt-einsum + ]; + + disabledTests = [ + "test_to_daft" # requires optional dependency daft + ]; + + nativeCheckInputs = [ + pytestCheckHook + # xdoctest + pytest-cov + coverage + mock + black + ]; + + meta = with lib; { + description = "Python Library for learning (Structure and Parameter), inference (Probabilistic and Causal), and simulations in Bayesian Networks"; + homepage = "https://github.com/pgmpy/pgmpy"; + changelog = "https://github.com/pgmpy/pgmpy/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pgvector/default.nix b/nixpkgs/pkgs/development/python-modules/pgvector/default.nix new file mode 100644 index 000000000000..89f3974d4069 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pgvector/default.nix @@ -0,0 +1,62 @@ +{ lib +, asyncpg +, buildPythonPackage +, django +, fetchFromGitHub +, numpy +, postgresql +, postgresqlTestHook +, psycopg +, psycopg2 +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "pgvector"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pgvector"; + repo = "pgvector-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-VcV/WyDY1UN2TcuvNRQRIh5YIlewGQXf6fcTZihvftQ="; + }; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + asyncpg + django + (postgresql.withPackages (p: with p; [ pgvector ])) + postgresqlTestHook + psycopg + psycopg2 + pytest-asyncio + pytestCheckHook + sqlalchemy + ]; + + env = { + PGDATABASE = "pgvector_python_test"; + postgresqlEnableTCP = 1; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + }; + + pythonImportsCheck = [ "pgvector" ]; + + meta = with lib; { + description = "Pgvector support for Python"; + homepage = "https://github.com/pgvector/pgvector-python"; + changelog = "https://github.com/pgvector/pgvector-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 27e5cc16511f..976fd81f6cfd 100644 --- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.11"; + version = "8.13.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PjJ02IyrNgm1X/W5NBcHXbyi0TBk8QP79WLg6h3aD5o="; + hash = "sha256-s2DHViUoBdRLRHtbym0lDPa9bGm28PQljzv+Wrgb72k="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/nixpkgs/pkgs/development/python-modules/phonopy/default.nix index 0350be43ff70..9007c3eec672 100644 --- a/nixpkgs/pkgs/development/python-modules/phonopy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonopy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.19.1"; + version = "2.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ObQuPCDjpjjz4mq831IsU0muNMlDZVoNFAX6PUCTVbU="; + hash = "sha256-peL50b1u+tBRxt/U2SloRvS9LTeMXEjrF5F3ZWhJmZ4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix b/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix index 8975be61f1b8..0e14d34151a0 100644 --- a/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Factory and registry pattern for Python classes"; homepage = "https://class-registry.readthedocs.io/en/latest/"; license = licenses.mit; - maintainers = with maintainers; [ kevincox SuperSandro2000 ]; + maintainers = with maintainers; [ kevincox ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix b/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix index 4b60c649fe9c..fa6c63378625 100644 --- a/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.15.0"; + version = "0.16.1"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-8VxkrzADp3yCeb02BxtT6oSP1FCX8GW4oc6OECK2hJw="; + hash = "sha256-4VOJ7l6tBhMBZ2x+T5Bl5WdnMg4JEBkwaGDA/9XUmc8="; }; propagatedBuildInputs = [ @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Clean and modern Sphinx theme"; homepage = "https://piccolo-theme.readthedocs.io"; - license = licenses.mit; + license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ loicreynier ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/python-modules/picosvg/default.nix b/nixpkgs/pkgs/development/python-modules/picosvg/default.nix new file mode 100644 index 000000000000..a04479cfb414 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/picosvg/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, setuptools-scm +, absl-py +, lxml +, skia-pathops +, pytestCheckHook +}: +buildPythonPackage rec { + pname = "picosvg"; + version = "0.22.0"; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = pname; + rev = "v${version}"; + hash = "sha256-J06ijF1c3ZKPqKiQha6yqfj8EjFZoZzA6i6UCCrexi8="; + }; + + patches = [ + # see https://github.com/googlefonts/picosvg/issues/299 + # this patch fixed a failing test case after the update to skia-pathops 0.8 + # as soon as skia-pathops in nixpkgs is updated to 0.8, this patch should be removed + (fetchpatch { + url = "https://github.com/googlefonts/picosvg/commit/4e971ed6cd9afb412b2845d29296a0c24f086562.patch"; + hash = "sha256-OZEipNPCSuuqcy4XggBiuGv4HN604dI4N9wlznyAwF0="; + revert = true; + }) + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + absl-py + lxml + skia-pathops + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # a few tests are failing on aarch64 + doCheck = !stdenv.isAarch64; + + meta = with lib; { + description = "Tool to simplify SVGs"; + homepage = "https://github.com/googlefonts/picosvg"; + license = licenses.asl20; + maintainers = with maintainers; [ _999eagle ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix index 746496ff2855..4573e25a22b2 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix @@ -32,6 +32,6 @@ import ../pillow/generic.nix (rec { Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. ''; license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } // args ) diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index 6dc894c0a4ca..b3ff63b1fb93 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook @@ -12,7 +13,7 @@ import ./generic.nix (rec { pname = "pillow"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,9 +21,17 @@ import ./generic.nix (rec { src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-ocLXeARI65P7zDeJvzkWqlcg2ULjeUX0BWaAMX8c0j4="; + hash = "sha256-v1SEedM2cm16Ds6252fhefveN4M65CeUYCYxoHDWMPE="; }; + patches = [ + (fetchpatch { + # Fixed type handling for include and lib directories; Remove with 10.0.0 + url = "https://github.com/python-pillow/Pillow/commit/0ec0a89ead648793812e11739e2a5d70738c6be5.patch"; + hash = "sha256-m5R5fLflnbJXbRxFlTjT2X3nKdC05tippMoJUDsJmy0="; + }) + ]; + passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; @@ -37,6 +46,6 @@ import ./generic.nix (rec { processing and graphics capabilities. ''; license = licenses.hpnd; - maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; + maintainers = with maintainers; [ goibhniu prikhi ]; }; } // args ) diff --git a/nixpkgs/pkgs/development/python-modules/pims/default.nix b/nixpkgs/pkgs/development/python-modules/pims/default.nix index 307ed7bc1cbc..5de3ec424f60 100644 --- a/nixpkgs/pkgs/development/python-modules/pims/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pims/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/soft-matter/pims"; changelog = "https://github.com/soft-matter/pims/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix b/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix index dccde0b41895..84f3798df846 100644 --- a/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix @@ -13,11 +13,11 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "2.2.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-CHjcruRHxGyNGz1xyFRonap+VI5QCaFxeAkHx9TnR4k="; + hash = "sha256-OR/kE3VO/U4O8AFUtEJx1jxM3Uvt8IjSMRGlcl2GMhA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ping3/default.nix b/nixpkgs/pkgs/development/python-modules/ping3/default.nix new file mode 100644 index 000000000000..c5dd49ba0d59 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ping3/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, setuptools +, wheel +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ping3"; + version = "4.0.4"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HqEqz2dS1GZmFjQf18Y5PGZM/8UQxpPvBvc2+yZ6E7o="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "ping3" ]; + + meta = with lib; { + description = "A pure python3 version of ICMP ping implementation using raw socket"; + homepage = "https://pypi.org/project/ping3"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix index 18e497f00f41..a4dd78a557e6 100644 --- a/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix @@ -2,24 +2,22 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , setuptools , pint , pandas , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "pint-pandas"; - # Latest release contains bugs and failing tests. - version = "unstable-2022-11-24"; + version = "0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "hgrecco"; repo = "pint-pandas"; - rev = "c58a7fcf9123eb65f5e78845077b205e20279b9d"; - hash = "sha256-gMZNJSJxtSZvgU4o71ws5ZA6tgD2M5c5oOrn62DRyMI="; + rev = version; + hash = "sha256-FuH6wksSCkkL2AyQN46hwTnfeAZFwkWRl6KEEhsxmUY="; }; nativeBuildInputs = [ @@ -36,7 +34,7 @@ buildPythonPackage { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "Pandas support for pint"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint-pandas"; diff --git a/nixpkgs/pkgs/development/python-modules/pint/default.nix b/nixpkgs/pkgs/development/python-modules/pint/default.nix index 8873b27d5e7d..2259ecf655d7 100644 --- a/nixpkgs/pkgs/development/python-modules/pint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pint/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Physical quantities module"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; - maintainers = with maintainers; [ costrouc doronbehar ]; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pipdate/default.nix b/nixpkgs/pkgs/development/python-modules/pipdate/default.nix index 4d241e87e1c0..172401620a59 100644 --- a/nixpkgs/pkgs/development/python-modules/pipdate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipdate/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "pip update helpers"; homepage = "https://github.com/nschloe/pipdate"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix b/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix index 5dffc381c586..43d99563a47c 100644 --- a/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.7.1"; + version = "2.12.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-EJVmekODfxaFyLGHQQWiqp2lSTQ4rWZ8E39T0ZV4e3s="; + hash = "sha256-4qRMET04JLVuDRfQtv/uQquf76iU00rnsWNaUXj1Gfw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -54,6 +54,11 @@ buildPythonPackage rec { "pipdeptree" ]; + disabledTests = [ + # Don't run console tests + "test_console" + ]; + meta = with lib; { description = "Command line utility to show dependency tree of packages"; homepage = "https://github.com/tox-dev/pipdeptree"; diff --git a/nixpkgs/pkgs/development/python-modules/piper-phonemize/default.nix b/nixpkgs/pkgs/development/python-modules/piper-phonemize/default.nix new file mode 100644 index 000000000000..cd09567a61e3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/piper-phonemize/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, onnxruntime-native +, piper-phonemize-native +, pybind11 +, setuptools +}: + +buildPythonPackage { + inherit (piper-phonemize-native) pname version src; + format = "pyproject"; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + buildInputs = [ + onnxruntime-native + piper-phonemize-native + piper-phonemize-native.espeak-ng + ]; + + pythonImportsCheck = [ + "piper_phonemize" + ]; + + # no tests + doCheck = false; + + meta = { + description = "Phonemization libary used by Piper text to speech system"; + inherit (piper-phonemize-native.meta) homepage license maintainers; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix b/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix index c0187f4838f7..b6a7b74701cb 100644 --- a/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix @@ -4,7 +4,6 @@ , pillow , poetry-core , pytest-benchmark -, pytest-mypy , pytestCheckHook , pythonOlder }: @@ -31,13 +30,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pillow pytest-benchmark - pytest-mypy pytestCheckHook ]; pytestFlagsArray = [ - # Incompatible types in assignment - #"--mypy" "--benchmark-disable" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix index d5b5815c3bb3..b5fc0c4499c9 100644 --- a/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Interface Python with pkg-config"; homepage = "https://github.com/matze/pkgconfig"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/nixpkgs/pkgs/development/python-modules/pkgutil-resolve-name/default.nix new file mode 100644 index 000000000000..d70cfd1c4345 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchPypi +, lib +, nix-update-script +, pythonOlder +}: +buildPythonPackage rec { + pname = "pkgutil-resolve-name"; + version = "1.3.10"; + format = "flit"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "pkgutil_resolve_name"; + inherit version; + hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; + }; + + # has no tests + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://pypi.org/project/pkgutil_resolve_name/"; + description = "A backport of Python 3.9’s pkgutil.resolve_name."; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 37223e779801..648d04ddf7fc 100644 --- a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "13.0.0"; + version = "15.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-xe0HK6S612q/DiNLGpBqhfTg1RVvzeeez5Y0ot/+Tqk="; + hash = "sha256-NJCU82Q19X1fApYcbP+ZAxf76uwAnSnhch4aBer9Nm4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix b/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix index 1c43c1d6d79e..7ba83b6b9fbc 100644 --- a/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.9.1"; + version = "3.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5+l3JkK/8S1KFXqa0++l3mIQ2KCpHe9+DiVqasBAZA0="; + hash = "sha256-k4Xs1w/26QAfNdJY6P1gpJkBzg/tWi7vDFKZi7naVHo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix b/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix index c807faff9d0b..9d2deb68d442 100644 --- a/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "3.0.0"; + version = "3.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RiZ26BGqS8nN5qHpUt7LIXSck/cGM8qlet3uL81TyPo="; + hash = "sha256-/qi22jiF+P7XcG/D+dxoOrHk89amdBoGewrTqZZOsoM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/playwright/default.nix b/nixpkgs/pkgs/development/python-modules/playwright/default.nix index bdd7846c7623..1c64471778a6 100644 --- a/nixpkgs/pkgs/development/python-modules/playwright/default.nix +++ b/nixpkgs/pkgs/development/python-modules/playwright/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.34.0"; + version = "1.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "v${version}"; - hash = "sha256-GIxMVuSSJsRDsHDOPnJsDsTcghGYtIFpRS5u7HJd+zY="; + hash = "sha256-/umpMkD+WEpBmw2cRb71PtOMd1sRNfwmURKdaRy4Qsc="; }; patches = [ @@ -94,7 +94,7 @@ buildPythonPackage rec { description = "Python version of the Playwright testing and automation library"; homepage = "https://github.com/microsoft/playwright-python"; license = licenses.asl20; - maintainers = with maintainers; [ techknowlogick yrd SuperSandro2000 ]; + maintainers = with maintainers; [ techknowlogick yrd ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 3ce2567a34ff..7c7d36167fea 100644 --- a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -8,7 +8,6 @@ , freezegun , jsonpickle , munch -, mypy , pyserial , pytest-aiohttp , pytest-asyncio @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.31.5"; + version = "0.31.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-gQNVHotuOur4J61QYmqFHJPZbZGifEzTI9Vh2rS1d5c="; + hash = "sha256-IRetWNKVzWsrHOphdgV5xmdiubwDx8KOUA7x+BmTt9A="; }; propagatedBuildInputs = [ @@ -48,7 +47,6 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun jsonpickle - mypy pytest-aiohttp pytest-asyncio pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 5418d449f44e..625cd6ab9148 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -56,6 +56,8 @@ buildPythonPackage rec { "poetry_dynamic_versioning" ]; + setupHook = ./setup-hook.sh; + meta = with lib; { description = "Plugin for Poetry to enable dynamic versioning based on VCS tags"; homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning"; diff --git a/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/setup-hook.sh b/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/setup-hook.sh new file mode 100644 index 000000000000..1e1befa8eb16 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/setup-hook.sh @@ -0,0 +1,8 @@ +version-pretend-hook() { + echo "Setting POETRY_DYNAMIC_VERSIONING_BYPASS to $version" + export POETRY_DYNAMIC_VERSIONING_BYPASS=$version +} + +if [ -z "${dontBypassPoetryDynamicVersioning-}" ]; then + preBuildHooks+=(version-pretend-hook) +fi diff --git a/nixpkgs/pkgs/development/python-modules/poetry-plugin-export/default.nix b/nixpkgs/pkgs/development/python-modules/poetry-plugin-export/default.nix deleted file mode 100644 index d712dacff7cd..000000000000 --- a/nixpkgs/pkgs/development/python-modules/poetry-plugin-export/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -}: - -buildPythonPackage rec { - pname = "poetry-plugin-export"; - version = "1.3.1"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "python-poetry"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-zA5YHZ3/iVoNf2AKqkrKVDYJIoJh+FMwuoskWHutG5I="; - }; - - postPatch = '' - sed -i '/poetry =/d' pyproject.toml - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - # infinite recursion with poetry - doCheck = false; - pythonImportsCheck = []; - - meta = with lib; { - changelog = "https://github.com/python-poetry/poetry-plugin-export/blob/${src.rev}/CHANGELOG.md"; - description = "Poetry plugin to export the dependencies to various formats"; - license = licenses.mit; - homepage = "https://github.com/python-poetry/poetry-plugin-export"; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock b/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock index ee02705f3555..cb2615304449 100644 --- a/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock +++ b/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock @@ -86,8 +86,9 @@ dependencies = [ [[package]] name = "arrow2" -version = "0.17.0" -source = "git+https://github.com/ritchie46/arrow2?branch=polars_2023-04-29#0a711a1a371edba0fa0f18c61e16bbf8096a3dcc" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15ae0428d69ab31d7b2adad22a752d6f11fef2e901d2262d0cad4f5cb08b7093" dependencies = [ "ahash", "arrow-format", @@ -104,8 +105,6 @@ dependencies = [ "futures", "getrandom", "hash_hasher", - "indexmap", - "json-deserializer", "lexical-core", "lz4", "multiversion", @@ -139,7 +138,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -150,7 +149,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -184,9 +183,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" [[package]] name = "bitflags" @@ -228,9 +227,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" @@ -249,16 +248,10 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -331,9 +324,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -342,31 +335,21 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] name = "comfy-table" version = "6.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -487,60 +470,6 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" -dependencies = [ - "quote", - "syn 2.0.15", -] - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] name = "dyn-clone" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -584,9 +513,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -672,7 +601,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -706,15 +635,6 @@ dependencies = [ ] [[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] name = "getrandom" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -735,7 +655,7 @@ checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -765,11 +685,10 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "halfbrown" -version = "0.1.18" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2a3c70a9c00cc1ee87b54e89f9505f73bb17d63f1b25c9a462ba8ef885444f" +checksum = "f985624e90f861184145c13b736873a0f83cdb998a292dbb0653598ab03aecbf" dependencies = [ - "fxhash", "hashbrown 0.13.2", "serde", ] @@ -819,11 +738,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "home" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -842,12 +761,11 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -888,11 +806,10 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7741301a6d6a9b28ce77c0fb77a4eb116b6bc8f3bef09923f7743d059c4157d3" +checksum = "e0539b5de9241582ce6bd6b0ba7399313560151e58c9aaf8b74b711b1bdce644" dependencies = [ - "ctor", "ghost", ] @@ -939,23 +856,14 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] [[package]] -name = "json-deserializer" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f63b421e16eb4100beb677af56f0b4f3a4f08bab74ef2af079ce5bb92c2683f" -dependencies = [ - "indexmap", -] - -[[package]] name = "jsonpath_lib" version = "0.3.0" source = "git+https://github.com/ritchie46/jsonpath?branch=improve_compiled#24eaf0b4416edff38a4d1b6b17bc4b9f3f047b4b" @@ -1040,15 +948,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libflate" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -1078,15 +986,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a558e3d911bc3c7bfc8c78bc580b404d6e51c1cefbf656e176a94b49b0df40" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" dependencies = [ "cc", "libc", @@ -1094,9 +1002,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -1105,15 +1013,6 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] name = "lock_api" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1154,10 +1053,11 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb99c395ae250e1bf9133673f03ca9f97b7e71b705436bf8f089453445d1e9fe" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] @@ -1187,18 +1087,18 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d88dad3f985ec267a3fcb7a1726f5cb1a7e8cad8b646e70a84f967210df23da" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" dependencies = [ "libmimalloc-sys", ] [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1212,14 +1112,14 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "multiversion" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a87eede2251ca235e5573086d01d2ab6b59dfaea54c2be10f9320980f7e8f7" +checksum = "8cda45dade5144c2c929bf2ed6c24bebbba784e9198df049ec87d722b9462bd1" dependencies = [ "multiversion-macros", "target-features", @@ -1227,9 +1127,9 @@ dependencies = [ [[package]] name = "multiversion-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af1abf82261d780d114014eff4b555e47d823f3b84f893c4388572b40e089fb" +checksum = "04bffdccbd4798b61dce08c97ce8c66a68976f95541aaf284a6e90c1d1c306e1" dependencies = [ "proc-macro2", "quote", @@ -1373,7 +1273,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1471,9 +1371,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "planus" @@ -1486,7 +1386,7 @@ dependencies = [ [[package]] name = "polars" -version = "0.28.0" +version = "0.30.0" dependencies = [ "getrandom", "polars-core", @@ -1500,7 +1400,7 @@ dependencies = [ [[package]] name = "polars-algo" -version = "0.28.0" +version = "0.30.0" dependencies = [ "polars-core", "polars-lazy", @@ -1509,9 +1409,10 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", + "atoi", "chrono", "chrono-tz", "hashbrown 0.13.2", @@ -1524,7 +1425,7 @@ dependencies = [ [[package]] name = "polars-core" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "arrow2", @@ -1557,7 +1458,7 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", "regex", @@ -1566,7 +1467,7 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "arrow2", @@ -1587,6 +1488,7 @@ dependencies = [ "polars-arrow", "polars-core", "polars-error", + "polars-json", "polars-time", "polars-utils", "rayon", @@ -1599,8 +1501,24 @@ dependencies = [ ] [[package]] +name = "polars-json" +version = "0.30.0" +dependencies = [ + "ahash", + "arrow2", + "fallible-streaming-iterator", + "hashbrown 0.13.2", + "indexmap", + "num-traits", + "polars-arrow", + "polars-error", + "polars-utils", + "simd-json", +] + +[[package]] name = "polars-lazy" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "bitflags", @@ -1609,6 +1527,7 @@ dependencies = [ "polars-arrow", "polars-core", "polars-io", + "polars-json", "polars-ops", "polars-pipe", "polars-plan", @@ -1621,7 +1540,7 @@ dependencies = [ [[package]] name = "polars-ops" -version = "0.28.0" +version = "0.30.0" dependencies = [ "argminmax", "arrow2", @@ -1632,6 +1551,7 @@ dependencies = [ "memchr", "polars-arrow", "polars-core", + "polars-json", "polars-utils", "serde", "serde_json", @@ -1640,7 +1560,7 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.28.0" +version = "0.30.0" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -1660,7 +1580,7 @@ dependencies = [ [[package]] name = "polars-plan" -version = "0.28.0" +version = "0.30.0" dependencies = [ "ahash", "arrow2", @@ -1682,7 +1602,7 @@ dependencies = [ [[package]] name = "polars-row" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", "polars-error", @@ -1691,7 +1611,7 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.28.0" +version = "0.30.0" dependencies = [ "polars-arrow", "polars-core", @@ -1704,7 +1624,7 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.28.0" +version = "0.30.0" dependencies = [ "arrow2", "atoi", @@ -1723,8 +1643,10 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.28.0" +version = "0.30.0" dependencies = [ + "ahash", + "hashbrown 0.13.2", "once_cell", "rayon", "smartstring", @@ -1739,16 +1661,16 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] [[package]] name = "py-polars" -version = "0.17.11" +version = "0.18.0" dependencies = [ "ahash", "built", @@ -1840,9 +1762,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -1926,13 +1848,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6cf59af1067a3fb53fbe5c88c053764e930f932be1d71d3ffe032cbe147f59" +checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.0", + "regex-syntax 0.7.2", ] [[package]] @@ -1943,9 +1865,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6868896879ba532248f33598de5181522d8b3d9d724dfd230911e1a7d4822f5" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "rle-decode-fast" @@ -1987,12 +1909,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] name = "semver" version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2009,22 +1925,22 @@ checksum = "e6b44e8fc93a14e66336d230954dda83d18b4605ccace8fe09bc7514a71ad0bc" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2071,11 +1987,14 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.7.0" -source = "git+https://github.com/ritchie46/simd-json?branch=alignment#cbd37361769d900620944618a39123f37edf3d83" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b001e6c10fcba79ac15990241d37c3f8c6ba4f9a14ee35fcebc0c067514b83a" dependencies = [ + "ahash", "halfbrown", "lexical-core", + "once_cell", "serde", "serde_json", "simdutf8", @@ -2139,9 +2058,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67dc6ef36edb658196c3fef0464a80b53dbbc194a904e81f9bd4190f9ecc5b" +checksum = "37d3706eefb17039056234df6b566b0014f303f867f2656108334a55b8096f59" dependencies = [ "log", ] @@ -2205,9 +2124,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -2216,9 +2135,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" +checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1" dependencies = [ "cfg-if", "core-foundation-sys", @@ -2230,24 +2149,15 @@ dependencies = [ [[package]] name = "target-features" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24840de800c1707d75c800893dbd727a5e1501ce921944e602f0698167491e36" +checksum = "06f6b473c37f9add4cf1df5b4d66a8ef58ab6c895f1a3b3f949cf3e21230140e" [[package]] name = "target-lexicon" -version = "0.12.6" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "thiserror" @@ -2266,7 +2176,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2297,16 +2207,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "libc", "mio", "pin-project-lite", "socket2", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2364,9 +2274,9 @@ dependencies = [ [[package]] name = "value-trait" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995de1aa349a0dc50f4aa40870dce12961a30229027230bad09acd2843edbe9e" +checksum = "09a5b6c8ceb01263b969cac48d4a6705134d490ded13d889e52c0cfc80c6945e" dependencies = [ "float-cmp", "halfbrown", @@ -2400,9 +2310,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2410,24 +2320,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -2437,9 +2347,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2447,22 +2357,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "wasm-timer" @@ -2481,9 +2391,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -2506,15 +2416,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2539,6 +2440,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/nixpkgs/pkgs/development/python-modules/polars/default.nix b/nixpkgs/pkgs/development/python-modules/polars/default.nix index 2a1a9d85ff08..49d23e2d07e0 100644 --- a/nixpkgs/pkgs/development/python-modules/polars/default.nix +++ b/nixpkgs/pkgs/development/python-modules/polars/default.nix @@ -6,15 +6,16 @@ , libiconv , fetchFromGitHub , typing-extensions +, darwin }: let pname = "polars"; - version = "0.17.11"; + version = "0.18.0"; # Can't update to >0.18.0 until we get rust 1.71 rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-zNp/77an9daUfHQ+HCaHtZzaq0TT9F+8aH3abrF7+YA="; + hash = "sha256-uzo8KPEegaVuzrfKUmsHheQfmm9hVMgkNJMWdfqDrw8="; }; in buildPythonPackage { @@ -27,16 +28,14 @@ buildPythonPackage { # thus the `sed` command # Make sure to check that the right substitutions are made when updating the package preBuild = '' - cd py-polars - #sed -i 's/version = "0.17.11"/version = "${version}"/g' Cargo.lock + cd py-polars + #sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock ''; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "arrow2-0.17.0" = "sha256-jjrwTP+ZKem9lyrmAWJ+t9cZBkGqAR1VlgNFXDtx1LA="; "jsonpath_lib-0.3.0" = "sha256-NKszYpDGG8VxfZSMbsTlzcMGFHBOUeFojNw4P2wM3qk="; - "simd-json-0.7.0" = "sha256-tlz6my4vhUQIArPonJml8zIyk1sbbDSORKp3cmPUUSI="; }; }; cargoRoot = "py-polars"; @@ -48,7 +47,10 @@ buildPythonPackage { nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + ]; pythonImportsCheck = [ "polars" ]; # nativeCheckInputs = [ @@ -62,7 +64,6 @@ buildPythonPackage { # ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; homepage = "https://github.com/pola-rs/polars"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix b/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix index bfb804911084..af6c1295bfa9 100644 --- a/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.6"; + version = "0.12.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "policy_sentry"; rev = "refs/tags/${version}"; - hash = "sha256-odtMbPHty3NUqz+4UAw+8dsK6AMZer41/BAX8cK5Rek="; + hash = "sha256-r2UQrMmgWaS1v8ZSFSvpwiSRdGw5uTAoWIlSbzrG6/g="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix b/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix index 85fe94458f0a..7dd625b83c62 100644 --- a/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.1.20230608"; + version = "1.5.1.20230725"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q0Btbo5jznv3mUXh5SjVU7SmdxFpPkiVe/ZNY+lzUCg="; + hash = "sha256-N0yQSVgSYx2D5wpixBMrxPq8ddKcGr/vfnsGn+Smrac="; }; # Tests are not shipped and there are no GitHub tags diff --git a/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/nixpkgs/pkgs/development/python-modules/pontos/default.nix index 5abcf106ce06..bc61bfb7395a 100644 --- a/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.6.0"; + version = "23.7.7"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NWhDKcxA4lFOPLYH12FGqfsErIKp+Lsrjy0adFIKEWc="; + hash = "sha256-qaeVQQmgEfuQ46us2l74W2yWZnUzePyT8+f5JQR0RdM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix b/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix index c2bbeab96daa..06c0e7a6e6ee 100644 --- a/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix @@ -10,27 +10,19 @@ , poppler , pkg-config , setuptools -, fetchpatch }: buildPythonPackage rec { pname = "python-poppler-qt5"; - version = "21.1.0"; + version = "21.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0b82gm4i75q5v19kfbq0h4y0b2vcwr2213zkhxh6l0h45kdndmxd"; + sha256 = "sha256-tHfohB8OoOCf2rby8wXPON+XfZ4ULlaTo3RgXXXdb+A="; }; - patches = [ - # Fix for https://github.com/frescobaldi/python-poppler-qt5/issues/43 (from PR #45) - (fetchpatch { - url = "https://github.com/frescobaldi/python-poppler-qt5/commit/40e71ad88173d02648bceb2438bc0567e60dacd5.patch"; - sha256 = "0c93d0k7b1n2s2njl8g92x6vw3z96da1fczah9qx07x08iw8dzi5"; - }) - ]; buildInputs = [ qtbase.dev poppler pyqt-builder ]; nativeBuildInputs = [ pkg-config qmake sip setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/portalocker/default.nix b/nixpkgs/pkgs/development/python-modules/portalocker/default.nix index 6742b989c292..34845722ce4f 100644 --- a/nixpkgs/pkgs/development/python-modules/portalocker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/portalocker/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytest-mypy , pythonOlder , redis }: @@ -25,7 +24,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-mypy ]; disabledTests = [ @@ -41,6 +39,5 @@ buildPythonPackage rec { homepage = "https://github.com/WoLpH/portalocker"; license = licenses.psfl; maintainers = with maintainers; [ jonringer ]; - platforms = platforms.unix; # Windows has a dependency on pypiwin32 }; } diff --git a/nixpkgs/pkgs/development/python-modules/posthog/default.nix b/nixpkgs/pkgs/development/python-modules/posthog/default.nix new file mode 100644 index 000000000000..d6136cf71723 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/posthog/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# build inputs +, requests +, six +, monotonic +, backoff +, python-dateutil +# check inputs +, pytestCheckHook +, mock +, freezegun +}: +let + pname = "posthog"; + version = "3.0.1"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "PostHog"; + repo = "posthog-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-GSHsa05DUcbIHg1HCoIn8d4NZoG+Iddqfgod2nP4fX0="; + }; + + propagatedBuildInputs = [ + requests + six + monotonic + backoff + python-dateutil + ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + freezegun + ]; + + pythonImportsCheck = [ + "posthog" + ]; + + disabledTests = [ + "test_load_feature_flags_wrong_key" + # Tests require network access + "test_request" + "test_upload" + ]; + + meta = with lib; { + description = "Official PostHog python library"; + homepage = "https://github.com/PostHog/posthog-python"; + changelog = "https://github.com/PostHog/posthog-python/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/potentials/default.nix b/nixpkgs/pkgs/development/python-modules/potentials/default.nix index 87c374fd533e..4cad316d2a66 100644 --- a/nixpkgs/pkgs/development/python-modules/potentials/default.nix +++ b/nixpkgs/pkgs/development/python-modules/potentials/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "0.3.6"; + version = "0.3.7"; pname = "potentials"; format = "setuptools"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-VEPGa3Wp+B3KterfA5XGjaDf6sIAkSST0GWdeqaJcE0="; + hash = "sha256-vkrNVRf9ntYSpf8nXmAmGjc+sQ4iFllisYHd9s+uQv0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ppft/default.nix b/nixpkgs/pkgs/development/python-modules/ppft/default.nix index 1dce18366b76..3a868d78d86d 100644 --- a/nixpkgs/pkgs/development/python-modules/ppft/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ppft/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.7.6.6"; + version = "1.7.6.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE="; + hash = "sha256-qzRDaBTi8YI481aI/YabJkGy0tjcoiuNJG9nAd/JVMg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pq/default.nix b/nixpkgs/pkgs/development/python-modules/pq/default.nix index 37cd041424cd..320c264acaac 100644 --- a/nixpkgs/pkgs/development/python-modules/pq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pq/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "PQ is a transactional queue for PostgreSQL"; homepage = "https://github.com/malthe/pq/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/prance/default.nix b/nixpkgs/pkgs/development/python-modules/prance/default.nix index 25ceb1259c5f..572e1efceb67 100644 --- a/nixpkgs/pkgs/development/python-modules/prance/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prance/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; homepage = "https://github.com/RonnyPfannschmidt/prance"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/praw/default.nix b/nixpkgs/pkgs/development/python-modules/praw/default.nix index a554ceec910d..0ce6027c1bfe 100644 --- a/nixpkgs/pkgs/development/python-modules/praw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/praw/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "praw"; - version = "7.7.0"; + version = "7.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "praw-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-reJW1M1yDSQ1SvZJeOc0jwHj6ydl1AmMl5VZqRHxXZA="; + hash = "sha256-L7wTHD/ypXVc8GMfl9u16VNb9caLJoXpaMEIzaVVUgo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/primer3/default.nix b/nixpkgs/pkgs/development/python-modules/primer3/default.nix index 6a82ba130a7f..84068a9d9671 100644 --- a/nixpkgs/pkgs/development/python-modules/primer3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/primer3/default.nix @@ -5,30 +5,42 @@ , cython , gcc , click +, pythonOlder }: buildPythonPackage rec { pname = "primer3"; - version = "1.0.0"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "libnano"; repo = "primer3-py"; rev = "refs/tags/v${version}"; - hash = "sha256-o9B8TN3mOchOO7dz34mI3NDtIhHSlA9+lMNsYcxhTE0="; + hash = "sha256-Ku2PVrWYWPKnNXeUQmstQedJg1O0hsQl4/iEnAMMEaY="; }; - nativeBuildInputs = [ cython ] - ++ lib.optionals stdenv.isDarwin [ gcc ]; + nativeBuildInputs = [ + cython + ] ++ lib.optionals stdenv.isDarwin [ + gcc + ]; # pytestCheckHook leads to a circular import issue - nativeCheckInputs = [ click ]; + nativeCheckInputs = [ + click + ]; - pythonImportsCheck = [ "primer3" ]; + pythonImportsCheck = [ + "primer3" + ]; meta = with lib; { description = "Oligo analysis and primer design"; homepage = "https://github.com/libnano/primer3-py"; + changelog = "https://github.com/libnano/primer3-py/blob/v${version}/CHANGES"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/prison/default.nix b/nixpkgs/pkgs/development/python-modules/prison/default.nix index 320764a88e8e..d70808d97218 100644 --- a/nixpkgs/pkgs/development/python-modules/prison/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prison/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Rison encoder/decoder"; homepage = "https://github.com/betodealmeida/python-rison"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/progress/default.nix b/nixpkgs/pkgs/development/python-modules/progress/default.nix index 801beaa44710..192841994ec8 100644 --- a/nixpkgs/pkgs/development/python-modules/progress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progress/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/verigak/progress/"; description = "Easy to use progress bars"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix b/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix index 0d6c6bb58d8c..aed4d5c5b258 100644 --- a/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.16.0"; + version = "0.17.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; rev = "refs/tags/v${version}"; - hash = "sha256-FYQE0toy5VFKNVadSsxG/5NCRANYJOcVR4bGPrCAxvc="; + hash = "sha256-ag9gun47Ar0Sw3ZGIXAHjtv4GdhX8x51UVkgwdQ8A+s="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/prompthub-py/default.nix b/nixpkgs/pkgs/development/python-modules/prompthub-py/default.nix new file mode 100644 index 000000000000..0f1fbe5427b0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/prompthub-py/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pyyaml +, requests +}: +let + pname = "prompthub-py"; + version = "4.0.0"; +in +buildPythonPackage { + inherit version pname; + format = "pyproject"; + + # Pypi source package doesn't contain tests + src = fetchFromGitHub { + owner = "deepset-ai"; + repo = pname; + rev = "v${version}"; + hash = "sha256-FA4IfhHViSL1u4pgd7jh40rEcS0BldSFDwCPG5irk1g="; + }; + + disabled = pythonOlder "3.8"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyyaml + requests + ]; + + meta = with lib; { + description = "A simple client to fetch prompts from Prompt Hub using its REST API."; + homepage = "https://github.com/deepset-ai/prompthub-py"; + changelog = "https://github.com/deepset-ai/prompthub-py/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/propka/default.nix b/nixpkgs/pkgs/development/python-modules/propka/default.nix new file mode 100644 index 000000000000..0894e05a9886 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/propka/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "propka"; + version = "3.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jensengroup"; + repo = "propka"; + rev = "refs/tags/v${version}"; + hash = "sha256-NbvrlapBALGbUyBqdqDcDG/igDf/xqxC35DzVUrbHlo="; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "propka" + ]; + + meta = with lib; { + description = "A predictor of the pKa values of ionizable groups in proteins and protein-ligand complexes based in the 3D structure"; + homepage = "https://github.com/jensengroup/propka"; + changelog = "https://github.com/jensengroup/propka/releases/tag/v${version}"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index 3d3469e3f788..d6ef622698a9 100644 --- a/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Beautiful, idiomatic protocol buffers in Python"; homepage = "https://github.com/googleapis/proto-plus-python"; license = licenses.asl20; - maintainers = with maintainers; [ ruuda SuperSandro2000 ]; + maintainers = with maintainers; [ ruuda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index 1aaeca9c6413..f2615499f7ba 100644 --- a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -1,10 +1,12 @@ { buildPackages -, lib , buildPythonPackage -, protobuf -, isPyPy , fetchpatch +, isPyPy +, lib +, protobuf +, pytestCheckHook , pythonAtLeast +, tzdata }: let @@ -21,9 +23,7 @@ buildPythonPackage { then "${toString (lib.toInt versionMajor + 1)}.${versionMinor}.${versionPatch}" else protobuf.version; - disabled = isPyPy; - - sourceRoot = "source/python"; + sourceRoot = "${protobuf.src.name}/python"; patches = lib.optionals (pythonAtLeast "3.11") [ (fetchpatch { @@ -41,6 +41,8 @@ buildPythonPackage { fi ''; + nativeBuildInputs = lib.optional isPyPy tzdata; + buildInputs = [ protobuf ]; propagatedNativeBuildInputs = [ @@ -50,6 +52,20 @@ buildPythonPackage { setupPyGlobalFlags = [ "--cpp_implementation" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals isPyPy [ + # error message differs + "testInvalidTimestamp" + # requires tracemalloc which pypy does not implement + # https://foss.heptapod.net/pypy/pypy/-/issues/3048 + "testUnknownFieldsNoMemoryLeak" + # assertion is not raised for some reason + "testStrictUtf8Check" + ]; + pythonImportsCheck = [ "google.protobuf" "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked diff --git a/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix index f1ef45d14c36..efc6aa6d742c 100644 --- a/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.24"; + version = "1.9.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RW8v3UeO2tCjKkCqraFw2IfVt2YL3EbixfGsK7pOQYI="; + hash = "sha256-+oxXuZaHkLPuMIsiFOkvW6VLuGxpV7YKs6Gxp/lexVQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/psycopg/default.nix b/nixpkgs/pkgs/development/python-modules/psycopg/default.nix index a61468b5eaca..e2d775f0b3b3 100644 --- a/nixpkgs/pkgs/development/python-modules/psycopg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yRb6yRpX1vDmXpYu4O50MYMpP2j75aSqhXCWMF1xVH0="; + hash = "sha256-GdgzHmzPCK3wq/8sCc1NaPEVwl4Q5OBZMp86RXkhE0M="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/psygnal/default.nix b/nixpkgs/pkgs/development/python-modules/psygnal/default.nix index c3f8f499338b..c4a1565ccc2d 100644 --- a/nixpkgs/pkgs/development/python-modules/psygnal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/psygnal/default.nix @@ -6,7 +6,6 @@ , mypy-extensions , numpy , pydantic -, pytest-mypy-plugins , pytestCheckHook , pythonOlder , typing-extensions @@ -42,7 +41,6 @@ buildPythonPackage rec { nativeCheckInputs = [ numpy pydantic - pytest-mypy-plugins pytestCheckHook wrapt ]; diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix index 71f231f98230..915c1d98cee9 100644 --- a/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix @@ -27,6 +27,6 @@ buildPythonPackage { description = "Get a public suffix for a domain name using the Public Suffix List"; homepage = "https://github.com/nexB/python-publicsuffix2"; license = licenses.mpl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index 2d8887dc35e5..3a46c99691f9 100644 --- a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230608"; + version = "0.10.0.20230804"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hMtOGJMX0VGquGxQUX/KSIALT0bORZaBEyoZSDLLBlc="; + hash = "sha256-J8yeq9CuzXGlqPjGf8hnV0IeI+Wg0Q5GS69/8z+FLp8="; }; passthru.optional-dependencies = { diff --git a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index a94b40de50fe..f35edd59794a 100644 --- a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.1.0"; + version = "7.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-+g/VBxv0XfqqwTEKtgBAy7Pfakll00JXMFBS2q3pHn8="; + hash = "sha256-AUB6pk3Gkrjc0RRFP0mql+up1baPjyPwuiRz8O6r/GM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index 5046e61b4091..a1cedcaa5ab4 100644 --- a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.41.0"; + version = "5.42.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-axVzystW9kvyMP35h/GCN1Cy1y8CYNxZglWeXVJfWSc="; + hash = "sha256-UUUnbByfxBMdJzZRu7EZHa809eshrR4h4poBxJAdTiI="; }; sourceRoot = "${src.name}/sdk/python"; @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/pulumi/pulumi-aws"; changelog = "https://github.com/pulumi/pulumi-aws/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pushover/default.nix b/nixpkgs/pkgs/development/python-modules/pushover/default.nix deleted file mode 100644 index 0f8a5f2779c1..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pushover/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi -, requests }: - -buildPythonPackage rec { - pname = "python-pushover"; - version = "0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "dee1b1344fb8a5874365fc9f886d9cbc7775536629999be54dfa60177cf80810"; - }; - - propagatedBuildInputs = [ requests ]; - - # tests require network - doCheck = false; - - meta = with lib; { - broken = true; # Relies on 2to3 via setuptools - description = "Bindings and command line utility for the Pushover notification service"; - homepage = "https://github.com/Thibauth/python-pushover"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix index dcdad33afa91..8f7c58a3dfdf 100644 --- a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix @@ -1,53 +1,64 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, numpy, pandas, pytz, six -, pytestCheckHook, flaky, mock, pytest-mock, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, h5py +, numpy +, pandas +, pytestCheckHook +, pytest-mock +, pytest-remotedata +, pytest-rerunfailures +, pytest-timeout +, pythonOlder +, pytz +, requests +, requests-mock +, scipy +, setuptools +}: buildPythonPackage rec { pname = "pvlib"; - version = "0.7.2"; + version = "0.10.1"; + format = "pyproject"; - # Support for Python <3.5 dropped in 0.6.3 on June 1, 2019. - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchPypi{ inherit pname version; - sha256 = "40708492ed0a41e900d36933b9b9ab7b575c72ebf3eee81293c626e301aa7ea1"; + hash = "sha256-H3wiNCmnZ6+GjXMhDbeOL98Yy7V6s2oOFAKWJCb8XCk="; }; - patches = [ - # enable later pandas versions, remove next bump - (fetchpatch { - url = "https://github.com/pvlib/pvlib-python/commit/010a2adc9e9ef6fe9f2aea4c02d7e6ede9f96a53.patch"; - sha256 = "0jibn4khixz6hv6racmp86m5mcms0ysz1y5bgpplw1kcvf8sn04x"; - excludes = [ - "pvlib/tests/test_inverter.py" - "docs/sphinx/source/whatsnew/v0.8.0.rst" - "ci/requirements-py35-min.yml" - ]; - }) + nativeBuildInputs = [ + setuptools ]; - nativeCheckInputs = [ pytestCheckHook flaky mock pytest-mock ]; - propagatedBuildInputs = [ numpy pandas pytz six requests ]; - - # Skip a few tests that try to access some URLs - pytestFlagsArray = [ "pvlib/tests" ]; - disabledTests = [ - "read_srml_dt_index" - "read_srml_month_from_solardata" - "get_psm3" - "pvgis" - "read_surfrad_network" - "remote" - # small rounding errors, E.g <1e-10^5 - "calcparams_pvsyst" - "martin_ruiz_diffuse" - "hsu" - "backtrack" + propagatedBuildInputs = [ + h5py + numpy + pandas + pytz + requests + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + pytest-remotedata + pytest-rerunfailures + pytest-timeout + requests-mock + ]; + + pythonImportsCheck = [ + "pvlib" ]; meta = with lib; { homepage = "https://pvlib-python.readthedocs.io"; description = "Simulate the performance of photovoltaic energy systems"; + changelog = "https://pvlib-python.readthedocs.io/en/v${version}/whatsnew.html"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix b/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix index 3c8b1f1e1cd3..68301c0e499f 100644 --- a/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/workhorsy/py-cpuinfo"; changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix b/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix index e74a8d7ac297..d48fe7411d79 100644 --- a/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-dmidecode/default.nix @@ -1,23 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi, dmidecode }: +{ lib +, buildPythonPackage +, dmidecode +, fetchPypi +, poetry-core +, pythonOlder +}: buildPythonPackage rec { pname = "py-dmidecode"; - version = "0.1.0"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - sha256 = "1bv1vmhj8h520kj6slwpz16xfmgp117yjjkfyihkl5ix6mn5zkpa"; + pname = "py_dmidecode"; + inherit version; + hash = "sha256-nMy/jOlg7yUPfGF27MN0NyVM0vuTIBuJTV2GKNP13UA="; }; - propagatedBuildInputs = [ dmidecode ]; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + dmidecode + ]; - # Project has no tests. + # Module has no tests doCheck = false; - pythonImportsCheck = [ "dmidecode" ]; + + pythonImportsCheck = [ + "dmidecode" + ]; meta = with lib; { - homepage = "https://github.com/zaibon/py-dmidecode/"; description = "Python library that parses the output of dmidecode"; + homepage = "https://github.com/zaibon/py-dmidecode/"; + changelog = "https://github.com/zaibon/py-dmidecode/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix b/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix index 226b22a45d0e..9a7d1c3720c8 100644 --- a/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "ECC pairing and bn_128 and bls12_381 curve operations"; homepage = "https://github.com/ethereum/py_ecc"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix index 3db729884035..8ede11e35903 100644 --- a/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -39,6 +39,8 @@ buildPythonPackage rec { description = "Collection of functions to generate hashes for signing on Ethereum"; homepage = "https://github.com/rmeissner/py-eth-sig-utils"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; + # TODO: upstream is stale and doesn't not work with the new `eth-abi` package any more. + broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/py-expression-eval/default.nix b/nixpkgs/pkgs/development/python-modules/py-expression-eval/default.nix new file mode 100644 index 000000000000..6aee63effb34 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/py-expression-eval/default.nix @@ -0,0 +1,24 @@ +{ lib, + buildPythonPackage, + fetchFromGitHub, +}: + +buildPythonPackage rec { + pname = "py-expression-eval"; + version = "0.3.14"; + + src = fetchFromGitHub { + owner = "axiacore"; + repo = "py-expression-eval"; + rev = "v${version}"; + sha256 = "YxhZd8V6ofphcNdcbBbrT5mc37O9c6W1mfhsvFVC+KM="; + }; + + meta = with lib; { + homepage = "https://github.com/AxiaCore/py-expression-eval/"; + description = "Python Mathematical Expression Evaluator"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix b/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix index 08630928f23b..d2057d2cf980 100644 --- a/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { description = "An in-memory LRU cache for python"; homepage = "https://github.com/stucchio/Python-LRU-cache"; license = licenses.gpl3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix b/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix index a23ff548cf87..9ae0d1a1d3db 100644 --- a/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix @@ -1,9 +1,8 @@ -{ base58 +{ lib +, base58 , buildPythonPackage , fetchFromGitHub -, lib , morphys -, pytest-runner , pytestCheckHook , pythonOlder , six @@ -13,18 +12,21 @@ buildPythonPackage rec { pname = "py-multihash"; version = "2.0.1"; + format = "setuptools"; + disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "multiformats"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; }; - nativeBuildInputs = [ - pytest-runner - ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner', " "" + ''; propagatedBuildInputs = [ base58 @@ -37,7 +39,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "multihash" ]; + pythonImportsCheck = [ + "multihash" + ]; meta = with lib; { description = "Self describing hashes - for future proofing"; diff --git a/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix b/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix index e85e4116ba50..eb71f167b740 100644 --- a/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.3.3"; + version = "0.3.5"; format = "pyproject"; src = fetchFromGitHub { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-7FYIRlr75L0y1d9jgbPpq/G7VC4YMD7IUQVNhfHdCh8="; + hash = "sha256-CVpXw5yAYBeRgTlNzgourQlDqfNmKLdzV7mQSd7PoJg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix b/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix new file mode 100644 index 000000000000..f76f12708f83 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "py-radix-sr"; + version = "1.0.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "SEKOIA-IO"; + repo = "py-radix"; + rev = "v${version}"; + hash = "sha256-aHV+NvPR4Gyk6bEpCftgBylis9rU7BWLpBMatjP4QmE="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "name='py-radix'" "name='py-radix-sr'" + ''; + + pythonImportsCheck = [ "radix" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Python radix tree for IPv4 and IPv6 prefix matching"; + homepage = "https://github.com/SEKOIA-IO/py-radix"; + license = with licenses; [ isc bsdOriginal ]; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/py-radix/default.nix b/nixpkgs/pkgs/development/python-modules/py-radix/default.nix deleted file mode 100644 index 579311776f34..000000000000 --- a/nixpkgs/pkgs/development/python-modules/py-radix/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, pythonAtLeast -, fetchFromGitHub -, coverage -, nose -}: - -buildPythonPackage rec { - pname = "py-radix"; - version = "0.10.0"; - - disabled = pythonAtLeast "3.10"; # abandoned, remove when we move to py310/py311 - - src = fetchFromGitHub { - owner = "mjschultz"; - repo = "py-radix"; - rev = "v${version}"; - sha256 = "01xyn9lg6laavnzczf5bck1l1c2718ihxx0hvdkclnnxjqhbrqis"; - }; - - doCheck = true; - nativeCheckInputs = [ coverage nose ]; - - meta = with lib; { - description = "Python radix tree for IPv4 and IPv6 prefix matching"; - homepage = "https://github.com/mjschultz/py-radix"; - license = with licenses; [ isc bsdOriginal ]; - maintainers = with maintainers; [ mkg ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/py3nvml/default.nix b/nixpkgs/pkgs/development/python-modules/py3nvml/default.nix new file mode 100644 index 000000000000..3cd3b122d867 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/py3nvml/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, xmltodict +}: + +buildPythonPackage rec { + pname = "py3nvml"; + version = "0.2.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Ce4dBFmKbmZOJEZfgEzjv+EZpv21Ni3xwWj4qpKfvXM="; + }; + + propagatedBuildInputs = [ + xmltodict + ]; + + pythonImportsCheck = [ "py3nvml" ]; + + meta = with lib; { + description = "Python 3 Bindings for the NVIDIA Management Library"; + homepage = "https://pypi.org/project/py3nvml/"; + license = with licenses; [ bsd3 bsd2 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 10eed66a24b0..9d44aff94394 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.50"; + version = "3.51"; src = fetchPypi { inherit pname version; - hash = "sha256-LUFLc7GNEoPIAsTQDhVTt0/NqhwaZHBRLoHF+2nqTUg="; + hash = "sha256-x4MftAC1TyR4FEvl+ytwCYg2cm5qAG/X/MJUhJRGlkU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/py65/default.nix b/nixpkgs/pkgs/development/python-modules/py65/default.nix new file mode 100644 index 000000000000..5748b8c16938 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/py65/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "py65"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mnaberez"; + repo = "py65"; + rev = "refs/tags/${version}"; + hash = "sha256-WLs3TAZovuphWZIvMvM3CZnqg1aZfMF4Yrqw46k+bLA="; + }; + + postPatch = '' + substituteInPlace py65/tests/test_monitor.py \ + --replace "test_argv_rom" "dont_test_argv_rom" \ + --replace "test_argv_combination_rom_mpu" "dont_test_argv_combination_rom_mpu" + ''; + + meta = { + homepage = "https://py65.readthedocs.io/"; + description = "Emulate 6502-based microcomputer systems in Python"; + longDescription = '' + Py65 includes a program called Py65Mon that functions as a machine + language monitor. This kind of program is sometimes also called a + debugger. Py65Mon provides a command line with many convenient commands + for interacting with the simulated 6502-based system. + ''; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres tomasajt ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyamg/default.nix b/nixpkgs/pkgs/development/python-modules/pyamg/default.nix index ab1d40fcec20..4180edaebde3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyamg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyamg/default.nix @@ -4,17 +4,22 @@ , numpy , scipy , pytest +, python , pybind11 , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "pyamg"; - version = "5.0.0"; + version = "5.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6rlnIo9hQ0LOI8e01rvKJa2LknpFy3Ym0e8XyfBioC4="; + hash = "sha256-XwSKAXQzQ64NTIYjBgBzhs+5sURTxHrf2tJ363mkbVA="; }; nativeBuildInputs = [ @@ -28,12 +33,16 @@ buildPythonPackage rec { pybind11 ]; - # failed with "ModuleNotFoundError: No module named 'pyamg.amg_core.evolution_strength'" - doCheck = false; - # taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=python-pyamg#n27 - # checkPhase = '' - # PYTHONPATH="$PWD/build/lib.linux-*:$PYTHONPATH" ${python3.interpreter} -c "import pyamg; pyamg.test()" - # ''; + checkPhase = '' + runHook preCheck + + # The `pyamg` directory in PWD doesn't have the compiled Cython modules in it, but has higher import priority compared to the properly built and installed `pyamg`. + # It's easier to just remove the package directory in PWD. + rm -r pyamg + ${python.interpreter} -c "import pyamg; pyamg.test()" + + runHook postCheck + ''; pythonImportsCheck = [ "pyamg" @@ -43,7 +52,8 @@ buildPythonPackage rec { meta = with lib; { description = "Algebraic Multigrid Solvers in Python"; homepage = "https://github.com/pyamg/pyamg"; + changelog = "https://github.com/pyamg/pyamg/blob/v${version}/changelog.md"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix b/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix index 7dbb595efe8c..053844d71fe9 100644 --- a/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Auto-generate PEP-484 annotations"; homepage = "https://github.com/dropbox/pyannotate"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyasn/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn/default.nix index 0fe2d58f95c3..0fc2121f1430 100644 --- a/nixpkgs/pkgs/development/python-modules/pyasn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyasn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { datasrc = fetchFromGitHub { owner = "hadiasghari"; repo = "pyasn"; - rev = "${version}"; + rev = version; hash = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix index ccdff83be1cd..3888f66d776a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { homepage = "https://pyasn1.readthedocs.io"; changelog = "https://github.com/etingof/pyasn1/blob/master/CHANGES.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index 53b23ec6b9c4..5cddd154aa3f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -12,18 +12,20 @@ , protobuf , pytest-aiohttp , pytest-asyncio +, pytest-httpserver , pytest-timeout , pytestCheckHook , pythonRelaxDepsHook , pythonOlder , requests , srptools +, stdenv , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.12.1"; + version = "0.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +34,7 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HugvgJAD5R6n8XK802QR7FAaZscyzFRayg48kf3crFQ="; + hash = "sha256-lg7gsCB8zn+q+ZTkIoGkIls10xS7bp8Svd749a10bWA="; }; postPatch = '' @@ -77,6 +79,7 @@ buildPythonPackage rec { deepdiff pytest-aiohttp pytest-asyncio + pytest-httpserver pytest-timeout pytestCheckHook ]; @@ -85,6 +88,11 @@ buildPythonPackage rec { "--asyncio-mode=legacy" ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ + # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False + "test_stream_retransmission" + ]; + disabledTestPaths = [ # Test doesn't work in the sandbox "tests/protocols/companion/test_companion_auth.py" diff --git a/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix b/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix index 77ce5686a912..99aef4c985af 100644 --- a/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = "https://github.com/appknox/pyaxmlparser"; # Files from Androguard are licensed ASL 2.0 license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix deleted file mode 100644 index 0e94764e4a22..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv -, python -, pkgs -, isPy3k -}: - -stdenv.mkDerivation rec { - pname = "pyblock"; - version = "0.53"; - md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; - - src = pkgs.fetchurl { - url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; - sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; - }; - - postPatch = '' - sed -i -e 's|/usr/include/python|${python}/include/python|' \ - -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile - ''; - - buildInputs = [ python pkgs.lvm2 pkgs.dmraid ]; - - makeFlags = [ - "USESELINUX=0" - "SITELIB=$(out)/${python.sitePackages}" - ]; - - meta = with lib; { - homepage = "https://www.centos.org/docs/5/html/5.4/Technical_Notes/python-pyblock.html"; - description = "Interface for working with block devices"; - license = licenses.gpl2Plus; - broken = isPy3k; # doesn't build on python 3, 2018-04-11 - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix b/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix index 7b7b2a88946c..20e7fba1b045 100644 --- a/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "pycep-parser"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "gruebel"; repo = "pycep"; rev = "refs/tags/${version}"; - hash = "sha256-ZKvFurD5DzByeqDJZdJHpkaUh00UoitCGYDh+TmF/Yc="; + hash = "sha256-OSdxdhGAZhl625VdIDHQ1aepQR5B0pCTLavfxer1tqc="; }; nativeBuildInputs = [ @@ -39,11 +39,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'regex = "^2022.3.15"' 'regex = "*"' - ''; - pythonImportsCheck = [ "pycep" ]; @@ -51,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python based Bicep parser"; homepage = "https://github.com/gruebel/pycep"; + changelog = "https://github.com/gruebel/pycep/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix b/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix index 03f8b1d69959..4147e01668a3 100644 --- a/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.20.2"; + version = "0.20.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TumqpNaxH9YET56PhTXJVG/OQw3syXaYNtHn+Vyh6xI="; + hash = "sha256-dHgd6vnmlg+VXMp7QUZoT2aic1X05lJGm8hDrowALvk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pycm/default.nix b/nixpkgs/pkgs/development/python-modules/pycm/default.nix index 4decab5c3931..58570c177902 100644 --- a/nixpkgs/pkgs/development/python-modules/pycm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "3.8"; + version = "4.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L0WPZomOU/I/x8QrdAerG0S2wnHyP661XTaDzzWeruk="; + hash = "sha256-GyH06G7bArFBTzV/Sx/KmoJvcoed0sswW7qGqsSULHo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix b/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix index ed4ac3f5fbf3..cdbec2770080 100644 --- a/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix @@ -18,6 +18,13 @@ buildPythonPackage rec { hash = "sha256-NHGHvbR2Mp2Y9pXCE9cpWoRtEVL/T+m6y4qVkLjucFM="; }; + patches = [ + # https://github.com/PyCQA/pycodestyle/issues/1151 + # Applies a modified version of an upstream patch that only applied + # to Python 3.12. + ./python-3.11.4-compat.patch + ]; + # https://github.com/PyCQA/pycodestyle/blob/2.10.0/tox.ini#L13 checkPhase = '' ${python.interpreter} -m pycodestyle --statistics pycodestyle.py diff --git a/nixpkgs/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch b/nixpkgs/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch new file mode 100644 index 000000000000..d8a0d7953776 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch @@ -0,0 +1,16 @@ +diff --git a/testsuite/test_api.py b/testsuite/test_api.py +index 8dde32ff..38e34acf 100644 +--- a/testsuite/test_api.py ++++ b/testsuite/test_api.py +@@ -329,7 +329,10 @@ def test_check_nullbytes(self): + count_errors = pep8style.input_file('stdin', lines=['\x00\n']) + + stdout = sys.stdout.getvalue() +- expected = "stdin:1:1: E901 ValueError" ++ if sys.version_info < (3, 11, 4): ++ expected = "stdin:1:1: E901 ValueError" ++ else: ++ expected = "stdin:1:1: E901 SyntaxError: source code string cannot contain null bytes" # noqa: E501 + self.assertTrue(stdout.startswith(expected), + msg='Output %r does not start with %r' % + (stdout, expected)) diff --git a/nixpkgs/pkgs/development/python-modules/pycookiecheat/default.nix b/nixpkgs/pkgs/development/python-modules/pycookiecheat/default.nix new file mode 100644 index 000000000000..08085b03c87c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pycookiecheat/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, keyring +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, playwright +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pycookiecheat"; + version = "0.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "n8henrie"; + repo = "pycookiecheat"; + rev = "refs/tags/v${version}"; + hash = "sha256-3I7iw/dwF4lRqmVM3OR402InZCFoV9gzKpRQrx4F9KA="; + }; + + pythonRelaxDeps = [ + "cryptography" + "keyring" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + cryptography + keyring + ]; + + nativeCheckInputs = [ + playwright + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pycookiecheat" + ]; + + disabledTests = [ + # Tests want to use playwright executable + "test_no_cookies" + "test_fake_cookie" + ] ++ lib.optionals stdenv.isDarwin [ + "test_slack_config" + ]; + + meta = with lib; { + description = "Borrow cookies from your browser's authenticated session for use in Python scripts"; + homepage = "https://github.com/n8henrie/pycookiecheat"; + changelog = "https://github.com/n8henrie/pycookiecheat/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyct/default.nix b/nixpkgs/pkgs/development/python-modules/pyct/default.nix index 3a00c7819881..1aed69b85fe6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyct/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyct/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyviz/pyct"; changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index f9dd03be57a2..45e5d8f13a15 100644 --- a/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -82,6 +82,6 @@ buildPythonPackage rec { homepage = "http://pycurl.io/"; description = "Python Interface To The cURL library"; license = with licenses; [ lgpl2Only mit ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix index 70a305450176..8e51bf8d085f 100644 --- a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.9.1"; + version = "2.10.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-HWJ+VHrSwdVN+PNp5NoqmDTVqb6RJy2Sr3zlrDuSBgA="; + hash = "sha256-G4mNBHk8xskQyt1gbMqz5XhoTfWWxp+qTruOSqmTvOc="; }; propagatedBuildInputs = [ @@ -30,6 +30,8 @@ buildPythonPackage rec { urllib3 ]; + doCheck = false; # tests fail and upstream does not seem to run them either + nativeCheckInputs = [ freezegun pytest-aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/nixpkgs/pkgs/development/python-modules/pydantic/default.nix index 1a2851158c52..ea4943a06506 100644 --- a/nixpkgs/pkgs/development/python-modules/pydantic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydantic/default.nix @@ -6,6 +6,7 @@ , devtools , email-validator , fetchFromGitHub +, fetchpatch , pytest-mock , pytestCheckHook , python-dotenv @@ -32,7 +33,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.8"; + version = "1.10.9"; format = "setuptools"; outputs = [ @@ -47,9 +48,18 @@ buildPythonPackage rec { owner = "pydantic"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4oJoDlP1grLblF0ppqYM1GYEyNMEM9FssFQjacipmms="; + hash = "sha256-POqMxBJUFFS1TnO9h5W7jYwFlukBOng0zbtq4kzmMB4="; }; + patches = [ + # Fixes racy doctests build failures on really fast machines + # FIXME: remove after next release + (fetchpatch { + url = "https://github.com/pydantic/pydantic/pull/6103/commits/f05014a30340e608155683aaca17d275f93a0380.diff"; + hash = "sha256-sr47hpl37SSFFbK+/h3hGlF6Pl6L8XPKDU0lZZV7Vzs="; + }) + ]; + postPatch = '' sed -i '/flake8/ d' Makefile ''; diff --git a/nixpkgs/pkgs/development/python-modules/pydata-google-auth/default.nix b/nixpkgs/pkgs/development/python-modules/pydata-google-auth/default.nix index 1baeb8f0d9e6..f24f2e78470b 100644 --- a/nixpkgs/pkgs/development/python-modules/pydata-google-auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydata-google-auth/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pydata-google-auth"; - version = "1.7.0"; + version = "1.8.2"; format = "setuptools"; src = fetchFromGitHub { repo = pname; owner = "pydata"; rev = "refs/tags/${version}"; - hash = "sha256-VJmu7VExWmXBa0cjgppyOgWDLDRMdhOoaOrZoi4WAxo="; + hash = "sha256-Wo+tXbzOuz/cW8GuWoSxLA/Lr2S9NMdePa8tIV39mbY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydeps/default.nix b/nixpkgs/pkgs/development/python-modules/pydeps/default.nix index ac00f09a9eca..faa85f6f4a85 100644 --- a/nixpkgs/pkgs/development/python-modules/pydeps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydeps/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.8"; + version = "1.12.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6NxI67K1gw6VRO10T2o+5pwMsvCqIgMnHueLbg88XSQ="; + hash = "sha256-n4FmMqpCqxPmGJokfaxnruG9d5oodv6Yfg80Y1EIr34="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydevd/default.nix b/nixpkgs/pkgs/development/python-modules/pydevd/default.nix index fe90cb70209f..cc79c43febd7 100644 --- a/nixpkgs/pkgs/development/python-modules/pydevd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydevd/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , numpy @@ -48,6 +49,9 @@ buildPythonPackage rec { # AssertionError pydevd_tracing.set_trace_to_threads(tracing_func) == 0 "test_tracing_other_threads" "test_tracing_basic" + ] ++ lib.optionals stdenv.isDarwin [ + "test_multiprocessing_simple" + "test_evaluate_exception_trace" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix b/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix index 9de7758557d0..654d1887804e 100644 --- a/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.15.4"; + version = "1.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyDrive2"; inherit version; - hash = "sha256-DAEbdOvCTzxspyggYmt38d/groj1dAxaXPlug915upk="; + hash = "sha256-chBTXoNyiWpEcCxCQKop1GELAyWyX5TN0H1P7A/ScFM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydy/default.nix b/nixpkgs/pkgs/development/python-modules/pydy/default.nix index caa013f22688..c7ee5359bee4 100644 --- a/nixpkgs/pkgs/development/python-modules/pydy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydy/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Python tool kit for multi-body dynamics"; homepage = "http://pydy.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pydyf/default.nix b/nixpkgs/pkgs/development/python-modules/pydyf/default.nix index 64e5062736e4..b44b691c83e1 100644 --- a/nixpkgs/pkgs/development/python-modules/pydyf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydyf/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydyf"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tEo4hV1+R7dAs80xq2Oi9bmyeTkx1QsMyu07t7hpEvw="; + hash = "sha256-paiMsG5b62Sh7yFH7oebDlE59f24J/2i/PFKAYx7EeY="; }; postPatch = '' @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Low-level PDF generator written in Python and based on PDF specification 1.7"; homepage = "https://doc.courtbouillon.org/pydyf/stable/"; + changelog = "https://github.com/CourtBouillon/pydyf/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ rprecenth ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyemby/default.nix b/nixpkgs/pkgs/development/python-modules/pyemby/default.nix index db1ec840136b..33180d742e4d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyemby/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyemby/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyemby"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "mezz64"; repo = pname; rev = version; - hash = "sha256-EpmXdyKtfb/M8rTv6YrfNCpDmKei2AD5DBcdVvqCVWw="; + hash = "sha256-4mOQLfPbRzZzpNLvekJHVKiqdGGKPhW6BpKkyRfk2Pc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyemd/default.nix b/nixpkgs/pkgs/development/python-modules/pyemd/default.nix index c7b277a60989..bb178a572415 100644 --- a/nixpkgs/pkgs/development/python-modules/pyemd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyemd/default.nix @@ -1,16 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, cython +, packaging +, setuptools +, numpy +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyemd"; - version = "0.5.1"; + version = "1.0.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "fc81c2116f8573e559dfbb8d73e03d9f73c22d0770559f406516984302e07e70"; + hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4="; }; - propagatedBuildInputs = [ numpy ]; - buildInputs = [ cython ]; + nativeBuildInputs = [ + cython + packaging + setuptools + ]; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; diff --git a/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix b/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix index b82a15d4df9e..6c7c30fe384d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.17"; + version = "0.2.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-Yc1M/O08PlRb0+YIB4etscaWMnb+r9fkMje94Tvcwus="; + hash = "sha256-YQlPv8YfPbYfpg+4VrLWHOWYJoecuAr3K7JBiogiI/g="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix b/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix index 2a99f637f850..0b5d016a422c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fgFbwMqlQcF83k345kztw/SN5j447/TuJUPYmFPKiFY="; + hash = "sha256-dAC+jW+Ky+uPsgBXpp81+bxytWYeZbd+zWzEXkmM198="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix index 56e6e8864526..d83c02783729 100644 --- a/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch, isPy311 , pytestCheckHook }: @@ -18,6 +19,14 @@ buildPythonPackage rec { hash = "sha256-7IsnamtgvYDe/tJa3X5DmIHBnmSFCv2bNGKD1BZf0P0="; }; + patches = lib.optional isPy311 # could be made unconditional on rebuild + (fetchpatch { + name = "tests-py311.patch"; + url = "https://github.com/PyCQA/pyflakes/commit/836631f2f73d45baa4021453d89fc9fd6f52be58.diff"; + hash = "sha256-xlgql+bN0HsGnTMkwax3ZG/5wrbkUl/kQkjlr3lsgRw="; + }) + ; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyfma/default.nix b/nixpkgs/pkgs/development/python-modules/pyfma/default.nix index 5c73cc84c267..e0934dc34b89 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfma/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Fused multiply-add for Python"; homepage = "https://github.com/nschloe/pyfma"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix index b276e80e6b28..e48513b55ce4 100644 --- a/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Asynchronous FTP server library"; homepage = "https://github.com/giampaolo/pyftpdlib/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix b/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix index 8e1196002641..45dbd1a43ae2 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyfuse3"; - version = "3.2.2"; + version = "3.2.3"; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "libfuse"; repo = "pyfuse3"; rev = "refs/tags/${version}"; - hash = "sha256-Y9Haz3MMhTXkvYFOGNWJnoGNnvoK6wiQ+s3AwJhBD8Q="; + hash = "sha256-2YrVapCojcFRaljqNeWPMWz3hEgSutKPy2u8FXp0fME="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pygbm/default.nix b/nixpkgs/pkgs/development/python-modules/pygbm/default.nix deleted file mode 100644 index 4eac823b50e8..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pygbm/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, scipy -, numpy -, numba -, scikit-learn -, pytest -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pygbm"; - version = "0.1.0"; - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "ogrisel"; - repo = pname; - rev = "v${version}"; - sha256 = "1qg2md86d0z5aa6jn8kj3rxsippsqsccx1dbraspdsdkycncvww3"; - }; - - propagatedBuildInputs = [ - scipy - numpy - numba - scikit-learn - ]; - - nativeCheckInputs = [ - pytest - ]; - - checkPhase = '' - # numerical rounding error in test - pytest -k "not test_derivatives" - ''; - - meta = with lib; { - description = "Experimental Gradient Boosting Machines in Python"; - homepage = "https://github.com/ogrisel/pygbm"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix b/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix index f07340ce2fb8..f4f842852b0c 100644 --- a/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix @@ -1,25 +1,38 @@ -{ lib, castxml, fetchFromGitHub, buildPythonPackage, -llvmPackages }: +{ lib +, castxml +, fetchFromGitHub +, buildPythonPackage +, llvmPackages +, pythonOlder +}: + buildPythonPackage rec { pname = "pygccxml"; - version = "2.2.1"; + version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "gccxml"; - repo = "pygccxml"; - rev = "v${version}"; - sha256 = "1msqpg3dqn7wjlf91ddljxzz01a3b1p2sy91n36lrsy87lz499gh"; + owner = "gccxml"; + repo = "pygccxml"; + rev = "refs/tags/v${version}"; + hash = "sha256-+cmp41iWbkUSLNFLvEPHocpTQAX2CpD8HMXLIYcy+8k="; }; - buildInputs = [ castxml llvmPackages.libcxxStdenv]; + buildInputs = [ + castxml + llvmPackages.libcxxStdenv + ]; # running the suite is hard, needs to generate xml_generator.cfg # but the format doesn't accept -isystem directives doCheck = false; meta = with lib; { - homepage = "https://github.com/gccxml/pygccxml"; description = "Python package for easy C++ declarations navigation"; + homepage = "https://github.com/gccxml/pygccxml"; + changelog = "https://github.com/CastXML/pygccxml/blob/v${version}/CHANGELOG.md"; license = licenses.boost; maintainers = with maintainers; [ teto ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/nixpkgs/pkgs/development/python-modules/pygit2/default.nix index ba8b2577986a..0ce6dc642448 100644 --- a/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.12.0"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6UQNCGZeNSeJiZOVkKU/N6k46tpPlEaESTCqLuMNc74="; + hash = "sha256-VuhdDmbelX1ZnR77JAnTmv7v2PAQCb/aB5a0Kktng1g="; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/python-modules/pygithub/default.nix b/nixpkgs/pkgs/development/python-modules/pygithub/default.nix index 798bd09972f6..0ac5e65f5fd8 100644 --- a/nixpkgs/pkgs/development/python-modules/pygithub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygithub/default.nix @@ -1,38 +1,51 @@ { lib , buildPythonPackage -, cryptography , deprecated , fetchFromGitHub , pynacl +, typing-extensions , pyjwt +, python-dateutil , pythonOlder , requests +, setuptools-scm }: buildPythonPackage rec { pname = "pygithub"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - hash = "sha256-DZmKF0C5zexTQ/kbDtTg0FLEocNU4dYMOFCJyvuiV98="; + hash = "sha256-bfXf1lwTpoyf6Pn4J0KR99xUh28VPszlbcYSbqKfyFQ="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ - cryptography deprecated - pynacl pyjwt + pynacl + python-dateutil requests - ]; + typing-extensions + ] ++ pyjwt.optional-dependencies.crypto; # Test suite makes REST calls against github.com doCheck = false; - pythonImportsCheck = [ "github" ]; + + pythonImportsCheck = [ + "github" + ]; meta = with lib; { description = "Python library to access the GitHub API v3"; diff --git a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix index 29d3bab48ab1..85aead0f9b42 100644 --- a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "2.0.7"; + version = "2.0.8"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-koL5SXwcDNyyzDnYwFCQz2ht7bnrvvSo3kmvIqCuDo8="; + hash = "sha256-xc+aEywcAaZ/VL959aTNi0Rm1Cb1aFIDMHij9nzYg8Y="; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyglm/default.nix b/nixpkgs/pkgs/development/python-modules/pyglm/default.nix new file mode 100644 index 000000000000..b98fee9d38db --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyglm/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: +buildPythonPackage rec { + pname = "PyGLM"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "Zuzu-Typ"; + repo = "PyGLM"; + rev = "${version}"; + hash = "sha256-+On4gqfB9hxuINQdcGcrZyOsphfylUNq7tB2uvjsCkE="; + fetchSubmodules = true; + }; + + meta = with lib; { + homepage = "https://github.com/Zuzu-Typ/PyGLM"; + description = "An OpenGL Mathematics (GLM) library for Python written in C++"; + license = licenses.zlib; + maintainers = with maintainers; [ sund3RRR ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pygments/default.nix b/nixpkgs/pkgs/development/python-modules/pygments/default.nix index f3bcafff799f..a7b2acd55ca9 100644 --- a/nixpkgs/pkgs/development/python-modules/pygments/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygments/default.nix @@ -46,7 +46,7 @@ let pygments = buildPythonPackage description = "A generic syntax highlighter"; mainProgram = "pygmentize"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in pygments diff --git a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix index 15fe2d674749..147198087fa5 100644 --- a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix @@ -58,6 +58,6 @@ toPythonModule (stdenv.mkDerivation rec { description = "Parallel optimisation for Python"; homepage = "https://github.com/esa/pygmo2"; license = licenses.gpl3Plus; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; }) diff --git a/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix b/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix new file mode 100644 index 000000000000..312faf202bb0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cryptography +, dictdiffer +, grpcio +, protobuf +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pygnmi"; + version = "0.8.12"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "akarneliuk"; + repo = "pygnmi"; + rev = "v${version}"; + sha256 = "sha256-5dAjN/HDFKQmJIjhergBjSmHQKhBxqy/Jneh1pLCHrw="; + }; + + propagatedBuildInputs = [ + cryptography + dictdiffer + grpcio + protobuf + ]; + + # almost all tests fail with: + # TypeError: expected string or bytes-like object + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pygnmi" ]; + + meta = with lib; { + description = "Pure Python gNMI client to manage network functions and collect telemetry"; + homepage = "https://github.com/akarneliuk/pygnmi"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pygsl/default.nix b/nixpkgs/pkgs/development/python-modules/pygsl/default.nix new file mode 100644 index 000000000000..d55ac1d56be7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pygsl/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, gsl +, swig +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pygsl"; + version = "2.3.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-F3m85Bs8sONw0Rv0EAOFK6R1DFHfW4dxuzQmXo4PHfM="; + }; + + nativeBuildInputs = [ + gsl.dev + swig + ]; + buildInputs = [ + gsl + ]; + propagatedBuildInputs = [ + numpy + ]; + + preCheck = '' + cd tests + ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python interface for GNU Scientific Library"; + homepage = "https://github.com/pygsl/pygsl"; + changelog = "https://github.com/pygsl/pygsl/blob/v${version}/ChangeLog"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ amesgen ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix b/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix index edded89ab5f4..aeb65d92556d 100644 --- a/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pygtfs"; - version = "0.1.7"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sGJwtf8DVIrE4hcU3IksnyAAt8yf67UBJIiVILDSsv8="; + hash = "sha256-J5vu51OOMabWd8h60PpvvBiCnwQlhEnBywNXxy9hOuA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyheck/Cargo.lock b/nixpkgs/pkgs/development/python-modules/pyheck/Cargo.lock new file mode 100644 index 000000000000..c98ef0169802 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyheck/Cargo.lock @@ -0,0 +1,377 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyheck" +version = "0.1.5" +dependencies = [ + "heck", + "pyo3", + "rayon", +] + +[[package]] +name = "pyo3" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "parking_lot", + "paste", + "pyo3-build-config", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pyo3-macros" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" +dependencies = [ + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/nixpkgs/pkgs/development/python-modules/pyheck/default.nix b/nixpkgs/pkgs/development/python-modules/pyheck/default.nix new file mode 100644 index 000000000000..4a32babb69fb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyheck/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, cargo +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, rustc +, rustPlatform +}: + +buildPythonPackage rec { + pname = "pyheck"; + version = "0.1.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kevinheavey"; + repo = "pyheck"; + rev = "refs/tags/${version}"; + hash = "sha256-mfXkrCbBaJ0da+taKJvfyU5NS43tYJWqtTUXiCLVoGQ="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + cargo + poetry-core + rustc + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyheck" + ]; + + meta = with lib; { + description = "Python bindings for heck, the Rust case conversion library"; + homepage = "https://github.com/kevinheavey/pyheck"; + changelog = "https://github.com/kevinheavey/pyheck/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index 8bd3389e4633..22c044e68b81 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.4.2"; + version = "1.4.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5c2hcW9XSEyIMlyrn70U7tgBWdxGrtJoQkjkYzlrbKE="; + hash = "sha256-KKF+XYQgdmLbbicyMFyZBG4ol69xAWCF2W/r15gH2Mo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix b/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix index acff1fba1c98..9dfe3b82cb55 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyinstrument"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "joerick"; repo = pname; - rev = "v${version}"; - hash = "sha256-0GbJkYBgSOIZrHSKM93SW93jXD+ieYN6A01kWoFbyvQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-HvPapa3b9/Wc4ClaMOmCAIeHS7H4V9aCR9JCDol2ElE="; }; # Module import recursion diff --git a/nixpkgs/pkgs/development/python-modules/pyipp/default.nix b/nixpkgs/pkgs/development/python-modules/pyipp/default.nix index 7970db4cbe3e..de0bdc5f637e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyipp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyipp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.14.1"; + version = "0.14.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-ipp"; rev = version; - hash = "sha256-l8zDgqv8+9r15dt1YeuAYq2GCl9JsrtNRjPlQ9A7H9c="; + hash = "sha256-IPmpup0VrilfLnYiigjVjL6oRwW4RPlgiafIy7yyckI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix b/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix index ac0a493cd611..55e682e07414 100644 --- a/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyjwt"; - version = "2.6.0"; + version = "2.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyJWT"; inherit version; - hash = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0="; + hash = "sha256-vWyko8QoXBotQ0nloDX9+PuU4EzND8vmuiidrpzD4HQ="; }; postPatch = '' @@ -48,6 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jwt" ]; meta = with lib; { + changelog = "https://github.com/jpadilla/pyjwt/blob/${version}/CHANGELOG.rst"; description = "JSON Web Token implementation in Python"; homepage = "https://github.com/jpadilla/pyjwt"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/pykdl/default.nix b/nixpkgs/pkgs/development/python-modules/pykdl/default.nix index 0d7e82be63f3..cc92086747e4 100644 --- a/nixpkgs/pkgs/development/python-modules/pykdl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykdl/default.nix @@ -4,7 +4,7 @@ toPythonModule (stdenv.mkDerivation { pname = "pykdl"; inherit (orocos-kdl) version src; - sourceRoot = "source/python_orocos_kdl"; + sourceRoot = "${orocos-kdl.src.name}/python_orocos_kdl"; # Fix hardcoded installation path postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pylddwrap/default.nix b/nixpkgs/pkgs/development/python-modules/pylddwrap/default.nix index 6c8a5159f987..d228c1a39ec9 100644 --- a/nixpkgs/pkgs/development/python-modules/pylddwrap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylddwrap/default.nix @@ -1,10 +1,11 @@ { lib +, stdenv , buildPythonPackage -, coreutils , fetchFromGitHub , icontract , pytestCheckHook , pythonOlder +, substituteAll , typing-extensions }: @@ -21,10 +22,12 @@ buildPythonPackage rec { hash = "sha256-Gm82VRu8GP52BohQzpMUJfh6q2tiUA2GJWOcG7ymGgg="; }; - postPatch = '' - substituteInPlace lddwrap/__init__.py \ - --replace '/usr/bin/env' '${coreutils}/bin/env' - ''; + patches = [ + (substituteAll { + src = ./replace_env_with_placeholder.patch; + ldd_bin = "${stdenv.cc.bintools.libc_bin}/bin/ldd"; + }) + ]; # Upstream adds some plain text files direct to the package's root directory # https://github.com/Parquery/pylddwrap/blob/master/setup.py#L71 @@ -39,6 +42,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # uses mocked ldd from PATH, but we are patching the source to not look at PATH + disabledTests = [ + "TestAgainstMockLdd" + "TestMain" + ]; + pythonImportsCheck = [ "lddwrap" ]; meta = with lib; { @@ -47,5 +56,8 @@ buildPythonPackage rec { changelog = "https://github.com/Parquery/pylddwrap/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ thiagokokada ]; + # should work in any Unix platform that uses glibc, except for darwin + # since it has its own tool (`otool`) + badPlatforms = platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pylddwrap/replace_env_with_placeholder.patch b/nixpkgs/pkgs/development/python-modules/pylddwrap/replace_env_with_placeholder.patch new file mode 100644 index 000000000000..676b0c10b4a9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pylddwrap/replace_env_with_placeholder.patch @@ -0,0 +1,25 @@ +diff --git a/lddwrap/__init__.py b/lddwrap/__init__.py +index 1222c97..db8a735 100644 +--- a/lddwrap/__init__.py ++++ b/lddwrap/__init__.py +@@ -190,10 +190,8 @@ def list_dependencies(path: pathlib.Path, + Otherwise specified env is used. + :return: list of dependencies + """ +- # We need to use /usr/bin/env since Popen ignores the PATH, +- # see https://stackoverflow.com/questions/5658622 + proc = subprocess.Popen( +- ["/usr/bin/env", "ldd", path.as_posix()], ++ ["@ldd_bin@", path.as_posix()], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + universal_newlines=True, +@@ -209,7 +207,7 @@ def list_dependencies(path: pathlib.Path, + + if unused: + proc_unused = subprocess.Popen( +- ["/usr/bin/env", "ldd", "--unused", ++ ["@ldd_bin@", "--unused", + path.as_posix()], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, diff --git a/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 39207c063f39..7ce16743125a 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -115,6 +115,6 @@ buildPythonPackage rec { - epylint: Emacs and Flymake compatible Pylint ''; license = licenses.gpl1Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pylion/default.nix b/nixpkgs/pkgs/development/python-modules/pylion/default.nix new file mode 100644 index 000000000000..10cfd173b66d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pylion/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromBitbucket +, h5py +, termcolor +, pexpect +, jinja2 +, sphinxHook +, sphinx-rtd-theme +}: + +buildPythonPackage { + pname = "pylion"; + version = "0.5.3"; + format = "setuptools"; + + src = fetchFromBitbucket { + owner = "dtrypogeorgos"; + repo = "pylion"; + # Version is set in setup.cfg, but not in a git tag / bitbucket release + rev = "3e6b96b542b97107c622d66b0be0551c3bd9f948"; + hash = "sha256-c0UOv2Vlv9wJ6YW+QdHinhpdaclUh3As5TDvyoRhpSI="; + }; + + # Docs are not available online, besides the article: + # http://dx.doi.org/10.1016/j.cpc.2020.107187 + nativeBuildInputs = [ + sphinxHook + sphinx-rtd-theme + ]; + + propagatedBuildInputs = [ + h5py + termcolor + pexpect + jinja2 + ]; + + pythonImportsCheck = [ "pylion" ]; + + # Tests fail from some reason - some files seem to be missing from the repo. + doCheck = false; + + postInstall = '' + mkdir -p $out/share/doc/$name + cp -r examples $out/share/doc/$name/examples + ''; + + meta = with lib; { + description = "A LAMMPS wrapper for molecular dynamics simulations of trapped ions"; + homepage = "https://bitbucket.org/dtrypogeorgos/pylion"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix index 912b968538b8..4f70a25afabf 100644 --- a/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, poetry-dynamic-versioning , pyjwt , pytest-aiohttp , pytest-freezegun @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.4.0"; + version = "2023.4.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,12 +23,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "natekspencer"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-nF6njY2qNoHW2ZGNDHNeTBTjSBbitJxitPgyayLaqSE="; + rev = "refs/tags/v${version}"; + hash = "sha256-pUtOLQ4ftG0tYPued12CqKGt3LKyfmLPxIYKvkYg1nI="; }; nativeBuildInputs = [ poetry-core + poetry-dynamic-versioning ]; propagatedBuildInputs = [ @@ -50,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modulefor controlling a Litter-Robot"; homepage = "https://github.com/natekspencer/pylitterbot"; - changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${version}"; + changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix index 63f9122acdc8..509df2efaf79 100644 --- a/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Spyder extensions for the python-language-server"; homepage = "https://github.com/spyder-ide/pyls-spyder"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix b/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix index 5793cccd55ba..3a5879633114 100644 --- a/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -2,31 +2,46 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, setuptools , mypy , pytestCheckHook , python-lsp-server , pythonOlder -, toml +, tomli }: buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.6"; - format = "setuptools"; + version = "0.6.7"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "Richardk2n"; + owner = "python-lsp"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-9B+GSEoQEqd1W/g0oup4xULKWOF0TgSG5DfBtyWA3vs="; + hash = "sha256-ZsNIw0xjxnU9Ue0C7TlhzVOCOCKEbCa2CsiiqeMb14I="; }; + patches = [ + # https://github.com/python-lsp/pylsp-mypy/pull/64 + (fetchpatch { + name = "fix-hanging-test.patch"; + url = "https://github.com/python-lsp/pylsp-mypy/commit/90d28edb474135007804f1e041f88713a95736f9.patch"; + hash = "sha256-3DVyUXVImRemXCuyoXlYbPJm6p8OnhBdEKmwjx88ets="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ mypy python-lsp-server - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ @@ -44,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mypy plugin for the Python LSP Server"; - homepage = "https://github.com/Richardk2n/pylsp-mypy"; + homepage = "https://github.com/python-lsp/pylsp-mypy"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix b/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix index 2528885e196a..a3e651e17766 100644 --- a/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "A Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs "; homepage = "https://github.com/geekpradd/PyLyrics"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix b/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix deleted file mode 100644 index b1b5cf473855..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, fetchurl -, buildPythonPackage -, pymatgen -, pytest-runner -, pytestCheckHook -, isPy3k -}: - -buildPythonPackage rec { - pname = "pymatgen-lammps"; - version = "0.4.5"; - disabled = !isPy3k; - - src = fetchurl { - url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; - sha256 = "0shldl8is3195jmji7dr3zsh1bzxlahaqrmpr28niks7nnfj80fx"; - }; - - buildInputs = [ pytest-runner ]; - nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ pymatgen ]; - - pythonImportsCheck = [ "pmg_lammps" ]; - - meta = { - description = "A LAMMPS wrapper using pymatgen"; - homepage = "https://gitlab.com/costrouc/pymatgen-lammps"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; - # not compatible with recent versions of pymatgen - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch b/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch new file mode 100644 index 000000000000..2193b260aea1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_kdtree.py b/tests/test_kdtree.py +index 0110083..049fa07 100644 +--- a/tests/test_kdtree.py ++++ b/tests/test_kdtree.py +@@ -23,7 +23,7 @@ def run_kdtree(): + + tree = cKDTree(data_points) + +- distances2, indices2 = tree.query(query_points, k=k, n_jobs=-1) ++ distances2, indices2 = tree.query(query_points, k=k) + + t2 = time.perf_counter() + diff --git a/nixpkgs/pkgs/development/python-modules/pymatting/default.nix b/nixpkgs/pkgs/development/python-modules/pymatting/default.nix new file mode 100644 index 000000000000..0d10efd616a4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pymatting/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numba +, numpy +, pillow +, scipy +, pytestCheckHook +, +}: +buildPythonPackage rec { + pname = "pymatting"; + version = "1.1.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pymatting"; + repo = "pymatting"; + rev = "v${version}"; + hash = "sha256-9eRpsWwXAkp6aw1ZWJsUFf0BMIN0UBFc2rW1lltL2cw="; + }; + + patches = [ ./01-kdtree-signature.patch ]; + + propagatedBuildInputs = [ + numba + numpy + pillow + scipy + ]; + + pythonImportsCheck = [ "pymatting" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # no access to input data set + # see: https://github.com/pymatting/pymatting/blob/master/tests/download_images.py + "test_alpha" + "test_laplacians" + "test_preconditioners" + "test_lkm" + ]; + + meta = with lib; { + description = "A Python library for alpha matting"; + homepage = "https://github.com/pymatting/pymatting"; + changelog = "https://github.com/pymatting/pymatting/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix index c8ccad6a52b5..c25d11eb1180 100644 --- a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.37"; + version = "2.4.39"; src = fetchPypi { inherit pname version; - hash = "sha256-dU561/kOBW++mrfzX/kqNVPgi7m/QniBrCJxBD/fZ1Y="; + hash = "sha256-rS1EZGGAcWEi7MK565oii+KUaqACruLrWXNcB/aXPek="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymazda/default.nix b/nixpkgs/pkgs/development/python-modules/pymazda/default.nix index 4e00ecc83654..f5b07c5a4f3d 100644 --- a/nixpkgs/pkgs/development/python-modules/pymazda/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymazda/default.nix @@ -3,21 +3,26 @@ , buildPythonPackage , cryptography , fetchPypi +, poetry-core , pythonOlder }: buildPythonPackage rec { pname = "pymazda"; - version = "0.3.8"; - format = "setuptools"; + version = "0.3.10"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CBPBmzghuc+kvBt50qmU+jHyUdGgLgNX3jcVm9CC7/Q="; + hash = "sha256-b7YRg5g9ltYJhjMVcq9uZaSqzizJZM4pE4WYW2u9AwY="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp cryptography @@ -33,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for interacting with the MyMazda API"; homepage = "https://github.com/bdr99/pymazda"; + changelog = "https://github.com/bdr99/pymazda/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix b/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix index a58d565922d5..de9b8e9ae14c 100644 --- a/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "A package for symbolic computation"; homepage = "https://documen.tician.de/pymbolic/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pymedio/default.nix b/nixpkgs/pkgs/development/python-modules/pymedio/default.nix index bf220a4dc248..36673b071e61 100644 --- a/nixpkgs/pkgs/development/python-modules/pymedio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymedio/default.nix @@ -12,22 +12,21 @@ buildPythonPackage rec { pname = "pymedio"; - version = "0.2.13"; + version = "0.2.14"; + format = "setuptools"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jcreinhold"; repo = "pymedio"; rev = "refs/tags/v${version}"; - hash = "sha256-iHbClOrtYkHT1Nar+5j/ig4Krya8LdQdFB4Mmm5B9bg="; + hash = "sha256-x3CHoWASDrUoCXfj73NF+0Y/3Mb31dK2Lh+o4OD9ryk="; }; - # relax Python dep to work with 3.10.x and 3.11.x - postPatch = '' - substituteInPlace setup.cfg --replace "!=3.10.*," "" --replace "!=3.11.*" "" - ''; - - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; nativeCheckInputs = [ pytestCheckHook @@ -44,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read medical image files into Numpy arrays"; homepage = "https://github.com/jcreinhold/pymedio"; + changelog = "https://github.com/jcreinhold/pymedio/blob/v${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix index 983cc7566df6..ba22546099a3 100644 --- a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.2.8"; + version = "2.2.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "milvus-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Oqwa/2UT9jyGaEEzjr/phZZStLOZ6JRj+4ck0tmP0W0="; + hash = "sha256-NTzdbmI2vNvNBFhN+xyZewH4b6l1BbKkDDE7rLNJ4IE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix index bc2fa19032f2..c1b1b75d284c 100644 --- a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.1.3"; + version = "3.3.2"; format = "setuptools"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GHyDlt046v4KP9KQRnXH6F+3ikoCjbhVHEQuSdm99a8="; + hash = "sha256-EGJyb0AVLKN7FEoeWF4rVqmJBNbXHent9P+cxc13rQs="; }; # Twisted asynchronous version is not supported due to a missing dependency diff --git a/nixpkgs/pkgs/development/python-modules/pymunk/default.nix b/nixpkgs/pkgs/development/python-modules/pymunk/default.nix index ab6903b93187..869a2a085eb8 100644 --- a/nixpkgs/pkgs/development/python-modules/pymunk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymunk/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.4.0"; + version = "6.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-YNzZ/wQz5s5J5ctXekNo0FksRoX03rZE1wXIghYcck4="; + hash = "sha256-ZEO7YJBkCMgsD9MnwBn/X3qt39+IiecM453bjDgZDls="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index d1b4d15bc87d..0bea5f8c51b5 100644 --- a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.21.1"; + version = "1.22.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMuPDF"; inherit version; - hash = "sha256-+BV0GkNcYqADa7y/X6bFM1Z71pxTONQTcU/FeyLbk+A="; + hash = "sha256-XsjVEGdSKXUp0NaNRs/EzpmRSqvZm+hD8VmaGELWP+k="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pynina/default.nix b/nixpkgs/pkgs/development/python-modules/pynina/default.nix index 1a981fa1852b..a167f8cf1d65 100644 --- a/nixpkgs/pkgs/development/python-modules/pynina/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - hash = "sha256-5+Mg3dPjMxEL2pgEeuR1TwiicIMHN6RO6G0SgbZm/eM="; + hash = "sha256-HyOk3W95dEl+p8YGh3xP29HcvbncqxsUaWSQUiKgTWM="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API wrapper to retrieve warnings from the german NINA app"; homepage = "https://gitlab.com/DeerMaximum/pynina"; + changelog = "https://gitlab.com/DeerMaximum/pynina/-/releases/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix index 2014c70b61c9..3d1c3a842208 100644 --- a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pynisher"; - version = "1.0.5"; + version = "1.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-usSowgCwGTATiX1dbPpScO9/FI+E567dvGZxAC+zS14="; + hash = "sha256-BTH34zv7OAaVKc20VASfv3QaxAt/Y14Dkd/PBo/V6vo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pynvim-pp/default.nix b/nixpkgs/pkgs/development/python-modules/pynvim-pp/default.nix new file mode 100644 index 000000000000..af2dbc27d63e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pynvim-pp/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pynvim +, setuptools +}: + +buildPythonPackage { + pname = "pynvim-pp"; + version = "unstable-2023-07-09"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "pynvim_pp"; + rev = "93aa25bf3ee039c4eb85f402d6adf6977033013b"; + hash = "sha256-gZvIiFpP+eMLD8/xodY7ywWxhWXtethXviVRedW/bgo="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ pynvim ]; + + meta = with lib; { + homepage = "https://github.com/ms-jpq/pynvim_pp"; + description = "Dependency to chadtree and coq_nvim plugins"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pynvim/default.nix b/nixpkgs/pkgs/development/python-modules/pynvim/default.nix index 8bed5bf24d21..2ce6e83315a3 100644 --- a/nixpkgs/pkgs/development/python-modules/pynvim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynvim/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ msgpack - ] ++ lib.optional (!isPyPy) [ + ] ++ lib.optionals (!isPyPy) [ greenlet ]; @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/neovim/pynvim"; changelog = "https://github.com/neovim/pynvim/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pynws/default.nix b/nixpkgs/pkgs/development/python-modules/pynws/default.nix index 3931c416ad60..145f20e4c589 100644 --- a/nixpkgs/pkgs/development/python-modules/pynws/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynws/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pynws"; - version = "1.4.1"; + version = "1.5.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; rev = "v${version}"; - hash = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y="; + hash = "sha256-UGwK7HasDAPw3edQUdrzWOmrbbM9l5R1BVw3M+FNm1s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyomo/default.nix b/nixpkgs/pkgs/development/python-modules/pyomo/default.nix index 0d738ef469ef..c0900b664439 100644 --- a/nixpkgs/pkgs/development/python-modules/pyomo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyomo/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { homepage = "http://pyomo.org"; changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index 03549ea2977d..c5336d788560 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -24,13 +24,13 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2023.1"; + version = "2023.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-2d5gcnKRmlB6nCTD3+7q/nLAX3zWyeN7IRno7jxTqJE="; + hash = "sha256-CtkleKlKC+De3Vyk/Lbie1p13k5frHV/BMkES9nUJEQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 65b04ab3c56a..bc0a350a31c6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyopengl-accelerate"; - version = "3.1.6"; + version = "3.1.7"; disabled = pythonAtLeast "3.10"; # fails to compile src = fetchPypi { pname = "PyOpenGL-accelerate"; inherit version; - hash = "sha256-rYowAlbsolIoJh3hb3QeUaMPNPHhsc9oNZ9cYtvNzcM="; + hash = "sha256-KxI2ISc6k59/0uwidUHjmfm11OgV1prgvbG2xwopNoA="; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix index df5416ad993c..db77f854dbb3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix @@ -95,6 +95,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/pyopenssl"; changelog = "https://github.com/pyca/pyopenssl/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix b/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix index 7debcd3b7a35..c7abf88c3da7 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix @@ -8,22 +8,21 @@ , pytestCheckHook , pythonOlder , requests -, six }: buildPythonPackage rec { pname = "pyopnsense"; - version = "0.3.0"; + version = "0.4.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "06rssdb3zhccnm63z96mw5yd38d9i99fgigfcdxn9divalbbhp5a"; + hash = "sha256-3DKlVrOtMa55gTu557pgojRpdgrO5pEZ3L+9gKoW9yg="; }; propagatedBuildInputs = [ pbr - six requests ]; @@ -34,11 +33,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pyopnsense" ]; + pythonImportsCheck = [ + "pyopnsense" + ]; meta = with lib; { description = "Python client for the OPNsense API"; homepage = "https://github.com/mtreinish/pyopnsense"; + changelog = "https://github.com/mtreinish/pyopnsense/releases/tag/${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix b/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix index 5a537f7f8b28..678c66d29b22 100644 --- a/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, pythonRelaxDepsHook , poetry-core , httpx , pydicom @@ -22,10 +23,14 @@ buildPythonPackage rec { hash = "sha256-RZJ7BuQRJ+yaHFv9iq4uFvMtH8NvGvmpjmgmyvw9rGk="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ]; propagatedBuildInputs = [ httpx pydicom ]; + pythonRelaxDeps = [ + "httpx" + ]; + doCheck = false; # requires orthanc server (not in Nixpkgs) pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix b/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix index eafcc135279a..7f261a3cfd1b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.8.0"; + version = "1.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-Mo28QpPJqfzzb/bq4W+OUcyptWCaLJSon99VdJ9Ss80="; + hash = "sha256-03tbWCkSAG/aE6hsPxCPuGRFPTiMgkp/tCzWScPW8YE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyperf/default.nix b/nixpkgs/pkgs/development/python-modules/pyperf/default.nix index 28eac119f9b5..e6ae36f0cf8a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyperf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyperf/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Python module to generate and modify perf"; homepage = "https://pyperf.readthedocs.io/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pypika/default.nix b/nixpkgs/pkgs/development/python-modules/pypika/default.nix new file mode 100644 index 000000000000..ab2105ecee1f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pypika/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, parameterized +, unittestCheckHook +}: +buildPythonPackage rec { + pname = "pypika"; + version = "0.48.9"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "kayak"; + repo = "pypika"; + rev = "v${version}"; + hash = "sha256-9HKT1xRu23F5ptiKhIgIR8srLIcpDzpowBNuYOhqMU0="; + }; + + pythonImportsCheck = ["pypika"]; + + nativeCheckInputs = [ + parameterized + unittestCheckHook + ]; + + meta = with lib; { + description = "A python SQL query builder"; + homepage = "https://github.com/kayak/pypika"; + license = licenses.asl20; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix b/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix index e1bb5cd068f1..74ddf37e236d 100644 --- a/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/pypiserver/pypiserver"; description = "Minimal PyPI server for use with pip/easy_install"; license = with licenses; [ mit zlib ]; - maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; + maintainers = with maintainers; [ austinbutler ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix b/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix index 90c42306a134..816afc262f90 100644 --- a/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "pypitoken"; - version = "6.0.3"; + version = "7.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ewjoachim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1kPIVcxpFjqlAnPh71iS07n9M0qcFrwMRV8k38YxHBc="; + hash = "sha256-CjSENkk1VlzrCngwFoJuq31Iai60qTJXBGMoV5QkSsE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix b/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix index 02ce9804d478..6203e88cbf61 100644 --- a/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypoolstation/default.nix @@ -3,21 +3,21 @@ , backoff , buildPythonPackage , fetchPypi +, importlib-metadata , poetry-core , pythonOlder }: buildPythonPackage rec { pname = "pypoolstation"; - version = "0.4.9"; + version = "0.5.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "PyPoolstation"; - inherit version; - hash = "sha256-2smgsR5f2fzmutr4EjhyrFWrO9odTba0ux+0B6k3+9Y="; + inherit pname version; + hash = "sha256-hszGCA2DDGQSh37lxp8G0bqHliH/+i2so5imDyzyOJw="; }; nativeBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp backoff + importlib-metadata ]; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix b/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix index 0f82bf1a4e54..b6e52d675485 100644 --- a/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix @@ -5,6 +5,7 @@ , mpi4py , numpy , precice +, pkgconfig , pythonOlder }: @@ -24,6 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython + pkgconfig ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pypresence/default.nix b/nixpkgs/pkgs/development/python-modules/pypresence/default.nix index c21692f7f2a9..e400956aaf49 100644 --- a/nixpkgs/pkgs/development/python-modules/pypresence/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypresence/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pypresence"; - version = "4.2.1"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "691daf98c8189fd216d988ebfc67779e0f664211512d9843f37ab0d51d4de066"; + sha256 = "sha256-phkaOvM6lmfypO8BhVd8hrli7nCqgmQ8Rydopv7R+/M="; }; doCheck = false; # tests require internet connection diff --git a/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix b/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix index 4f6736240905..5d072364ea3c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyqldb"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-qldb-driver-python"; - rev = "v${version}"; - hash = "sha256-TKf43+k428h8T6ye6mJrnK9D4J1xpIu0QacM7lWJF7w="; + rev = "refs/tags/v${version}"; + hash = "sha256-TyIXvk3ZJn5J2SBFDTPJpSnGFOFheXIqR2daL5npOk8="; }; propagatedBuildInputs = [ boto3 amazon-ion ionhash ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix index f43038fac296..6bb268d21995 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix @@ -17,6 +17,8 @@ , withWebKit ? false , withWebSockets ? false , withLocation ? false +, withSerialPort ? false +, withTools ? false }: buildPythonPackage rec { @@ -86,6 +88,8 @@ buildPythonPackage rec { ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withLocation qtlocation + ++ lib.optional withSerialPort qtserialport + ++ lib.optional withTools qttools ; buildInputs = with libsForQt5; [ @@ -99,6 +103,8 @@ buildPythonPackage rec { ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withLocation qtlocation + ++ lib.optional withSerialPort qtserialport + ++ lib.optional withTools qttools ; propagatedBuildInputs = [ @@ -130,6 +136,8 @@ buildPythonPackage rec { ++ lib.optional withMultimedia "PyQt5.QtMultimedia" ++ lib.optional withConnectivity "PyQt5.QtBluetooth" ++ lib.optional withLocation "PyQt5.QtPositioning" + ++ lib.optional withSerialPort "PyQt5.QtSerialPort" + ++ lib.optional withTools "PyQt5.QtDesigner" ; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix index d24d3f362eb3..22f2048ba1d3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, isPy27 , fetchPypi , pkg-config , dbus @@ -15,9 +14,7 @@ , pythonOlder , withMultimedia ? true , withWebSockets ? true -# FIXME: Once QtLocation is available for Qt6 enable this -# https://bugreports.qt.io/browse/QTBUG-96795 -#, withLocation ? true +, withLocation ? true # Not currently part of PyQt6 #, withConnectivity ? true , withPrintSupport ? true @@ -26,14 +23,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.5.0"; + version = "6.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uXy0vpssiZeQTqZozzsKSuWCIZb3eSWQ0F7N5iFqn7w="; + hash = "sha256-FIfuc1D5/7ZtYKtBdlGSUsKzcXYsvo+DQP2VH2OAEoA="; }; patches = [ @@ -83,7 +80,7 @@ buildPythonPackage rec { # ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withMultimedia qtmultimedia ++ lib.optional withWebSockets qtwebsockets - # ++ lib.optional withLocation qtlocation + ++ lib.optional withLocation qtlocation ; buildInputs = with qt6Packages; [ @@ -97,7 +94,7 @@ buildPythonPackage rec { ] # ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebSockets qtwebsockets - # ++ lib.optional withLocation qtlocation + ++ lib.optional withLocation qtlocation ; propagatedBuildInputs = [ @@ -132,7 +129,7 @@ buildPythonPackage rec { ++ lib.optional withWebSockets "PyQt6.QtWebSockets" ++ lib.optional withMultimedia "PyQt6.QtMultimedia" # ++ lib.optional withConnectivity "PyQt6.QtConnectivity" - # ++ lib.optional withLocation "PyQt6.QtPositioning" + ++ lib.optional withLocation "PyQt6.QtPositioning" ; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyqt3d/default.nix b/nixpkgs/pkgs/development/python-modules/pyqt3d/default.nix new file mode 100644 index 000000000000..c6129a08680e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyqt3d/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pyqt5 +, pyqt-builder +, python +, pythonOlder +, qt3d +, setuptools +, sip +}: + +buildPythonPackage rec { + pname = "pyqt3d"; + version = "5.15.6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "PyQt3D"; + inherit version; + hash = "sha256-fWxtVc2PwiGzE8mVwPhymjdxFJJvA3f46QEdRevziBw="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]" + ''; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + preBuild = '' + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" + ''; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + sip + qt3d + setuptools + pyqt-builder + ]; + + buildInputs = [ + qt3d + ]; + + propagatedBuildInputs = [ + pyqt5 + ]; + + dontConfigure = true; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "PyQt5.Qt3DCore" + ]; + + meta = with lib; { + description = "Python bindings for the Qt 3D framework"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ panicgh ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyqtchart/default.nix b/nixpkgs/pkgs/development/python-modules/pyqtchart/default.nix new file mode 100644 index 000000000000..3f95fe791574 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyqtchart/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pyqt5 +, pyqt-builder +, python +, pythonOlder +, qtcharts +, setuptools +, sip +}: + +buildPythonPackage rec { + pname = "pyqtchart"; + version = "5.15.6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "PyQtChart"; + inherit version; + hash = "sha256-JpF5b+kqKUphdZKlxcNeeF3JH3dZ3vnrItp532N2Izk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]" + ''; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + preBuild = '' + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" + ''; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + sip + qtcharts + setuptools + pyqt-builder + ]; + + buildInputs = [ + qtcharts + ]; + + propagatedBuildInputs = [ + pyqt5 + ]; + + dontConfigure = true; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "PyQt5.QtChart" + ]; + + meta = with lib; { + description = "Python bindings for the Qt Charts library"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ panicgh ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyqtdatavisualization/default.nix b/nixpkgs/pkgs/development/python-modules/pyqtdatavisualization/default.nix new file mode 100644 index 000000000000..1561e9d4be51 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyqtdatavisualization/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pyqt5 +, pyqt-builder +, python +, pythonOlder +, qtdatavis3d +, setuptools +, sip +}: + +buildPythonPackage rec { + pname = "pyqtdatavisualization"; + version = "5.15.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "PyQtDataVisualization"; + inherit version; + hash = "sha256-iSf496pwhX7wDFHj379vg92fOFX0FuDVMVknYcu53H8="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]" + ''; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + preBuild = '' + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" + ''; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + sip + qtdatavis3d + setuptools + pyqt-builder + ]; + + buildInputs = [ + qtdatavis3d + ]; + + propagatedBuildInputs = [ + pyqt5 + ]; + + dontConfigure = true; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "PyQt5.QtDataVisualization" + ]; + + meta = with lib; { + description = "Python bindings for the Qt Data Visualization library"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ panicgh ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix b/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix index 96f5d66cf650..0f88c0afb7ad 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "A Pythonic interface to the RabbitMQ Management HTTP API"; homepage = "https://github.com/deslum/pyrabbit2"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyradiomics/default.nix b/nixpkgs/pkgs/development/python-modules/pyradiomics/default.nix new file mode 100644 index 000000000000..606f542f8f96 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyradiomics/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, numpy +, pykwalify +, pywavelets +, setuptools +, simpleitk +, six +, versioneer +}: + +buildPythonPackage rec { + pname = "pyradiomics"; + version = "3.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "AIM-Harvard"; + repo = "pyradiomics"; + rev = "refs/tags/v${version}"; + hash = "sha256-/qFNN63Bbq4DUZDPmwUGj1z5pY3ujsbqFJpVXbO+b8E="; + name = "pyradiomics"; + }; + + nativeBuildInputs = [ setuptools versioneer ]; + + propagatedBuildInputs = [ + numpy + pykwalify + pywavelets + simpleitk + six + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + rm -rf radiomics + ''; + # tries to access network at collection time: + disabledTestPaths = [ "tests/test_wavelet.py" ]; + # various urllib download errors and (probably related) missing feature errors: + disabledTests = [ + "brain1_shape2D-original_shape2D" + "brain2_shape2D-original_shape2D" + "breast1_shape2D-original_shape2D" + "lung1_shape2D-original_shape2D" + "lung2_shape2D-original_shape2D" + ]; + # note the above elements of disabledTests are patterns, not exact tests, + # so simply setting `disabledTests` does not suffice: + pytestFlagsArray = [ + "-k '${toString (lib.intersperse "and" (lib.forEach disabledTests (t: "not ${t}")))}'" + ]; + + pythonImportsCheck = [ + "radiomics" + ]; + + meta = with lib; { + homepage = "https://pyradiomics.readthedocs.io"; + description = "Extraction of Radiomics features from 2D and 3D images and binary masks"; + changelog = "https://github.com/AIM-Harvard/pyradiomics/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix b/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix index 4b082e22d61d..67a57b8c203b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix @@ -1,4 +1,5 @@ { lib +, aiohttp-retry , buildPythonPackage , fetchFromGitHub , freezegun @@ -21,16 +22,16 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "2.0.1"; + version = "3.0.1"; format = "setuptools"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ssm/nFciUeWexgsKUpF4qZHz/grG8OYJV7roBAjMsac="; + hash = "sha256-Qi0NfLayypi/wKJZB9IOzoeaZsb3oq2JahXWdkwSjeo="; }; postPatch = '' @@ -42,6 +43,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + aiohttp-retry ical pycryptodome pydantic @@ -50,6 +52,8 @@ buildPythonPackage rec { requests ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ freezegun parameterized diff --git a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index 426459a67fb4..a5dbfd521d62 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , webtest -, zope_component +, zope-component , hupper , pastedeploy , plaster @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ webtest - zope_component + zope-component ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix index f4031db0d95e..69862bdfe554 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Chameleon template compiler for pyramid"; homepage = "https://github.com/Pylons/pyramid_chameleon"; license = licenses.bsd0; diff --git a/nixpkgs/pkgs/development/python-modules/pyre-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/pyre-extensions/default.nix new file mode 100644 index 000000000000..dd9868d2078d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyre-extensions/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +# build inputs +, typing-extensions +, typing-inspect +}: +let + pname = "pyre-extensions"; + version = "0.0.30"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disable = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-unkjxIbgia+zehBiOo9K6C1zz/QkJtcRxIrwcOW8MbI="; + }; + + propagatedBuildInputs = [ + typing-extensions + typing-inspect + ]; + + pythonImportsCheck = [ "pyre_extensions" ]; + + meta = with lib; { + description = "This module defines extensions to the standard “typing” module that are supported by the Pyre typechecker"; + homepage = "https://pypi.org/project/pyre-extensions"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyreaderwriterlock/default.nix b/nixpkgs/pkgs/development/python-modules/pyreaderwriterlock/default.nix new file mode 100644 index 000000000000..378be471aef0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyreaderwriterlock/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder + + # propagates +, typing-extensions + + # tests +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "pyReaderWriterLock"; + version = "1.0.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "elarivie"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-8FC+4aDgGpF1BmOdlkFtMy7OfWdSmvn9fjKXSmmeJlg="; + }; + + propagatedBuildInputs = [ typing-extensions ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "readerwriterlock" ]; + + meta = with lib; { + changelog = "https://github.com/elarivie/pyReaderWriterLock/blob/master/CHANGELOG.md"; + description = "Implementation of the Readers-writers problem"; + homepage = "https://github.com/elarivie/pyReaderWriterLock"; + license = licenses.mit; + maintainers = with maintainers; [ MayNiklas ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix b/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix index 33e1e8dc015c..808b0e5428e9 100644 --- a/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-7DpmWIRzhB32YZCDpR+rEIAzn5OuZqt7wvS0GnxnT/g="; + hash = "sha256-CvovylOTTyXm0ucTwNSFZzkcA0H8H76BSg4vjB2Pe4M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyres/default.nix b/nixpkgs/pkgs/development/python-modules/pyres/default.nix deleted file mode 100644 index 4aeccc1d360a..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyres/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }: - -buildPythonPackage rec { - pname = "pyres"; - version = "1.5"; - - propagatedBuildInputs = [ simplejson setproctitle redis pkgs.ps ]; - nativeCheckInputs = [ nose pkgs.redis ]; - - # PyPI tarball doesn't contain tests so let's use GitHub - src = fetchFromGitHub { - owner = "binarydud"; - repo = pname; - rev = version; - sha256 = "1rkpv7gbjxl9h9g7kncmsrgmi77l7pgfq8d7dbnsr3ia2jmjqb8y"; - }; - - # started redis-server makes this hang on darwin - doCheck = !stdenv.isDarwin; - - checkPhase = '' - redis-server & - nosetests . --exclude test_worker_pids - ''; - - meta = with lib; { - description = "Python resque clone"; - homepage = "https://github.com/binarydud/pyres"; - license = licenses.mit; - maintainers = with maintainers; [ jluttine ]; - broken = true; # not compatible with latest redis - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix b/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix index 94e06834fe25..9dbd71e83acf 100644 --- a/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.4"; + version = "1.8.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-dm+tYeUt9IiF3pbUEhPaH46MG3ns8witUxifzRXBy0E="; + hash = "sha256-ANL03ailPmbZVRJNxuSektz1cM071waCUJHbdk2TzQc="; }; propagatedBuildInputs = [ @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for probabilistic modeling and inference"; homepage = "http://pyro.ai"; + changelog = "https://github.com/pyro-ppl/pyro/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ teh georgewhewell ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix b/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix index c387bdef4b8c..7ee23f34e093 100644 --- a/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Formulate and solve resource-constrained scheduling problems"; homepage = "https://github.com/timnon/pyschedule"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix b/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix index 80920c5c9148..abc30c72ce84 100644 --- a/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.6.0"; + version = "2023.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-ogYVk0Kvv595IlIa/qdV1lqlnW45IG29PX5EEaMaphw="; + hash = "sha256-PH8ClpuYwTu+34hSPPwI1KMFut6UaxWVrbf38LYb9EQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix b/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix index 1daeb9408778..f04b85a9d003 100644 --- a/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "python screenshot"; homepage = "https://github.com/ponty/pyscreenshot"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix b/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix index 2ebfa8238f39..75672f3466dd 100644 --- a/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.28"; + version = "1.0.32"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7mYYsJCiJZedbmO9fv/Zr+QZOaSE6d6ld94yWUhUmUQ="; + hash = "sha256-5A98g2SyJa+aGFewPLUgL73XpkccQTYec1mCZvIOa9w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix b/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix new file mode 100644 index 000000000000..ffc7486cf20a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, pkg-config +, rustPlatform +, cargo +, rustc +, bzip2 +, nettle +, openssl +, pcsclite +, stdenv +, darwin +}: + +buildPythonPackage rec { + pname = "pysequoia"; + version = "0.1.14"; + format = "pyproject"; + + src = fetchFromGitLab { + owner = "sequoia-pgp"; + repo = "pysequoia"; + rev = "v${version}"; + hash = "sha256-63kUUxZTG33cB/IiD4AiDpLOI6Uew/fETgqhaGc7zp0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-S/j3bGgU46nvVQFs35ih05teVEIJrFN4Ryq4B7rLFDE="; + }; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + cargo + rustc + ]; + + buildInputs = [ + bzip2 + nettle + openssl + pcsclite + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + ]; + + pythonImportsCheck = [ "pysequoia" ]; + + meta = with lib; { + description = "This library provides OpenPGP facilities in Python through the Sequoia PGP library"; + homepage = "https://sequoia-pgp.gitlab.io/pysequoia"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix b/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix index 16e02df4798c..34bfacb9c0c5 100644 --- a/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { pyserial ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "serial_asyncio" ]; @@ -29,6 +31,5 @@ buildPythonPackage rec { homepage = "https://github.com/pyserial/pyserial-asyncio"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyshark/default.nix b/nixpkgs/pkgs/development/python-modules/pyshark/default.nix index cef7660d63eb..523da7030662 100644 --- a/nixpkgs/pkgs/development/python-modules/pyshark/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyshark/default.nix @@ -1,20 +1,20 @@ { lib +, stdenv +, appdirs , buildPythonPackage -, pythonOlder , fetchFromGitHub -, fetchpatch -, appdirs , lxml , packaging , py , pytestCheckHook +, pythonOlder +, termcolor , wireshark-cli -, stdenv }: buildPythonPackage rec { pname = "pyshark"; - version = "0.5.3"; + version = "0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,32 +23,34 @@ buildPythonPackage rec { owner = "KimiNewt"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-byll2GWY2841AAf8Xh+KfaCOtMGVKabTsLCe3gCdZ1o="; + hash = "sha256-kzJDzUK6zknUyXPdKc4zMvWim4C5NQCSJSS45HI6hKM="; }; - patches = [ - (fetchpatch { - name = "fix-mapping.patch"; - url = - "https://github.com/KimiNewt/pyshark/pull/608/commits/c2feb17ef621390481d6acc29dbf807d6851ed4c.patch"; - hash = "sha256-TY09HPxqJP3zI8+ugm518aMuBgog7wrXs5uoReHHaEI="; - }) - ]; - # `stripLen` does not seem to work here patchFlags = [ "-p2" ]; sourceRoot = "${src.name}/src"; # propagate wireshark, so pyshark can find it when used - propagatedBuildInputs = [ appdirs py lxml packaging wireshark-cli ]; + propagatedBuildInputs = [ + appdirs + lxml + packaging + py + termcolor + wireshark-cli + ]; + + nativeCheckInputs = [ + py + pytestCheckHook + wireshark-cli + ]; preCheck = '' export HOME=$(mktemp -d) ''; - nativeCheckInputs = [ py pytestCheckHook wireshark-cli ]; - disabledTests = [ # flaky # KeyError: 'Packet of index 0 does not exist in capture' @@ -59,14 +61,18 @@ buildPythonPackage rec { "test_iterate_empty_psml_capture" ]; - pythonImportsCheck = [ "pyshark" ]; + pythonImportsCheck = [ + "pyshark" + ]; - pytestFlagsArray = [ "../tests/" ]; + pytestFlagsArray = [ + "../tests/" + ]; meta = with lib; { - description = - "Python wrapper for tshark, allowing Python packet parsing using Wireshark dissectors"; + description = "Python wrapper for tshark, allowing Python packet parsing using Wireshark dissectors"; homepage = "https://github.com/KimiNewt/pyshark/"; + changelog = "https://github.com/KimiNewt/pyshark/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/nixpkgs/pkgs/development/python-modules/pyside2/default.nix index 4fa3e757767d..151efb65895e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyside2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyside2/default.nix @@ -17,11 +17,11 @@ disabledIf (pythonAtLeast "3.11") ( stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.5"; + version = "5.15.10"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "0cwvw6695215498rsbm2xzkwaxdr3w7zfvy4kc62c01k6pxs881r"; + sha256 = "sha256-KvaR02E6Qfg6YEObRlaPwsaW2/rkL3zXsHFS0RXq0zo="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index fa14fae70707..69bca8d73444 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.3"; + version = "1.0.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-NjMfJgM8YaJiQp8rucR099y4ZFG98XnxK1KZlnZb+MI="; + hash = "sha256-HHg5WNnWm7/4yhKRNMxskZzOgyH5qTjRxh55g8nkCb8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index 18b85d41939a..87612e80eb52 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.1.9"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-/oHwWe8EcE1CS/hOmzJm9smfRLS/wShfbSGqOuvp8rU="; + hash = "sha256-0VBnbThEkGhpxkGNBop0rPYn0NujyrK+ei/2+2f3Wno="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyslim/default.nix b/nixpkgs/pkgs/development/python-modules/pyslim/default.nix new file mode 100644 index 000000000000..fcb53da4a4f3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyslim/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pythonOlder +, msprime +, numpy +, tskit +}: + +buildPythonPackage rec { + pname = "pyslim"; + version = "1.0.3"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BRfv5AcdRpnvk7zGeYYWweh+foFEOSZjz3pTjX8KOnA="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + msprime + tskit + numpy + ]; + + # Requires non-packaged software SLiM + doCheck = false; + + pythonImportsCheck = [ + "pyslim" + ]; + + meta = with lib; { + description = "Tools for dealing with tree sequences coming to and from SLiM"; + homepage = "https://github.com/tskit-dev/pyslim"; + license = licenses.mit; + maintainers = with maintainers; [ alxsimon ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index 97133b20eee8..52649fed6710 100644 --- a/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "22.5.1"; + version = "23.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { repo = "pyslurm"; owner = "PySlurm"; rev = "refs/tags/v${version}"; - hash = "sha256-sPZELCxe2e7/gUmRxvP2aOwqsbaR/x+0grHwuDdx0Dg="; + hash = "sha256-M8seh5pkw2OTiDU4O96D0Lg3+FrlB2w4ehy53kSxyoU="; }; buildInputs = [ cython slurm ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix b/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix index 84c79409aa65..e404ef905de1 100644 --- a/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysmartapp"; - version = "0.3.4"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = pname; rev = version; - hash = "sha256-zYjv7wRxQTS4PnNaY69bw9xE6I4DZMocwUzEICBfwqM="; + hash = "sha256-RiRGOO5l5hcHllyDDGLtQHr51JOTZhAa/wK8BfMqmAY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix b/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix index 5f878839693a..369cd6ecea6e 100644 --- a/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysmartthings"; - version = "0.7.7"; + version = "0.7.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = pname; rev = version; - hash = "sha256-AzAiMn88tRRPwMpwSnKoS1XUERHbKz0sVm/TjcbTsGs="; + hash = "sha256-r+f2+vEXJdQGDlbs/MhraFgEmsAf32PU282blLRLjzc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix b/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix index e8a6727ae694..9cebc9d7bc7a 100644 --- a/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysnooper"; - version = "1.1.1"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "PySnooper"; - hash = "sha256-0X3JHMoVk8ECMNzkXkax0/8PiRDww46UHt9roSYLOCA="; + hash = "sha256-gQZp4WKiUKBm2GYuVzrbxa93DpN8W1V48ou3NV0chZs="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix index 91fdc8389664..4aa6718c82eb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyspark/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyspark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.4.0"; + version = "3.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Fnoj4RhUrbN/hgLeb8w6T5b9Xx4yO5u4MyXzhAjFqv0="; + hash = "sha256-cs1mq4z2GnWFTlp1P3W+o17gdcOpb53k4qZtAux/xlI="; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix b/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix index 5aff4d2ccd2e..8ac514d7fa5c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -4,6 +4,7 @@ , asynccmd , buildPythonPackage , fetchFromGitHub +, poetry-core , pytest-asyncio , pytestCheckHook , pythonOlder @@ -11,18 +12,22 @@ buildPythonPackage rec { pname = "pyspcwebgw"; - version = "0.6.0"; - format = "setuptools"; + version = "0.7.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mbrrg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Pjv8AxXuwi48Z8U+LSZZ+OhXrE3KlX7jlmnXTBLxXOs="; + hash = "sha256-gdIrbr25GXaX26B1f7u0NKbqqnAC2tmMFZspzW6I4HI="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ asynccmd aiohttp @@ -43,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the SPC Web Gateway REST API"; homepage = "https://github.com/mbrrg/pyspcwebgw"; + changelog = "https://github.com/pyspcwebgw/pyspcwebgw/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix b/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix index 76db9500abfa..7441689895cb 100644 --- a/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Python 3 bindings for SQLCipher"; homepage = "https://github.com/rigglemania/pysqlcipher3/"; license = licenses.zlib; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix b/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix index 7762a7645467..7c9425a9d02a 100644 --- a/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rajlaud"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nNCxptQDabNPKtKFy19kBl5rIhlHlgvvKkz/JWj3k8A="; + hash = "sha256-WnL9Va3uaWlUHVBtit4v+XdYOFmPpxG91mAHEGwI+7c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysrim/default.nix b/nixpkgs/pkgs/development/python-modules/pysrim/default.nix index 4c3b66698adb..d00c430e3cc5 100644 --- a/nixpkgs/pkgs/development/python-modules/pysrim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysrim/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Srim Automation of Tasks via Python"; homepage = "https://gitlab.com/costrouc/pysrim"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pystardict/default.nix b/nixpkgs/pkgs/development/python-modules/pystardict/default.nix new file mode 100644 index 000000000000..4e5cbd64e4b6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pystardict/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools-scm +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pystardict"; + version = "0.8"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "lig"; + repo = "pystardict"; + rev = version; + hash = "sha256-YrZpIhyxfA3G7rP0SJ+EvzGwAXlne80AYilkj6cIDnA="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ six ]; + + nativeBuildInputs = [ setuptools setuptools-scm ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pystardict" ]; + + meta = with lib; { + description = + "Library for manipulating StarDict dictionaries from within Python"; + homepage = "https://github.com/lig/pystardict"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ thornycrackers ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysubs2/default.nix b/nixpkgs/pkgs/development/python-modules/pysubs2/default.nix new file mode 100644 index 000000000000..3ae2de440750 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysubs2/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "pysubs2"; + version = "1.6.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tkarabela"; + repo = pname; + rev = version; + hash = "sha256-0bW9aB6ERRQK3psqeU0Siyi/8drEGisAp8UtTfOKlp0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pysubs2" + ]; + + meta = with lib; { + homepage = "https://github.com/tkarabela/pysubs2"; + description = "A Python library for editing subtitle files"; + license = licenses.mit; + maintainers = with maintainers; [ Benjamin-L ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index c3ad116570e4..3005c3b18d8a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.37.6"; + version = "0.38.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-LZkAyfcDX48hR7lak2mc27lTQQR3VX1ozpdi2btDzbY="; + hash = "sha256-0BlrrrOvMHBH+w7r1lzvXg2Lq84XZFfSRheBaDmCpc4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytado/default.nix b/nixpkgs/pkgs/development/python-modules/pytado/default.nix index 44d38fb6636a..ddd618d6d14f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytado/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pytado"; - version = "0.13.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; # Upstream hasn't tagged 0.13.0 yet - rev = "2a243174e9ae01ef7adae940ecc6e340992ab28d"; - sha256 = "Y1FxEzs/AF0ZTPdOK/1v+2U2fidfu+AmZbPddJCWIFc="; + rev = "refs/tags/${version}"; + sha256 = "sha256-tpWr+VlkJ9svN9XtBIDEAos4uxYCl6njvUBPIJG++Yg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytapo/default.nix b/nixpkgs/pkgs/development/python-modules/pytapo/default.nix index 63d4839dea7f..7d026e0625ba 100644 --- a/nixpkgs/pkgs/development/python-modules/pytapo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.1.13"; + version = "3.1.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fuColL2POq9hGL53oxPGZri5m1AqBPwdggCt6i4RM/Q="; + hash = "sha256-pYzp/iQHTXS+ovtWIwOoUfYg/h/46ZLNZyevK2vQHEA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix index d73e3b8f8e6a..2c70cbd320f6 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix @@ -37,10 +37,10 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "Generate PyAnnotate annotations from your pytest tests"; homepage = "https://github.com/kensho-technologies/pytest-annotate"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index 110db96aba93..a9934fbdcc1a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , ansible-core @@ -55,6 +56,17 @@ buildPythonPackage rec { # [Errno -3] Temporary failure in name resolution "test_connection_failure_v2" "test_connection_failure_extra_inventory_v2" + ] ++ lib.optionals stdenv.isDarwin [ + # These tests fail in the Darwin sandbox + "test_ansible_facts" + "test_func" + "test_param_override_with_marker" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # These tests fail in the Darwin sandbox + "tests/test_adhoc.py" + "tests/test_adhoc_result.py" ]; pythonImportsCheck = [ @@ -66,6 +78,6 @@ buildPythonPackage rec { homepage = "https://github.com/jlaska/pytest-ansible"; changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix index 95e22510d8a0..7984a390a688 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Pytest plugin to help with comparing array output from tests"; homepage = "https://github.com/astrofrog/pytest-arraydiff"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix index aa88d42813ea..43f2edfc30ea 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Plugin to add diagnostic information to the header of the test output"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix index a111c8953d63..5e1f9223019a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Meta-package containing dependencies for testing"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-asyncio/tests.nix b/nixpkgs/pkgs/development/python-modules/pytest-asyncio/tests.nix index 6a471513112a..94e6e1855afb 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-asyncio/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-asyncio/tests.nix @@ -6,7 +6,7 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytest-asyncio-tests"; inherit (pytest-asyncio) version; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix index f34c6c8c3f4c..4110a0191f3c 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { requests ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytestCheckHook pytest-localserver diff --git a/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix index debbe626ffab..ffc13ca9eb58 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/Stranger6667/pytest-click"; changelog = "https://github.com/Stranger6667/pytest-click/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix index 4f520f3e8b2e..b3f445cad431 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-examples/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-examples/default.nix new file mode 100644 index 000000000000..37e7c2fe6bfe --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-examples/default.nix @@ -0,0 +1,66 @@ +{ lib +, black +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pytest +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, ruff +}: + +buildPythonPackage rec { + pname = "pytest-examples"; + version = "0.0.9"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pytest-examples"; + rev = "refs/tags/v${version}"; + hash = "sha256-ecxSLbPnHdL60vlc7EjKmw5rATTePqJCa5QIdyxevv0="; + }; + + postPatch = '' + # ruff binary is used directly, the ruff Python package is not needed + substituteInPlace pytest_examples/lint.py \ + --replace "'ruff'" "'${ruff}/bin/ruff'" + ''; + + pythonRemoveDeps = [ + "ruff" + ]; + + nativeBuildInputs = [ + hatchling + pythonRelaxDepsHook + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + black + ruff + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_examples" + ]; + + meta = with lib; { + description = "Pytest plugin for testing examples in docstrings and markdown files"; + homepage = "https://github.com/pydantic/pytest-examples"; + changelog = "https://github.com/pydantic/pytest-examples/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-freezer/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-freezer/default.nix index 8621eeee8088..d7381c44a680 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-freezer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-freezer/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , freezegun -, hatchling , pytest , pytestCheckHook , pythonOlder @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-freezer"; - version = "0.4.6"; + version = "0.4.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,11 +19,11 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0JZv6MavRceAV+ZOetCVxJEyttd5W3PCts6Fz2KQsh0="; + hash = "sha256-Eak6LNoyu2wvZbPaBBUO0UkyB9vni8YbsADGK0as7Cg="; }; nativeBuildInputs = [ - hatchling + flit-core ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix index 347ac2257e12..da22eea8d7f1 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix @@ -6,11 +6,12 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.21.3"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-+jOPbEul/mkZbaR6ZqwLTgVtemi18vOYgqJcgv6JSII="; + hash = "sha256-J5Y5G3/8d9hAtDFqweqA73amnXUpPbmb0uTrCslpl9k="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + buildInputs = [ pytest ]; @@ -30,6 +35,10 @@ buildPythonPackage rec { httpx ]; + pythonRelaxDeps = [ + "httpx" + ]; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/pytest-image-diff/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-image-diff/default.nix new file mode 100644 index 000000000000..cbe607d0648e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-image-diff/default.nix @@ -0,0 +1,43 @@ +{ lib +, python3 +, buildPythonPackage +, fetchFromGitHub +, typing-extensions +, diffimg +, imgdiff +, pytestCheckHook +, recommonmark +}: + +buildPythonPackage rec { + pname = "pytest-image-diff"; + version = "0.0.11"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Apkawa"; + repo = "pytest-image-diff"; + rev = "v${version}"; + hash = "sha256-7GBwxm0YQNN/Gq1yyBIxCEYbM7hmOFa9kUsfbBKQtBQ="; + }; + + propagatedBuildInputs = [ + typing-extensions + diffimg + imgdiff + ]; + + pythonImportsCheck = [ "pytest_image_diff" ]; + + nativeCheckInputs = [ + pytestCheckHook + recommonmark + ]; + + meta = with lib; { + description = "Pytest helps for compare images and regression"; + homepage = "https://github.com/Apkawa/pytest-image-diff"; + license = licenses.mit; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix index bb0d410618e1..89b035e74d83 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.3.1"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-muQ8lb00tdhAvaLaNupuHh6YqbDEvkaGFbnb4tR2Wes="; + hash = "sha256-iabj6WuS6+65O4ztagT1/H+U8/SKySQ9bQiOfvln1AQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix index 26cf78d0f785..63b64f233199 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Pytest plugin to help with testing figures output from Matplotlib"; homepage = "https://github.com/matplotlib/pytest-mpl"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 61fa877d9a9c..4c041ce40c89 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "1.10.1"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7Qow315zuZB6BNIIm6QR9ZMFH6E/VSp2vRBpONlqYhM="; + hash = "sha256-UlNjqloAl0Qmy3EQ73e+KmsHeJN3eBkkBJxCehpOs48="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix index 5e869b9a06ec..8514fbb7202a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Mypy static type checker plugin for Pytest"; homepage = "https://github.com/dbader/pytest-mypy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix index f076417fbbe5..ac7936c0146e 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Pytest plugin for detecting inadvertent open file handles"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix deleted file mode 100644 index 5156aa35a5ae..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchFromGitHub, buildPythonPackage -, pytest }: - -buildPythonPackage rec { - pname = "pytest-ordering"; - version = "unstable-2019-06-19"; - - # Pypi lacks tests/ - # Resolves PytestUnknownMarkWarning from pytest - src = fetchFromGitHub { - owner = "ftobia"; - repo = pname; - rev = "492697ee26633cc31d329c1ceaa468375ee8ee9c"; - sha256 = "1xim0kj5g37p1skgvp8gdylpx949krmx60w3pw6j1m1h7sakmddn"; - }; - - nativeCheckInputs = [ - pytest - ]; - - checkPhase = '' - pytest tests - ''; - - meta = with lib; { - homepage = "https://github.com/ftobia/pytest-ordering"; - description = "Pytest plugin to run your tests in a specific order"; - license = licenses.mit; - broken = true; # See https://github.com/NixOS/nixpkgs/pull/122264 - maintainers = with maintainers; [ eadwu ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-parallel/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-parallel/default.nix new file mode 100644 index 000000000000..0bc2070ce354 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-parallel/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# build inputs +, tblib +, pytest +, py +}: +let + pname = "pytest-parallel"; + version = "0.1.1"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "kevlened"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-ddpoWBTf7Zor569p6uOMjHSTx3Qa551f4mSwyTLDdBU="; + }; + + propagatedBuildInputs = [ + tblib + pytest + py + ]; + + meta = with lib; { + description = "A pytest plugin for parallel and concurrent testing"; + homepage = "https://github.com/kevlened/pytest-parallelt"; + changelog = "https://github.com/kevlened/pytest-parallel/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-pudb/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-pudb/default.nix new file mode 100644 index 000000000000..cc3e0db8570f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-pudb/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest +, pudb +}: + +buildPythonPackage rec { + pname = "pytest-pudb"; + version = "0.7.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "wronglink"; + repo = "pytest-pudb"; + # Repo missing tags for releases https://github.com/wronglink/pytest-pudb/issues/24 + rev = "a6b3d2f4d35e558d72bccff472ecde9c9d9c69e5"; + hash = "sha256-gI9p6sXCQaQjWBXaHJCFli6lBh8+pr+KPhz50fv1F7A="; + }; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ pudb ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pytest_pudb" ]; + + meta = with lib; { + description = "Pytest PuDB debugger integration"; + homepage = "https://github.com/wronglink/pytest-pudb"; + license = licenses.mit; + maintainers = with maintainers; [ thornycrackers ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix index ed076fa8476c..5bb9224ac421 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Pytest plugin to check source code with pylint"; homepage = "https://github.com/carsongee/pytest-pylint"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix index 3d7a5a86fbbe..96f751935403 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "pytest support for PyQt and PySide applications"; homepage = "https://github.com/pytest-dev/pytest-qt"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix index 7962198ca8d5..84f7edb2b6e4 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Relaxed test discovery/organization for pytest"; changelog = "https://github.com/bitprophet/pytest-relaxed/blob/${version}/docs/changelog.rst"; license = licenses.bsd0; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix index 1529796bab3b..544a2e340079 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/astropy/pytest-remotedata"; changelog = "https://github.com/astropy/pytest-remotedata/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix index 61d7d22b2945..9bd2ee22ad81 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Pytest plugin for repeating tests"; homepage = "https://github.com/pytest-dev/pytest-repeat"; license = licenses.mpl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix deleted file mode 100644 index a62bd2ada95f..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, aiohttp -, async_generator -, buildPythonPackage -, fetchFromGitHub -, httpx -, pytest -, pytestCheckHook -, sanic -, websockets -}: - -buildPythonPackage rec { - pname = "pytest-sanic"; - version = "1.9.1"; - - src = fetchFromGitHub { - owner = "yunstanford"; - repo = pname; - rev = "v${version}"; - hash = "sha256-82Xq/jyxTXyZVHqn7G+S9K++InDdORCO9oFqgaIgY7s="; - }; - - buildInputs = [ - pytest - ]; - - propagatedBuildInputs = [ - aiohttp - async_generator - httpx - pytest - websockets - ]; - - nativeCheckInputs = [ - sanic - pytestCheckHook - ]; - - pythonImportsCheck = [ - "pytest_sanic" - ]; - - meta = with lib; { - description = "A pytest plugin for Sanic"; - homepage = "https://github.com/yunstanford/pytest-sanic/"; - license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; - broken = true; # 2021-11-04 - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix index 72936dff1720..7047eef03eef 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "A plugin to enable snapshot testing with pytest"; homepage = "https://github.com/joseph-roitman/pytest-snapshot/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix index 89395ad8030a..67ee191b85cb 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Pytest Plugin to disable socket calls during tests"; homepage = "https://github.com/miketheman/pytest-socket"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix index c744a2926b02..e916e0e00516 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Frozenball/pytest-sugar"; changelog = "https://github.com/Teemu/pytest-sugar/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix new file mode 100644 index 000000000000..fe663c3f265b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, setuptools-scm +, ansible-core +, paramiko +, pytestCheckHook +, pytest-xdist +, pywinrm +, salt +}: + +buildPythonPackage rec { + pname = "pytest-testinfra"; + version = "8.1.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-m0CCi1j7esK/8pzBRlk0rfQ08Q3VoQj2BTXe5SZgpj0="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ + ansible-core + paramiko + pytestCheckHook + pytest-xdist + pywinrm + salt + ]; + + # markers don't get added when docker is not available (leads to warnings): + # https://github.com/pytest-dev/pytest-testinfra/blob/8.1.0/test/conftest.py#L228 + preCheck = '' + export HOME=$(mktemp -d) + sed -i '54imarkers = \ + \ttestinfra_hosts(host_selector): mark test to run on selected hosts \ + \tdestructive: mark test as destructive \ + \tskip_wsl: skip test on WSL, no systemd support' setup.cfg + ''; + + # docker is required for all disabled tests + disabledTests = [ + # test/test_backends.py + "test_command" + "test_encoding" + "test_ansible_any_error_fatal" + "test_user_connection" + "test_sudo" + "test_docker_encoding" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # broken because salt package only built for python 3.10 + "test_backend_importables" + ]; + + disabledTestPaths = [ + "test/test_modules.py" + ]; + + meta = with lib; { + description = "Pytest plugin for testing your infrastructure"; + homepage = "https://github.com/pytest-dev/pytest-testinfra"; + license = licenses.asl20; + maintainers = with maintainers; [ hulr ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix index 584cc75e5cd8..4f9b9bd5d637 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "2.0.8"; + version = "2.0.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tarpas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UMWcLNKPMlfPl2plSViRcKkgqYs23b3KdzexLHXq/+g="; + hash = "sha256-hv5sgWSbMk13h+nFTcy4aEMJvTyaLbXFhg6ZOKYEvVQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix index 77c8c0cf226e..9064b4283ba8 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix @@ -4,7 +4,6 @@ , pytest , pytestCheckHook , pexpect -, pytest-cov }: buildPythonPackage rec { @@ -24,7 +23,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pexpect - pytest-cov ]; disabledTests = [ @@ -46,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-timeout/"; changelog = "https://github.com/pytest-dev/pytest-timeout/#changelog"; license = licenses.mit; - maintainers = with maintainers; [ makefu costrouc ]; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix index ba067c19658a..0b555274c90a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -3,20 +3,24 @@ , fetchPypi , pytest , pyvirtualdisplay -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "pytest-xvfb"; - version = "2.0.0"; - disabled = isPy27; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4"; + hash = "sha256-N0arH00RWfA/dRY40FNonM0oQpGzi4+wPT67579pz8A="; }; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ pyvirtualdisplay @@ -25,7 +29,8 @@ buildPythonPackage rec { meta = with lib; { description = "A pytest plugin to run Xvfb for tests"; homepage = "https://github.com/The-Compiler/pytest-xvfb"; + changelog = "https://github.com/The-Compiler/pytest-xvfb/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-arango/default.nix b/nixpkgs/pkgs/development/python-modules/python-arango/default.nix index 0912daa20f46..e9224b543b57 100644 --- a/nixpkgs/pkgs/development/python-modules/python-arango/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-arango/default.nix @@ -9,6 +9,7 @@ , mock , requests , requests-toolbelt +, setuptools }: let @@ -38,6 +39,7 @@ buildPythonPackage rec { requests requests-toolbelt pyjwt + setuptools ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix b/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix index 5e97286bd483..1e56b59c1fd4 100644 --- a/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-barcode"; - version = "0.14.0"; + version = "0.15.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JBs0qlxctqmImIL5QJsBgpA6LF0ZtCGL42Cc271f/fk="; + hash = "sha256-Oxgl+9sR5ZdGbf9ChrTqmx6GpXcXtZ5WOuZ5cm/IVN4="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Create standard barcodes with Python"; homepage = "https://github.com/WhyNotHugo/python-barcode"; + changelog = "https://github.com/WhyNotHugo/python-barcode/blob/v${version}/docs/changelog.rst"; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index 561e89cd1ae5..e2daf959abb0 100644 --- a/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.30.2"; + version = "0.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MT1oZqzYFK37z6YpRZ9LBg0ynCaq2UrrQzlDDb3YIvo="; + hash = "sha256-4fBV7sInw/jrKt7CmG7riMTmpLyrsyvWZGRY6s3YbHw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-binance/default.nix b/nixpkgs/pkgs/development/python-modules/python-binance/default.nix index eb582c47c826..59a36e776094 100644 --- a/nixpkgs/pkgs/development/python-modules/python-binance/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-binance/default.nix @@ -3,6 +3,8 @@ , buildPythonPackage , dateparser , fetchFromGitHub +, fetchpatch +, pycryptodome , pytestCheckHook , pythonOlder , requests @@ -26,10 +28,19 @@ buildPythonPackage rec { hash = "sha256-e88INUEkjOSVOD0KSs9LmstuQ7dQZdJk8K6VqFEusww="; }; + patches = [ + (fetchpatch { + name = "fix-unable-to-determine-version-error.patch"; + url = "https://github.com/sammchardy/python-binance/commit/1b9dd4853cafccf6cdacc13bb64a18632a79a6f1.patch"; + hash = "sha256-6KRHm2cZRcdD6qMdRAwlea4qLZ1/1YFzZAQ7Ph4XMCs="; + }) + ]; + propagatedBuildInputs = [ aiohttp dateparser requests + pycryptodome six ujson websockets diff --git a/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix b/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix index c75dc71e0fc0..99cf1c63ca8f 100644 --- a/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-crontab"; - version = "2.7.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-shr0ZHx7u4SP7y8CBhbGsCidy5+UtPmRpVMQ/5vsV0k="; + hash = "sha256-eft0ZQOd39T7k9By1u4NRcGsi/FZfwaG6hT9Q2Hbo3k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix b/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix index 66c1939c7edc..1044fe0a2748 100644 --- a/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ cython diff --git a/nixpkgs/pkgs/development/python-modules/ev3dev2/default.nix b/nixpkgs/pkgs/development/python-modules/python-ev3dev2/default.nix index 5afbb7da655f..b5fc2e4fe537 100644 --- a/nixpkgs/pkgs/development/python-modules/ev3dev2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-ev3dev2/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - pname = "ev3dev2"; + pname = "python-ev3dev2"; version = "2.1.0"; src = fetchFromGitHub { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; postPatch = '' - echo "${version}\n" > RELEASE-VERSION + echo "${version}" > RELEASE-VERSION ''; propagatedBuildInputs = [ pillow ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index 905f421dbfec..0c0ded8af09f 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.14.0"; + version = "3.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7zuJYPru6YgPgrCHLYB+P6uUrOErDSqEGKl4dciBLTw="; + hash = "sha256-yeZet2Eqn7uKvwM5ly7Kf9enPU2mbJtEb/5SiTCv9TQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix index 15e96e798c3b..de8c5d000163 100644 --- a/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "python-glanceclient"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5nwCPOc9GBxk9BItiaScfy1eljl+e0okFCEOVsHoXDQ="; + hash = "sha256-ejZuH/Zr23bmJ+7PfNQFO9lPNfo83GkNKa/0fpduBTI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix b/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix index 156d2270d8e4..03290d2e99c5 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-cHWOOH/A4MS628s5T2GsvmizSXCo/tfg98iUaf4XkSo="; + hash = "sha256-VnS61Ok4dsCw0xl+MU1/lC05AYvzHiuDP2eIpoE8P7g="; }; postPatch = '' @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "API for the GNU Privacy Guard (GnuPG)"; homepage = "https://github.com/vsajip/python-gnupg"; + changelog = "https://github.com/vsajip/python-gnupg/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ copumpkin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix b/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix index c327257e0a92..bfb53c92df41 100644 --- a/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-s3FNRpMZC/MG3s+ZDHgdsIT2AhvBDmGvJfutUPzY4wE="; + hash = "sha256-XTSnIL/hBL1Rsyv/tBce/WCvA3n7mZern0v3i6gTOeA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-ipware/default.nix b/nixpkgs/pkgs/development/python-modules/python-ipware/default.nix new file mode 100644 index 000000000000..fb652df4a9e0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-ipware/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, unittestCheckHook +}: +buildPythonPackage rec { + pname = "python-ipware"; + version = "0.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "un33k"; + repo = "python-ipware"; + rev = "v${version}"; + hash = "sha256-RK624ktIzoLBD/2mB65zcYZ+o8axDE16bJpB6TwG4h4="; + }; + + pythonImportsCheck = [ + "ipware" + ]; + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + description = "A python package for server applications to retrieve client's IP address"; + homepage = "https://github.com/un33k/python-ipware"; + changelog = "https://github.com/un33k/python-ipware/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ e1mo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix index 4dbeb88bdd28..386bf8179ae1 100644 --- a/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.2.0"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-bnWUfNIx85vSV0P5zcI7syjP0+wTXYDmC8wiuInjGfc="; + hash = "sha256-veDhwpSXPtoi27tKI6xebH4haAeq+sUsEEk9TxQSbg4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix index 863ab45ed548..07044b9499bb 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix @@ -33,9 +33,14 @@ buildPythonPackage rec { buildInputs = [ mock ]; propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ stestr testscenarios requests-mock ]; checkPhase = '' - stestr run + # Skip tests that fail due to setuptools>=66.0.0 rejecting PEP 440 + # non-conforming versions. See + # https://github.com/pypa/setuptools/issues/2497 for details. + stestr run -E "tests.test_plugins.(PluginsTestScenarios.test_plugin_version_comparison|PluginsTestScenarios.test_plugin_version_object_comparison|PluginsTest.test_plugin_equal|PluginsTest.test_plugin_not_equal)" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix b/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix index ab7ae435f56e..78f97117f89f 100644 --- a/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix @@ -1,10 +1,13 @@ { lib +, anyio +, async-timeout , asyncclick , buildPythonPackage , fetchFromGitHub -, importlib-metadata -, pydantic +, kasa-crypt +, orjson , poetry-core +, pydantic , pytest-asyncio , pytest-mock , pytestCheckHook @@ -14,16 +17,16 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.5.1"; + version = "0.5.3"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vp2r842f9A2lEFLhUcHyGZavAWT4Ke9mH+FAlGucdqo="; + hash = "sha256-7GJnkT7FOYzytQyOCP8zU5hUk4SbeC7gc1qkhl5eXGo="; }; nativeBuildInputs = [ @@ -31,8 +34,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + anyio + async-timeout asyncclick - importlib-metadata pydantic ]; @@ -43,6 +47,13 @@ buildPythonPackage rec { voluptuous ]; + passthru.optional-dependencies = { + speedup = [ + kasa-crypt + orjson + ]; + }; + pytestFlagsArray = [ "--asyncio-mode=auto" ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix b/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix index 62b8cd62024c..a4adbf787aac 100644 --- a/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Provides access to the Keycloak API"; homepage = "https://github.com/marcospereirampj/python-keycloak"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix index 67e242f49514..d3b6a90c5925 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-lsp-black"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-black"; - rev = "v${version}"; - hash = "sha256-qNA6Bj1VI0YEtRuvcMQZGWakQNNrJ2PqhozrLmQHPAg="; + rev = "refs/tags/v${version}"; + hash = "sha256-16HjNB0VfrXLyVa+u5HaFNjq/ER2yXIWokMFsPgejr8="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 89b081499e39..67bbaf998dbb 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.7.2"; + version = "1.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jsWk2HDDRjOAPGX1K9NqhWkA5xD2fM830z7g7Kee0yQ="; + hash = "sha256-plciPUROFileVULGBZpwUTkW2NZVHy4Nuf4+fSjd8nM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/python-magic/default.nix b/nixpkgs/pkgs/development/python-modules/python-magic/default.nix index f90591a7fbff..056b466216bf 100644 --- a/nixpkgs/pkgs/development/python-modules/python-magic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-magic/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "A python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix index 88a11a121960..de841e5f1fe2 100644 --- a/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-iKBbR4h9J9OiQMHjUHxUVk+NbCRUYmIPtWxRwVVGQtY="; + hash = "sha256-voeJkwe/7nta2B19+Y5d27XTkhQ/nbWt6MXOicYQZnU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix b/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix index 37357d779b16..d1ceb5ed7431 100644 --- a/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix @@ -7,11 +7,10 @@ , python-openstackclient }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-manilaclient-tests"; - inherit (python-manilaclient) version; - - src = python-manilaclient.src; + inherit (python-manilaclient) version src; + format = "other"; dontBuild = true; dontInstall = true; diff --git a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix index 1f7722ec4207..c04beb032f95 100644 --- a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "3.4.2"; + version = "3.7.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-C46GrCoilOYVZvuvYIOwyJM16tpJtm8cknqdAzhew7I="; + hash = "sha256-t++7jQreibGpJRjJawicxjFIye5X6R1dpFqiM6yvRf0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix b/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix index edf3db11d5d0..9078f41aeaca 100644 --- a/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "A streaming multipart parser for Python"; homepage = "https://github.com/andrew-d/python-multipart"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-olm/default.nix b/nixpkgs/pkgs/development/python-modules/python-olm/default.nix index 39cd201c9655..e255a9b8915c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-olm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-olm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { disabled = !isPy3k; - sourceRoot = "source/python"; + sourceRoot = "${olm.src.name}/python"; buildInputs = [ olm ]; preBuild = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-openems/default.nix b/nixpkgs/pkgs/development/python-modules/python-openems/default.nix index 348f10b3aeed..7a186276dfc7 100644 --- a/nixpkgs/pkgs/development/python-modules/python-openems/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-openems/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ cython diff --git a/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix b/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix index 74a0d8deb09f..389e8a5df98c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jozMYrmXHSykv5npboyySuVDs1Lamlee15ZPYI4zmO4="; + hash = "sha256-oLqgjTuC5rpAzXTJO+KFn+uQ0TV7rNPWHOAJtRI4otk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix index 9cb3baf0663d..104e446fa4cb 100644 --- a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix @@ -56,6 +56,6 @@ in buildPythonPackage rec { homepage = "https://github.com/python-rapidjson/python-rapidjson"; description = "Python wrapper around rapidjson"; license = licenses.mit; - maintainers = with maintainers; [ costrouc dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index 860bcb383c62..ade8f0cfd76b 100644 --- a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , aiohttp +, alexapy , async-timeout , buildPythonPackage , click @@ -14,27 +15,34 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "python-roborock"; - version = "0.23.6"; + version = "0.32.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-5WgCVdmEhFrKYT7Uflnjv6OIISk//VH2aoxVwlWuPTk="; + hash = "sha256-DojIfAmYW/asvpAkcBj/pN1rdCPFD4nwkEqpGVBkMoE="; }; + pythonRelaxDeps = [ + "pycryptodome" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + alexapy aiohttp async-timeout click diff --git a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix index 48528adf2bec..05fcdda421dc 100644 --- a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Python library for the snappy compression library from Google"; homepage = "https://github.com/andrix/python-snappy"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-sql/default.nix b/nixpkgs/pkgs/development/python-modules/python-sql/default.nix index 58a5cd625fc4..424c1635f91a 100644 --- a/nixpkgs/pkgs/development/python-modules/python-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-sql/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.4.0"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY="; + hash = "sha256-stuHXGcgwblayCyD6lLOu5RMQHvmii7wN8zdi6ucxTw="; }; nativeCheckInputs = [ @@ -27,7 +27,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library to write SQL queries in a pythonic way"; - homepage = "https://pypi.org/project/python-sql/"; + homepage = "https://foss.heptapod.net/tryton/python-sql"; + changelog = "https://foss.heptapod.net/tryton/python-sql/-/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ johbo ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/python-tado/default.nix b/nixpkgs/pkgs/development/python-modules/python-tado/default.nix index 4f4f62cea912..97e6215f1d9d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-tado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-tado/default.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "python-tado"; - version = "0.15.0"; + version = "0.16.0"; format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/nixpkgs/pkgs/development/python-modules/python-utils/default.nix b/nixpkgs/pkgs/development/python-modules/python-utils/default.nix index ac69e15ec77d..499a7660664d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-utils/default.nix @@ -4,30 +4,35 @@ , fetchFromGitHub , loguru , pytest-asyncio -, pytest-mypy , pytestCheckHook , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "python-utils"; - version = "3.5.2"; + version = "3.7.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FFBWkq7ct4JWSTH4Ldg+pbG/BAiW33puB7lqFPBjptw="; + hash = "sha256-WSP5LQQZnm9k0v/xbsUHgQiwmhcb2Uw9BQurC1ieMjI="; }; postPatch = '' - sed -i '/--cov/d' pytest.ini - sed -i '/--mypy/d' pytest.ini + sed -i pytest.ini \ + -e '/--cov/d' \ + -e '/--mypy/d' ''; + propagatedBuildInputs = [ + typing-extensions + ]; + passthru.optional-dependencies = { loguru = [ loguru @@ -36,7 +41,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio - pytest-mypy pytestCheckHook ] ++ passthru.optional-dependencies.loguru; diff --git a/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix b/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix index c2357f2df32a..5dca7585de12 100644 --- a/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-velbus"; - version = "2.1.9"; + version = "2.1.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SbuECT6851E+QNyyPaNTnKmH54fYovemSto8gvfMIKg="; + hash = "sha256-X0jg1qd4rWbaRZqgMBJKOZD50sFq3Eyhw9RU6cEjORo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix b/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix new file mode 100644 index 000000000000..f9a0841fdcba --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, dataclasses-json +, isodate +, requests +, requests-oauthlib +, pytestCheckHook +, responses +}: +buildPythonPackage rec { + pname = "python-youtube"; + version = "0.9.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "sns-sdks"; + repo = "python-youtube"; + rev = "v${version}"; + hash = "sha256-PbPdvUv7I9NKW6w4OJbiUoRNVJ1SoXychSXBH/y5nzY="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov=pyyoutube" "" \ + --replace "--cov-report xml" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + dataclasses-json + isodate + requests + requests-oauthlib + ]; + + pythonImportsCheck = [ "pyyoutube" ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + ]; + + meta = with lib; { + description = "A simple Python wrapper around for YouTube Data API"; + homepage = "https://github.com/sns-sdks/python-youtube"; + changelog = "https://github.com/sns-sdks/python-youtube/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/python3-application/default.nix b/nixpkgs/pkgs/development/python-modules/python3-application/default.nix index f4b162a14ab7..9170ce798115 100644 --- a/nixpkgs/pkgs/development/python-modules/python3-application/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python3-application/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "python3-application"; - version = "3.0.4"; + version = "3.0.6"; disabled = !isPy3k; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "AGProjects"; repo = pname; rev = "release-${version}"; - hash = "sha256-XXAKp/RlBVs3KmcnuiexdYfxf0zt2A/DrsJzdC9I4vA="; + hash = "sha256-L7KN6rKkbjNmkSoy8vdMYpXSBkWN7afNpreJO0twjq8="; }; propagatedBuildInputs = [ zope_interface twisted ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "application" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "A collection of modules that are useful when building python applications"; homepage = "https://github.com/AGProjects/python3-application"; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix index 1f4142b3245f..91dc505a3d83 100644 --- a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix @@ -1,75 +1,54 @@ -{ stdenv -, lib +{ lib , fetchPypi -, fetchNuGet , buildPythonPackage , pytestCheckHook , pycparser , psutil -, pkg-config -, dotnetbuildhelpers -, clang -, glib -, mono +, dotnet-sdk +, buildDotnetModule +, clr-loader +, setuptools }: let - - dotnetPkgs = [ - (fetchNuGet { - pname = "UnmanagedExports"; - version = "1.2.7"; - sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf"; - outputFiles = [ "*" ]; - }) - (fetchNuGet { - pname = "NUnit"; - version = "3.12.0"; - sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; - outputFiles = [ "*" ]; - }) - (fetchNuGet { - pname = "System.ValueTuple"; - version = "4.5.0"; - sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; - outputFiles = [ "*" ]; - }) - ]; - -in - -buildPythonPackage rec { pname = "pythonnet"; - version = "2.5.2"; - + version = "3.0.1"; src = fetchPypi { - inherit pname version; - sha256 = "1qzdc6jd7i9j7p6bcihnr98y005gv1358xqdr1plpbpnl6078a5p"; + pname = "pythonnet"; + inherit version; + sha256 = "sha256-7U9/f5VRVAQRLds9oWOOGhATy1bmTEjE+mAwPwKwo90="; }; - postPatch = '' - substituteInPlace setup.py --replace 'self._install_packages()' '#self._install_packages()' - ''; + # This buildDotnetModule is used only to get nuget sources, the actual + # build is done in `buildPythonPackage` below. + dotnet-build = buildDotnetModule { + inherit pname version src; + nugetDeps = ./deps.nix; + }; +in +buildPythonPackage { + inherit pname version src; - preConfigure = '' - [ -z "''${dontPlacateNuget-}" ] && placate-nuget.sh - [ -z "''${dontPlacatePaket-}" ] && placate-paket.sh + format = "pyproject"; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' ''; nativeBuildInputs = [ - pycparser - - pkg-config - dotnetbuildhelpers - clang - - mono + setuptools + dotnet-sdk + ]; - ] ++ dotnetPkgs; + propagatedBuildInputs = [ + pycparser + clr-loader + ]; - buildInputs = [ - glib - mono + pytestFlagsArray = [ + # Run tests using .NET Core, Mono is unsupported for now due to find_library problem in clr-loader + "--runtime coreclr" ]; nativeCheckInputs = [ @@ -77,26 +56,23 @@ buildPythonPackage rec { psutil # needed for memory leak tests ]; - preBuild = '' - rm -rf packages - mkdir packages - - ${builtins.concatStringsSep "\n" ( - builtins.map ( - x: ''ln -s ${x}/lib/dotnet/${x.pname} ./packages/${x.pname}.${x.version}'' - ) dotnetPkgs)} - - # Setting TERM=xterm fixes an issue with terminfo in mono: System.Exception: Magic number is wrong: 542 - export TERM=xterm + # Perform dotnet restore based on the nuget-source + preConfigure = '' + dotnet restore \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source ${dotnet-build.nuget-source} ''; + # Rerun this when updating to refresh Nuget dependencies + passthru.fetch-deps = dotnet-build.fetch-deps; + meta = with lib; { - broken = stdenv.isDarwin; - description = ".Net and Mono integration for Python"; + description = ".NET integration for Python"; homepage = "https://pythonnet.github.io"; license = licenses.mit; # <https://github.com/pythonnet/pythonnet/issues/898> badPlatforms = [ "aarch64-linux" ]; - maintainers = with maintainers; [ jraygauthier ]; + maintainers = with maintainers; [ jraygauthier mdarocha ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pythonnet/deps.nix b/nixpkgs/pkgs/development/python-modules/pythonnet/deps.nix new file mode 100644 index 000000000000..43d3a4992c7b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pythonnet/deps.nix @@ -0,0 +1,194 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.1"; sha256 = "1kgypxfp34vjy9kvqq8csznsjbnv37pp4r0457i5l1j6zrsm76rp"; }) + (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.1"; sha256 = "0fizarpvdajwcvfhd45c35xrnrci5rbn5ksf3zvlw4q300hnlsir"; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55"; }) + (fetchNuGet { pname = "Iced"; version = "1.8.0"; sha256 = "12cgd9p3jm81wd7m8bp3pm20gmrmbad2hcwzynhz644h3062nn24"; }) + (fetchNuGet { pname = "Lost.Compat.NullabilityAttributes"; version = "0.0.4"; sha256 = "1h8m1n4x1p69xh86ia1rf4dcr17w965fpxws7d3458r4w1wl143a"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.6.1"; sha256 = "1plk343h9fyxg08b9bcnlqyaq00cbnc1v73pj9nbcyphmgf5bqfp"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.10.0"; sha256 = "1l690xqrhmkasns5ghz0vqj8n2xyl5yrwan5gs52hwfxdwahqaaj"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.10.0"; sha256 = "0saabsr81crawdzs2cnzyjp5cgg2hk5k6q7n0i0pxghswb0m4dxk"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.11.0"; sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "1.1.126102"; sha256 = "0w7jcxkd4cix6dbh0szawilmykjmdc1rqysllrpwb7ivrxzazypn"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "2.0.61"; sha256 = "0gq51l4yyyn8dir6w41im9fwhw9r6jz6n7jm4zhmvvway5ijbcac"; }) + (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) + (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.0.1"; sha256 = "08njbdnmjzjd6phys94w0di3vcxfq7pniad6s3jc5f65r9s1f0w2"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.11.0"; sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.0"; sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.11.0"; sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.11.0"; sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NonCopyableAnalyzer"; version = "0.7.0"; sha256 = "1jry36p53fkk3fn9pawgg7qiv79j30y0kvd4xrnd58d7zg7zzdj0"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) + (fetchNuGet { pname = "NUnit"; version = "3.12.0"; sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; }) + (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.16.1"; sha256 = "1pzhmapfdszsfza7zjr3zrlz4fssdxsyiwmlj76a40mbhxhfa4q9"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.5.0"; sha256 = "1srx1629s0k1kmf02nmz251q07vj6pv58mdafcr5dr0bbn1fh78i"; }) + (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) + (fetchNuGet { pname = "System.Diagnostics.StackTrace"; version = "4.3.0"; sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Management"; version = "4.5.0"; sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { pname = "System.Xml.XPath.XDocument"; version = "4.3.0"; sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }) + (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) +] diff --git a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index 33a61c2582ee..6f782ae2139c 100644 --- a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.27.2"; + version = "0.28.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-8JeQvvCxKAmFy8kiXVD+l1EBv5mO1rWYoAg+iLjapRw="; + hash = "sha256-S/arFxM+9VZECqUzPijTxclBQ6oeiOxdRXQLb+uhkfM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix b/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix index 7a6ab301279d..1b5bd96110e8 100644 --- a/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pytomorrowio"; - version = "0.3.5"; + version = "0.3.6"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-LFIQJJPqKlqLzEoX9ShfoASigPC5R+OWiW81VmjONe8="; + hash = "sha256-ZCA+GYuZuRgc4Pi9Bcg4zthOnkmQ+/IddFMkR0WYfKk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/nixpkgs/pkgs/development/python-modules/pytools/default.nix index 77318092885f..7cf21f3cc667 100644 --- a/nixpkgs/pkgs/development/python-modules/pytools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytools/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2022.1.14"; + version = "2023.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-QQFzcWELsqA2hVl8UoUgXmWXx/F3OD2VyLhxJEsSwU4="; + hash = "sha256-8Q5CUiCu+h/5JTQrZY/wLcM1l8IfuI16Y/lEG/LnpQ4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index 17c179fbcc18..d4067edd338e 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.2"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-MSztKWjg/7J+4+sv4sqFlucaYuQlGoehtcUTiqNUlPA="; + hash = "sha256-/RfHryuIFhLn9SCg6YVn0Ley8ajcIlsDtuKNuhUFm8M="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix index f430b488c6fe..e9526ebb354a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.1.2"; + version = "2.2.0"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-B2gDPOQSJGg29xjJbZsWUrSalBnn+S8h+2j8NQ4tfTM="; + hash = "sha256-KolC1lcJWOcVjFEEYK2RNZodVrS/GjBzhlQ6z8kFOmE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix index 77c055b4e665..84a5aed8c7ad 100644 --- a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix @@ -1,25 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, setuptools , requests , lxml , pandas +, pytestCheckHook +, pytest-recording +, responses }: buildPythonPackage rec { pname = "pytrends"; - version = "4.9.0"; - disabled = isPy27; # python2 pandas is too old + version = "4.9.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pU/B4xcUQrPI9cCApeId+Ae8T6rXeQzGK33bBZ6wqUs="; + hash = "sha256-aRxuNrGuqkdU82kr260N/0RuUo/7BS7uLn8TmqosaYk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'addopts = "--cov pytrends/"' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests lxml pandas ]; - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-recording + responses + ]; + + pytestFlagsArray = [ + "--block-network" + ]; + pythonImportsCheck = [ "pytrends" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix index 9384ff0e0b40..3da9eb457fcd 100644 --- a/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.7.0"; + version = "1.7.2"; format = "setuptools"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - hash = "sha256-9c7lfeM6PXF6CR3JtLi1NPmTwEbrv9Kh1kvdDQbskuI="; + hash = "sha256-ChFD05ZK0TCVvM+uqGzma2x5qqyD94uBvFpSnWuyL2c="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyudev/default.nix b/nixpkgs/pkgs/development/python-modules/pyudev/default.nix index 24f3b89a86f9..29b1e5f8d530 100644 --- a/nixpkgs/pkgs/development/python-modules/pyudev/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.24.0"; + version = "0.24.1"; src = fetchPypi { inherit pname version; - hash = "sha256-sqOv4cmep1H4KWZSVX6sVZh02iobHsBiUXhwbsWjRfM="; + hash = "sha256-deVNNyGPWsRbDaHw/ZzF5SajysPvHPrUEM96sziwFHE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix index 1fa78ef9f72a..e9ec506d6d4b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.10.2"; + version = "4.10.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-q54TLmPVo7dz9IkTZfz2qk13TQkMIopWhxlPac0IBGA="; + hash = "sha256-vO60QMr+J3tE7ZIU7fZP27jMuPeCJH56Hbhjek5ZfXI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix b/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix index 43295e0c90d8..a8af2db23622 100644 --- a/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "PyUtilib: A collection of Python utilities"; homepage = "https://github.com/PyUtilib/pyutilib"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix b/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix index 287b41d3ee90..b3672b20b672 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.1.7"; + version = "2.1.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aU9NfAYMTfMlTjiSnv5vhUBUzrOD+UDQvktpLoGr8N8="; + hash = "sha256-RrFCza6y5IdeDokSAGOYs20OMIm4UGCRy/0YO/uYtNo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index d9efdd0275d0..b6d3593b94ce 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.54"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0X2K3glUWIJjiThvsTwIPUA3TVf9ret74B3BcAcr9bE="; + hash = "sha256-eBmmXdtYeG6O8Wdt0Gye78/6dt+XZznXyEzlv9WFwcI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix b/nixpkgs/pkgs/development/python-modules/pyvista/default.nix index 0ecbea866b14..e63038b54c0b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvista/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.39.1"; + version = "0.41.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-N+1FfTKDITBmLaOjKZsahMd6s26W19ObcWXk8gGQ0QI="; + hash = "sha256-vFxEMKEkiFOBrkvmaJPwoo+lOe6V9AmPxl32Tocy9p8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix b/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix index 30901bb689e0..4b3678494990 100644 --- a/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Launch jobs, organize the output, and dissect the results"; homepage = "https://pyviz.org/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix b/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix index 0eede926edc9..5d53d72ea18f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.1.0"; + version = "8.0.1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JVs7+GTILBeuKjGadhQWF5peHPPdaAPE1sJKyP9hdlk="; + hash = "sha256-MT0jT4wT8+4OEsIDWZbiqWK+3YASfVtOQT2KkadfwbM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix b/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix index 2fd5a96fa933..802ad73a6411 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/joe-jordan/pyvoro"; description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pywayland/default.nix b/nixpkgs/pkgs/development/python-modules/pywayland/default.nix index 2a681c4f4960..f35c6a028d13 100644 --- a/nixpkgs/pkgs/development/python-modules/pywayland/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywayland/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.15"; + version = "0.4.16"; src = fetchPypi { inherit pname version; - hash = "sha256-vz7Sjd8KT7UgOBI5AN5q6CS7jl+WL87w91cgm0bXRGw="; + hash = "sha256-qqcMhwsKs2UhX45xUF9zaDxO0VsfNjhDOx3HNE/ltd0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index 244a68de6ace..6a643979715d 100644 --- a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, hypothesis , ifaddr , lxml , poetry-core @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.9.2"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mrLZ8W7imM/ysJhd4OcqZFzx2z/KG8k5bOPFb4ldYzE="; + hash = "sha256-6aigzwHP9iAQF4GKKQfnZl9sAbwZfOAG/xPf6ay7rGs="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + hypothesis pytest-vcr pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/pywerview/default.nix b/nixpkgs/pkgs/development/python-modules/pywerview/default.nix index 2bbb0b235726..aeffc4f03954 100644 --- a/nixpkgs/pkgs/development/python-modules/pywerview/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywerview/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywerview"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "the-useless-one"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+fSYDaN0nsffL1icx2nAIJydzwT+JB6qF9u+5b3RPK8="; + hash = "sha256-0vL1kMg4XRFq1CWR/2x5YYyfjm8YzjJaXkezehsT4hg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywick/default.nix b/nixpkgs/pkgs/development/python-modules/pywick/default.nix deleted file mode 100644 index 5d685d2496e6..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pywick/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestCheckHook -, dill -, h5py -, hickle -, numpy -, opencv4 -, pandas -, pillow -, pycm -, pyyaml -, scipy -, requests -, scikit-image -, six -, tabulate -, torch -, torchvision -, tqdm -, yacs -, lib -}: - -buildPythonPackage rec { - pname = "pywick"; - version = "0.6.5"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "achaiah"; - repo = pname; - rev = "v${version}"; - sha256 = "0wnijdvqgdpzfdsy1cga3bsr0n7zzsl8hp4dskqwxx087g5h1r84"; - }; - - postPatch = '' - substituteInPlace setup.py --replace "opencv-python-headless" "opencv" - ''; - - propagatedBuildInputs = [ - dill - h5py - hickle - numpy - opencv4 - pandas - pillow - pycm - pyyaml - scipy - requests - scikit-image - tabulate - torch - torchvision - tqdm - six - yacs - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - description = "High-level training framework for Pytorch"; - homepage = "https://github.com/achaiah/pywick"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bcdarwin ]; - broken = true; # Nixpkgs missing `albumentations` and `prodict` - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix b/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix index 8db0c5e0ea23..3442d5f9848e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyxbe"; - version = "1.0.1"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mborgerson"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oOY0g1F5sxGUxXAT19Ygq5q7pnxEhIAKmyYELR1PHEA="; + hash = "sha256-iLzGGgizUbaEG1xrNq4WDaWrGtcaLwAYgn4NGYiSDBo="; }; nativeCheckInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { # Update location for run with pytest preCheck = '' substituteInPlace tests/test_load.py \ - --replace "'xbefiles'" "'tests/xbefiles'" + --replace '"xbefiles"' '"tests/xbefiles"' ''; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix b/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix index 19063414a44d..1242697abab3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Python 3 port of pyxl for writing structured and reusable inline HTML"; homepage = "https://github.com/gvanrossum/pyxl3"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix b/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix index 16ba6b4de944..e8956dba3484 100644 --- a/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix @@ -1,21 +1,27 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder -, nose +, pytestCheckHook , lxml +, matplotlib +, networkx +, pandas , requests , six }: buildPythonPackage rec { pname = "pyxnat"; - version = "1.5"; - disabled = pythonOlder "3.7"; + version = "1.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Y8mj6OfZXyE1q3C8HyVzGySuZB6rLSsL/CV/7axxaec="; + # PyPI dist missing test configuration files: + src = fetchFromGitHub { + owner = "pyxnat"; + repo = "pyxnat"; + rev = "refs/tags/${version}"; + hash = "sha256-QejYisvQFN7CsDOx9wAgTHmRZcSEqgIr8twG4XucfZ4="; }; propagatedBuildInputs = [ @@ -30,17 +36,37 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "pathlib>=1.0" "" \ --replace "future>=0.16" "" + sed -i '/--cov/d' setup.cfg ''; - nativeCheckInputs = [ nose ]; - checkPhase = "nosetests pyxnat/tests"; - doCheck = false; # requires a docker container running an XNAT server + nativeCheckInputs = [ + pytestCheckHook + matplotlib + networkx + pandas + ]; + preCheck = '' + export PYXNAT_SKIP_NETWORK_TESTS=1 + ''; + pytestFlagsArray = [ "pyxnat" ]; + disabledTestPaths = [ + # try to access network even though PYXNAT_SKIP_NETWORK_TESTS is set: + "pyxnat/tests/pipelines_test.py" + "pyxnat/tests/search_test.py" + "pyxnat/tests/user_and_project_management_test.py" + ]; + disabledTests = [ + # try to access network even though PYXNAT_SKIP_NETWORK_TESTS is set: + "test_ashs_volumes" + "test_inspector_structure" + ]; pythonImportsCheck = [ "pyxnat" ]; meta = with lib; { homepage = "https://pyxnat.github.io/pyxnat"; description = "Python API to XNAT"; + changelog = "https://github.com/pyxnat/pyxnat/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/qcodes/default.nix b/nixpkgs/pkgs/development/python-modules/qcodes/default.nix index 46e39fc4fcf8..db565e11d02d 100644 --- a/nixpkgs/pkgs/development/python-modules/qcodes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qcodes/default.nix @@ -10,7 +10,6 @@ , h5netcdf , h5py , importlib-metadata -, importlib-resources , ipywidgets , ipykernel , jsonschema @@ -35,6 +34,7 @@ # optional , qcodes-loop +, slack-sdk # test , pytestCheckHook @@ -51,17 +51,20 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.38.1"; - - disabled = pythonOlder "3.8"; + version = "0.39.0"; format = "pyproject"; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-whUGkRvYQOdYxWoj7qhv2kiiyTwq3ZLLipI424PBzFg="; + sha256 = "sha256-zKn9LN7FBxKUfYSxUV1O6fB2s/B5bQpGDZTrK4DcxmU="; }; - nativeBuildInputs = [ setuptools versioningit ]; + nativeBuildInputs = [ + setuptools + versioningit + ]; propagatedBuildInputs = [ broadbean @@ -90,18 +93,20 @@ buildPythonPackage rec { rsa ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources ]; passthru.optional-dependencies = { loop = [ qcodes-loop ]; + slack = [ + slack-sdk + ]; }; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ - pytestCheckHook deepdiff hypothesis lxml @@ -109,25 +114,34 @@ buildPythonPackage rec { pytest-mock pytest-rerunfailures pytest-xdist + pytestCheckHook pyvisa-sim sphinx ]; + pytestFlagsArray = [ + # Follow upstream with settings + "--durations=20" + ]; + disabledTestPaths = [ # depends on qcodes-loop, causing a cyclic dependency "qcodes/tests/dataset/measurement/test_load_legacy_data.py" ]; - pythonImportsCheck = [ "qcodes" ]; + pythonImportsCheck = [ + "qcodes" + ]; postInstall = '' export HOME="$TMPDIR" ''; - meta = { + meta = with lib; { homepage = "https://qcodes.github.io/Qcodes/"; description = "Python-based data acquisition framework"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ evilmav ]; + changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ evilmav ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix b/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix index 8de6ba9e6dc5..e140c949b631 100644 --- a/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.5"; + version = "0.21.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-lw6jswIaqDFExz/hjIrpZf4BC757l83MeCfOyZaTbfg="; + hash = "sha256-1vXqwir3lAM+m/HGHWuXl20muAOasEWo1H0RjUCShTM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/qgrid/default.nix b/nixpkgs/pkgs/development/python-modules/qgrid/default.nix new file mode 100644 index 000000000000..79df36ed0ca7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/qgrid/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, ipywidgets +, notebook +, pandas +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "qgrid"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-/or1tQgzCE3AtqJlzRrHuDfAPA+FIRUBY1YNzneNcRw="; + }; + + patches = [ + # Fixes compatibility of qgrid with ipywidgets >= 8.0.0 + # See https://github.com/quantopian/qgrid/pull/331 + (fetchpatch { + url = "https://github.com/quantopian/qgrid/pull/331/commits/8cc50d5117d4208a9dd672418021c59898e2d1b2.patch"; + hash = "sha256-+NLz4yBUGUXKyukPVE4PehenPzjnfljR5RAX7CEtpV4="; + }) + ]; + + propagatedBuildInputs = [ + ipywidgets + notebook + pandas + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Those tests are also failing upstream + disabledTests = [ + "test_edit_date" + "test_period_object_column" + ]; + + pythonImportsCheck = [ "qgrid" ]; + + meta = with lib; { + description = "An interactive grid for sorting, filtering, and editing DataFrames in Jupyter notebooks"; + homepage = "https://github.com/quantopian/qgrid"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/qiling/default.nix b/nixpkgs/pkgs/development/python-modules/qiling/default.nix index c9854e345276..b7d424be3bfe 100644 --- a/nixpkgs/pkgs/development/python-modules/qiling/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qiling/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "qiling"; - version = "1.4.5"; + version = "1.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MEafxry/ewqlzOMu9TJMQodXLChGMYjS2jX3yv7FZJk="; + hash = "sha256-l3WQBlJic4lXCe5Z1FmoxaqOblE7uAaW2gG/nTn84Kc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qtile/default.nix b/nixpkgs/pkgs/development/python-modules/qtile/default.nix index bf3f59dcb3bb..1d8aaa55ba6e 100644 --- a/nixpkgs/pkgs/development/python-modules/qtile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtile/default.nix @@ -8,7 +8,6 @@ , libinput , libxkbcommon , mpd2 -, mypy , pango , pkg-config , psutil @@ -82,11 +81,6 @@ buildPythonPackage rec { libxkbcommon ]; - # for `qtile check`, needs `stubtest` and `mypy` commands - makeWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ mypy ]}" - ]; - doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/quantulum3/default.nix b/nixpkgs/pkgs/development/python-modules/quantulum3/default.nix new file mode 100644 index 000000000000..364a5e6098a1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/quantulum3/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, pythonOlder +, pythonAtLeast +, fetchFromGitHub + # build inputs +, inflect +, num2words +, numpy +, scipy +, scikit-learn +, joblib +, wikipedia +, stemming +}: +let + pname = "quantulum3"; + version = "0.9.0"; +in +buildPythonPackage { + inherit version pname; + format = "pyproject"; + + # Pypi source package doesn't contain tests + src = fetchFromGitHub { + owner = "nielstron"; + repo = pname; + rev = "9dafd76d3586aa5ea1b96164d86c73037e827294"; + hash = "sha256-fHztPeTbMp1aYsj+STYWzHgwdY0Q9078qXpXxtA8pPs="; + }; + + disabled = pythonOlder "3.7"; + + propagatedBuildInputs = [ + inflect + num2words + numpy + scipy + scikit-learn + joblib + wikipedia + stemming + ]; + + pythonImportsCheck = [ "quantulum3" ]; + + meta = with lib; { + description = "Library for unit extraction - fork of quantulum for python3"; + homepage = "https://github.com/nielstron/quantulum3"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/qudida/default.nix b/nixpkgs/pkgs/development/python-modules/qudida/default.nix new file mode 100644 index 000000000000..48d83c4d14ee --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/qudida/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, opencv4 +, pythonOlder +, pythonRelaxDepsHook +, scikit-learn +, typing-extensions +}: + +buildPythonPackage rec { + pname = "qudida"; + version = "0.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-2xmOKIerDJqgAj5WWvv/Qd+3azYfhf1eE/eA11uhjMg="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "opencv-python" + ]; + + propagatedBuildInputs = [ + numpy + opencv4 + scikit-learn + typing-extensions + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "qudida" ]; + + meta = with lib; { + description = "QUick and DIrty Domain Adaptation"; + homepage = "https://github.com/arsenyinfo/qudida"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/qutip/default.nix b/nixpkgs/pkgs/development/python-modules/qutip/default.nix index 4a49e3d70e7a..43f3b9d8cfa6 100644 --- a/nixpkgs/pkgs/development/python-modules/qutip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qutip/default.nix @@ -4,7 +4,6 @@ , cvxopt , cvxpy , cython -, doCheck ? true , fetchFromGitHub , ipython , matplotlib @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "qutip"; - version = "4.7.1"; + version = "4.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +27,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-W5iqRWAB6D1Dnxz0Iyl7ZmP3yrXvLyV7BdBdIgFCiQY="; + hash = "sha256-qItj+MSiFKBgRiz/1+AWsmMzdaQs6rFT1FWWHbReudY="; }; nativeBuildInputs = [ @@ -86,9 +85,9 @@ buildPythonPackage rec { }; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Open-source software for simulating the dynamics of closed and open quantum systems"; homepage = "https://qutip.org/"; + changelog = "https://github.com/qutip/qutip/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fabiangd ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix b/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix deleted file mode 100644 index 9287c72441cc..000000000000 --- a/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, mock -, nose -, pamqp -}: - -buildPythonPackage rec { - version = "2.0.1"; - pname = "rabbitpy"; - - # No tests in the pypi tarball, so we directly fetch from git - src = fetchFromGitHub { - owner = "gmr"; - repo = pname; - rev = version; - sha256 = "0m5z3i3d5adrz1wh6y35xjlls3cq6p4y9p1mzghw3k7hdvg26cck"; - }; - - propagatedBuildInputs = [ pamqp ]; - nativeCheckInputs = [ mock nose ]; - - checkPhase = '' - runHook preCheck - rm tests/integration_tests.py # Impure tests requiring network - nosetests tests - runHook postCheck - ''; - - postPatch = '' - # See: https://github.com/gmr/rabbitpy/issues/118 - substituteInPlace setup.py \ - --replace 'pamqp>=2,<3' 'pamqp' - ''; - - meta = with lib; { - description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; - homepage = "https://pypi.python.org/pypi/rabbitpy"; - license = licenses.bsd3; - - # broken by pamqp==3, tracked in - # https://github.com/gmr/rabbitpy/issues/125 - broken = true; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/rank_bm25/default.nix b/nixpkgs/pkgs/development/python-modules/rank_bm25/default.nix new file mode 100644 index 000000000000..4019864f27d6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rank_bm25/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, numpy +}: +let + pname = "rank_bm25"; + version = "0.2.2"; +in +buildPythonPackage { + inherit version pname; + format = "setuptools"; + + # Pypi source package doesn't contain tests + src = fetchFromGitHub { + owner = "dorianbrown"; + repo = pname; + rev = version; + hash = "sha256-+BxQBflMm2AvCLAFFj52Jpkqn+KErwYXU1wztintgOg="; + }; + + disabled = pythonOlder "3.7"; + + postPatch = '' + # Upstream doesn't provide a PKG-INFO file + substituteInPlace setup.py --replace "get_version()" "'${version}'" + ''; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "rank_bm25" ]; + + meta = with lib; { + description = "A Collection of BM25 Algorithms in Python"; + homepage = "https://github.com/dorianbrown/rank_bm25"; + changelog = "https://github.com/dorianbrown/rank_bm25/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rapt-ble/default.nix b/nixpkgs/pkgs/development/python-modules/rapt-ble/default.nix index 3369ca92a8bd..4c5df7b4b9fa 100644 --- a/nixpkgs/pkgs/development/python-modules/rapt-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rapt-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rapt-ble"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sairon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BLpe4AxxvFeOfcBSPtLwPIJZnNIBEdd6JpuQb9upO34="; + hash = "sha256-ozZwVgTV/xYl1nXLiybcPs6DQKocNdbxTEYDfYyQuvY="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 7f6abe087255..7410b8029a85 100644 --- a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.3.7"; + version = "1.3.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-6AtGRXGuAXMrePqS2lmNdOuPZi6LHuiWP2LJyxH3L3M="; + hash = "sha256-8kPzUvTZ/jRDXlYMAZkG1xdLAQuzxnvHXBzwWizMOTo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rauth/default.nix b/nixpkgs/pkgs/development/python-modules/rauth/default.nix new file mode 100644 index 000000000000..059dfa9a2a60 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rauth/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, requests +, pytestCheckHook +, mock +, nose +, pycrypto +}: + +buildPythonPackage rec { + pname = "rauth"; + version = "0.7.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "litl"; + repo = "rauth"; + rev = version; + hash = "sha256-wRKZbxZCEfihOaJM8sk8438LE++KJWxdOGImpL1gHa4="; + }; + + patches = [ + (fetchpatch { + # https://github.com/litl/rauth/pull/211 + name = "fix-pycrypdodome-replacement-for-pycrypto.patch"; + url = "https://github.com/litl/rauth/commit/7fb3b7bf1a1869a52cf59ee3eb607d318e97265c.patch"; + hash = "sha256-jiAIw+VQ2d/bkm2brqfY1RUrNGf+lsMPnoI91gGUS6o="; + }) + ]; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ "rauth" ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + nose + pycrypto + ]; + + meta = with lib; { + description = "A Python library for OAuth 1.0/a, 2.0, and Ofly"; + homepage = "https://github.com/litl/rauth"; + changelog = "https://github.com/litl/rauth/blob/${src.rev}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/rdkit/default.nix b/nixpkgs/pkgs/development/python-modules/rdkit/default.nix index 470cc1e22e8c..ddb79cf36a02 100644 --- a/nixpkgs/pkgs/development/python-modules/rdkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rdkit/default.nix @@ -42,7 +42,7 @@ let in buildPythonPackage rec { pname = "rdkit"; - version = "2023.03.1"; + version = "2023.03.2"; format = "other"; src = @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - hash = "sha256-hiDaPWDAWzALRf3+SAfzghu2K706rcajeZ69tMFplhU="; + hash = "sha256-p1zJLMtIlO+0qKMO7ghDLrONNZFPTuc2QtOtB1LJPtc="; }; unpackPhase = '' @@ -156,5 +156,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ rmcgibbo natsukium ]; license = licenses.bsd3; homepage = "https://www.rdkit.org"; + changelog = "https://github.com/rdkit/rdkit/releases/tag/${src.rev}"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix b/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix index 8f0006a3c0ce..cca38cd71ae5 100644 --- a/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { broken = stdenv.isDarwin; description = "Fast python port of arc90's readability tool"; homepage = "https://github.com/buriy/python-readability"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ siraben ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/readme/default.nix b/nixpkgs/pkgs/development/python-modules/readme/default.nix index cf3c7f6e8da8..6a43bcdc3e06 100644 --- a/nixpkgs/pkgs/development/python-modules/readme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/readme/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { description = "Readme is a library for rendering readme descriptions for Warehouse"; homepage = "https://github.com/pypa/readme"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/recline/default.nix b/nixpkgs/pkgs/development/python-modules/recline/default.nix new file mode 100644 index 000000000000..074e1da03386 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/recline/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pudb +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "recline"; + version = "2023.5"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "NetApp"; + repo = "recline"; + rev = "v${version}"; + sha256 = "sha256-jsWOPkzhN4D+Q/lK5yWg1kTgFkmOEIQY8O7oAXq5Nak="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pudb + pytestCheckHook + ]; + + pythonImportsCheck = [ "recline" ]; + + meta = with lib; { + description = "This library helps you quickly implement an interactive command-based application"; + homepage = "https://github.com/NetApp/recline"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix b/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix index 467d5e1340b4..1c739ebb0780 100644 --- a/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.0.910"; + version = "2.0.911"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aws"; repo = "amazon-redshift-python-driver"; rev = "refs/tags/v${version}"; - hash = "sha256-24yI6pXSHxhT30N3rJXAMtpCOhhGsBuDrwx9jMO1FW0="; + hash = "sha256-D1LpFGYEpGmkYCAJbYJaQStDnol90mH8X4S6iXg6Nfs="; }; # disable test coverage diff --git a/nixpkgs/pkgs/development/python-modules/referencing/default.nix b/nixpkgs/pkgs/development/python-modules/referencing/default.nix new file mode 100644 index 000000000000..f6ccd201df97 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/referencing/default.nix @@ -0,0 +1,64 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, hatch-vcs +, hatchling +, jsonschema +, pytest-subtests +, pytestCheckHook +, pythonOlder +, rpds-py +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "referencing"; + version = "0.30.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-jsonschema"; + repo = "referencing"; + rev = "refs/tags/v${version}"; + fetchSubmodules = true; + hash = "sha256-nJSnZM3gg2+yfFAnOJzzXsmIEQdNf5ypt5R0O60NphA="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + postPatch = '' + sed -i "/Topic/d" pyproject.toml + ''; + + nativeBuildInputs = [ + hatch-vcs + hatchling + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + rpds-py + ]; + + nativeCheckInputs = [ + jsonschema + pytest-subtests + pytestCheckHook + ]; + + pythonImportsCheck = [ + "referencing" + ]; + + meta = with lib; { + description = "Cross-specification JSON referencing"; + homepage = "https://github.com/python-jsonschema/referencing"; + changelog = "https://github.com/python-jsonschema/referencing/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index 332031fa2fb8..2cee50ac5039 100644 --- a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2023.05.1"; + version = "2023.06.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8+lHfepVvR1+est5RImV4L3PHtME1o8xRX2cI1YpUKI="; + hash = "sha256-W5W/2gBraraZs8ai8tyg3aRWvHt6WOQCVICuiAigae0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/regional/default.nix b/nixpkgs/pkgs/development/python-modules/regional/default.nix index 0fc894e9f011..ccbfb1cb874a 100644 --- a/nixpkgs/pkgs/development/python-modules/regional/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regional/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Simple manipualtion and display of spatial regions"; homepage = "https://github.com/freeman-lab/regional"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index 4837e89c3a74..ee631bf221c1 100644 --- a/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -1,17 +1,16 @@ { lib , aiohttp -, aiounittest , buildPythonPackage , fetchFromGitHub , ffmpeg-python -, pytestCheckHook +, orjson , pythonOlder , requests }: buildPythonPackage rec { pname = "reolink-aio"; - version = "0.6.0"; + version = "0.7.6"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-fDtZEcHv13f9WtNZKoT8/I+Hz145n7SmQz0t9CVqE3g="; + hash = "sha256-muxM9+3D8WL2muw5yxbYKmbkVc5lTcj9XQOr67hb/pU="; }; postPatch = '' @@ -28,34 +27,16 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "ffmpeg" "ffmpeg-python" ''; + propagatedBuildInputs = [ aiohttp ffmpeg-python + orjson requests ]; - doCheck = false; # all testse require a network device - - nativeCheckInputs = [ - aiounittest - pytestCheckHook - ]; - - pytestFlagsArray = [ - "tests/test.py" - ]; - - disabledTests = [ - # Tests require network access - "test1_settings" - "test2_states" - "test3_images" - "test4_properties" - "test_succes" - "test_wrong_host" - "test_wrong_password" - "test_wrong_user" - ]; + # All tests require a network device + doCheck = false; pythonImportsCheck = [ "reolink_aio" diff --git a/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix b/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix index 4d68f52be981..f87d5cdc782c 100644 --- a/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix +++ b/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix @@ -3,13 +3,12 @@ , fetchPypi , pythonOlder , setuptools-scm -, six , pytestCheckHook }: buildPythonPackage rec { pname = "repeated-test"; - version = "2.3.1"; + version = "2.3.3"; format = "pyproject"; disabled = pythonOlder "3.5"; @@ -17,17 +16,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "repeated_test"; inherit version; - hash = "sha256-TbVyQA7EjCSwo6qfDksbE8IU1ElkSCABEUBWy5j1KJc="; + hash = "sha256-3YPU8SL9rud5s0pnwwH5TJk1MXsDhdkDnZp/Oj6sgXs="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - six - ]; - nativeCheckInputs = [ pytestCheckHook ]; @@ -39,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unittest-compatible framework for repeating a test function over many fixtures"; homepage = "https://github.com/epsy/repeated_test"; + changelog = "https://github.com/epsy/repeated_test/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ tjni ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/reprshed/default.nix b/nixpkgs/pkgs/development/python-modules/reprshed/default.nix new file mode 100644 index 000000000000..1aa9469aab29 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/reprshed/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "python-reprshed"; + version = "1.0.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mentalisttraceur"; + repo = "python-reprshed"; + rev = "v${version}"; + hash = "sha256-XfmiewI74eDLKTAU6Ed76QXfJYMRb+idRACl6CW07ME="; + }; + + pythonImportsCheck = [ + "reprshed" + ]; + + meta = with lib; { + homepage = "https://github.com/mentalisttraceur/python-reprshed"; + description = "A toolshed for writing great __repr__ methods quickly and easily"; + license = licenses.bsd0; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/requests-futures/default.nix b/nixpkgs/pkgs/development/python-modules/requests-futures/default.nix index cc6eb312431e..b2f1aab46988 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-futures/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-futures/default.nix @@ -1,24 +1,37 @@ -{ buildPythonPackage, fetchPypi, requests, lib }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: buildPythonPackage rec { pname = "requests-futures"; - version = "1.0.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148"; + sha256 = "sha256-9VpO+ABw4oWOfR5zEj0r+uryW5P9NDhNjd8UjitnY3M="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; - # tests are disabled because they require being online + # Tests are disabled because they require being online doCheck = false; - pythonImportsCheck = [ "requests_futures" ]; + pythonImportsCheck = [ + "requests_futures" + ]; meta = with lib; { description = "Asynchronous Python HTTP Requests for Humans using Futures"; homepage = "https://github.com/ross/requests-futures"; + changelog = "https://github.com/ross/requests-futures/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ applePrincess ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix b/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix index 031bf93faa6f..4e72ce67364a 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix @@ -1,33 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, python -, mock +{ lib +, buildPythonPackage +, fetchPypi +, fixtures , purl +, pytestCheckHook +, python , requests +, requests-futures , six -, testrepository , testtools -, pytest }: buildPythonPackage rec { pname = "requests-mock"; - version = "1.10.0"; + version = "1.11.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WcnDJBmp+xroPsJC2Y6InEW9fXpl1IN1zCQ+wIRBZYs="; + hash = "sha256-7xC1crSJpfKOCbcIaXIIxKOyuJ74Cp8BWENA6jV+w8Q="; }; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - propagatedBuildInputs = [ requests six ]; - nativeCheckInputs = [ mock purl testrepository testtools pytest ]; + nativeCheckInputs = [ + fixtures + purl + pytestCheckHook + requests-futures + testtools + ]; meta = with lib; { description = "Mock out responses from the requests package"; homepage = "https://requests-mock.readthedocs.io"; + changelog = "https://github.com/jamielennox/requests-mock/releases/tag/${version}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix index 1f6dc8a5b4b4..aee478432006 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.16"; + version = "1.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-Uva9H2ToL7qpcXH/gmiBPKw+2gfmOxMKwxh4b43xFcA="; + hash = "sha256-jZWaTcPM4EO8e+eVpYU8fQ4H53OzlaMUsT/d2DWuU+0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix b/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix index 4e32c712e180..58ecce446c21 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pbr , requests , pytestCheckHook @@ -17,6 +18,15 @@ buildPythonPackage rec { hash = "sha256-KDBCg+qTV9Rf/1itWxHkdwjPv1gGgXqlmyo2Mijulx4="; }; + patches = [ + # https://github.com/msabramo/requests-unixsocket/pull/69 + (fetchpatch { + name = "urllib3-2-compatibility.patch"; + url = "https://github.com/msabramo/requests-unixsocket/commit/39b9c64847a52ddc8c6d14ff414a6a7a3f6358d9.patch"; + hash = "sha256-DFtjhk33JLCu7FW6XI7uf2klNmwzvh2QNwxUb4W223Q="; + }) + ]; + nativeBuildInputs = [ pbr ]; diff --git a/nixpkgs/pkgs/development/python-modules/respx/default.nix b/nixpkgs/pkgs/development/python-modules/respx/default.nix index 9c49071ae313..d678aca57283 100644 --- a/nixpkgs/pkgs/development/python-modules/respx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/respx/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , httpcore , httpx , flask @@ -21,6 +22,14 @@ buildPythonPackage rec { hash = "sha256-Qs3+NWMKiAFlKTTosdyHOxWRPKFlYQD20+MKiKR371U="; }; + patches = [ + (fetchpatch { + name = "httpx-0.24-test-compatibility.patch"; + url = "https://github.com/lundberg/respx/commit/b014780bde8e82a65fc6bb02d62b89747189565c.patch"; + hash = "sha256-wz9YYUtdptZw67ddnzUCet2iTozKaW0jrTIS62I/HXo="; + }) + ]; + propagatedBuildInputs = [ httpx ]; diff --git a/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix b/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix index 08df5a3d9fd5..4f1aafbdfa66 100644 --- a/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix @@ -3,12 +3,13 @@ , fetchPypi , pytest-mock , pytestCheckHook +, pythonAtLeast , pythonOlder }: buildPythonPackage rec { pname = "restrictedpython"; - version = "6.0"; + version = "6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0="; + hash = "sha256-fljqFcySoLkW4MjKKV6LLG1A/uTRLhorUGPYbvwnmpw="; }; nativeCheckInputs = [ @@ -24,6 +25,10 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + "test_compile__compile_restricted_exec__5" + ]; + pythonImportsCheck = [ "RestrictedPython" ]; diff --git a/nixpkgs/pkgs/development/python-modules/returns/default.nix b/nixpkgs/pkgs/development/python-modules/returns/default.nix index c9fcac37f932..0b54d62ba569 100644 --- a/nixpkgs/pkgs/development/python-modules/returns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/returns/default.nix @@ -1,18 +1,15 @@ { lib , anyio -, curio , buildPythonPackage +, curio , fetchFromGitHub , httpx , hypothesis -, mypy , poetry-core -, pytestCheckHook , pytest-aio -, pytest-cov -, pytest-mypy -, pytest-mypy-plugins , pytest-subtests +, pytestCheckHook +, pythonOlder , setuptools , trio , typing-extensions @@ -20,16 +17,24 @@ buildPythonPackage rec { pname = "returns"; - version = "0.20.0"; + version = "0.21.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "dry-python"; repo = "returns"; rev = "refs/tags/${version}"; - hash = "sha256-28WYjrjmu3hQ8+Snuvl3ykTd86eWYI97AE60p6SVwDQ="; + hash = "sha256-oYOCoh/pF2g4KGWC2mEnFD+zm2CKL+3x5JjzuZ3QHVQ="; }; + postPatch = '' + sed -i setup.cfg \ + -e '/--cov.*/d' \ + -e '/--mypy.*/d' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -43,23 +48,30 @@ buildPythonPackage rec { curio httpx hypothesis - mypy pytestCheckHook pytest-aio - pytest-cov - pytest-mypy - pytest-mypy-plugins pytest-subtests setuptools trio ]; - pytestFlagsArray = [ "--ignore=typesafety" ]; + preCheck = '' + rm -rf returns/contrib/mypy + ''; + + pythonImportsCheck = [ + "returns" + ]; + + pytestFlagsArray = [ + "--ignore=typesafety" + ]; meta = with lib; { description = "Make your functions return something meaningful, typed, and safe!"; - homepage = "returns.rtfd.io"; + homepage = "https://github.com/dry-python/returns"; + changelog = "https://github.com/dry-python/returns/blob/${version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = [ maintainers.jessemoore ]; + maintainers = with maintainers; [ jessemoore ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix index 55d37ab8740a..d2b4bf57a062 100644 --- a/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Validating URI References per RFC 3986"; homepage = "https://rfc3986.readthedocs.org"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ripser/default.nix b/nixpkgs/pkgs/development/python-modules/ripser/default.nix index a82d4107ceb3..0b65e8c1c487 100644 --- a/nixpkgs/pkgs/development/python-modules/ripser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ripser/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://ripser.scikit-tda.org"; changelog = "https://github.com/scikit-tda/ripser.py/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix b/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix index 13aca2c0d7b6..651c27be676a 100644 --- a/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "riscv-isac"; - version = "0.17.0"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "riscv-software-src"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-I0RsvSCrSlNGVj8z+WUQx6vbdNkKCRyMFvNx+0mTBAE="; + hash = "sha256-7CWUyYwzynFq/Qk5SzQB+ljsVVI98kPPDT63Emhqihw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/rlp/default.nix b/nixpkgs/pkgs/development/python-modules/rlp/default.nix index f03ba7019ac0..b0e7d123e691 100644 --- a/nixpkgs/pkgs/development/python-modules/rlp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rlp/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "RLP serialization library"; homepage = "https://github.com/ethereum/pyrlp"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/rns/default.nix b/nixpkgs/pkgs/development/python-modules/rns/default.nix index 8295ca7dd54b..84b8c975f15d 100644 --- a/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.5.4"; + version = "0.5.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-OFU61RX6XtC/7x3SWbRCsODTrs3k3FCTCvEapkkeWQU="; + hash = "sha256-s/rOU9FEWdb0vmRsMq/yPkP/ZTNc5wjlfdB0V+ltryQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/robomachine/default.nix b/nixpkgs/pkgs/development/python-modules/robomachine/default.nix index 768aaeb89cf6..613b47a8e601 100644 --- a/nixpkgs/pkgs/development/python-modules/robomachine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robomachine/default.nix @@ -1,27 +1,48 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: +{ stdenv +, lib +, allpairspy +, buildPythonPackage +, fetchPypi +, pyparsing +, pythonRelaxDepsHook +, robotframework +, setuptools +}: buildPythonPackage rec { pname = "RoboMachine"; version = "0.10.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k="; }; - propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; - # Remove Windows .bat files - postInstall = '' - rm "$out/bin/"*.bat - ''; + propagatedBuildInputs = [ + pyparsing + robotframework + allpairspy + ]; - postPatch = '' - substituteInPlace setup.py --replace "argparse" "" - ''; + pythonRemoveDeps = [ + "argparse" + ]; + + pythonRelaxDeps = [ + "pyparsing" + ]; + + pythonImportsCheck = [ + "robomachine" + ]; meta = with lib; { - broken = true; description = "Test data generator for Robot Framework"; homepage = "https://github.com/mkorpela/RoboMachine"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index fd5655bcd156..43da9125f1ae 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.1.2"; + version = "4.2.0"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotframework"; repo = "PythonLibCore"; - rev = "v${version}"; - hash = "sha256-uS0NwyFqidhrMG7thHM0qau22B/kI16c8aXEUuNdioQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-RJTn1zSVJYgbh93Idr77uHl02u0wpj6p6llSJfQVTQk="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix index 36f9541e2397..e1c43eb66b87 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework-requests"; - version = "0.9.4"; + version = "0.9.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "MarketSquare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XjcR29dH9K9XEnJZlQ4UUDI1MG92dRO1puiB6fcN58k="; + hash = "sha256-PvhMo1r/4962nntPQb4fQxcMMXIvKjp0FdNyOA43Euc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix index 9b224775f6e7..3dcf1606c8ce 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Python Tools for Robot Framework and Test Libraries"; homepage = "https://github.com/userzimmermann/robotframework-tools"; license = licenses.gpl3Plus; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix index 6ca7aafc0eb2..d11c38444a35 100644 --- a/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { - version = "3.0.0"; + version = "3.0.1"; pname = "robotstatuschecker"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "statuschecker"; rev = "refs/tags/v${version}"; - hash = "sha256-7xHPqlR7IFZp3Z120mg25ZSg9eI878kE8RF1y3F5O70="; + hash = "sha256-yW6353gDwo/IzoWOB8oelaS6IUbvTtwwDT05yD7w6UA="; }; propagatedBuildInputs = [ robotframework ]; diff --git a/nixpkgs/pkgs/development/python-modules/routeros-api/default.nix b/nixpkgs/pkgs/development/python-modules/routeros-api/default.nix new file mode 100644 index 000000000000..622d29584f02 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/routeros-api/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, mock +, tox +}: + +buildPythonPackage rec { + pname = "routeros-api"; + version = "0.17.0"; + + # N.B. The version published on PyPI is missing tests. + src = fetchFromGitHub { + owner = "socialwifi"; + repo = pname; + rev = version; + sha256 = "wpIfeYZ1w/yoNCHLYFVjn0O4Rb+N5lfvYzhGuN+HDTA="; + }; + + nativeCheckInputs = [ + mock + tox + ]; + + propagatedBuildInputs = [ six ]; + + meta = with lib; { + description = "Python API to RouterBoard devices produced by MikroTik."; + homepage = "https://github.com/socialwifi/RouterOS-api"; + license = licenses.mit; + maintainers = with maintainers; [ quentin ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix b/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix new file mode 100644 index 000000000000..8b6eb61e72f6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, buildPythonPackage +, cargo +, fetchPypi +, pytestCheckHook +, pythonOlder +, rustc +, rustPlatform +, libiconv +}: + +buildPythonPackage rec { + pname = "rpds-py"; + version = "0.9.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "rpds_py"; + inherit version; + hash = "sha256-jXDo8UkA8mV8JJ6k3vljvthqKbgfgfW3a1qSFWgN6UU="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-2LiQ+beFj9+kykObPNtqcg+F+8wBDzvWcauwDLHa7Yo="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + cargo + rustc + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rpds" + ]; + + meta = with lib; { + description = "Python bindings to Rust's persistent data structures (rpds"; + homepage = "https://pypi.org/project/rpds-py/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index fea68174bb43..58e38eb56294 100644 --- a/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.11"; + version = "3.5.12"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - hash = "sha256-DT5VTayPTlWiiTLylGNBquPgKJQwThGYVHIiqoa4niE="; + hash = "sha256-7q33lP0qpUj4hWjGodJufDgQzUp2Soeyw7MdMZQtbUU="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/rq/default.nix b/nixpkgs/pkgs/development/python-modules/rq/default.nix index 4ec3b676698a..b8e19d46f790 100644 --- a/nixpkgs/pkgs/development/python-modules/rq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rq"; - version = "1.15"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-QTQ90ZJQU6UWPjNCjmR4ez6av+B9M8gDof2Gq+R86aY="; + hash = "sha256-cymNXFI+6YEVw2Pc7u6+vroC0428oW7BTLxyBgPqLng="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix b/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix index 7bb8ac8545a0..6d6a48425574 100644 --- a/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "rst2pdf"; - version = "0.100"; + version = "0.101"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Zkw8FubT3qJ06ECkNurE26bLUKtq8xYvydVxa+PLe0I="; + sha256 = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg="; }; outputs = [ "out" "man" ]; @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert reStructured Text to PDF via ReportLab"; homepage = "https://rst2pdf.org/"; + changelog = "https://github.com/rst2pdf/rst2pdf/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix b/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix index 1126a61ff6ae..0a250a83fa5b 100644 --- a/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , docutils , fetchFromGitHub @@ -45,6 +46,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. + "test_error_without_config_file_macos" + "test_file_1_is_bad_without_config_macos" + ]; + pythonImportsCheck = [ "rstcheck_core" ]; diff --git a/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix b/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix index 0d06168191f1..22f160000830 100644 --- a/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , docutils , fetchFromGitHub @@ -7,6 +8,7 @@ , pydantic , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , rstcheck-core , typer , types-docutils @@ -27,8 +29,13 @@ buildPythonPackage rec { hash = "sha256-UMByfnnP1va3v1IgyQL0f3kC+W6HoiWScb7U2FAvWkU="; }; + pythonRelaxDeps = [ + "typer" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -47,6 +54,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. + "test_error_without_config_file_macos" + "test_file_1_is_bad_without_config_macos" + ]; + pythonImportsCheck = [ "rstcheck" ]; diff --git a/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix index 2db8a335e895..26b94d0fd917 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Common routines for ruamel packages"; homepage = "https://sourceforge.net/projects/ruamel-base/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index a8f93d53f6f1..7975629b4e12 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix index 13885e03ab2b..d938fb1f219c 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; homepage = "https://sourceforge.net/projects/ruamel-yaml/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ruff-lsp/default.nix b/nixpkgs/pkgs/development/python-modules/ruff-lsp/default.nix deleted file mode 100644 index 39deed3b0161..000000000000 --- a/nixpkgs/pkgs/development/python-modules/ruff-lsp/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, pythonOlder -, buildPythonPackage -, fetchPypi -, ruff -, pygls -, lsprotocol -, hatchling -, typing-extensions -, unittestCheckHook -, python-lsp-jsonrpc -}: - -buildPythonPackage rec { - pname = "ruff-lsp"; - version = "0.0.27"; - format = "pyproject"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit version; - pname = "ruff_lsp"; - hash = "sha256-Mp5PX87UFUADl/INxZptTsHUBxNpaSRqdsPgRNnLCaQ="; - }; - - postPatch = '' - # ruff binary added to PATH in wrapper so it's not needed - sed -i '/"ruff>=/d' pyproject.toml - ''; - - nativeBuildInputs = [ - hatchling - ]; - - propagatedBuildInputs = [ - pygls - lsprotocol - typing-extensions - ]; - - doCheck = stdenv.isDarwin; - - nativeCheckInputs = [ - unittestCheckHook - python-lsp-jsonrpc - ruff - ]; - - makeWrapperArgs = [ - # prefer ruff from user's PATH, that's usually desired behavior - "--suffix PATH : ${lib.makeBinPath [ ruff ]}" - ]; - - - meta = with lib; { - homepage = "https://github.com/charliermarsh/ruff-lsp"; - description = "A Language Server Protocol implementation for Ruff"; - changelog = "https://github.com/charliermarsh/ruff-lsp/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ kalekseev ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/ruuvitag-ble/default.nix b/nixpkgs/pkgs/development/python-modules/ruuvitag-ble/default.nix index 8280f62723d9..d69e92636aef 100644 --- a/nixpkgs/pkgs/development/python-modules/ruuvitag-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruuvitag-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ruuvitag-ble"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WkPYlEkUH1xvGjBVr6JkLx5CfIPvAa9vX50OjCOmTME="; + hash = "sha256-J+807p2mE+VZ0oqldFtjdcNGsRTkAU54s6byQSGrng4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix index eec3bbff8316..80721c039a21 100644 --- a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.3.0"; + version = "2023.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XBVN7Tjjw9jw66f+wnBvKbQeDDlfGfv+87qOcMaFsEk="; + hash = "sha256-Y/2N3wXrci3nhLe1AxlhB/KlGAYSmM8AWopHFbTUkRc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/sacrebleu/default.nix b/nixpkgs/pkgs/development/python-modules/sacrebleu/default.nix new file mode 100644 index 000000000000..411426eaa34d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sacrebleu/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# Propagated build inputs +, portalocker +, regex +, tabulate +, numpy +, colorama +, lxml + +# Check inputs +, pytestCheckHook +}: +let + pname = "sacrebleu"; + version = "2.3.1"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mjpost"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+58dhQv5LkjccjktfoAG2gqja6TMLIxHIbRgzZPDhKo="; + }; + + # postPatch = '' + # substituteInPlace setup.py \ + # --replace "portalocker==" "portalocker>=" + # ''; + + propagatedBuildInputs = [ + portalocker + regex + tabulate + numpy + colorama + lxml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # require network access + "test/test_api.py" + "test/test_dataset.py" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "sacrebleu" ]; + + meta = with lib; { + description = "Hassle-free computation of shareable, comparable, and reproducible BLEU, chrF, and TER scores"; + homepage = "https://github.com/mjpost/sacrebleu"; + changelog = "https://github.com/mjpost/sacrebleu/blob/v{version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/safetensors/default.nix b/nixpkgs/pkgs/development/python-modules/safetensors/default.nix index c268dad92030..06a2c3966a2d 100644 --- a/nixpkgs/pkgs/development/python-modules/safetensors/default.nix +++ b/nixpkgs/pkgs/development/python-modules/safetensors/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , cargo , fetchFromGitHub -, fetchpatch , h5py , numpy , pythonOlder @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "safetensors"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,26 +25,16 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Qpb5lTw1WEME9tWEGfxC8l8dK9mGMH2rz+O+xGCrUxw"; + hash = "sha256-RoIBD+zBKVzXE8OpI8GR371YPxceR4P8B9T1/AHc9vA="; }; - patches = [ - # remove after next release - (fetchpatch { - name = "commit-cargo-lockfile"; - relative = "bindings/python"; - url = "https://github.com/huggingface/safetensors/commit/a7061b4235b59312010b2dd6f9597381428ee9a2.patch"; - hash = "sha256-iH4vQOL2LU93kd0dSS8/JJxKGb+kDstqnExjYSSwi78"; - }) - ]; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; - sourceRoot = "source/bindings/python"; + inherit src; + sourceRoot = "${src.name}/bindings/python"; hash = "sha256-tC0XawmKWNGCaByHQfJEfmHM3m/qgTuIpcRaEFJC6dM"; }; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; nativeBuildInputs = [ setuptools-rust diff --git a/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index 6bee251ff3dd..c45a72916467 100644 --- a/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -1,65 +1,84 @@ { lib , buildPythonPackage -, fetchPypi +, pythonOlder +, fetchFromGitHub , pythonRelaxDepsHook , attrs , boto3 +, cloudpickle , google-pasta -, importlib-metadata , numpy , protobuf -, protobuf3-to-dict , smdebug-rulesconfig +, importlib-metadata +, packaging , pandas , pathos -, packaging -, pythonOlder +, schema +, pyyaml +, jsonschema +, platformdirs +, tblib +, urllib3 +, docker +, scipy }: buildPythonPackage rec { pname = "sagemaker"; - version = "2.135.0"; + version = "2.173.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ypdcqEYLxHbfnq1ycq3hVLThhIIs3pq29Fv33Ly2hbE="; + src = fetchFromGitHub { + owner = "aws"; + repo = "sagemaker-python-sdk"; + rev = "refs/tags/v${version}"; + hash = "sha256-Fzkw37bRBbCD7VBIsN4Qkk6dI0Qh4Gvt5TJbnoUuPCs="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ - # FIXME: Remove when >= 2.111.0 "attrs" - "protobuf" + "boto3" ]; propagatedBuildInputs = [ attrs boto3 + cloudpickle google-pasta - importlib-metadata numpy - packaging - pathos protobuf - protobuf3-to-dict smdebug-rulesconfig + importlib-metadata + packaging pandas + pathos + schema + pyyaml + jsonschema + platformdirs + tblib ]; - postFixup = '' - [ "$($out/bin/sagemaker-upgrade-v2 --help 2>&1 | grep -cim1 'pandas failed to import')" -eq "0" ] - ''; - - doCheck = false; + doCheck = false; # many test dependencies are not available in nixpkgs pythonImportsCheck = [ "sagemaker" "sagemaker.lineage.visualizer" ]; + passthru.optional-dependencies = { + local = [ urllib3 docker pyyaml ]; + scipy = [ scipy ]; + # feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs + }; + meta = with lib; { description = "Library for training and deploying machine learning models on Amazon SageMaker"; homepage = "https://github.com/aws/sagemaker-python-sdk/"; diff --git a/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/nixpkgs/pkgs/development/python-modules/sanic/default.nix index 52b04f4cccef..eaa14240191b 100644 --- a/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -130,6 +130,6 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/sanic/"; changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc AluisioASG ]; + maintainers = with maintainers; [ AluisioASG ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix index bc25094c3d7f..9c82820f8416 100644 --- a/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -23,7 +23,7 @@ , html5lib , importlib-metadata , intbitset -, jaraco_functools +, jaraco-functools , javaproperties , jinja2 , jsonstreams @@ -94,7 +94,7 @@ buildPythonPackage rec { html5lib importlib-metadata intbitset - jaraco_functools + jaraco-functools javaproperties jinja2 jsonstreams diff --git a/nixpkgs/pkgs/development/python-modules/scapy/default.nix b/nixpkgs/pkgs/development/python-modules/scapy/default.nix index 3714d7bf76cf..1a5f80371139 100644 --- a/nixpkgs/pkgs/development/python-modules/scapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scapy/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ++ lib.optional withCryptography cryptography ++ lib.optional withVoipSupport sox ++ lib.optional withPlottingSupport matplotlib - ++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ]; + ++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-basic graphviz imagemagick ]; # Running the tests seems too complicated: doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index 7e0e7bdbd8bc..c1a2295ec88b 100644 --- a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -6,22 +6,24 @@ , cachecontrol , lockfile , mistune +, mypy , rdflib , ruamel-yaml +, setuptools , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "schema-salad"; - version = "8.4.20230213094415"; + version = "8.4.20230606143604"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-x2co8WjL+e4nBZd0pGUwv39nzNkO5G3dYrYJZeqP31o="; + hash = "sha256-8Zo9ZhS0r+zsk7nHEh0x7gHYwaoWmyctQYRMph09mvY="; }; nativeBuildInputs = [ @@ -32,8 +34,10 @@ buildPythonPackage rec { cachecontrol lockfile mistune + mypy rdflib ruamel-yaml + setuptools # needs pkg_resources at runtime ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix b/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix index fa750c06e91e..bf4bcee43758 100644 --- a/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "schemdraw"; - version = "0.16"; + version = "0.17"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-W9sXtYI8gEwQPRo50taEGT6AQG1tdAbeCtX49eHVvFQ="; + hash = "sha256-wa/IeNGZynU/xKwyFwebXcFaruhBFqGWsrZYaIEVa8Q="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/schwifty/default.nix b/nixpkgs/pkgs/development/python-modules/schwifty/default.nix index a775650b5828..071b891a9565 100644 --- a/nixpkgs/pkgs/development/python-modules/schwifty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schwifty/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2023.3.0"; + version = "2023.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Un9J1Yzt080vZ3rzoVURNpMcAObBS8Jsn5kEQKUVxf0="; + hash = "sha256-hDNAoITt2Ak5aVWmMgqg2oA9rDFsiuum5JXc7v7sspU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index 18e49239d08b..2c4920cf4c15 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Data structures, algorithms and educational resources for bioinformatics"; license = licenses.bsd3; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix index 2915e68767e9..553afcd8a1fa 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "A Python extension module which implements the fast marching method"; homepage = "https://github.com/scikit-fmm/scikit-fmm"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix index 91eb003987f7..09c9547fd583 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { description = "Sequential model-based optimization toolbox"; homepage = "https://scikit-optimize.github.io/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; + broken = true; # It will fix by https://github.com/scikit-optimize/scikit-optimize/pull/1123 }; } diff --git a/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix index c4a90132d9f9..6940859b9f6a 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "0.25.0"; + version = "0.28.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-rf"; repo = pname; - rev = "v${version}"; - hash = "sha256-drH1N1rKFu/zdLmLsD1jH5xUkzK37V/+nJqGQ38vsTI="; + rev = "refs/tags/v${version}"; + hash = "sha256-cTvWNfIs2bAOYpXDg6ghZA4tRXlaNbUZwcaZMjCi/YY="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix index 784dc84a0892..e2b6fae9aa01 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "Topological Data Analysis for humans"; homepage = "https://github.com/scikit-tda/scikit-tda"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix b/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix index c37618c8d95b..c429c6f6478c 100644 --- a/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "1.0.3"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Ne0iN1rVbdxyoN8XiM9Xj8uyzlEL6WHPUZbFWt/qH40="; + hash = "sha256-ggqSS5SWJvKxYzCz4Q9LkA0hXmj/3iGhMKeNb/UQVXg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 20fddbe8a226..61b3ed1e1e2d 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-VkyXK1blS4MUHzlc4/aiW/4gk9YdE/m4HQU4ThnbmNo="; + hash = "sha256-ThajP8jAOli99OjUvcofhnNU6sacz1c2WMf/NPoMrjk="; }; nativeBuildInputs = [ @@ -98,6 +98,7 @@ buildPythonPackage rec { "test_custom_loop_asyncio" "test_custom_loop_asyncio_deferred_signal" "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157 + "test_persist" "test_timeout_download_from_spider_nodata_rcvd" "test_timeout_download_from_spider_server_hangs" # Depends on uvloop diff --git a/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix b/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix index 25b1773472ff..7f5fb4718ff9 100644 --- a/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "seatconnect"; - version = "1.1.6"; + version = "1.1.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "farfar"; repo = pname; rev = version; - hash = "sha256-8ZqqNDLygHgtUzTgdb34+4BHuStXJXnl9fBfo0WSNZw="; + hash = "sha256-8QZtivHG+tf7S2hVlFaQ7yCeCCI7ft/EIr0D73mcURw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/selectors2/default.nix b/nixpkgs/pkgs/development/python-modules/selectors2/default.nix index 2611ae5c3aa8..297a6514ec63 100644 --- a/nixpkgs/pkgs/development/python-modules/selectors2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/selectors2/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://www.github.com/SethMichaelLarson/selectors2"; description = "Back-ported, durable, and portable selectors"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/nixpkgs/pkgs/development/python-modules/selenium/default.nix index 598bbc41deee..053b42d90e9a 100644 --- a/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Bindings for Selenium WebDriver"; homepage = "https://selenium.dev/"; license = licenses.asl20; - maintainers = with maintainers; [ jraygauthier SuperSandro2000 ]; + maintainers = with maintainers; [ jraygauthier ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/semaphore-bot/default.nix b/nixpkgs/pkgs/development/python-modules/semaphore-bot/default.nix new file mode 100644 index 000000000000..7725b48adac4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/semaphore-bot/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, attrs +, anyio +}: + +buildPythonPackage rec { + pname = "semaphore-bot"; + version = "0.16.0"; + format = "setuptools"; + + src = fetchPypi { + inherit version pname; + hash = "sha256-EOUvzW4a8CgyQSxb2fXnIWfOYs5Xe0v794vDIruSHmI="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "anyio>=3.5.0,<=3.6.2" "anyio" + ''; + + propagatedBuildInputs = [ + anyio + attrs + python-dateutil + ]; + + # Upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "semaphore" ]; + + meta = with lib; { + description = "Simple rule-based bot library for Signal Private Messenger"; + homepage = "https://github.com/lwesterhof/semaphore"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/semver/default.nix b/nixpkgs/pkgs/development/python-modules/semver/default.nix index d0e92a4cbc38..c33db77b72d2 100644 --- a/nixpkgs/pkgs/development/python-modules/semver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/semver/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "semver"; - version = "3.0.0"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python-semver"; repo = "python-semver"; rev = "refs/tags/${version}"; - hash = "sha256-ErLmKZswoNgsY82epNUmJDVs065JvSwz3zY+y8jQ0e8="; + hash = "sha256-vVi0+Pq8VpYMy73JSrvi9ranOzvFaHpcPZRt8gMkkFs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix index 61f1477c7c51..43836e882303 100644 --- a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , aiohttp , async-timeout +, kasa-crypt , orjson , pythonOlder , requests @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.11.2"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-i6XI6hiQTOGHB4KcDgz/MlYAhdEKaElLfNMq2R0fgu8="; + hash = "sha256-LVpTB7Q78N/cRbneJJ1aT+lFE790ssdMHo8VRirtDHY="; }; postPatch = '' @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp async-timeout + kasa-crypt orjson requests websocket-client @@ -48,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "API for the Sense Energy Monitor"; homepage = "https://github.com/scottbonline/sense"; + changelog = "https://github.com/scottbonline/sense/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix b/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix index c347be86e252..7316256cd8aa 100644 --- a/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.15.1"; + version = "2.17.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EZL/sYz2U4V2p0eEoxLwZhe9Xok9IcZabNLwAE6itGw="; + hash = "sha256-zfgkTBdE8UWwk+G3bLBThVjgU+m2QoPf1fzORyznEgs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix b/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix index c1ad64b3f5e4..dc7335b351f8 100644 --- a/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ sentencepiece.dev ]; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; # sentencepiece installs 'bin' output. meta = builtins.removeAttrs sentencepiece.meta [ "outputsToInstall" ]; diff --git a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index 0010723fcf46..94cb5ab003cc 100644 --- a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.25.0"; + version = "1.29.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-aY6oZf6S6jioeL10euxo1ijvzE7FcHQoWjadE21ILA4="; + hash = "sha256-etn7vkKgCN7a8Dxv4gDSVaG6mvCltVh6rTOLaKEyNRA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/serializable/default.nix b/nixpkgs/pkgs/development/python-modules/serializable/default.nix new file mode 100644 index 000000000000..5c881558d69e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/serializable/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, simplejson +, six +, typechecks +}: + +buildPythonPackage rec { + pname = "serializable"; + version = "unstable-2023-07-13"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "iskandr"; + repo = pname; + # See https://github.com/iskandr/serializable/issues/7. As of 2023-07-13, + # they do no have version tags. + rev = "ed309a6f8f2590b525fc0f93c00549223c8c944f"; + hash = "sha256-AXlgIc1B7bkR+joXn6ZSxk/t848CWlgVZp8WIsSZFKQ="; + }; + + propagatedBuildInputs = [ simplejson six typechecks ]; + + pythonImportsCheck = [ "serializable" ]; + + meta = with lib; { + description = "Base class with serialization methods for user-defined Python objects"; + homepage = "https://github.com/iskandr/serializable"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix index 5a1a2e2107a1..906d6355e9b8 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/PyO3/setuptools-rust"; changelog = "https://github.com/PyO3/setuptools-rust/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix index dc338bd41120..36373efda530 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/setuptools_scm/"; description = "Handles managing your python package versions in scm metadata"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix b/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix index 9bbdb1c6946c..b679a0f5ca4c 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix @@ -7,13 +7,11 @@ , virtualenv }: -buildPythonPackage rec { +buildPythonPackage { pname = "setuptools-scm-tests"; - inherit (setuptools-scm) version; + inherit (setuptools-scm) version src; format = "other"; - src = setuptools-scm.src; - dontBuild = true; dontInstall = true; diff --git a/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix b/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix index 45c0224e30af..0d2c0192c1c9 100644 --- a/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix @@ -1,23 +1,37 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "sexpdata"; - version = "1.0.0"; + version = "1.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6NX3XDeKB8bRzGH62WEbRRyTg8AlMFLhYZioUuFiBwU="; + hash = "sha256-b2XxFSkYkMvOXNJpwTvfH4KkzSO8YbbhUKJ1Ee5qfV4="; }; + nativeBuildInputs = [ + setuptools + ]; + doCheck = false; + pythonImportsCheck = [ + "sexpdata" + ]; + meta = with lib; { description = "S-expression parser for Python"; - homepage = "https://github.com/tkf/sexpdata"; - license = licenses.bsd0; + homepage = "https://github.com/jd-boyd/sexpdata"; + changelog = "https://github.com/jd-boyd/sexpdata/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/sh/default.nix b/nixpkgs/pkgs/development/python-modules/sh/default.nix index 069afeca9b21..20e4d95928ea 100644 --- a/nixpkgs/pkgs/development/python-modules/sh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sh/default.nix @@ -3,10 +3,6 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, python -, lsof -, glibcLocales -, coreutils , pytestCheckHook }: @@ -47,6 +43,9 @@ buildPythonPackage rec { "test_unicode_path" # fails to import itself after modifying the environment "test_environment" + # timing sensitive through usage of sleep(1) and signal handling + # https://github.com/amoffat/sh/issues/684 + "test_general_signal" ] ++ lib.optionals stdenv.isDarwin [ # Disable tests that fail on Darwin sandbox "test_background_exception" diff --git a/nixpkgs/pkgs/development/python-modules/shap/default.nix b/nixpkgs/pkgs/development/python-modules/shap/default.nix index 96c9c1f952ac..a93cca6232fd 100644 --- a/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -1,51 +1,59 @@ { lib , buildPythonPackage , fetchFromGitHub -, writeText -, isPy27 , pytestCheckHook -, pytest-mpl +, pythonOlder +, writeText +, catboost +, cloudpickle +, ipython +, lightgbm +, lime +, matplotlib +, nose +, numba , numpy -, scipy -, scikit-learn -, pandas -, transformers , opencv4 -, lightgbm -, catboost +, pandas , pyspark +, pytest-mpl +, scikit-learn +, scipy , sentencepiece -, tqdm +, setuptools , slicer -, numba -, matplotlib -, nose -, lime -, cloudpickle -, ipython +, tqdm +, transformers +, xgboost }: buildPythonPackage rec { pname = "shap"; - version = "0.41.0"; - disabled = isPy27; + version = "0.42.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "slundberg"; - repo = pname; + repo = "shap"; rev = "refs/tags/v${version}"; - hash = "sha256-rYVWQ3VRvIObSQPwDRsxhTOGOKNkYkLtiHzVwoB3iJ0="; + hash = "sha256-Ezq6WS6QnoM5uEfo2DgDAEo1HkQ1KjmfgIyVWh3RM94="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + cloudpickle + numba numpy - scipy - scikit-learn pandas - tqdm + scikit-learn + scipy slicer - numba - cloudpickle + tqdm ]; passthru.optional-dependencies = { @@ -58,7 +66,7 @@ buildPythonPackage rec { # tests that try to access the network will raise, get caught, be marked as skipped and tagged as xfailed. conftestSkipNetworkErrors = writeText "conftest.py" '' from _pytest.runner import pytest_runtest_makereport as orig_pytest_runtest_makereport - import urllib, requests + import urllib, requests, transformers class NetworkAccessDeniedError(RuntimeError): pass def deny_network_access(*a, **kw): @@ -68,6 +76,7 @@ buildPythonPackage rec { requests.get = deny_network_access urllib.request.urlopen = deny_network_access urllib.request.Request = deny_network_access + transformers.AutoTokenizer.from_pretrained = deny_network_access def pytest_runtest_makereport(item, call): tr = orig_pytest_runtest_makereport(item, call) @@ -81,55 +90,41 @@ buildPythonPackage rec { # when importing the local copy the extension is not found rm -r shap - # coverage testing is a waste considering how much we have to skip - substituteInPlace pytest.ini \ - --replace "--cov=shap --cov-report=term-missing" "" - # Add pytest hook skipping tests that access network. # These tests are marked as "Expected fail" (xfail) cat ${conftestSkipNetworkErrors} >> tests/conftest.py ''; + nativeCheckInputs = [ - pytestCheckHook - pytest-mpl + ipython matplotlib nose - ipython + pytest-mpl + pytestCheckHook # optional dependencies, which only serve to enable more tests: - opencv4 - #pytorch # we already skip all its tests due to slowness, adding it does nothing - transformers - #xgboost # numerically unstable? xgboost tests randomly fails pending on nixpkgs revision - lightgbm catboost + lightgbm + opencv4 pyspark sentencepiece + #torch # we already skip all its tests due to slowness, adding it does nothing + transformers + xgboost ]; + disabledTestPaths = [ - # takes forever without GPU acceleration - "tests/explainers/test_deep.py" - "tests/explainers/test_gradient.py" - # requires GPU. We skip here instead of having pytest repeatedly check for GPU - "tests/explainers/test_gpu_tree.py" # The resulting plots look sane, but does not match pixel-perfectly with the baseline. # Likely due to a matplotlib version mismatch, different backend, or due to missing fonts. "tests/plots/test_summary.py" # FIXME: enable - # 100% of the tests in these paths require network - "tests/explainers/test_explainer.py" - "tests/explainers/test_exact.py" - "tests/explainers/test_partition.py" - "tests/maskers/test_fixed_composite.py" - "tests/maskers/test_text.py" - "tests/models/test_teacher_forcing_logits.py" - "tests/models/test_text_generation.py" ]; + disabledTests = [ - # unstable. A xgboost-enabled test. possibly related: https://github.com/slundberg/shap/issues/2480 - "test_provided_background_tree_path_dependent" + # The same reason as above test_summary.py + "test_simple_bar_with_cohorts_dict" + "test_random_summary_violin_with_data2" + "test_random_summary_layered_violin_with_data2" ]; - #pytestFlagsArray = ["-x" "-W" "ignore"]; # uncomment this to debug - pythonImportsCheck = [ "shap" "shap.explainers" @@ -148,10 +143,6 @@ buildPythonPackage rec { homepage = "https://github.com/slundberg/shap"; changelog = "https://github.com/slundberg/shap/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ evax ]; - platforms = platforms.unix; - # No support for scikit-learn > 1.2 - # https://github.com/slundberg/shap/issues/2866 - broken = true; + maintainers = with maintainers; [ evax natsukium ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/nixpkgs/pkgs/development/python-modules/shapely/default.nix index ec4f6bd6b377..419bed0a371c 100644 --- a/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { description = "Manipulation and analysis of geometric objects"; homepage = "https://github.com/shapely/shapely"; license = licenses.bsd3; - maintainers = with maintainers; [ knedlsepp ]; + maintainers = teams.geospatial.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix index 08117a58df00..ee368852422a 100644 --- a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix @@ -9,15 +9,16 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.5.0.post1"; + version = "1.5.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sarugaku"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nAXI1GxSpmmpJuatPYUeAClA88B9c/buPEWhq7RKvs8="; + hash = "sha256-7hMlKw9oSGp57FQmbxdAgUsm5cFRr1oTW1ymJyYsgOg="; }; nativeBuildInputs = [ @@ -29,11 +30,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "shellingham" ]; + pythonImportsCheck = [ + "shellingham" + ]; meta = with lib; { description = "Tool to detect the surrounding shell"; homepage = "https://github.com/sarugaku/shellingham"; + changelog = "https://github.com/sarugaku/shellingham/blob/${version}/CHANGELOG.rst"; license = licenses.isc; maintainers = with maintainers; [ mbode ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/showit/default.nix b/nixpkgs/pkgs/development/python-modules/showit/default.nix index 10638620b012..bb74352b1a8c 100644 --- a/nixpkgs/pkgs/development/python-modules/showit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/showit/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "simple and sensible display of images"; homepage = "https://github.com/freeman-lab/showit"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/shtab/default.nix b/nixpkgs/pkgs/development/python-modules/shtab/default.nix index 3a10e6744895..f27d2c1f253d 100644 --- a/nixpkgs/pkgs/development/python-modules/shtab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shtab/default.nix @@ -4,14 +4,15 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm , bashInteractive }: buildPythonPackage rec { pname = "shtab"; - version = "1.6.1"; - format = "setuptools"; + version = "1.6.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,12 +20,18 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5qjavFzwFH75SlTQxxhMoJjBRIjGz9oogdvSw9dkjz0="; + hash = "sha256-9XXAVwno8rO5Uw7S5FWsyEUSqUE46QRehpAr5wIlYgc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" "" + ''; + nativeBuildInputs = [ + setuptools setuptools-scm ]; @@ -34,11 +41,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" "" - ''; - pythonImportsCheck = [ "shtab" ]; diff --git a/nixpkgs/pkgs/development/python-modules/signalslot/default.nix b/nixpkgs/pkgs/development/python-modules/signalslot/default.nix index 4dd13c4c089f..98e3a15eec57 100644 --- a/nixpkgs/pkgs/development/python-modules/signalslot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/signalslot/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "signalslot"; - version = "0.1.2"; + version = "0.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Z26RPNau+4719e82jMhb2LyIR6EvsANI8r3+eKuw494="; + hash = "sha256-ZNodibNGfCOa8xd3myN+cRa28rY3/ynNUia1kwjTIOU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix index f417ac326897..8598f04918c3 100644 --- a/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { homepage = "https://github.com/simple-salesforce/simple-salesforce"; changelog = "https://github.com/simple-salesforce/simple-salesforce/blob/v${version}/CHANGES"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix b/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix index cc138695e3fd..aa8a970364d8 100644 --- a/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { format = "pyproject"; disabled = pythonOlder "3.8"; - sourceRoot = "source/Wrapping/Python"; + sourceRoot = "${src.name}/Wrapping/Python"; preBuild = '' make ''; diff --git a/nixpkgs/pkgs/development/python-modules/simplekv/default.nix b/nixpkgs/pkgs/development/python-modules/simplekv/default.nix new file mode 100644 index 000000000000..12e2449b04c5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/simplekv/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, dulwich +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "simplekv"; + version = "0.14.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mbr"; + repo = "simplekv"; + rev = "refs/tags/${version}"; + hash = "sha256-seUGDj2q84+AjDFM1pxMLlHbe9uBgEhmqA96UHjnCmo="; + }; + + nativeCheckInputs = [ + dulwich + mock + pytestCheckHook + six + ]; + + pythonImportsCheck = [ + "simplekv" + ]; + + disabledTests = [ + # Issue with fixture + "test_concurrent_mkdir" + ]; + + meta = with lib; { + description = "A simple key-value store for binary data"; + homepage = "https://github.com/mbr/simplekv"; + changelog = "https://github.com/mbr/simplekv/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix b/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix index 9cb4775fa13c..0fefc6d41f7c 100644 --- a/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , cython +, isPyPy , ninja , setuptools-scm , setuptools @@ -50,8 +51,10 @@ buildPythonPackage rec { meta = { description = "Python access to operations on paths using the Skia library"; - homepage = "https://skia.org/dev/present/pathops"; + homepage = "https://github.com/fonttools/skia-pathops"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.BarinovMaxim ]; + # ERROR at //gn/BUILDCONFIG.gn:87:14: Script returned non-zero exit code. + broken = isPyPy; }; } diff --git a/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix b/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix index e13bb2b57d80..759f568237a1 100644 --- a/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gLk+Dj2x2OHa6VIIoA7FesDKtg180MuCud2nYk9mYpM="; + hash = "sha256-gV/+mt6XxY1UcA1H8zM4pG1ugrDo0m876e3XG1yV32A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/nixpkgs/pkgs/development/python-modules/skorch/default.nix index 17cc53dccc7a..2f8b842d9a9a 100644 --- a/nixpkgs/pkgs/development/python-modules/skorch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skorch/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "skorch"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - hash = "sha256-k9Zs4uqskHLqVHOKK7dIOmBSUmbDpOMuPS9eSdxNjO0="; + hash = "sha256-/d0s0N40W18uGfVbD9VEbhbWfduoo+TBqDjmTkjMUxs="; }; propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ]; diff --git a/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix b/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix new file mode 100644 index 000000000000..30cf185c1aa7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix @@ -0,0 +1,88 @@ +{ buildPythonPackage +, chalice +, cherrypy +, django +, falcon +, fastapi +, fetchFromGitHub +, flask +, flask-sockets +, lib +, moto +, numpy +, pyramid +, pytest-asyncio +, pytestCheckHook +, sanic +, sanic-testing +, slack-sdk +, starlette +, tornado +}: + +buildPythonPackage rec { + pname = "slack-bolt"; + version = "1.18.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "slackapi"; + repo = "bolt-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-s9djd/MDNnyNkjkeApY6Fb1mhI6iop8RghaSJdi4eAs="; + }; + + # The packaged pytest-runner version is too new as of 2023-07-27. It's not really needed anyway. Unfortunately, + # pythonRelaxDepsHook doesn't work on setup_requires packages. + postPatch = '' + substituteInPlace setup.py --replace "pytest-runner==5.2" "" + ''; + + propagatedBuildInputs = [ slack-sdk ]; + + nativeCheckInputs = [ + chalice + cherrypy + django + falcon + fastapi + flask + flask-sockets + moto + pyramid + pytest-asyncio + pytestCheckHook + sanic + sanic-testing + starlette + tornado + ]; + + # Work around "Read-only file system: '/homeless-shelter'" errors + preCheck = '' + export HOME="$(mktemp -d)" + ''; + + disabledTestPaths = [ + # boddle is not packaged as of 2023-07-15 + "tests/adapter_tests/bottle/" + ]; + + disabledTests = [ + # Require network access + "test_events" + "test_interactions" + "test_lazy_listener_calls" + "test_lazy_listeners" + "test_failure" + ]; + + pythonImportsCheck = [ "slack_bolt" ]; + + meta = with lib; { + description = "A framework to build Slack apps using Python"; + homepage = "https://github.com/slackapi/bolt-python"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index 6d805c35f021..433f9ad62a85 100644 --- a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -5,7 +5,6 @@ , boto3 , buildPythonPackage , codecov -, databases , fetchFromGitHub , flake8 , flask-sockets @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.20.2"; + version = "3.21.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-2MPXV+rVXZYMTZe11T8x8GKQmHZwUlkwarCkheVkERo="; + hash = "sha256-begpT/DaDqOi8HZE10FCuIIv18KSU/i5G/Z5DXKUT7Y="; }; propagatedBuildInputs = [ @@ -44,7 +43,6 @@ buildPythonPackage rec { nativeCheckInputs = [ codecov - databases flake8 flask-sockets moto @@ -67,6 +65,7 @@ buildPythonPackage rec { "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" "test_org_installation" "test_interactions" + "test_issue_690_oauth_access" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix b/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix index 47e3f58f5817..f74447750cc3 100644 --- a/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Library to access sliced imaging data"; homepage = "https://github.com/spacetx/slicedimage"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/slicer/default.nix b/nixpkgs/pkgs/development/python-modules/slicer/default.nix index 7228c7914619..f678dfb2eaa2 100644 --- a/nixpkgs/pkgs/development/python-modules/slicer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slicer/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage +, dos2unix +, fetchpatch , fetchPypi -, isPy27 , pytestCheckHook +, pythonOlder , pandas , torch , scipy @@ -11,13 +13,38 @@ buildPythonPackage rec { pname = "slicer"; version = "0.0.7"; - disabled = isPy27; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f5d5f7b45f98d155b9c0ba6554fa9770c6b26d5793a3e77a1030fb56910ebeec"; + hash = "sha256-9dX3tF+Y0VW5wLplVPqXcMaybVeTo+d6EDD7VpEOvuw="; }; + prePatch = '' + dos2unix slicer/* + ''; + + patches = [ + # these patches add support for numpy>=1.24 + (fetchpatch { + url = "https://github.com/interpretml/slicer/commit/028e09e639c4a3c99abe1d537cce30af2eebb081.patch"; + hash = "sha256-jh/cbz7cx2ks6jMNh1gI1n5RS/OHBtSIDZRxUGyrl/I="; + }) + (fetchpatch { + url = "https://github.com/interpretml/slicer/commit/d4bb09f136d7e1f64711633c16a37e7bee738696.patch"; + hash = "sha256-9rh99s4JWF4iKClZ19jvqSeRulL32xB5Use8PGkh/SA="; + }) + (fetchpatch { + url = "https://github.com/interpretml/slicer/commit/74b3683a5a7bd982f9eaaf8d8d665dfdaf2c6604.patch"; + hash = "sha256-R3zsC3udYPFUT93eRhb6wyc9S5n2wceiOunWJ8K+648="; + }) + ]; + + nativeBuildInputs = [ + dos2unix + ]; + nativeCheckInputs = [ pytestCheckHook pandas torch scipy ]; disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/slicerator/default.nix b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix index a1240f47c4e8..a8a4a7d3b8d2 100644 --- a/nixpkgs/pkgs/development/python-modules/slicerator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "A lazy-loading, fancy-sliceable iterable"; homepage = "https://github.com/soft-matter/slicerator"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix index ef2a897de21e..be0e061bdc68 100644 --- a/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix @@ -9,12 +9,13 @@ , pythonOlder , setuptools , solc +, web3 , withSolc ? false }: buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.9.2"; + version = "0.9.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-Co3BFdLmSIMqlZVEPJHYH/Cf7oKYSZ+Ktbnd5RZGmfE="; + hash = "sha256-c6H7t+aPPWn1i/30G9DLOmwHhdHHHbcP3FRVVjk1XR4="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { packaging prettytable setuptools + web3 ]; postFixup = lib.optionalString withSolc '' @@ -55,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/trailofbits/slither"; changelog = "https://github.com/crytic/slither/releases/tag/${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ arturcygan fab ]; + maintainers = with maintainers; [ arturcygan fab hellwolf ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sly/default.nix b/nixpkgs/pkgs/development/python-modules/sly/default.nix index 715298062986..a1ba8f67f87b 100644 --- a/nixpkgs/pkgs/development/python-modules/sly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sly/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "An improved PLY implementation of lex and yacc for Python 3"; homepage = "https://github.com/dabeaz/sly"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix b/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix index d7d568602358..bd0d181a3ede 100644 --- a/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.5.1"; + version = "0.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "grahamwetzler"; repo = "smart-meter-texas"; - rev = "v${version}"; - hash = "sha256-rjMRV5MekwRkipes2nWos/1zi3sD+Ls8LyD3+t5FOZc="; + rev = "refs/tags/v${version}"; + hash = "sha256-8htd5fLrtkaVlSEm+RB7tWA5YZkcAOjAXVNzZiMwP7k="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/snakebite/default.nix b/nixpkgs/pkgs/development/python-modules/snakebite/default.nix index 62e233aec314..a5b8a9931102 100644 --- a/nixpkgs/pkgs/development/python-modules/snakebite/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snakebite/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Pure Python HDFS client"; homepage = "https://github.com/spotify/snakebite"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix b/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix index 6f6a1df05b8e..a36c8e48d490 100644 --- a/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Snapshot testing for pytest, unittest, Django, and Nose"; homepage = "https://github.com/syrusakbary/snapshottest"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/snorkel/default.nix b/nixpkgs/pkgs/development/python-modules/snorkel/default.nix new file mode 100644 index 000000000000..6e918c2f9145 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/snorkel/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, tensorboard +, scipy +, tqdm +, scikit-learn +, munkres +, networkx +, torch +, pandas +# test dependencies +, pytestCheckHook +, spacy +, pyspark +, dill +, dask +, spacy_models +}: +let + pname = "snorkel"; + version = "0.9.9"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "snorkel-team"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IDWYvblS0Q8ubuHzgIc7fU/gwpJ43Dd7VMWycMfAJxc="; + }; + + propagatedBuildInputs = [ + tensorboard + scipy + tqdm + scikit-learn + munkres + networkx + torch + pandas + ]; + + # test fail because of some wrong path references + # things like No such file or directory: '/nix/store/8r9x7xv9nfwmd36ca28a39xaharcjdzj-python3.10-pyspark-3.4.0/lib/python3.10/site-packages/pyspark/./bin/spark-submit' + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + spacy + pyspark + dill + dask + spacy_models.en_core_web_sm + ] ++ dask.optional-dependencies.distributed; + + meta = with lib; { + description = "A system for quickly generating training data with weak supervision"; + homepage = "https://github.com/snorkel-team/snorkel"; + changelog = "https://github.com/snorkel/snorkel/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 4a89534c63cd..fbf000d21e1e 100644 --- a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -7,6 +7,7 @@ , fetchPypi , filelock , idna +, keyring , oscrypto , pycryptodomex , pyjwt @@ -53,6 +54,10 @@ buildPythonPackage rec { typing-extensions ]; + passthru.optional-dependencies = { + secure-local-storage = [ keyring ]; + }; + # Tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix b/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix index de552ca673c9..509505b27028 100644 --- a/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "socid-extractor"; - version = "0.0.23"; + version = "0.0.25"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "soxoj"; repo = pname; - rev = "v${version}"; - hash = "sha256-tDKwYgW1vEyPzuouPGK9tdTf3vNr+UaosHtQe23srG0="; + rev = "refs/tags/v${version}"; + hash = "sha256-3aqtuaecqtUcKLp+LRUct5aZb9mP0cE9xH91xWqtb1Q="; }; propagatedBuildInputs = [ @@ -28,9 +28,9 @@ buildPythonPackage rec { ]; postPatch = '' - # https://github.com/soxoj/socid-extractor/pull/125 + # https://github.com/soxoj/socid-extractor/pull/150 substituteInPlace requirements.txt \ - --replace "beautifulsoup4~=4.10.0" "beautifulsoup4>=4.10.0" + --replace "beautifulsoup4~=4.11.1" "beautifulsoup4>=4.10.0" ''; # Test require network access @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract details from personal pages"; homepage = "https://github.com/soxoj/socid-extractor"; + changelog = "https://github.com/soxoj/socid-extractor/blob/v${version}/CHANGELOG.md"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/softlayer/default.nix b/nixpkgs/pkgs/development/python-modules/softlayer/default.nix index 032b5827d258..cd49c0cbc55c 100644 --- a/nixpkgs/pkgs/development/python-modules/softlayer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/softlayer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.4"; + version = "6.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ofl8MmGn70CJPuPZi0W0GJiMiceMNMACSNVKaOPdQN8="; + hash = "sha256-WL/hv1/eB8/ynSo0XOTOYE2rGWV/4VsgSQsRioR2ACE="; }; postPatch = '' @@ -49,6 +49,8 @@ buildPythonPackage rec { urllib3 ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ mock pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/solc-select/default.nix b/nixpkgs/pkgs/development/python-modules/solc-select/default.nix index 9b8c611b925d..d9910e570d5d 100644 --- a/nixpkgs/pkgs/development/python-modules/solc-select/default.nix +++ b/nixpkgs/pkgs/development/python-modules/solc-select/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "solc-select"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - hash = "sha256-850IA1NVvQ4KiH5KEIjqEKFd1k5ECMx/zXLZE7Rvx5k="; + hash = "sha256-23ud4AmvbeOlQWuAu+W21ja/MUcDwBYxm4wSMeJIpsc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/nixpkgs/pkgs/development/python-modules/somajo/default.nix index 543f075b281c..98f98741a986 100644 --- a/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.3"; + version = "2.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-EnYw8TSZLXgB4pZaZBgxaO13PpTDx4lGsdGJ+51A6wE="; + hash = "sha256-vO3wEM3WkPQqq+ureJY+cpRHQ4cOLPV6DukA5LOscEM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/nixpkgs/pkgs/development/python-modules/sopel/default.nix index bd7efca27e6f..93b942811c38 100644 --- a/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -27,6 +27,13 @@ buildPythonPackage rec { hash = "sha256-IJ+ovLQv6/UU1oepmUQjzaWBG3Rdd3xvui7FjK85Urs="; }; + patches = [ + # https://github.com/sopel-irc/sopel/issues/2401 + # https://github.com/sopel-irc/sopel/commit/596adc44330939519784389cbb927435305ef758.patch + # rewrite the patch because there are too many patches needed to apply the above patch. + ./python311-support.patch + ]; + propagatedBuildInputs = [ dnspython geoip2 diff --git a/nixpkgs/pkgs/development/python-modules/sopel/python311-support.patch b/nixpkgs/pkgs/development/python-modules/sopel/python311-support.patch new file mode 100644 index 000000000000..dfa0283409ac --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sopel/python311-support.patch @@ -0,0 +1,96 @@ +diff --git a/sopel/plugins/handlers.py b/sopel/plugins/handlers.py +index 76902aa0..05f0279d 100644 +--- a/sopel/plugins/handlers.py ++++ b/sopel/plugins/handlers.py +@@ -46,20 +46,15 @@ from __future__ import absolute_import, division, print_function, unicode_litera + + import imp + import importlib ++import importlib.util + import inspect + import itertools + import os ++import sys + + from sopel import loader + from . import exceptions + +-try: +- reload = importlib.reload +-except AttributeError: +- # py2: no reload function +- # TODO: imp is deprecated, to be removed when py2 support is dropped +- reload = imp.reload +- + + class AbstractPluginHandler(object): + """Base class for plugin handlers. +@@ -301,7 +296,7 @@ class PyModulePlugin(AbstractPluginHandler): + + This method assumes the plugin is already loaded. + """ +- self._module = reload(self._module) ++ self._module = importlib.reload(self._module) + + def is_loaded(self): + return self._module is not None +@@ -402,45 +397,31 @@ class PyFilePlugin(PyModulePlugin): + + if good_file: + name = os.path.basename(filename)[:-3] +- module_type = imp.PY_SOURCE ++ spec = importlib.util.spec_from_file_location( ++ name, ++ filename, ++ ) + elif good_dir: + name = os.path.basename(filename) +- module_type = imp.PKG_DIRECTORY ++ spec = importlib.util.spec_from_file_location( ++ name, ++ os.path.join(filename, '__init__.py'), ++ submodule_search_locations=filename, ++ ) + else: + raise exceptions.PluginError('Invalid Sopel plugin: %s' % filename) + + self.filename = filename + self.path = filename +- self.module_type = module_type ++ self.module_spec = spec + + super(PyFilePlugin, self).__init__(name) + + def _load(self): +- # The current implementation uses `imp.load_module` to perform the +- # load action, which also reloads the module. However, `imp` is +- # deprecated in Python 3, so that might need to be changed when the +- # support for Python 2 is dropped. +- # +- # However, the solution for Python 3 is non-trivial, since the +- # `importlib` built-in module does not have a similar function, +- # therefore requires to dive into its public internals +- # (``importlib.machinery`` and ``importlib.util``). +- # +- # All of that is doable, but represents a lot of work. As long as +- # Python 2 is supported, we can keep it for now. +- # +- # TODO: switch to ``importlib`` when Python2 support is dropped. +- if self.module_type == imp.PY_SOURCE: +- with open(self.path) as mod: +- description = ('.py', 'U', self.module_type) +- mod = imp.load_module(self.name, mod, self.path, description) +- elif self.module_type == imp.PKG_DIRECTORY: +- description = ('', '', self.module_type) +- mod = imp.load_module(self.name, None, self.path, description) +- else: +- raise TypeError('Unsupported module type') +- +- return mod ++ module = importlib.util.module_from_spec(self.module_spec) ++ sys.modules[self.name] = module ++ self.module_spec.loader.exec_module(module) ++ return module + + def get_meta_description(self): + """Retrieve a meta description for the plugin. diff --git a/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix b/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix index 7158c6decaa0..3b60be8c4877 100644 --- a/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix @@ -32,7 +32,7 @@ let description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; homepage = "https://grantjenks.com/docs/sortedcontainers/"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in diff --git a/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix b/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix index cd5a0cd19404..e26a04192f48 100644 --- a/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix @@ -3,7 +3,6 @@ , fetchPypi , hatchling , isPy3k -, backports_functools_lru_cache }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix b/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix index 5dabab1ed267..db50edc66aff 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.2.4"; + version = "1.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hZwgk/rZ/0EAW8VcABjUKQvdYkVPdr3bzzGKroXzB7U="; + hash = "sha256-+VIQXcffodzR6QEr2ZfvEIBGIxqKwsNZotI+Eh0EOIw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix index f6ecf1d7ebe7..a3cf5a63cf50 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , blis , buildPythonPackage , callPackage @@ -17,6 +18,7 @@ , pytest , python , pythonOlder +, pythonRelaxDepsHook , requests , setuptools , spacy-legacy @@ -28,7 +30,6 @@ , typing-extensions , wasabi , writeScript -, stdenv , nix , git , nix-update @@ -36,16 +37,24 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.5.2"; + version = "3.5.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IsH/qrKFt0dwA9S1sDhBTMMkaKaQ1HkBW5ppjFMcgTs="; + hash = "sha256-mpwWfp3Ov++sx12sNKjnK+y+NI60W78GpsBSOuBaxCU="; }; + pythonRelaxDeps = [ + "typer" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ blis catalogue @@ -70,9 +79,7 @@ buildPythonPackage rec { wasabi ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ]; - - postPatch = '' + ]; postPatch = '' substituteInPlace setup.cfg \ --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0" ''; @@ -82,6 +89,7 @@ buildPythonPackage rec { ]; doCheck = false; + checkPhase = '' ${python.interpreter} -m pytest spacy/tests --vectors --models --slow ''; diff --git a/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix b/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix new file mode 100644 index 000000000000..72403d67c955 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, spacy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "spacy-lookups-data"; + version = "1.0.3"; + format = "setuptools"; + + src = fetchPypi { + pname = "spacy_lookups_data"; + inherit version; + hash = "sha256-q2hlVI+4ZtR5CQ4xEIp+Je0ZKhH8sJiW5xFjKM3FK+E="; + }; + + nativeCheckInputs = [ + spacy + pytestCheckHook + ]; + + pythonImportsCheck = [ "spacy_lookups_data" ]; + + meta = with lib; { + description = "Additional lookup tables and data resources for spaCy"; + homepage = "https://pypi.org/project/spacy-lookups-data"; + license = licenses.mit; + maintainers = with maintainers; [ jboy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sparse/default.nix b/nixpkgs/pkgs/development/python-modules/sparse/default.nix index 047689b5c26f..9904e594e0b6 100644 --- a/nixpkgs/pkgs/development/python-modules/sparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sparse/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { changelog = "https://sparse.pydata.org/en/stable/changelog.html"; downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix b/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix index 298ac0a27106..252f25ddad2f 100644 --- a/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix @@ -1,28 +1,30 @@ { lib , stdenv -, fetchPypi -, buildPythonPackage , aplpy -, joblib , astropy +, astropy-helpers +, buildPythonPackage , casa-formats-io -, radio_beam -, six , dask -, pytestCheckHook +, fetchPypi +, joblib , pytest-astropy -, astropy-helpers +, pytestCheckHook +, pythonOlder +, radio_beam , setuptools-scm }: buildPythonPackage rec { pname = "spectral-cube"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "1c0pp82wgl680w2vcwlrrz46sy83z1qs74w5bd691wg0512hv2jx"; + hash = "sha256-0Fr9PvUShi04z8SUsZE7zHuXZWg4rxt6gwSBb6lr2Pc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -31,8 +33,19 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ astropy casa-formats-io radio_beam joblib six dask ]; - nativeCheckInputs = [ pytestCheckHook aplpy pytest-astropy ]; + propagatedBuildInputs = [ + astropy + casa-formats-io + radio_beam + joblib + dask + ]; + + nativeCheckInputs = [ + aplpy + pytest-astropy + pytestCheckHook + ]; # On x86_darwin, this test fails with "Fatal Python error: Aborted" # when sandbox = true. @@ -40,12 +53,15 @@ buildPythonPackage rec { "spectral_cube/tests/test_visualization.py" ]; - meta = { + pythonImportsCheck = [ + "spectral_cube" + ]; + + meta = with lib; { description = "Library for reading and analyzing astrophysical spectral data cubes"; - homepage = "http://radio-astro-tools.github.io"; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ smaret ]; - broken = true; + homepage = "https://spectral-cube.readthedocs.io"; + changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ smaret ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/speechbrain/default.nix b/nixpkgs/pkgs/development/python-modules/speechbrain/default.nix new file mode 100644 index 000000000000..e0a72e331f06 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/speechbrain/default.nix @@ -0,0 +1,55 @@ +{ buildPythonPackage +, fetchFromGitHub +, huggingface-hub +, hyperpyyaml +, joblib +, lib +, numpy +, packaging +, pythonOlder +, sentencepiece +, scipy +, torch +, torchaudio +, tqdm +}: + +buildPythonPackage rec { + pname = "speechbrain"; + version = "0.5.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "speechbrain"; + repo = "speechbrain"; + rev = "refs/tags/v${version}"; + hash = "sha256-r1q7JO+H7ynfrzlihRTY0PtMGmvwm98BHUZV534ABXw="; + }; + + propagatedBuildInputs = [ + huggingface-hub + hyperpyyaml + joblib + numpy + packaging + sentencepiece + scipy + torch + torchaudio + tqdm + ]; + + doCheck = false; # requires sox backend + + pythonImportsCheck = [ "speechbrain" ]; + + meta = with lib; { + description = "A PyTorch-based Speech Toolkit"; + homepage = "https://speechbrain.github.io"; + changelog = "https://github.com/speechbrain/speechbrain/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/speg/default.nix b/nixpkgs/pkgs/development/python-modules/speg/default.nix new file mode 100644 index 000000000000..83bdc1e5b046 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/speg/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, speg +}: + +buildPythonPackage rec { + pname = "speg"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EMvvR+Fo38YvFNtXXPHEKAN6K4gc7mw8/O2gQ5wkPnE="; + extension = "zip"; + }; + + pythonImportChecks = [ "speg" ]; + + # checks fail for seemingly spurious reasons + doCheck = false; + + meta = with lib; { + description = "A PEG-based parser interpreter with memoization (in time)"; + homepage = "https://github.com/avakar/speg"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ xworld21 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix index f92c9e237ff5..69a34dd2c619 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinx-basic-ng"; - version = "1.0.0.beta1"; + version = "1.0.0.beta2"; disable = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pradyunsg"; repo = "sphinx-basic-ng"; rev = version; - hash = "sha256-Zh9KvKs4js+AVSfIk0pAj6Kzq/O2m/MGTF+HCwYJTXk="; + hash = "sha256-MHBGIKOKhGklrx3O075LRud8NhY2hzlTWh+jalrFpko="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix index 002b71b474b6..4e585353687b 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "sphinx-design"; - version = "0.4.1"; + version = "0.5.0"; format = "flit"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "sphinx_design"; - hash = "sha256-W2QYukotw9g1kuoP9hpSqJH+chlaTDoYsvocdmjORwg="; + hash = "sha256-6OUTrOpvktFcbeOzTpVEWPJFuOdhtFtjlQ9lNzNSqwA="; }; nativeBuildInputs = [ flit-core ]; @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A sphinx extension for designing beautiful, view size responsive web components"; homepage = "https://github.com/executablebooks/sphinx-design"; + changelog = "https://github.com/executablebooks/sphinx-design/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-navtree/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-navtree/default.nix deleted file mode 100644 index ae56a9fdce11..000000000000 --- a/nixpkgs/pkgs/development/python-modules/sphinx-navtree/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage, sphinx }: - -buildPythonPackage rec { - version = "0.3.0"; - pname = "sphinx-navtree"; - src = fetchPypi { - inherit pname version; - sha256 = "1nqcsbqwr8ihk1fv534i0naag1qw04f7ibcgl2j8csvkh8q90b4p"; - }; - - propagatedBuildInputs = [ sphinx ]; - - meta = { - description = "Navigation tree customization for Sphinx"; - homepage = "https://github.com/bintoro/sphinx-navtree"; - license = lib.licenses.mit; - # not compatible with sphinx 3.3, not updated since 2016 - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx/default.nix index 1e14bc7a6133..eb559c414860 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch +, isPyPy # nativeBuildInputs , flit-core @@ -144,6 +144,19 @@ buildPythonPackage rec { "test_auth_header_no_match" "test_follows_redirects_on_GET" "test_connect_to_selfsigned_fails" + ] ++ lib.optionals isPyPy [ + # PyPy has not __builtins__ which get asserted + # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous + "test_autosummary_generate_content_for_module" + "test_autosummary_generate_content_for_module_skipped" + # internals are asserted which are sightly different in PyPy + "test_autodoc_inherited_members_None" + "test_automethod_for_builtin" + "test_builtin_function" + "test_cython" + "test_isattributedescriptor" + "test_methoddescriptor" + "test_partialfunction" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 06e00fbe1e93..8589689ec8d1 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -1,8 +1,14 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, sphinx, sphinxcontrib-tikz }: +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, sphinxcontrib-tikz +}: buildPythonPackage rec { pname = "sphinxcontrib-bayesnet"; version = "0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -20,6 +26,5 @@ buildPythonPackage rec { description = "Bayesian networks and factor graphs in Sphinx using TikZ syntax"; license = licenses.gpl3Only; maintainers = with maintainers; [ jluttine ]; - broken = true; # relies on 2to3 conversion, which was removed from setuptools>=58.0 }; } diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index d38d0df97362..4a0dcda23887 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "A Sphinx extension for BibTeX style citations"; homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index ec00f9cb6443..248030c241bf 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.9.5"; + version = "0.9.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZNNi5qIKRyuPbXfFGhkAIvRFzuhsXcY73apIqOp8dJQ="; + hash = "sha256-OmdUsc/JDhQeP3Pgg16vyCYtpfr+ekxnT6cI+rec69c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 8421e1669a59..17f2d5dcbe64 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Sphinx extension to include program output"; homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 7a7ed5868fba..62e7df21ab8c 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "TikZ extension for Sphinx"; homepage = "https://bitbucket.org/philexander/tikz"; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix index 9ec70d67f864..9bf638647680 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "A sqlalchemy plugin that allows postgres use of CITEXT"; homepage = "https://github.com/mahmoudimus/sqlalchemy-citext"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index e978defcbf4c..fa0d3ad6cade 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -4,7 +4,6 @@ , flask , flask-login , flask-sqlalchemy -, flexmock , psycopg2 , pymysql , pytestCheckHook @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "sqlalchemy-continuum"; - version = "1.3.14"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SQLAlchemy-Continuum"; inherit version; - hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; + hash = "sha256-Rk+aWxBjUrXuRPE5MSyzWMWS0l7qrjU3wOrHLC+vteU="; }; propagatedBuildInputs = [ @@ -42,9 +41,6 @@ buildPythonPackage rec { flask-sqlalchemy = [ flask-sqlalchemy ]; - flexmock = [ - flexmock - ]; i18n = [ sqlalchemy-i18n ]; @@ -57,12 +53,7 @@ buildPythonPackage rec { ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Indicate tests that we don't have a database server at hand - DB = "sqlite"; - - disabledTestPaths = [ - # Test doesn't support latest SQLAlchemy - "tests/plugins/test_flask.py" - ]; + env.DB = "sqlite"; pythonImportsCheck = [ "sqlalchemy_continuum" @@ -74,8 +65,5 @@ buildPythonPackage rec { changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - - # https://github.com/kvesteri/sqlalchemy-continuum/issues/326 - broken = versionAtLeast sqlalchemy.version "2"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ae9d8bd953e8..ecfa57be2e30 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -4,7 +4,6 @@ , fetchPypi , fetchpatch , python -, pythonAtLeast , scripttest , pytz , pbr @@ -20,21 +19,18 @@ buildPythonPackage rec { pname = "sqlalchemy-migrate"; version = "0.13.0"; - # using deprecated inspect.getargspec function - # https://bugs.launchpad.net/sqlalchemy-migrate/+bug/2003619 - disabled = pythonAtLeast "3.11"; - src = fetchPypi { inherit pname version; sha256 = "1y0lcqii7b4vp7yh9dyxrl4i77hi8jkkw7d06mgdw2h458ljxh0b"; }; - # See: https://review.openstack.org/#/c/608382/ patches = [ + # See: https://review.openstack.org/#/c/608382/ (fetchpatch { url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; }) + ./python3.11-comp.diff ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff new file mode 100644 index 000000000000..c8e201b0ca6d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff @@ -0,0 +1,13 @@ +diff --git a/migrate/versioning/shell.py b/migrate/versioning/shell.py +index 5fb86b1..fae0ce4 100644 +--- a/migrate/versioning/shell.py ++++ b/migrate/versioning/shell.py +@@ -108,7 +108,7 @@ def main(argv=None, **kwargs): + parser.error("Invalid command %s" % command) + + parser.set_usage(inspect.getdoc(command_func)) +- f_args, f_varargs, f_kwargs, f_defaults = inspect.getargspec(command_func) ++ f_args, f_varargs, f_kwargs, f_defaults, _, _, _ = inspect.getfullargspec(command_func) + for arg in f_args: + parser.add_option( + "--%s" % arg, diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index e779b082e514..edb6ab2ed29e 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sqlalchemy-mixins"; - version = "2.0.1"; + version = "2.0.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "absent1706"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ftpw3oDVu7Vdcwj7+a1G9cPeVUAEPggtozlvWioENIA="; + hash = "sha256-soashrkokHveEI9YXAAPBPHydhoToJhCHx+g7bunhLE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index a65eec40d9ef..5ef275606185 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,7 +1,6 @@ { lib , isPyPy , pythonOlder -, fetchPypi , fetchFromGitHub , buildPythonPackage @@ -41,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.15"; + version = "2.0.18"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -50,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-05GhFearTA9At8MgmEfeXfbS3MAZ0Rmx8jER18q7fmI="; + hash = "sha256-juZIFlmgwGFFhv+3DsMx6k1QRcGLQyTOwR5Hii8A68c="; }; nativeBuildInputs =[ @@ -113,6 +112,9 @@ buildPythonPackage rec { postgresql_psycopg = [ psycopg ]; + postgresql_psycopgbinary = [ + psycopg + ]; pymysql = [ pymysql ]; @@ -140,6 +142,7 @@ buildPythonPackage rec { disabledTestPaths = [ # typing correctness, not interesting "test/ext/mypy" + "test/typing" # slow and high memory usage, not interesting "test/aaa_profiling" ]; diff --git a/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix b/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix index 2d4323456fed..ec85ffdc3db2 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "sqlglot"; - version = "15.0.0"; + version = "16.3.1"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "v${version}"; - hash = "sha256-F95JUYUgimWMyfPAV55e+bOcvWy5A95djKcJuSQ8RRs="; + hash = "sha256-EN5ocyXCZaWE1BaC2eDg41+o5BoHAog1372b9rc2IDM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index db77142a848a..c3ad45ec13a6 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -8,20 +8,23 @@ , python-dateutil , sqlite-fts4 , tabulate +, pluggy , pytestCheckHook , hypothesis +, testers +, sqlite-utils }: buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.32.1"; + version = "3.34"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bCj+Mvzr1lihaR3t+k0RFJmtMCzAE5xaWJOlkNRhhIo="; + hash = "sha256-RgdoPLsyz9TzxjkpBF6qAgqwIhxQNvm7QbeyW8dVzSM="; }; postPatch = '' @@ -35,6 +38,7 @@ buildPythonPackage rec { python-dateutil sqlite-fts4 tabulate + pluggy ]; nativeCheckInputs = [ @@ -46,6 +50,10 @@ buildPythonPackage rec { "sqlite_utils" ]; + passthru.tests.version = testers.testVersion { + package = sqlite-utils; + }; + meta = with lib; { description = "Python CLI utility and library for manipulating SQLite databases"; homepage = "https://github.com/simonw/sqlite-utils"; diff --git a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index dd7f8a5e11fd..1b5016a1ad0d 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.7.5"; + version = "1.7.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PQk3uEY1gjvs5BerfEAEZe4v6uZYpCZqCo+Qc7mSUw8="; + hash = "sha256-Ky/XmXhzmoF3UKNHu7xKcVWZf8epHp0ymqqQ9WHHObs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix b/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix index 262c81aa2b38..77ad7ab0425f 100644 --- a/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqltrie"; - version = "0.5.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-caCzFHQG0fnSmIdesk4k1W/VheY1DWxZb2W8/Xen/ZU="; + hash = "sha256-+o0JY572q3qSX4FeXsk9ke0hn94Om/N6HN3HNoUgSkc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix index 9a68f24a0440..295ebc98a941 100644 --- a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ssdp"; - version = "1.1.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "codingjoe"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-D2mww3sEc2SvufWNmT450a2CW+ogROn3RHypljkebuY="; + hash = "sha256-mORjMEg7Q/2CKZBLICSGF8dcdl98S6mBgJ4jujPGs6M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/sseclient/default.nix b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix index b0a3fac3f328..bc1be1222bbe 100644 --- a/nixpkgs/pkgs/development/python-modules/sseclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sseclient/default.nix @@ -1,5 +1,4 @@ { lib -, backports_unittest-mock , buildPythonPackage , fetchPypi , pytestCheckHook @@ -26,7 +25,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - backports_unittest-mock pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/sshfs/default.nix b/nixpkgs/pkgs/development/python-modules/sshfs/default.nix index 4653189fbf63..653b30f14d0c 100644 --- a/nixpkgs/pkgs/development/python-modules/sshfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sshfs/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2023.4.1"; + version = "2023.7.0"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qoOqKXtmavKgfbg6bBEeZb+n1RVyZSxqhKIQsToxDUU="; + hash = "sha256-XKBpB3ackquVKsdF8b/45Kaz5Y2ussOl0o0HkD+k9tM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/statistics/default.nix b/nixpkgs/pkgs/development/python-modules/statistics/default.nix index 283954c838ba..40a51373c70e 100644 --- a/nixpkgs/pkgs/development/python-modules/statistics/default.nix +++ b/nixpkgs/pkgs/development/python-modules/statistics/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "A Python 2.* port of 3.4 Statistics Module"; homepage = "https://github.com/digitalemagine/py-statistics"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ costrouc ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix b/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix index 704d53963d4a..4d05e36ad8bc 100644 --- a/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.5"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WTUmrK4cD9oOpsSEOfZ8OUMJTFQv52n4uQ/p5sbMSHE="; + hash = "sha256-aHXH1onpZtlI8V64FqtWFvSShwaxgM9HD9WQerb2R6Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/std2/default.nix b/nixpkgs/pkgs/development/python-modules/std2/default.nix new file mode 100644 index 000000000000..2b51f9caaec6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/std2/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +}: + +buildPythonPackage { + pname = "std2"; + version = "unstable-2023-07-09"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = "std2"; + rev = "2d5594b40585ecae60ce5175bee68cc8b3085ee6"; + hash = "sha256-phGIWow7PGOtS1Pre1Gz0Xg6izGp6BiUTmze5jI/BwY="; + }; + + nativeBuildInputs = [ setuptools ]; + + meta = with lib; { + homepage = "https://github.com/ms-jpq/std2"; + description = "Dependency to chadtree and coq_nvim plugins"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix b/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix index fb46ee24cd50..9cf75ab98ca1 100644 --- a/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix @@ -1,20 +1,26 @@ { lib , buildPythonPackage -, isPy27 , fetchPypi + +# build-system +, flit-core }: buildPythonPackage rec { pname = "stdlib-list"; - version = "0.8.0"; - format = "setuptools"; - disabled = isPy27; + version = "0.9.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "17vdn4q0sdlndc2fr9svapxx6366hnrhkn0fswp1xmr0jxqh7rd1"; + pname = "stdlib_list"; + inherit version; + hash = "sha256-mOtmE1l2yWtO4/TA7wVS67Wpl3zjAoQz23n0c4sCryY="; }; + nativeBuildInputs = [ + flit-core + ]; + pythonImportsCheck = [ "stdlib_list" ]; @@ -23,6 +29,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/pypi/stdlib-list/releases/tag/v${version}"; description = "A list of Python Standard Libraries"; homepage = "https://github.com/jackmaney/python-stdlib-list"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix b/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix new file mode 100644 index 000000000000..4d3398d326c3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "stdlibs"; + version = "2022.10.9"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "omnilib"; + repo = "stdlibs"; + rev = "refs/tags/v${version}"; + hash = "sha256-HkGZw58gQGd8mHnCP4aF6JWXxlpIIfe7B//HJiHVwA4="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "stdlibs" + ]; + + meta = with lib; { + description = "Overview of the Python stdlib"; + homepage = "https://github.com/omnilib/stdlibs"; + changelog = "https://github.com/omnilib/stdlibs/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/steamship/default.nix b/nixpkgs/pkgs/development/python-modules/steamship/default.nix index 59c3b8ae8eef..035329a97815 100644 --- a/nixpkgs/pkgs/development/python-modules/steamship/default.nix +++ b/nixpkgs/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.16.9"; + version = "2.17.18"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NHMrReRw8x7N7vy8BqmKx9fDfQYjlOWY7ChdLz+qGxQ="; + hash = "sha256-1pWSP+s1jjtuRWWoPD5CcYZzt9JSiGHPNxxkLXP+pkc="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/stem/default.nix b/nixpkgs/pkgs/development/python-modules/stem/default.nix index 2d72d751f2c8..dc90700948c0 100644 --- a/nixpkgs/pkgs/development/python-modules/stem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stem/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stem"; - version = "1.8.1"; + version = "1.8.2"; # As of May 2023, the master branch of stem contains fixes for Python 3.11 # that the last release (1.8.1) doesn't. The test suite fails on both master @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-gdQ6fGaLqde8EQOy56kR6dFIKUs3PSelmujaee96Pi8="; + hash = "sha256-g/sZ/9TJ+CIHwAYFFIA4n4CvIhp+R4MACu3sTjhOtYI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/stemming/default.nix b/nixpkgs/pkgs/development/python-modules/stemming/default.nix new file mode 100644 index 000000000000..b0e9ce0c4453 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/stemming/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +}: +let + pname = "stemming"; + version = "1.0.1"; +in +buildPythonPackage { + inherit version pname; + format = "setuptools"; + + # Pypi source package doesn't contain tests + src = fetchFromGitHub { + owner = "nmstoker"; + repo = pname; + rev = "477d0e354e79843f5ec241ba3603bcb5b843c3c4"; + hash = "sha256-wnmBCbxnCZ9mN1J7sLcN7OynMcvqgAnhEgpAwW2/xz4="; + }; + + disabled = pythonOlder "3.7"; + + pythonImportsCheck = [ "stemming" ]; + + meta = with lib; { + description = "Python implementations of various stemming algorithms."; + homepage = "https://github.com/nmstoker/stemming"; + license = licenses.unlicense; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/stestr/tests.nix b/nixpkgs/pkgs/development/python-modules/stestr/tests.nix index b66310f2dc63..f4964fa8f66e 100644 --- a/nixpkgs/pkgs/development/python-modules/stestr/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/stestr/tests.nix @@ -2,11 +2,10 @@ , stestr }: -buildPythonPackage rec { +buildPythonPackage { pname = "stestr-tests"; - inherit (stestr) version; - - src = stestr.src; + inherit (stestr) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/nixpkgs/pkgs/development/python-modules/stevedore/default.nix b/nixpkgs/pkgs/development/python-modules/stevedore/default.nix index 9dba2290a8c3..45a3e744f1ec 100644 --- a/nixpkgs/pkgs/development/python-modules/stevedore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stevedore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "5.0.0"; + version = "5.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LEKNIziXYnno6yGW96lJEJYNn3ui9B85iFEelcpEcCE="; + hash = "sha256-pUU0rPm4m8ftJkgHATtQW/B/dNvkvPo30yvQY4cLCHw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix index 23a4f01ddc76..d41dcda8aba1 100644 --- a/nixpkgs/pkgs/development/python-modules/stravalib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Python library for interacting with Strava v3 REST API"; homepage = "https://github.com/stravalib/stravalib"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix index cb21c2993107..98bd27072d16 100644 --- a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , asgiref -, backports-cached-property , buildPythonPackage , chalice , channels @@ -16,7 +15,8 @@ , freezegun , graphql-core , libcst -, mypy +, opentelemetry-api +, opentelemetry-sdk , poetry-core , pydantic , pygments @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.176.3"; + version = "0.185.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-O57gCJiLlR3k45V6cRNd9AHo9EGoWd7WRMmnV/8xFyQ="; + hash = "sha256-PwhTD1k2GOVf6ACNDY1atLLP1jjAF6eTDCE3eLUIpJA="; }; patches = [ @@ -112,10 +112,10 @@ buildPythonPackage rec { flask pytest-flask ]; - # opentelemetry = [ - # opentelemetry-api - # opentelemetry-sdk - # ]; + opentelemetry = [ + opentelemetry-api + opentelemetry-sdk + ]; pydantic = [ pydantic ]; @@ -147,7 +147,6 @@ buildPythonPackage rec { daphne email-validator freezegun - mypy pytest-asyncio pytest-emoji pytest-mock @@ -166,12 +165,14 @@ buildPythonPackage rec { "tests/django/test_dataloaders.py" "tests/exceptions/" "tests/http/" + "tests/mypy/test_plugin.py" # avoid dependency on mypy "tests/schema/extensions/" "tests/schema/test_dataloaders.py" "tests/schema/test_lazy/" "tests/starlite/" "tests/test_dataloaders.py" "tests/utils/test_pretty_print.py" + "tests/websockets/test_graphql_transport_ws.py" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/streamlit/default.nix b/nixpkgs/pkgs/development/python-modules/streamlit/default.nix new file mode 100755 index 000000000000..2ab4d11e640d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/streamlit/default.nix @@ -0,0 +1,88 @@ +{ lib +, stdenv +, altair +, blinker +, buildPythonPackage +, cachetools +, click +, fetchPypi +, gitpython +, importlib-metadata +, numpy +, packaging +, pandas +, pillow +, protobuf3 +, pyarrow +, pydeck +, pympler +, python-dateutil +, pythonOlder +, requests +, rich +, tenacity +, toml +, typing-extensions +, tzlocal +, validators +, watchdog +}: + +buildPythonPackage rec { + pname = "streamlit"; + version = "1.24.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version format; + hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I="; + }; + + propagatedBuildInputs = [ + altair + blinker + cachetools + click + gitpython + importlib-metadata + numpy + packaging + pandas + pillow + protobuf3 + pyarrow + pydeck + pympler + python-dateutil + requests + rich + tenacity + toml + typing-extensions + tzlocal + validators + ] ++ lib.optionals (!stdenv.isDarwin) [ + watchdog + ]; + + # pypi package does not include the tests, but cannot be built with fetchFromGitHub + doCheck = false; + + pythonImportsCheck = [ + "streamlit" + ]; + + postInstall = '' + rm $out/bin/streamlit.cmd # remove windows helper + ''; + + meta = with lib; { + homepage = "https://streamlit.io/"; + changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}"; + description = "The fastest way to build custom ML tools"; + maintainers = with maintainers; [ natsukium yrashk ]; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/nixpkgs/pkgs/development/python-modules/streamz/default.nix index b1c013790b65..ff12abf47ae3 100644 --- a/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/strenum/default.nix b/nixpkgs/pkgs/development/python-modules/strenum/default.nix index 195999cbe47b..b7d2661ce2c8 100644 --- a/nixpkgs/pkgs/development/python-modules/strenum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strenum/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "strenum"; - version = "0.4.10"; + version = "0.4.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "irgeek"; repo = "StrEnum"; rev = "refs/tags/v${version}"; - hash = "sha256-OkNV4kUXGgYPGuyylGOtAr0e0spgZQ1MrftKKL2HmV8="; + hash = "sha256-LrDLIWiV/zIbl7CwKh7DAy4LoLyY7+hfUu8nqduclnA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 3a51416cadc2..9f1f11e1c18c 100644 --- a/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "5.4.0"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cr2nv5vnUo4bl6W7rLBxbN9qDJWXsT/b+jZM7DwTBxM="; + hash = "sha256-BKlzKzekYijs8OSWFjo+3ZNZaw5iAAKfvEiRFjhifhk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/striprtf/default.nix b/nixpkgs/pkgs/development/python-modules/striprtf/default.nix index 42d99a101edb..95814c1c0603 100644 --- a/nixpkgs/pkgs/development/python-modules/striprtf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/striprtf/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.22"; + version = "0.0.26"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-T7rb6EJPQStbJjv3L7PA2rTdtXTWCd1NCE9uK4sEQCs="; + hash = "sha256-/bK7p6xEAHLRxB6rUNjXSuiPYKi2V1xuLHgF3EYgk6o="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/structlog/default.nix b/nixpkgs/pkgs/development/python-modules/structlog/default.nix index db53686c2caf..c21785f430b6 100644 --- a/nixpkgs/pkgs/development/python-modules/structlog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/structlog/default.nix @@ -1,47 +1,45 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, pytestCheckHook -, pytest-asyncio -, pretend , freezegun , hatch-fancy-pypi-readme , hatch-vcs , hatchling +, pretend +, pytest-asyncio +, pytestCheckHook +, pythonAtLeast +, pythonOlder , simplejson , typing-extensions -, pythonAtLeast }: buildPythonPackage rec { pname = "structlog"; - version = "22.3.0"; + version = "23.1.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - hash = "sha256-+r+M+uTXdNBWQf0TGQuZgsCXg2CBKwH8ZE2+uAe0Dzg="; + hash = "sha256-0zHvBMiZB4cGntdYXA7C9V9+FfnDB6sHGuFRYAo/LJw="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ hatch-fancy-pypi-readme hatch-vcs hatchling ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - pythonImportsCheck = [ - "structlog" - ]; - nativeCheckInputs = [ freezegun pretend @@ -50,9 +48,14 @@ buildPythonPackage rec { simplejson ]; + pythonImportsCheck = [ + "structlog" + ]; + meta = with lib; { description = "Painless structural logging"; homepage = "https://github.com/hynek/structlog"; + changelog = "https://github.com/hynek/structlog/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/stumpy/default.nix b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix index 8f0f9164dd4d..7f13c29172e0 100644 --- a/nixpkgs/pkgs/development/python-modules/stumpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Library that can be used for a variety of time series data mining tasks"; homepage = "https://github.com/TDAmeritrade/stumpy"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index a73ad1bc1c6f..d08fe36473ac 100644 --- a/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.6-1"; + version = "0.7.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/VaGiOnPyTHSwkxlQtwyIZohD3QK897kapmM3S8bHtM="; + hash = "sha256-SrOFKXh/wG2+HKaLvyNP6/Le9R3Ri7+/xsUBAazo7js="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/summarytools/default.nix b/nixpkgs/pkgs/development/python-modules/summarytools/default.nix new file mode 100644 index 000000000000..a46cf5080c7c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/summarytools/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, ipython +, matplotlib +, numpy +, pandas +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "summarytools"; + version = "0.2.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + # no version tags in GitHub repo + src = fetchPypi { + inherit pname version; + hash = "sha256-wsDf9IXCMQe0cVfQQuRVwMhxkhhUxbPu06yWZPLvgw4="; + }; + + propagatedBuildInputs = [ + ipython + matplotlib + numpy + pandas + ]; + + nativeCheckImports = [ pytestCheckHook ]; + pythonImportsCheck = [ "summarytools" ]; + + meta = with lib; { + description = "Python port of the R summarytools package for summarizing dataframes"; + homepage = "https://github.com/6chaoran/jupyter-summarytools"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index 5d07c631fc58..e81365767432 100644 --- a/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -158,7 +158,7 @@ buildPythonPackage rec { description = "Python for Solar Physics"; homepage = "https://sunpy.org"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sunweg/default.nix b/nixpkgs/pkgs/development/python-modules/sunweg/default.nix index 0d2e00e59e54..b33220898cd3 100644 --- a/nixpkgs/pkgs/development/python-modules/sunweg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sunweg/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sunweg"; - version = "1.0.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rokam"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fGaPn4pp1nDL4MX7K8zP2Vq2R/uRtd8rHSaWEG5Ye7s="; + hash = "sha256-S92PybN+pReI9WtJr9as95uceicsSMadMQfh9JxsE8U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sure/default.nix b/nixpkgs/pkgs/development/python-modules/sure/default.nix index 3252011450d3..991c88102056 100644 --- a/nixpkgs/pkgs/development/python-modules/sure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sure/default.nix @@ -5,30 +5,20 @@ , six , mock , isPyPy -, pythonOlder -, fetchpatch }: buildPythonPackage rec { pname = "sure"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "34ae88c846046742ef074036bf311dc90ab152b7bc09c342b281cebf676727a2"; + sha256 = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; }; - patches = [ - # https://github.com/gabrielfalcao/sure/issues/169 - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/055baa81cd987e566de62a5657513937521a90d4/trunk/python310.diff"; - hash = "sha256-BKylV8xpTOuO/X4hzZKpoIcAQcdAK0kXYENRad7AGPc="; - }) - ]; - propagatedBuildInputs = [ six mock @@ -38,8 +28,6 @@ buildPythonPackage rec { rednose ]; - doCheck = pythonOlder "3.11"; - pythonImportsCheck = [ "sure" ]; @@ -47,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility belt for automated testing"; homepage = "https://sure.readthedocs.io/"; - changelog = "https://github.com/gabrielfalcao/sure/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/gabrielfalcao/sure/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/survey/default.nix b/nixpkgs/pkgs/development/python-modules/survey/default.nix index f03ad5070102..2ce5a49b8d14 100644 --- a/nixpkgs/pkgs/development/python-modules/survey/default.nix +++ b/nixpkgs/pkgs/development/python-modules/survey/default.nix @@ -2,22 +2,23 @@ , buildPythonPackage , pythonOlder , fetchPypi -, wrapio +, setuptools-scm }: buildPythonPackage rec { pname = "survey"; - version = "3.4.3"; + version = "4.5.4"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TK89quY3bpNIEz1n3Ecew4FnTH6QgeSLdDNV86gq7+I="; + hash = "sha256-wjpO1+9AXi75uPXOTE5/owEiZgtffkkMAaZ+gDO0t5I="; }; - propagatedBuildInputs = [ - wrapio + nativeBuildInputs = [ + setuptools-scm ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/nixpkgs/pkgs/development/python-modules/symengine/default.nix index d850d28bb5bf..60ae59584805 100644 --- a/nixpkgs/pkgs/development/python-modules/symengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/symengine/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { description = "Python library providing wrappers to SymEngine"; homepage = "https://github.com/symengine/symengine.py"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/systemd/default.nix b/nixpkgs/pkgs/development/python-modules/systemd/default.nix index 0dea848dfc9a..ed8eb472dc50 100644 --- a/nixpkgs/pkgs/development/python-modules/systemd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/systemd/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://www.freedesktop.org/software/systemd/python-systemd/"; changelog = "https://github.com/systemd/python-systemd/blob/v${version}/NEWS"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix b/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix index 4862e3208d42..437c1b218394 100644 --- a/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/tableau/document-api-python"; changelog = "https://github.com/tableau/document-api-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tablib/default.nix b/nixpkgs/pkgs/development/python-modules/tablib/default.nix index 2b9076ae6043..679f8df11559 100644 --- a/nixpkgs/pkgs/development/python-modules/tablib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tablib/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "tablib"; - version = "3.4.0"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d+qX+vb5Kn4ZjAW9DGkPPLpXuD6kWmNrcvlny2/m8WA="; + hash = "sha256-9mYd/EXh1PUfqKYjn5yDSTgIWaW/qnMoBkXwRtbJbjM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/tadasets/default.nix b/nixpkgs/pkgs/development/python-modules/tadasets/default.nix index a5dbed7133cd..7eab0e9cda51 100644 --- a/nixpkgs/pkgs/development/python-modules/tadasets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tadasets/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Great data sets for Topological Data Analysis"; homepage = "https://tadasets.scikit-tda.org"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tago/default.nix b/nixpkgs/pkgs/development/python-modules/tago/default.nix index 86923a219ea8..d20d99f9ebc1 100644 --- a/nixpkgs/pkgs/development/python-modules/tago/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tago/default.nix @@ -5,13 +5,14 @@ , promise , python-socketio , pythonOlder +, pythonRelaxDepsHook , requests , websockets }: buildPythonPackage rec { pname = "tago"; - version = "3.0.0"; + version = "3.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,10 +20,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tago-io"; repo = "tago-sdk-python"; - rev = version; - hash = "sha256-eu6n83qmo1PQKnR/ellto04xi/3egl+LSKMOG277X1k="; + rev = "refs/tags/v${version}"; + hash = "sha256-q1xcPF+oeQsCAZjeYTVY2aaKFmb8rCTWVikGxdpPQ28="; }; + pythonRelaxDeps = true; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ aiohttp promise @@ -41,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for interacting with Tago.io"; homepage = "https://github.com/tago-io/tago-sdk-python"; + changelog = "https://github.com/tago-io/tago-sdk-python/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/tagoio-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/tagoio-sdk/default.nix new file mode 100644 index 000000000000..e6b9ab2d7216 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tagoio-sdk/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, python-dateutil +, python-socketio +, pythonOlder +, pythonRelaxDepsHook +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "tagoio-sdk"; + version = "4.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "tago-io"; + repo = "sdk-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-GHjkw7B/T+XZ3F3XCI0INpx9NWjORr0lbuGse/W25wY="; + }; + + pythonRelaxDeps = [ + "requests" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + aiohttp + python-dateutil + python-socketio + requests + ]; + + nativeCheckInputs = [ + requests-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tagoio_sdk" + ]; + + meta = with lib; { + description = "Module for interacting with Tago.io"; + homepage = "https://github.com/tago-io/sdk-python"; + changelog = "https://github.com/tago-io/sdk-python/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index 5d787e360a75..4d376dc6d2ca 100644 --- a/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , colorama , fetchFromGitHub -, pytest-mypy , pytestCheckHook , pythonOlder , regex @@ -28,7 +27,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-mypy pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix b/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix index bcc5cbbef946..4fa46defe2cb 100644 --- a/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix @@ -1,37 +1,76 @@ -{ lib +{ stdenv +, lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , attrs , pendulum +, poetry-core , pprintpp +, pytestCheckHook +, pythonRelaxDepsHook , wrapt }: buildPythonPackage rec { pname = "tbm-utils"; version = "2.6.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "1v7pb3yirkhzbv1z5i1qp74vl880f56zvzfj68p08b5jxv64hmr3"; + src = fetchFromGitHub { + owner = "thebigmunch"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-AEKawsAxDSDNkIaXEFFgdEBOY2PpASDrhlDrsnM5eyA="; }; - propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; - - # this versioning was done to prevent normal pip users from encountering - # issues with package failing to build from source, but nixpkgs is better postPatch = '' - substituteInPlace setup.py \ - --replace "'attrs>=18.2,<19.4'" "'attrs'" + substituteInPlace pyproject.toml \ + --replace 'poetry>=1.0.0' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' ''; - # No tests in archive. - doCheck = false; + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + attrs + pendulum + pprintpp + wrapt + ]; + + pythonRelaxDeps = [ + "attrs" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + # Skip on macOS because /etc/localtime is accessed through the pendulum + # library, which is not allowed in a sandboxed build. + "test_create_parser_filter_dates" + "test_parse_args" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # Skip on macOS because /etc/localtime is accessed through the pendulum + # library, which is not allowed in a sandboxed build. + "tests/test_datetime.py" + "tests/test_misc.py" + ]; + + pythonImportsCheck = [ + "tbm_utils" + ]; meta = { description = "A commonly-used set of utilities"; homepage = "https://github.com/thebigmunch/tbm-utils"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/thebigmunch/tbm-utils/blob/${version}/CHANGELOG.md"; + license = [ lib.licenses.mit ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/tempest/default.nix b/nixpkgs/pkgs/development/python-modules/tempest/default.nix index 406f1a507776..8f6b8c7552f8 100644 --- a/nixpkgs/pkgs/development/python-modules/tempest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tempest/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "tempest"; - version = "34.2.0"; + version = "35.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-450LDibTnlLnce4u1aNKmSVfHnHWz5S9kt6X6wFPrl8="; + hash = "sha256-TKGgOAOqa+1f3yXIkWxt2bVx4UT/IfQpc9rNB4fLkw0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/nixpkgs/pkgs/development/python-modules/tempora/default.nix index 1a63403f6a2d..128af5bc0687 100644 --- a/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -8,7 +8,7 @@ # runtime , pytz -, jaraco_functools +, jaraco-functools # tests , freezegun @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jaraco_functools + jaraco-functools pytz ]; diff --git a/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix b/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix index 7a10279ce88f..c49fcad07531 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix @@ -2,7 +2,6 @@ , fetchPypi , buildPythonPackage , pythonOlder -, pythonAtLeast , pythonRelaxDepsHook , numpy , wheel @@ -26,7 +25,7 @@ buildPythonPackage rec { pname = "tensorboard"; version = "2.11.0"; format = "wheel"; - disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version format; diff --git a/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix b/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix index 732d97946fff..36992eace585 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix @@ -1,8 +1,8 @@ { boto3 , buildPythonPackage , crc32c -, which , fetchFromGitHub +, fetchpatch , lib , matplotlib , moto @@ -13,8 +13,10 @@ , torch , six , soundfile +, stdenv , tensorboard , torchvision +, which }: buildPythonPackage rec { @@ -29,12 +31,33 @@ buildPythonPackage rec { hash = "sha256-Np0Ibn51qL0ORwq1IY8lUle05MQDdb5XkI1uzGOKJno="; }; - # apparently torch API changed a bit at 1.6 - postPatch = '' - substituteInPlace tensorboardX/pytorch_graph.py --replace \ - "torch.onnx.set_training(model, False)" \ - "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)" + patches = [ + (fetchpatch { + name = "fix-test-multiprocess-fork-on-darwin.patch"; + url = "https://github.com/lanpa/tensorboardX/commit/246a867237ff12893351b9275a1e297ee2861319.patch"; + hash = "sha256-ObUaIi1gFcGZAvDOEtZFd9TjZZUp3k89tYwmDQ5yOWg="; + }) + # https://github.com/lanpa/tensorboardX/pull/706 + (fetchpatch { + name = "fix-test-use-matplotlib-agg-backend.patch"; + url = "https://github.com/lanpa/tensorboardX/commit/751821c7af7f7f2cb724938e36fa04e814c0e4de.patch"; + hash = "sha256-Tu76ZRTh8fGj+/CzpqJO65hKrDFASbmzoLVIZ0kyLQA="; + }) + # https://github.com/lanpa/tensorboardX/pull/707 + (fetchpatch { + name = "fix-test-handle-numpy-float128-missing.patch"; + url = "https://github.com/lanpa/tensorboardX/commit/38f57ffc3b3dd91e76b13ec97404278065fbc782.patch"; + hash = "sha256-5Po41lHiO5hKi4ZtWR98/wwDe9HKZdADNTv40mgIEvk="; + }) + # https://github.com/lanpa/tensorboardX/pull/708 + (fetchpatch { + name = "fix-test-respect-tmpdir.patch"; + url = "https://github.com/lanpa/tensorboardX/commit/b0191d1cfb8a23def76e465d20fd59302c894f32.patch"; + hash = "sha256-6rSncJ16P1u70Cz9nObo8lMD7Go50BR3DZLgP4bODk4="; + }) + ]; + postPatch = '' # Version detection seems broken here, the version reported by python is # newer than the protobuf package itself. sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py @@ -71,6 +94,10 @@ buildPythonPackage rec { "test_TorchVis" # Requires network access (FileNotFoundError: [Errno 2] No such file or directory: 'wget') "test_onnx_graph" + ] ++ lib.optionals stdenv.isDarwin [ + # Fails with a mysterious error in pytorch: + # RuntimeError: required keyword attribute 'name' has the wrong type + "test_pytorch_graph" ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix index 962a39ababd4..1d60c09c6a82 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -1,4 +1,5 @@ { apache-beam +, array-record , attrs , beautifulsoup4 , buildPythonPackage @@ -19,6 +20,7 @@ , lxml , matplotlib , mwparserfromhell +, mwxml , networkx , nltk , numpy @@ -46,13 +48,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.8.2"; + version = "4.9.2"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - hash = "sha256-FYFk53WKNQTSrnGGiA6cn9LffbMJkZtjlGuOF52Og7c="; + hash = "sha256-FKquhuk5hVBH9Im2RrIwgmosgqkoJHj0ESR2BmAOlbI="; }; patches = [ @@ -61,6 +63,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + array-record attrs dill dm-tree @@ -95,6 +98,7 @@ buildPythonPackage rec { lxml matplotlib mwparserfromhell + mwxml networkx nltk opencv4 @@ -120,6 +124,7 @@ buildPythonPackage rec { "tensorflow_datasets/core/registered_test.py" "tensorflow_datasets/core/utils/gcs_utils_test.py" "tensorflow_datasets/import_without_tf_test.py" + "tensorflow_datasets/proto/build_tf_proto_test.py" "tensorflow_datasets/scripts/cli/build_test.py" # Requires `pretty_midi` which is not packaged in `nixpkgs`. diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix index a988a39c388b..0fc684b83c87 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix @@ -18,10 +18,10 @@ , wheel , jax , opt-einsum -, backports_weakref , tensorflow-estimator-bin , tensorboard -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudaPackages ? {} , zlib , python @@ -53,7 +53,7 @@ in buildPythonPackage { disabled = pythonAtLeast "3.11"; src = let - pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; + pyVerNoDot = lib.strings.stringAsChars (x: lib.optionalString (x != ".") x) python.pythonVersion; platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; key = "${platform}_py_${pyVerNoDot}_${unit}"; @@ -82,8 +82,7 @@ in buildPythonPackage { keras-applications keras-preprocessing h5py - ] ++ lib.optional (!isPy3k) mock - ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ]; + ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ wheel ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index ba7c36c9503c..8d16f6921d2f 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -17,7 +17,8 @@ # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudaPackages ? { } , cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , mklSupport ? false, mkl @@ -447,7 +448,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; linux ++ darwin; - broken = !(xlaSupport -> cudaSupport); + broken = !(xlaSupport -> cudaSupport) || python.pythonVersion == "3.11"; } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s diff --git a/nixpkgs/pkgs/development/python-modules/tensorly/default.nix b/nixpkgs/pkgs/development/python-modules/tensorly/default.nix index 0de6a2ff9eed..ad42066758a8 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tensorly"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6iZvUgsoYf8fDGEuAODgfr4jCkiJwaJXlQUAsaOF9JU="; + hash = "sha256-hwpdExW/ESOavFkL3old1Efo5WC+PYmcgJp5/oLelaA="; }; propagatedBuildInputs = [ @@ -54,8 +54,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # tries to download data: - "test_kinetic" + # this can fail on hydra and other peoples machines, check with others before re-enabling # AssertionError: Partial_SVD took too long, maybe full_matrices set wrongly "test_svd_time" ]; @@ -65,6 +64,5 @@ buildPythonPackage rec { homepage = "https://tensorly.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; - broken = stdenv.isLinux && stdenv.isAarch64; # test failures: test_TTOI and test_validate_tucker_rank }; } diff --git a/nixpkgs/pkgs/development/python-modules/tern/default.nix b/nixpkgs/pkgs/development/python-modules/tern/default.nix index 592c5d72da7d..9a07c2103518 100644 --- a/nixpkgs/pkgs/development/python-modules/tern/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tern/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "tern"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XvhKe7mf09Nr3sbpMOKOO63HQ+9thgluU02iEIdWSpg="; + hash = "sha256-yMIvFiliEHrbZMqvX3ZAROWcqii5VmB54QEYHGRJocA="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index a2c9a31a80e3..5ce4c59490da 100644 --- a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.8.1"; + version = "3.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RPR1ek1gpbermSRaGqT2v31UVB6044E2ZxIqv1yr2bs="; + hash = "sha256-K68UhtPtgTZoAl9NG5ZHOwzsvDl028coXS4ZpmJ0ULs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tess/default.nix b/nixpkgs/pkgs/development/python-modules/tess/default.nix index 883d541f8120..be8e8ff45e05 100644 --- a/nixpkgs/pkgs/development/python-modules/tess/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tess/default.nix @@ -25,6 +25,6 @@ buildPythonPackage { description = "A module for calculating and analyzing Voronoi tessellations"; homepage = "https://tess.readthedocs.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix b/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix index ce272b9d7a46..268ee9978536 100644 --- a/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d0MNJytT2s073Ur11WP9wkrlG4b9vJzy6BRvKceryaQ="; + sha256 = "sha256-pz82cutgQ9ifMS6+40mcBiOsXIqeEquYdBWT+npZNPY="; }; # https://github.com/sirfz/tesserocr/issues/314 diff --git a/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index af8153297531..4ccc1251a8fb 100644 --- a/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -7,7 +7,7 @@ , pythonOlder , sybil , twisted -, zope_component +, zope-component }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { pytestCheckHook sybil twisted - zope_component + zope-component ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/nixpkgs/pkgs/development/python-modules/textual-universal-directorytree/default.nix new file mode 100644 index 000000000000..9224f06511b9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, textual +, universal-pathlib +, adlfs +, aiohttp +, gcsfs +, paramiko +, requests +, s3fs +}: + +buildPythonPackage rec { + pname = "textual-universal-directorytree"; + version = "1.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "juftin"; + repo = "textual-universal-directorytree"; + rev = "v${version}"; + hash = "sha256-a7alxVmHTKJnJiU7X6UlUD2y7MY4O5TMR+02KcyPwEs="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + textual + universal-pathlib + ]; + + passthru.optional-dependencies = { + remote = [ + adlfs + aiohttp + gcsfs + paramiko + requests + s3fs + ]; + }; + + pythonImportsCheck = [ "textual_universal_directorytree" ]; + + meta = with lib; { + description = "Textual plugin for a DirectoryTree compatible with remote filesystems"; + homepage = "https://github.com/juftin/textual-universal-directorytree"; + changelog = "https://github.com/juftin/textual-universal-directorytree/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/textual/default.nix b/nixpkgs/pkgs/development/python-modules/textual/default.nix index 08c0704413cc..99b71d277381 100644 --- a/nixpkgs/pkgs/development/python-modules/textual/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.27.0"; + version = "0.28.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ag+sJFprYW3IpH+BiMR5eSRUFMBeVuOnF6GTTuXGBHw="; + hash = "sha256-tSCMKM9Wv4crl6SLcIc2r6QY6U3RBTW8yfAjkYLV3eE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix b/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix index 2a3fa04268f7..2ba2ea4944c1 100644 --- a/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Textwrap from Python 3.6 backport plus a few tweaks"; homepage = "https://github.com/jonathaneunice/textwrap3"; license = licenses.psfl; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix b/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix new file mode 100644 index 000000000000..b1fe7abfae25 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix @@ -0,0 +1,86 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonRelaxDepsHook +, pytest-runner +# runtime dependencies +, numpy +, onnx +, requests +, six +, flatbuffers +, protobuf +, tensorflow +# check dependencies +, pytestCheckHook +, graphviz +, parameterized +, pytest-cov +, pyyaml +, timeout-decorator +, onnxruntime +, keras +}: + +buildPythonPackage rec { + pname = "tf2onnx"; + version = "1.14.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "onnx"; + repo = "tensorflow-onnx"; + rev = "v${version}"; + hash = "sha256-JpXwf+GLjn0krsb5KnEhVuemWa0V2+wF10neDsdtOfI="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + pytest-runner + ]; + + pythonRelaxDeps = [ + "flatbuffers" + ]; + + propagatedBuildInputs = [ + numpy + onnx + requests + six + flatbuffers + protobuf + tensorflow + onnxruntime + ]; + + pythonImportsCheck = [ "tf2onnx" ]; + + nativeCheckInputs = [ + pytestCheckHook + graphviz + parameterized + pytest-cov + pyyaml + timeout-decorator + keras + ]; + + # TODO investigate the failures + disabledTestPaths = [ + "tests/test_backend.py" + "tests/test_einsum_helper.py" + "tests/test_einsum_optimizers.py" + ]; + + disabledTests = [ + "test_profile_conversion_time" + ]; + + meta = with lib; { + description = "Convert TensorFlow, Keras, Tensorflow.js and Tflite models to ONNX"; + homepage = "https://github.com/onnx/tensorflow-onnx"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/theano/default.nix b/nixpkgs/pkgs/development/python-modules/theano/default.nix index 1bcbda650a25..428bf4310d6b 100644 --- a/nixpkgs/pkgs/development/python-modules/theano/default.nix +++ b/nixpkgs/pkgs/development/python-modules/theano/default.nix @@ -11,8 +11,9 @@ , setuptools , six , libgpuarray -, cudaSupport ? false, cudaPackages ? {} -, cudnnSupport ? false +, config +, cudaSupport ? config.cudaSupport, cudaPackages ? { } +, cudnnSupport ? cudaSupport }: let diff --git a/nixpkgs/pkgs/development/python-modules/thorlabspm100/default.nix b/nixpkgs/pkgs/development/python-modules/thorlabspm100/default.nix new file mode 100644 index 000000000000..333105d0ad6f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/thorlabspm100/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unittestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "thorlabspm100"; + version = "1.2.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "clade"; + repo = "ThorlabsPM100"; + rev = "v${version}"; + hash = "sha256-X4qEow6u4aE0sbFwZfK3YEso2RS0c9j4iaWJPHaPQV4="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "ThorlabsPM100" + ]; + + meta = with lib; { + description = "Interface to the PM100A/D power meter from Thorlabs"; + homepage = "https://github.com/clade/ThorlabsPM100/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fsagbuya ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/three-merge/default.nix b/nixpkgs/pkgs/development/python-modules/three-merge/default.nix index dab312c88455..2bb1891cd0bb 100644 --- a/nixpkgs/pkgs/development/python-modules/three-merge/default.nix +++ b/nixpkgs/pkgs/development/python-modules/three-merge/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Simple library for merging two strings with respect to a base one"; homepage = "https://github.com/spyder-ide/three-merge"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix b/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix index 7d9ac9a6044a..87e84a43b916 100644 --- a/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix @@ -3,19 +3,24 @@ , buildPythonPackage , fetchPypi , python-dateutil +, poetry-core , requests }: buildPythonPackage rec { pname = "tidalapi"; - version = "0.7.1"; - format = "setuptools"; + version = "0.7.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ttOjw6VXR36QL/GUQXjpPWrE617Bmdt0piUsA4O5W/g="; + hash = "sha256-CyyvzhuDB9XgroeP+WPTJIufT3VU9fD6Pg2Q1prB0Mo="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ requests python-dateutil diff --git a/nixpkgs/pkgs/development/python-modules/tika-client/default.nix b/nixpkgs/pkgs/development/python-modules/tika-client/default.nix new file mode 100644 index 000000000000..971143289693 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tika-client/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, hatchling +, httpx +}: +buildPythonPackage rec { + pname = "tika-client"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "stumpylog"; + repo = "tika-client"; + rev = version; + hash = "sha256-ApKj+Lo3bG6bkgyYBwfY+4uodcGB/bupoGwZdSkizQE="; + }; + + propagatedBuildInputs = [ + hatchling + httpx + ]; + pythonImportsCheck = [ + "tika_client" + ]; + # Almost all of the tests (all except one in 0.1.0) fail since there + # is no tika http API endpoint reachable. Since tika is not yet + # packaged for nixpkgs, it seems like an unreasonable amount of effort + # fixing these tests. + doChecks = false; + + meta = with lib; { + description = "A modern Python REST client for Apache Tika server"; + homepage = "https://github.com/stumpylog/tika-client"; + changelog = "https://github.com/stumpylog/tika-client/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3; + maintainers = with maintainers; [ e1mo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/time-machine/default.nix b/nixpkgs/pkgs/development/python-modules/time-machine/default.nix index 6863a02855a0..a8749adfb616 100644 --- a/nixpkgs/pkgs/development/python-modules/time-machine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/time-machine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.9.0"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-mE9unzVh0QXSl93hHH43o8AshDEzrl2NXsBJ2fph5is="; + hash = "sha256-4HwHNowif0/YflznQrn8YRITjuiaBCB2mFIO0iCf6tA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/timetagger/default.nix b/nixpkgs/pkgs/development/python-modules/timetagger/default.nix index da570fbd1bca..3feb33508c32 100644 --- a/nixpkgs/pkgs/development/python-modules/timetagger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "23.4.1"; + version = "23.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-X0FeRyybomuOitpTldQTRlH3UeEs16ZYdYa/mu7mSGo="; + hash = "sha256-OLIjb5mFNNi0elPeXaPoK9V0fVw2Cnd7CHjPc1oGfyM="; }; propagatedBuildInputs = [ @@ -59,6 +59,5 @@ buildPythonPackage rec { changelog = "https://github.com/almarklein/timetagger/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ matthiasbeyer ]; - broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tiny-proxy/default.nix b/nixpkgs/pkgs/development/python-modules/tiny-proxy/default.nix new file mode 100644 index 000000000000..cbb015909ec0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tiny-proxy/default.nix @@ -0,0 +1,45 @@ +{ lib +, anyio +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "tiny-proxy"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "romis2012"; + repo = "tiny-proxy"; + rev = "refs/tags/v${version}"; + hash = "sha256-emQRiG2QiuZt4/lI8shJOvMpaqXNyJ/PMvtDZPaoyLo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + anyio + ]; + + # The tests depend on httpx-socks, whose tests depend on tiny-proxy. + doCheck = false; + + pythonImportsCheck = [ + "tiny_proxy" + ]; + + meta = with lib; { + description = "SOCKS5/SOCKS4/HTTP proxy server"; + homepage = "https://github.com/romis2012/tiny-proxy"; + changelog = "https://github.com/romis2012/tiny-proxy/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tinycss/default.nix b/nixpkgs/pkgs/development/python-modules/tinycss/default.nix index 108c989b7de5..aa537c6a6135 100644 --- a/nixpkgs/pkgs/development/python-modules/tinycss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tinycss/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://tinycss.readthedocs.io"; changelog = "https://github.com/Kozea/tinycss/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tinydb/default.nix b/nixpkgs/pkgs/development/python-modules/tinydb/default.nix index 1352ee20f800..2786018b99ad 100644 --- a/nixpkgs/pkgs/development/python-modules/tinydb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tinydb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.7.1"; + version = "4.8.0"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nKsTMakCOBVHDDp8AX/xDkvHpCMBoIb0pa24F4VX/14="; + hash = "sha256-sdWcpkjC8LtOI1k0Wyk4vLXBcwYe1vuQON9J7P8JPxA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tkinter/default.nix b/nixpkgs/pkgs/development/python-modules/tkinter/default.nix index 9f82dee45ef0..ccfc72907014 100644 --- a/nixpkgs/pkgs/development/python-modules/tkinter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tkinter/default.nix @@ -25,6 +25,30 @@ buildPythonPackage { patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter* ''; - meta = py.meta; + meta = py.meta // { + # Based on first sentence from https://docs.python.org/3/library/tkinter.html + description = "The standard Python interface to the Tcl/Tk GUI toolkit"; + longDescription = '' + The tkinter package (“Tk interface”) is the standard Python interface to + the Tcl/Tk GUI toolkit. Both Tk and tkinter are available on most Unix + platforms, including macOS, as well as on Windows systems. + + Running python -m tkinter from the command line should open a window + demonstrating a simple Tk interface, letting you know that tkinter is + properly installed on your system, and also showing what version of + Tcl/Tk is installed, so you can read the Tcl/Tk documentation specific to + that version. + + Tkinter supports a range of Tcl/Tk versions, built either with or without + thread support. The official Python binary release bundles Tcl/Tk 8.6 + threaded. See the source code for the _tkinter module for more + information about supported versions. + + Tkinter is not a thin wrapper, but adds a fair amount of its own logic to + make the experience more pythonic. This documentation will concentrate on + these additions and changes, and refer to the official Tcl/Tk + documentation for details that are unchanged. + ''; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index a94a1205e123..fd6153b940af 100644 --- a/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { lockFile = ./Cargo.lock; }; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/python-modules/tomli/default.nix b/nixpkgs/pkgs/development/python-modules/tomli/default.nix index 8f96a82ad6b8..b2de1c0dfdeb 100644 --- a/nixpkgs/pkgs/development/python-modules/tomli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tomli/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0"; homepage = "https://github.com/hukkin/tomli"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch SuperSandro2000 ]; + maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/torch/default.nix b/nixpkgs/pkgs/development/python-modules/torch/default.nix index c61601808273..912628bf9497 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildPythonPackage, python, - cudaSupport ? false, cudaPackages, magma, + config, cudaSupport ? config.cudaSupport, cudaPackages, magma, useSystemNccl ? true, MPISupport ? false, mpi, buildDocs ? false, @@ -208,6 +208,9 @@ in buildPythonPackage rec { # Use pytorch's custom configurations dontUseCmakeConfigure = true; + # causes possible redefinition of _FORTIFY_SOURCE + hardeningDisable = [ "fortify3" ]; + BUILD_NAMEDTENSOR = setBool true; BUILD_DOCS = setBool buildDocs; diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix index bc33961c097b..e1ec53671141 100644 --- a/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix @@ -28,13 +28,14 @@ in buildPythonPackage { disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12"); - buildInputs = with cudaPackages; [ + # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support. + buildInputs = with cudaPackages; lib.optionals stdenv.isLinux [ # $out/${sitePackages}/torchvision/_C.so wants libcudart.so.11.0 but torchvision.libs only ships # libcudart.$hash.so.11.0 cuda_cudart ]; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook addOpenGLRunpath ]; @@ -49,7 +50,7 @@ in buildPythonPackage { pythonImportsCheck = [ "torchvision" ]; - preInstall = '' + preInstall = lib.optionalString stdenv.isLinux '' addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; @@ -62,7 +63,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/nixpkgs/pkgs/development/python-modules/tornado/default.nix index 478b0c936f99..e255e603b9a1 100644 --- a/nixpkgs/pkgs/development/python-modules/tornado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tornado/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "A web framework and asynchronous networking library"; homepage = "https://www.tornadoweb.org/"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix b/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix index 5e87993f991a..5ce5deace5d0 100644 --- a/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2023.2"; + version = "2023.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-sZA+3UjYSHZnN87KUNukRCQ/kG7aobcPVWnhqNOLwJw="; + hash = "sha256-sx4KfWQCvGS+w83tECJSyLLWU9GkwYpo39gt4EKndPk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix index fe7df9d9efcf..b732988db39d 100644 --- a/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,11 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder , asn1crypto , cffi , cryptography -, ibm-sw-tpm2 , pkgconfig # see nativeBuildInputs , pkg-config # see nativeBuildInputs , pycparser @@ -14,6 +14,8 @@ , pyyaml , setuptools-scm , tpm2-tss +, tpm2-tools +, swtpm }: buildPythonPackage rec { @@ -28,6 +30,33 @@ buildPythonPackage rec { hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; }; + 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="; + }) + + # Fix hardcoded `fapi-config.json` configuration path + ./fapi-config.patch + ]; + + postPatch = '' + sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py + ''; + nativeBuildInputs = [ cffi pkgconfig # this is the Python module @@ -46,12 +75,12 @@ buildPythonPackage rec { pyyaml ]; - # https://github.com/tpm2-software/tpm2-pytss/issues/341 - doCheck = false; + doCheck = true; nativeCheckInputs = [ - ibm-sw-tpm2 pytestCheckHook + tpm2-tools + swtpm ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch new file mode 100644 index 000000000000..f6245ef30467 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch @@ -0,0 +1,12 @@ +diff --git a/src/tpm2_pytss/FAPI.py b/src/tpm2_pytss/FAPI.py +index 916eda6..1afba3f 100644 +--- a/src/tpm2_pytss/FAPI.py ++++ b/src/tpm2_pytss/FAPI.py +@@ -23,6 +23,7 @@ logger = logging.getLogger(__name__) + + FAPI_CONFIG_ENV = "TSS2_FAPICONF" + FAPI_CONFIG_PATHS = [ ++ "@TPM2_TSS@/etc/tpm2-tss/fapi-config.json", + "/etc/tpm2-tss/fapi-config.json", + "/usr/local/etc/tpm2-tss/fapi-config.json", + ] diff --git a/nixpkgs/pkgs/development/python-modules/trackpy/default.nix b/nixpkgs/pkgs/development/python-modules/trackpy/default.nix index 29815423372c..0123ce0cbd6c 100644 --- a/nixpkgs/pkgs/development/python-modules/trackpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trackpy/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { homepage = "https://github.com/soft-matter/trackpy"; changelog = "https://github.com/soft-matter/trackpy/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; broken = (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/nixpkgs/pkgs/development/python-modules/trailrunner/default.nix b/nixpkgs/pkgs/development/python-modules/trailrunner/default.nix new file mode 100644 index 000000000000..04cf6b0c071f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/trailrunner/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pathspec +, pythonOlder +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "trailrunner"; + version = "1.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "omnilib"; + repo = "trailrunner"; + rev = "refs/tags/v${version}"; + hash = "sha256-qtEBr22yyj6WcSfyYr/4r0IuuMJ6chFFqnmb+uMfQPA="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + pathspec + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "trailrunner" + ]; + + meta = with lib; { + description = "Module to walk paths and run things"; + homepage = "https://github.com/omnilib/trailrunner"; + changelog = "https://github.com/omnilib/trailrunner/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/trainer/default.nix b/nixpkgs/pkgs/development/python-modules/trainer/default.nix index cccddc47ed59..43f147a6a9ca 100644 --- a/nixpkgs/pkgs/development/python-modules/trainer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trainer/default.nix @@ -1,13 +1,11 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub -, pythonAtLeast , coqpit , fsspec , torch-bin -, tensorboardx +, tensorboard , protobuf , psutil @@ -18,7 +16,7 @@ let pname = "trainer"; - version = "0.0.25"; + version = "0.0.29"; in buildPythonPackage { inherit pname version; @@ -28,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-XhE3CbcbCZjuUI6dx1gNNpQrxycqCgmOgjkaQ8MtL9E="; + hash = "sha256-ISEIIJReYKT3tEAF9/pckPg2+aYkBJyRWo6fvWZ/asI="; }; postPatch = '' @@ -41,7 +39,7 @@ buildPythonPackage { protobuf psutil soundfile - tensorboardx + tensorboard torch-bin ]; diff --git a/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 0469c16a9fbd..cd5af01e0b9a 100644 --- a/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -2,90 +2,165 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, cookiecutter +# propagated build inputs , filelock , huggingface-hub -, importlib-metadata -, regex -, requests , numpy -, packaging -, tensorflow -, sagemaker -, ftfy , protobuf -, scikit-learn -, pillow +, packaging , pyyaml -, torch +, regex +, requests , tokenizers +, safetensors , tqdm +# optional dependencies +, scikit-learn +, tensorflow +, onnxconverter-common +, tf2onnx +, torch +, accelerate +, faiss +, datasets +, jax +, jaxlib +, flax +, optax +, ftfy +, onnxruntime +, onnxruntime-tools +, cookiecutter +, sagemaker +, fairscale +, optuna +, ray +, pydantic +, uvicorn +, fastapi +, starlette +, librosa +, phonemizer +, torchaudio +, pillow +, timm +, torchvision +, av +, sentencepiece }: buildPythonPackage rec { pname = "transformers"; - version = "4.28.1"; + version = "4.31.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FmiuWfoFZjZf1/GbE6PmSkeshWWh+6nDj2u2PMSeDk0="; + hash = "sha256-YbLI/CkRto8G4bV7ijUkB/0cc7LkfNBQxL1iNv8aWW4="; }; propagatedBuildInputs = [ filelock huggingface-hub numpy - protobuf packaging pyyaml regex requests tokenizers + safetensors tqdm - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; - passthru.optional-dependencies = { + passthru.optional-dependencies = + let + audio = [ + librosa + # pyctcdecode + phonemizer + # kenlm + ]; + vision = [ pillow ]; + in + { ja = [ # fugashi # ipadic - # unidic_lite + # rhoknp + # sudachidict_core + # sudachipy # unidic + # unidic_lite ]; sklearn = [ scikit-learn ]; tf = [ tensorflow - # onnxconverter-common - # tf2onnx + onnxconverter-common + tf2onnx + # tensorflow-text + # keras-nlp ]; torch = [ torch + accelerate ]; + retrieval = [ faiss datasets ]; + flax = [ jax jaxlib flax optax ]; tokenizers = [ tokenizers ]; + ftfy = [ ftfy ]; + onnxruntime = [ + onnxruntime + onnxruntime-tools + ]; + onnx = [ + onnxconverter-common + tf2onnx + onnxruntime + onnxruntime-tools + ]; modelcreation = [ cookiecutter ]; sagemaker = [ sagemaker ]; - ftfy = [ ftfy ]; - onnx = [ - # onnxconverter-common - # tf2onnx + deepspeed = [ + # deepspeed + accelerate + ]; + fairscale = [ fairscale ]; + optuna = [ optuna ]; + ray = [ ray ] ++ ray.optional-dependencies.tune-deps; + # sigopt = [ sigopt ]; + # integrations = ray ++ optuna ++ sigopt; + serving = [ + pydantic + uvicorn + fastapi + starlette ]; - vision = [ - pillow + audio = audio; + speech = [ torchaudio ] ++ audio; + torch-speech = [ torchaudio ] ++ audio; + tf-speech = audio; + flax-speech = audio; + timm = [ timm ]; + torch-vision = [ torchvision ] ++ vision; + # natten = [ natten ]; + # codecarbon = [ codecarbon ]; + video = [ + # decord + av ]; + sentencepiece = [ sentencepiece protobuf ]; }; @@ -102,6 +177,6 @@ buildPythonPackage rec { changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ pashashocky ]; + maintainers = with maintainers; [ pashashocky happysalada ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/translatehtml/default.nix b/nixpkgs/pkgs/development/python-modules/translatehtml/default.nix new file mode 100644 index 000000000000..e97e248edfdd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/translatehtml/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, argostranslate +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "translatehtml"; + version = "1.5.2"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "6b30ceb8b6f174917e2660caf2d2ccbaa71d8d24c815316edf56b061d678820d"; + }; + + patches = [ + # https://github.com/argosopentech/translate-html/pull/15 + (fetchpatch { + url = "https://github.com/argosopentech/translate-html/commit/b1c2d210ec1b5fcd0eb79f578bdb5d3ed5c9963a.patch"; + hash = "sha256-U65vVuRodMS32Aw6PZlLwaCos51P5B88n5hDgJNMZXU="; + }) + ]; + + propagatedBuildInputs = [ + argostranslate + beautifulsoup4 + ]; + + postPatch = '' + ln -s */requires.txt requirements.txt + + substituteInPlace requirements.txt \ + --replace "==" ">=" + ''; + + # required for import check to work (argostranslate) + env.HOME = "/tmp"; + + pythonImportsCheck = [ "translatehtml" ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Translate HTML using Beautiful Soup and Argos Translate."; + homepage = "https://www.argosopentech.com"; + license = licenses.mit; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/treq/default.nix b/nixpkgs/pkgs/development/python-modules/treq/default.nix index d72d46e9d7b3..540e52f0793b 100644 --- a/nixpkgs/pkgs/development/python-modules/treq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/treq/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/treq"; description = "Requests-like API built on top of twisted.web's Agent"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/nixpkgs/pkgs/development/python-modules/trezor/default.nix index 31b99ebf3e15..109f48d1f71b 100644 --- a/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.13.6"; + version = "0.13.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-/DWcB1Yv8ViuBP0j9lY6wV3ARlhvOmw3lTbd7w95C0g="; + hash = "sha256-dodeWIYBfclPUbu0Efkn8QO9nj7L8HVNXkSjU4mBSeA="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index cb8cce77fd72..4167a92e7ec3 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,18 +2,21 @@ , buildPythonPackage , fetchPypi , setuptools +, pythonOlder , numpy , lxml }: buildPythonPackage rec { pname = "trimesh"; - version = "3.22.0"; + version = "3.23.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-KuE8EVl4VbIFRlddd+Cqvj+aLWU/9ZMgmgyem9inY3Q="; + hash = "sha256-TjnN5gqzhsN2S/Acqio5pH33RW/Zp3acolI+B+sSaRA="; }; nativeBuildInputs = [ setuptools ]; @@ -33,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for loading and using triangular meshes"; homepage = "https://trimsh.org/"; + changelog = "https://github.com/mikedh/trimesh/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix index 45f4b195a80b..98fdcfae0c16 100644 --- a/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "WebSocket client and server implementation for Python Trio"; homepage = "https://github.com/HyperionGray/trio-websocket"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tritonclient/default.nix b/nixpkgs/pkgs/development/python-modules/tritonclient/default.nix new file mode 100644 index 000000000000..f218d02a4e2b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tritonclient/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, python-rapidjson +, numpy + # optional dependencies +, grpcio +, packaging +, aiohttp +, geventhttpclient +}: + +let + pname = "tritonclient"; + version = "2.35.0"; +in +buildPythonPackage { + inherit pname version; + format = "wheel"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + python = "py3"; + dist = "py3"; + format = "wheel"; + platform = "manylinux1_x86_64"; + hash = "sha256-JXVr+DWkM2g7CiU9STMcZyQJieXgNbKXlX/jqf/oam8="; + }; + + propagatedBuildInputs = [ + python-rapidjson + numpy + ]; + + doCheck = false; + + pythonImportsCheck = [ + "tritonclient" + ]; + + passthru = { + optional-dependencies = { + http = [ + aiohttp + geventhttpclient + ]; + grpc = [ + grpcio + packaging + ]; + }; + }; + + meta = with lib; { + description = "Triton python client"; + homepage = "https://github.com/triton-inference-server/client"; + license = licenses.bsd3; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.linux; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix b/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix index 46386b52a69a..911ab5a777b7 100644 --- a/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.4.22"; + version = "2023.7.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZejLOSnjeIFB25Cgd2t2/K++tUik++au5L/ZZW6JmTk="; + hash = "sha256-io4Wi1HSD+1gcEODHTdjK7UJGdHICmTg8Tk3RGkaiyI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/nixpkgs/pkgs/development/python-modules/trytond/default.nix index 73fa23157638..00c92181aec3 100644 --- a/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.8.1"; + version = "6.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+G3ELH0KnBGA1YJk67ID7VedmCN0vrhGBN+WA8aEcNg="; + hash = "sha256-iz5XGEhIDnrIjnm0rBpUiGfgv4PWUCSQb+noPQqUsjc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tskit/default.nix b/nixpkgs/pkgs/development/python-modules/tskit/default.nix new file mode 100644 index 000000000000..bb5139b425b0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tskit/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pythonOlder +, numpy +, jsonschema +, svgwrite +}: + +buildPythonPackage rec { + pname = "tskit"; + version = "0.5.5"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-phhBTAHAPlBnmzSiLmPYDMg1Mui85NZacni3WuYAc6c="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + numpy + jsonschema + svgwrite + ]; + + # Pypi does not include test folder and too complex to compile from GitHub source + # will ask upstream to include tests in pypi + doCheck = false; + + pythonImportsCheck = [ + "tskit" + ]; + + meta = with lib; { + description = "The tree sequence toolkit"; + homepage = "https://github.com/tskit-dev/tskit"; + license = licenses.mit; + maintainers = with maintainers; [ alxsimon ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ttp/default.nix b/nixpkgs/pkgs/development/python-modules/ttp/default.nix index 9fc1c5eff2a1..1807fdcf2b12 100644 --- a/nixpkgs/pkgs/development/python-modules/ttp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ttp/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ttp"; - version = "0.9.4"; + version = "0.9.5"; format = "pyproject"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iZJ38NQnofW9awisY5cFBIN1rjXinA6CpJYSCCnNaOY="; + hash = "sha256-IWqPFspERBVkjsTYTAkOTOrugq4fD65Q140G3SCEV0w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ttstokenizer/default.nix b/nixpkgs/pkgs/development/python-modules/ttstokenizer/default.nix new file mode 100644 index 000000000000..554e0341fb16 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ttstokenizer/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, anyascii +, inflect +, nltk +, numpy +}: + +buildPythonPackage rec { + pname = "ttstokenizer"; + version = "1.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HtDXDKlZ3jpwIgb5DvaqurEkRe8TRJ2xqKl2IKElnKU="; + }; + + propagatedBuildInputs = [ + anyascii + inflect + nltk + numpy + ]; + + pythonImportsCheck = [ "ttstokenizer" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Tokenizer for Text to Speech (TTS) models"; + homepage = "https://pypi.org/project/ttstokenizer"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/nixpkgs/pkgs/development/python-modules/tubeup/default.nix index a61e0f33e99d..af9e8f677061 100644 --- a/nixpkgs/pkgs/development/python-modules/tubeup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tubeup/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tubeup"; - version = "2023.5.29"; + version = "2023.7.23"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5tvRaIXVzZcNy40uOEPwwN4EKPvvZPiR3qIdmiZSXWw="; + sha256 = "sha256-lI+Ws1uVC8cnRERmfY7j5vPjQGEAH6zef7nBnd/hC+I="; }; nativeBuildInputs = [ @@ -33,7 +33,6 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "internetarchive" "urllib3" "docopt" ]; diff --git a/nixpkgs/pkgs/development/python-modules/turnt/default.nix b/nixpkgs/pkgs/development/python-modules/turnt/default.nix index 9a327f344fba..1fe1d303856d 100644 --- a/nixpkgs/pkgs/development/python-modules/turnt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/turnt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "turnt"; - version = "1.10.0"; + version = "1.11.0"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-pwUNmUvyUYxke39orGkziL3DVRWoJY5AQLz/pTyf3M8="; + hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 475af0b4d4aa..81b2f1afd141 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.2.2"; + version = "8.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-UXQMDP5JjxTnHpvw730Yz0U8/CwYdRz3R64TP0Zgbcw="; + hash = "sha256-tU4nyjo1DC7F2UvaV6Hn/Nqxbm8OR1E1qtUGMVgZ8U8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/nixpkgs/pkgs/development/python-modules/twisted/default.nix index f45acbe87a4e..7b12ef05facc 100644 --- a/nixpkgs/pkgs/development/python-modules/twisted/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twisted/default.nix @@ -159,8 +159,7 @@ buildPythonPackage rec { nativeCheckInputs = [ git glibcLocales - # "hypothesis" indirectly depends on twisted to build its documentation. - (hypothesis.override { enableDocumentation = false; }) + hypothesis pyhamcrest ] ++ passthru.optional-dependencies.conch @@ -203,6 +202,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/twisted"; description = "Asynchronous networking framework written in Python"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/txtai/default.nix b/nixpkgs/pkgs/development/python-modules/txtai/default.nix new file mode 100644 index 000000000000..acf1db58d2a6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/txtai/default.nix @@ -0,0 +1,156 @@ +{ + lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pythonRelaxDepsHook +# propagated build input +, faiss +, torch +, transformers +, huggingface-hub +, numpy +, pyyaml +, regex +# optional-dependencies +, aiohttp +, fastapi +, uvicorn +# TODO add apache-libcloud +# , apache-libcloud +, rich +, duckdb +, pillow +, networkx +, python-louvain +, onnx +, onnxruntime +, soundfile +, scipy +, ttstokenizer +, beautifulsoup4 +, nltk +, pandas +, tika +, imagehash +, timm +, fasttext +, sentencepiece +, accelerate +, onnxmltools +, annoy +, hnswlib +# TODO add pymagnitude-lite +#, pymagnitude-lite +, scikit-learn +, sentence-transformers +, croniter +, openpyxl +, requests +, xmltodict +# native check inputs +, unittestCheckHook +}: +let + version = "5.5.1"; + api = [ aiohttp fastapi uvicorn ]; + # cloud = [ apache-libcloud ]; + console = [ rich ]; + + database = [ duckdb pillow ]; + + graph = [ networkx python-louvain ]; + + model = [ onnx onnxruntime ]; + + pipeline-audio = [ onnx onnxruntime soundfile scipy ttstokenizer ]; + pipeline-data = [ beautifulsoup4 nltk pandas tika ]; + pipeline-image = [ imagehash pillow timm ]; + pipeline-text = [ fasttext sentencepiece ]; + pipeline-train = [ accelerate onnx onnxmltools onnxruntime ]; + pipeline = pipeline-audio ++ pipeline-data ++ pipeline-image ++ pipeline-text ++ pipeline-train; + + similarity = [ + annoy + fasttext + hnswlib + # pymagnitude-lite + scikit-learn + sentence-transformers + ]; + workflow = [ + # apache-libcloud + croniter + openpyxl + pandas + pillow + requests + xmltodict + ]; + all = api ++ console ++ database ++ graph ++ model ++ pipeline ++ similarity ++ workflow; + + optional-dependencies = { + inherit api console database graph model pipeline-audio pipeline-image + pipeline-text pipeline-train pipeline similarity workflow all; + }; +in +buildPythonPackage { + pname = "txtai"; + inherit version; + format = "setuptools"; + + disable = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "neuml"; + repo = "txtai"; + rev = "v${version}"; + hash = "sha256-h6TwWzLYfFg5x2QMIstAZ5pkxfHobBU+b4gb0HiayzY="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + # We call it faiss, not faiss-cpu. + "faiss-cpu" + ]; + + propagatedBuildInputs = [ + faiss + torch + transformers + huggingface-hub + numpy + pyyaml + regex + ]; + + passthru.optional-dependencies = optional-dependencies; + + pythonImportsCheck = [ "txtai" ]; + + # some tests hang forever + doCheck = false; + + preCheck = '' + export TRANSFORMERS_CACHE=$(mktemp -d) + ''; + + nativeCheckInputs = [ + unittestCheckHook + ] ++ optional-dependencies.api ++ optional-dependencies.similarity; + + unittestFlagsArray = [ + "-s" "test/python" "-v" + ]; + + meta = with lib; { + description = "Semantic search and workflows powered by language models"; + changelog = "https://github.com/neuml/txtai/releases/tag/v${version}"; + homepage = "https://github.com/neuml/txtai"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/typechecks/default.nix b/nixpkgs/pkgs/development/python-modules/typechecks/default.nix new file mode 100644 index 000000000000..c458c9c15236 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/typechecks/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +}: + +buildPythonPackage rec { + pname = "typechecks"; + version = "unstable-2023-07-13"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "openvax"; + repo = pname; + # See https://github.com/openvax/typechecks/issues/2. As of 2023-07-13, + # they do no have version tags. + rev = "5340b4e8a2f419b3a7aa816a5b19e2e0a6ce0679"; + hash = "sha256-GdmBtkyuzLfpk6oneWgJ5M1bnhGJ5/lSbGliwoAQWZs="; + }; + + pythonImportsCheck = [ "typechecks" ]; + + meta = with lib; { + description = "Type checking helpers for Python"; + homepage = "https://github.com/openvax/typechecks"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix b/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix index 5110e5e2a5cf..1c9144226bc2 100644 --- a/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix +++ b/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A="; }; - sourceRoot = "source/builtins/typecode_libmagic-linux"; + sourceRoot = "${src.name}/builtins/typecode_libmagic-linux"; propagatedBuildInputs = [ plugincode diff --git a/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix b/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix index 8487b7ff9e01..48ce811b9ebe 100644 --- a/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Python AST modules with type comment support"; homepage = "https://github.com/python/typed_ast"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/typepy/default.nix b/nixpkgs/pkgs/development/python-modules/typepy/default.nix index b0a505e3205b..a1d9e7df1534 100644 --- a/nixpkgs/pkgs/development/python-modules/typepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typepy/default.nix @@ -1,34 +1,46 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , mbstrdecoder , python-dateutil , pytz , packaging , pytestCheckHook +, pythonOlder , tcolorpy }: buildPythonPackage rec { pname = "typepy"; - version = "1.3.0"; + version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-J6SgVd2m0wOVr2ZV/pryRcJrn+BYTGstAUQO349c2lE="; + rev = "refs/tags/v${version}"; + hash = "sha256-cgy1+6RZ1DUyH45bAKpGPOOZCwhCUghummw2fnfJGww="; }; - propagatedBuildInputs = [ mbstrdecoder python-dateutil pytz packaging ]; + propagatedBuildInputs = [ + mbstrdecoder + python-dateutil + pytz + packaging + ]; - nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ tcolorpy ]; + nativeCheckInputs = [ + pytestCheckHook + tcolorpy + ]; meta = with lib; { + description = "Library for variable type checker/validator/converter at a run time"; homepage = "https://github.com/thombashi/typepy"; - description = "A library for variable type checker/validator/converter at a run time"; - maintainers = with maintainers; [ genericnerdyusername ]; + changelog = "https://github.com/thombashi/typepy/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ genericnerdyusername ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/typer/default.nix b/nixpkgs/pkgs/development/python-modules/typer/default.nix index f02a0f0c5139..e5676eba4679 100644 --- a/nixpkgs/pkgs/development/python-modules/typer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typer/default.nix @@ -1,43 +1,40 @@ { lib , stdenv , buildPythonPackage +, click , colorama +, coverage , fetchpatch , fetchPypi , flit-core -, click +, pytest-sugar +, pytest-xdist , pytestCheckHook +, pythonOlder , rich , shellingham -, pytest-xdist -, pytest-sugar -, coverage -, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "typer"; - version = "0.7.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/3l4RleKnyogG1NEKu3rVDMZRmhw++HHAeq2bddoEWU="; + hash = "sha256-UJIv15rqL0dRqOBAj/ENJmK9DIu/qEdVppnzutopeLI="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "rich >=10.11.0,<13.0.0" "rich" - ''; - nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ click + typing-extensions ]; passthru.optional-dependencies = { @@ -58,8 +55,11 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d); ''; - disabledTests = lib.optionals stdenv.isDarwin [ - # likely related to https://github.com/sarugaku/shellingham/issues/35 + + disabledTests = [ + "test_scripts" + # Likely related to https://github.com/sarugaku/shellingham/issues/35 + # fails also on Linux "test_show_completion" "test_install_completion" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for building CLI applications"; homepage = "https://typer.tiangolo.com/"; + changelog = "https://github.com/tiangolo/typer/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ winpat ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix b/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix index 1b2789dd8ebb..d724378fee85 100644 --- a/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.11"; + version = "0.4.15.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qUIesk2c/FhIgNwdM7f9QGoUInwfmfUMWrkmXgTQdjg="; + hash = "sha256-+9/F2dJNhcM70FT74zrcbOxE7tsZz7ur+7tX3CV65Lg="; }; # Module has no tests diff --git a/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix b/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix index 606164545393..c2e71f224569 100644 --- a/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.8.3"; + version = "5.1.8.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Mt04D8iNDnofJ6hLoc5uKboK1CyqobiOe10n5h9uSWI="; + hash = "sha256-qMOQJGNOmYNL7xRs7C42xYX0eISt303GXW0Lex9idRc="; }; # Modules doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/types-deprecated/default.nix b/nixpkgs/pkgs/development/python-modules/types-deprecated/default.nix index cc1102c03553..ee4ede8620f5 100644 --- a/nixpkgs/pkgs/development/python-modules/types-deprecated/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-deprecated/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-deprecated"; - version = "1.2.9.2"; + version = "1.2.9.3"; format = "setuptools"; src = fetchPypi { pname = "types-Deprecated"; inherit version; - hash = "sha256-kWFv1nRfi/LUV/u779FM3kODjp8AoEtaDq5Pwfe7xpc="; + hash = "sha256-74cyet8+PEpMfY4G5Y9kdnENNGbs+1PEnvsICASnDvM="; }; # Modules has no tests diff --git a/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix b/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix index fa0b37055c3b..c3c63592624f 100644 --- a/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "9.5.0.4"; + version = "10.0.0.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-8bavR6vRUYR+4lkR/+unhImbx9x/nrqMpqWqxSKwEu8="; + hash = "sha256-/gk4CrItQSztmJoGfp7kr3Gfo6R7obU7IytGUUqHEEI="; }; # Modules doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index 319082c8a64c..8a169a2d9ce5 100644 --- a/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.23.0.1"; + version = "4.23.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-e9XqEioFexGoK3hdneRkkyoekXX+l3pBKK3vEdfzVUc="; + hash = "sha256-EGawadTw4Jveu2TKTzXMa4rM9S+Ag2gEbM7JZ0SvA3U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix b/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix index cb169ef0e427..8e01ec2c3ff3 100644 --- a/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "5.9.5.9"; + version = "5.9.5.16"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xsfmtBtvfruHr9VlDfNgdR0Ois8NJ2t6xk0A9Bm+uSI="; + hash = "sha256-TpshnvtiXT0E9r8QaTT4fKtJqkGpSwo7MIlAP0enkig="; }; # Module doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix b/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix index 0c846fcfb64a..76691b13b12e 100644 --- a/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "23.2.0.0"; + version = "23.2.0.2"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-Q+MH6N+zp6ggihmHTKBgMF9GDFKdTqyoomaeqJSZ8kQ="; + hash = "sha256-agENrJ7NQrWC190sw+nkBIa3mztkuy//uhR0/5avkG0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix b/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix index 1f03d20e90c7..2d00bae5a29c 100644 --- a/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.13"; + version = "2.8.19.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-CaAnX5XuMc5oGWcQ7Sw9G53ELgthzEOsw2mkLLk5E08="; + hash = "sha256-H08QrJi7ixat6dvuNRjZrOAXgh2UsFekJbBp+DRzf0s="; }; # Modules doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix b/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix index 0dc731b60266..58a66197d00b 100644 --- a/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.9"; + version = "6.0.12.11"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - hash = "sha256-xRsb1tmd3wqiiEp6MogQ6/cKQmLCkhldP0+aAAX57rY="; + hash = "sha256-fTQLGcoozd/bpDjuY4zUCEveIT5QGjl4c4VD4nCUd1s="; }; # Module doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/types-redis/default.nix b/nixpkgs/pkgs/development/python-modules/types-redis/default.nix index 58df025b19b4..e191d56d69d5 100644 --- a/nixpkgs/pkgs/development/python-modules/types-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.5.5.2"; + version = "4.6.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-L+gvN02d3fAH3q8j2B/dz9lSPZUivxFSPFxDvFsnCZ4="; + hash = "sha256-797zfcDAS/V4YZVlH9aU+L/daT6sCexK9G2Q9yZSVY8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 6b8d972e4624..14481ff78da0 100644 --- a/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.1"; + version = "2.31.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PeZnz/oSPOaYWR3grX2wNKUxdFellusLSUTlqdno0aw="; + hash = "sha256-aqP3+vDqUtcouxjAoNFSLZv9jHLSb/b2G/w9BqQRz0A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-retry/default.nix b/nixpkgs/pkgs/development/python-modules/types-retry/default.nix index 489f024e2497..ecef01714f9d 100644 --- a/nixpkgs/pkgs/development/python-modules/types-retry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-retry/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-retry"; - version = "0.9.9.3"; + version = "0.9.9.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-G3oKBK3xLyEjfnaDNXSpqPdV+IiJwiatmdbjv6W248g="; + hash = "sha256-5HMdxoS1a4ddl0ZFmtZl07woGla1MKzfHJdzAWd5mUE="; }; # Modules doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix b/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix index 2be7a114282f..123aaa346171 100644 --- a/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.9.0.2"; + version = "0.9.0.3"; src = fetchPypi { inherit pname version; - hash = "sha256-HdQyKjoUbpBzFpx0J4uPFKWOuZBcqdsNJYjfQI8nysk="; + hash = "sha256-GXZR+dZGcZPNFm2FABFqbTom8qTrLbCTvJU17hwL5V4="; }; # Module doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix b/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix index d033d40274f2..ad4207769a1d 100644 --- a/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Typing stubs for typed-ast"; homepage = "https://github.com/python/typeshed"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 veehaitch ]; + maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/types-ujson/default.nix b/nixpkgs/pkgs/development/python-modules/types-ujson/default.nix index 5de3554a42e2..45737880fe24 100644 --- a/nixpkgs/pkgs/development/python-modules/types-ujson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-ujson/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-ujson"; - version = "5.7.0.5"; + version = "5.8.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-f/Kmd2BI5q1qvH6+39Qq4bbABVEq/7rkTK8/selrXRI="; + hash = "sha256-KFao0Ig0db7IDBrHcsAG6mkSFcxV3tIWR7XIfIYknLs="; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix b/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix index 911f9e311932..d02174d7727f 100644 --- a/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.13"; + version = "1.26.25.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-MwBTjJ3BHa0y6uSCesMT9dmGuLIUlIAfG/l6GsbAOuU="; + hash = "sha256-Ipt/V3yVG4wbksG8Ky/bC0mEe9KvbRzCouPdNA872o8="; }; # Module doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/nixpkgs/pkgs/development/python-modules/typesystem/default.nix index 18834d9c3899..96f351ccaf1f 100644 --- a/nixpkgs/pkgs/development/python-modules/typesystem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typesystem/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "A type system library for Python"; homepage = "https://github.com/encode/typesystem"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/typical/default.nix b/nixpkgs/pkgs/development/python-modules/typical/default.nix index 5cbdce7c6252..67d55e64243e 100644 --- a/nixpkgs/pkgs/development/python-modules/typical/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typical/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , future-typing , inflection -, mypy , orjson , pandas , pendulum @@ -45,7 +44,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - mypy pydantic sqlalchemy pandas diff --git a/nixpkgs/pkgs/development/python-modules/tzdata/default.nix b/nixpkgs/pkgs/development/python-modules/tzdata/default.nix index 7059c9cae15c..879024957937 100644 --- a/nixpkgs/pkgs/development/python-modules/tzdata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tzdata/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Provider of IANA time zone data"; homepage = "https://github.com/python/tzdata"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/uarray/default.nix b/nixpkgs/pkgs/development/python-modules/uarray/default.nix index f1b3c49646f9..31f55ebdea79 100644 --- a/nixpkgs/pkgs/development/python-modules/uarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uarray/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Universal array library"; homepage = "https://github.com/Quansight-Labs/uarray"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix b/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix new file mode 100644 index 000000000000..f9d1cf6c1d79 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyparsing +, six +}: + +buildPythonPackage rec { + pname = "ucsmsdk"; + version = "0.9.14"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "CiscoUcs"; + repo = "ucsmsdk"; + rev = "v${version}"; + hash = "sha256-lSkURvKRgW+qV1A8OT4WYsMGlxxIqaFnxQ3Rnlixdw0="; + }; + + propagatedBuildInputs = [ + pyparsing + six + ]; + + # most tests are broken + doCheck = false; + + pythonImportsCheck = [ "ucsmsdk" ]; + + meta = with lib; { + description = "Python SDK for Cisco UCS"; + homepage = "https://github.com/CiscoUcs/ucsmsdk"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ufmt/default.nix b/nixpkgs/pkgs/development/python-modules/ufmt/default.nix new file mode 100644 index 000000000000..cc510c0fa76f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ufmt/default.nix @@ -0,0 +1,61 @@ +{ lib +, black +, buildPythonPackage +, click +, fetchFromGitHub +, flit-core +, libcst +, moreorless +, pythonOlder +, tomlkit +, trailrunner +, typing-extensions +, unittestCheckHook +, usort +}: + +buildPythonPackage rec { + pname = "ufmt"; + version = "2.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "omnilib"; + repo = "ufmt"; + rev = "refs/tags/v${version}"; + hash = "sha256-eQIbSC0Oxi6JD7/3o2y9f+KhT8GIiFiYiV4A3QBoWl0="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + black + click + libcst + moreorless + tomlkit + trailrunner + typing-extensions + usort + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "ufmt" + ]; + + meta = with lib; { + description = "Safe, atomic formatting with black and usort"; + homepage = "https://github.com/omnilib/ufmt"; + changelog = "https://github.com/omnilib/ufmt/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/nixpkgs/pkgs/development/python-modules/ujson/default.nix index 8893d004346f..02376023260d 100644 --- a/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Ultra fast JSON encoder and decoder"; homepage = "https://github.com/ultrajson/ultrajson"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix b/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix index e22985753812..d6ec6611b755 100644 --- a/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.7.2"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AQeCgos/6BCvITTSnBYxefvAMWHHbJBsmbVMACl6L3o="; + hash = "sha256-UOAeIVjn3Z5zC4jZP0y+XH1HjYesxjGmFYpEknu8cag="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix index 7097ee33a1a9..04d3bd6fd9f4 100644 --- a/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix @@ -96,6 +96,6 @@ buildPythonPackage rec { description = "Uniform Manifold Approximation and Projection"; homepage = "https://github.com/lmcinnes/umap"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/unearth/default.nix b/nixpkgs/pkgs/development/python-modules/unearth/default.nix index d88c8c391cb7..cf9e95e41bb2 100644 --- a/nixpkgs/pkgs/development/python-modules/unearth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.9.1"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cgWDKwhwBdG3RpA6U1yn0NtTgcH2Id3AApBSTVav0hc="; + hash = "sha256-hF9LVzOHTOO0JyEm3kluq+AKSa1nj90E1ILR533u1CU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/unicorn/default.nix b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix index 74780c7e0320..c1f17ce880a6 100644 --- a/nixpkgs/pkgs/development/python-modules/unicorn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = unicorn-emu.src; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; prePatch = '' ln -s ${unicorn-emu}/lib/libunicorn.* prebuilt/ diff --git a/nixpkgs/pkgs/development/python-modules/units/default.nix b/nixpkgs/pkgs/development/python-modules/units/default.nix index 13ae42823ff1..8e9742d2f6a8 100644 --- a/nixpkgs/pkgs/development/python-modules/units/default.nix +++ b/nixpkgs/pkgs/development/python-modules/units/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { description = "Python support for quantities with units"; homepage = "https://bitbucket.org/adonohue/units/"; license = licenses.psfl; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 8497d17a5f37..be25e21a43f3 100644 --- a/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/xmlrunner/unittest-xml-reporting"; description = "unittest-based test runner with Ant/JUnit like XML reporting"; license = licenses.bsd2; - maintainers = with maintainers; [ rprospero SuperSandro2000 ]; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix b/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix index 2a23c01dd8e8..0d60a6b50c07 100644 --- a/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix @@ -1,24 +1,25 @@ { lib , buildPythonPackage -, fetchFromGitHub -, flit-core +, fetchPypi +, setuptools +, setuptools-scm , fsspec }: buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.0.23"; + version = "0.1.0"; format = "pyproject"; - src = fetchFromGitHub { - owner = "fsspec"; - repo = "universal_pathlib"; - rev = "v${version}"; - hash = "sha256-UT4S7sqRn0/YFzFL1KzByK44u8G7pwWHERzJEm7xmiw="; + src = fetchPypi { + pname = "universal_pathlib"; + inherit version; + hash = "sha256-LqzljIZUZh8zHvcyBqFHBbunpJVYFpk6mfuesVGyojg="; }; nativeBuildInputs = [ - flit-core + setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -30,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pathlib api extended to use fsspec backends"; homepage = "https://github.com/fsspec/universal_pathlib"; - changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/${src.rev}"; + changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix new file mode 100644 index 000000000000..7b3b5c8983cd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix @@ -0,0 +1,93 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# propagated build inputs +, click +, fastapi +, jinja2 +, mypy +, nbconvert +, python-multipart +, pandas +, types-requests +, types-ujson +, uvicorn +, autoflake +# native check inputs +, pytestCheckHook +, black +, coverage +, flake8 +, httpx +, ipython +, pytest-cov +, requests +, requests-toolbelt +, nbdev +, pytest-mock +}: +let + version = "0.10.10"; +in +buildPythonPackage { + pname = "unstructured-api-tools"; + inherit version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured-api-tools"; + rev = version; + hash = "sha256-CJ5bsII24hw03JN4+8VywYRYCsnMlYHjmaIIn0zttIs="; + }; + + propagatedBuildInputs = [ + click + fastapi + jinja2 + mypy + nbconvert + python-multipart + pandas + types-requests + types-ujson + uvicorn + autoflake + ] ++ uvicorn.optional-dependencies.standard; + + pythonImportsCheck = [ "unstructured_api_tools" ]; + + # test require file generation but it complains about a missing file mypy + doCheck = false; + # preCheck = '' + # substituteInPlace Makefile \ + # --replace "PYTHONPATH=." "" \ + # --replace "mypy" "${mypy}/bin/mypy" + # make generate-test-api + # ''; + + nativeCheckInputs = [ + pytestCheckHook + black + coverage + flake8 + httpx + ipython + pytest-cov + requests + requests-toolbelt + nbdev + pytest-mock + ]; + + meta = with lib; { + description = ""; + 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; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix new file mode 100644 index 000000000000..e03d2a6f4544 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix @@ -0,0 +1,99 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# runtime dependencies +, layoutparser +, python-multipart +, huggingface-hub +, opencv +, onnxruntime +, transformers +, detectron2 +# check inputs +, pytestCheckHook +, coverage +, click +, httpx +, mypy +, pytest-cov +, pdf2image +}: + +buildPythonPackage rec { + pname = "unstructured-inference"; + version = "0.5.7"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured-inference"; + rev = "refs/tags/${version}"; + hash = "sha256-xlsihi1ZTNgdnSk3H8rMBRi4AAxPKNFqygcIMtM/jE0="; + }; + + postPatch = '' + substituteInPlace requirements/base.in \ + --replace "opencv-python" "opencv" + ''; + + propagatedBuildInputs = [ + layoutparser + python-multipart + huggingface-hub + opencv + onnxruntime + transformers + detectron2 + # paddleocr + # yolox + ] + ++ layoutparser.optional-dependencies.layoutmodels + ++ layoutparser.optional-dependencies.tesseract; + + nativeCheckInputs = [ + pytestCheckHook + coverage + click + httpx + mypy + pytest-cov + pdf2image + huggingface-hub + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # not sure why this fails + "test_get_path_oob_move_deeply_nested" + "test_get_path_oob_move_nested[False]" + # requires yolox + "test_yolox" + # requires paddleocr + "test_table_prediction" + ]; + + disabledTestPaths = [ + # network access + "test_unstructured_inference/inference/test_layout.py" + "test_unstructured_inference/models/test_chippermodel.py" + "test_unstructured_inference/models/test_detectron2.py" + "test_unstructured_inference/models/test_detectron2onnx.py" + # unclear failure + "test_unstructured_inference/models/test_donut.py" + "test_unstructured_inference/models/test_model.py" + "test_unstructured_inference/models/test_tables.py" + ]; + + pythonImportsCheck = [ "unstructured_inference" ]; + + meta = with lib; { + description = ""; + homepage = "https://github.com/Unstructured-IO/unstructured-inference"; + changelog = "https://github.com/Unstructured-IO/unstructured-inference/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix new file mode 100644 index 000000000000..542e6f0adc27 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -0,0 +1,143 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# propagated build inputs +, chardet +, filetype +, lxml +, msg-parser +, nltk +, openpyxl +, pandas +, pdf2image +, pdfminer-six +, pillow +, pypandoc +, python-docx +, python-pptx +, python-magic +, markdown +, requests +, tabulate +, xlrd +# optional-dependencies +, langdetect +, sacremoses +, sentencepiece +, torch +, transformers +, unstructured-inference +, s3fs +, fsspec +, adlfs +# , discord-py +, pygithub +, python-gitlab +, praw +, slack-sdk +, wikipedia +, google-api-python-client +# , gcsfs +, elasticsearch8 +, jq +# , dropboxdrivefs +, atlassian-python-api +# test dependencies +, pytestCheckHook +, black +, coverage +, click +, freezegun +# , label-studio-sdk +, mypy +, pytest-cov +, pytest-mock +, vcrpy +, grpcio +}: +let + version = "0.8.1"; + optional-dependencies = { + huggingflace = [ + langdetect + sacremoses + sentencepiece + torch + transformers + ]; + local-inference = [ unstructured-inference ]; + s3 = [ s3fs fsspec ]; + azure = [ adlfs fsspec ]; + discord = [ ]; # discord-py + github = [ pygithub ]; + gitlab = [ python-gitlab ]; + reddit = [ praw ]; + slack = [ slack-sdk ]; + wikipedia = [ wikipedia ]; + google-drive = [ google-api-python-client ]; + gcs = []; # gcsfs fsspec + elasticsearch = [ elasticsearch8 jq ]; + dropbox = []; # dropboxdrivefs fsspec + confluence = [ atlassian-python-api ]; + }; +in +buildPythonPackage { + pname = "unstructured"; + inherit version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured"; + rev = version; + hash = "sha256-I9pRycg3uGn7Xfd4YGxic16SXi8+gslsIVarzDT8X2w="; + }; + + propagatedBuildInputs = [ + chardet + filetype + lxml + msg-parser + nltk + openpyxl + pandas + pdf2image + pdfminer-six + pillow + pypandoc + python-docx + python-pptx + python-magic + markdown + requests + tabulate + xlrd + ]; + + pythonImportsCheck = [ "unstructured" ]; + + # test try to download punkt from nltk + # figure out how to make it available to enable the tests + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + black + coverage + click + freezegun + mypy + pytest-cov + pytest-mock + vcrpy + grpcio + ]; + + meta = with lib; { + description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; + homepage = "https://github.com/Unstructured-IO/unstructured"; + changelog = "https://github.com/Unstructured-IO/unstructured/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 36f2a3c8b6ce..e0fb91744851 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.0.7"; + version = "5.0.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-Ql5Hk2Cd/TB9k7CVrffV5vi70wps+y9SE10Sb2NMaeg="; + hash = "sha256-xLyb0isWQro6RlIT7a4IBkB+m0/fF55CRLrYgi5WLrM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix b/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix index 613d9f75e84f..330be3286742 100644 --- a/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "uptime-kuma-api"; - version = "1.0.1"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "uptime_kuma_api"; inherit version; - hash = "sha256-6Cwo71pgwBk5B6MaFFs9XlbocJLL/s4+7m7Gi13ddlM="; + hash = "sha256-3Y7PGidtmBjrIXGAElzRAv//kvX0ZcK3OX0xnfeuLWE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/nixpkgs/pkgs/development/python-modules/urwid/default.nix index 7e135e2aa7f0..014382b21501 100644 --- a/nixpkgs/pkgs/development/python-modules/urwid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urwid/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "A full-featured console (xterm et al.) user interface library"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/userpath/default.nix b/nixpkgs/pkgs/development/python-modules/userpath/default.nix index 46fc9ab92512..edf92f571166 100644 --- a/nixpkgs/pkgs/development/python-modules/userpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/userpath/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BCM9L8/lz/kRweT7cYl1VkDhUk/4ekuCq51rh1/uV4c="; + hash = "sha256-heMnRUMXRHfGLVcB7UOj7xBRgkqd13aWitxBHlhkDdE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/usort/default.nix b/nixpkgs/pkgs/development/python-modules/usort/default.nix new file mode 100644 index 000000000000..2f61e8847ac6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/usort/default.nix @@ -0,0 +1,65 @@ +{ lib +, attrs +, buildPythonPackage +, click +, fetchFromGitHub +, hatch-vcs +, hatchling +, libcst +, moreorless +, pythonOlder +, stdlibs +, toml +, trailrunner +, unittestCheckHook +, volatile +}: + +buildPythonPackage rec { + pname = "usort"; + version = "1.1.0b2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "usort"; + rev = "refs/tags/v${version}"; + hash = "sha256-c3gQ+f/BRgM+Nwc+mEP7dcmig7ws7FqL5zwQhNJJlsI="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + attrs + click + libcst + moreorless + stdlibs + toml + trailrunner + ]; + + nativeCheckInputs = [ + unittestCheckHook + volatile + ]; + + pythonImportsCheck = [ + "usort" + ]; + + meta = with lib; { + description = "Safe, minimal import sorting for Python projects"; + homepage = "https://github.com/facebook/usort"; + changelog = "https://github.com/facebook/usort/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix b/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix index cb8e479377a8..4ada58e1d992 100644 --- a/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix @@ -12,10 +12,9 @@ , wsproto }: -buildPythonPackage rec { +buildPythonPackage { pname = "uvicorn-tests"; inherit (uvicorn) version; - format = "other"; src = uvicorn.testsout; diff --git a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index fc5023b5fcae..38283c71acd6 100644 --- a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -115,6 +115,6 @@ buildPythonPackage rec { description = "Fast implementation of asyncio event loop on top of libuv"; homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/validators/default.nix b/nixpkgs/pkgs/development/python-modules/validators/default.nix index 1a7b850342f1..2f562a02ffdd 100644 --- a/nixpkgs/pkgs/development/python-modules/validators/default.nix +++ b/nixpkgs/pkgs/development/python-modules/validators/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Python Data Validation for Humans™"; homepage = "https://github.com/kvesteri/validators"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/validictory/default.nix b/nixpkgs/pkgs/development/python-modules/validictory/default.nix deleted file mode 100644 index c4172079a607..000000000000 --- a/nixpkgs/pkgs/development/python-modules/validictory/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, pythonAtLeast -, fetchPypi -}: - -buildPythonPackage rec { - pname = "validictory"; - version = "1.1.2"; - - disabled = pythonAtLeast "3.10"; # abandoned, should be removed when we move to py310/311 - - src = fetchPypi { - inherit pname version; - sha256 = "1fim11vj990rmn59qd67knccjx1p4an7gavbgprpabsrb13bi1rs"; - }; - - doCheck = false; - - meta = with lib; { - description = "Validate dicts against a schema"; - homepage = "https://github.com/sunlightlabs/validictory"; - license = licenses.mit; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix b/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix index 44392d00b917..48fae161b20c 100644 --- a/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "3.2.1"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-KtjyTSD7osIdThq/Ota4oCyeseBHxqaYaL47wiVicsI="; + hash = "sha256-wlkb6aa2UtqjrbNA26TUH+ZKvOM64An+lol+MCdQh3U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/vcard/default.nix b/nixpkgs/pkgs/development/python-modules/vcard/default.nix new file mode 100644 index 000000000000..d984e7c106cc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/vcard/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, fetchFromGitLab +, lib +, pytestCheckHook +, python-dateutil +, pythonAtLeast +, pythonOlder +}: +buildPythonPackage rec { + pname = "vcard"; + version = "0.15.4"; + + disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + + src = fetchFromGitLab { + owner = "engmark"; + repo = "vcard"; + rev = "refs/tags/v${version}"; + hash = "sha256-7GNq6PoWZgwhhpxhWOkUEpqckeSfzocex1ZGN9CTJyo="; + }; + + propagatedBuildInputs = [ python-dateutil ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "vcard" ]; + + meta = { + homepage = "https://gitlab.com/engmark/vcard"; + description = "vCard validator, class and utility functions"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.l0b0 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index 034998fc904b..9bddbcf39a3c 100644 --- a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "vdirsyncer"; - version = "0.19.1"; + version = "0.19.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qnbHclqlpxH2N0vFzYO+eKrmjHSCljWp7Qc81MCfA64="; + hash = "sha256-/QWM7quCk0WaBGbNmw5Ks7OUYsbgiaDwrDfDB0INgro="; }; postPatch = '' @@ -72,9 +72,10 @@ buildPythonPackage rec { passthru.tests.version = testers.testVersion { package = vdirsyncer; }; meta = with lib; { - homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; - license = licenses.mit; + homepage = "https://github.com/pimutils/vdirsyncer"; + changelog = "https://github.com/pimutils/vdirsyncer/blob/v${version}/CHANGELOG.rst"; + license = licenses.bsd3; maintainers = with maintainers; [ loewenheim ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/vidstab/default.nix b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix index b4a16c44a072..dbddbe6be087 100644 --- a/nixpkgs/pkgs/development/python-modules/vidstab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/AdamSpannbauer/python_video_stab"; description = "Video Stabilization using OpenCV"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix b/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix index 8829279a1859..e0093f2ef892 100644 --- a/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { pname = "viv-utils"; - version = "0.7.7"; + version = "0.7.9"; src = fetchFromGitHub { owner = "williballenthin"; repo = "viv-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-ih6CtnsGfHRLDjoaF7BkoUENu+0pU3NB6TG0A70f3nE="; + hash = "sha256-xM3jtA6fNk36+enL/EcQH59CNajYnGlEDu06QXIFz6A="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/vivisect/default.nix b/nixpkgs/pkgs/development/python-modules/vivisect/default.nix index d8b5a7e9ee86..bf281f374c50 100644 --- a/nixpkgs/pkgs/development/python-modules/vivisect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vivisect/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "vivisect"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tAIhsHFds3qwPngfOsR1+xDKgi29ACnvFAYoklRnCAI="; + hash = "sha256-URRBEZelw4s43zqtb/GrLxIksvrqHbqQWntT9jVonhU="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/volatile/default.nix b/nixpkgs/pkgs/development/python-modules/volatile/default.nix new file mode 100644 index 000000000000..7be5989b159b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/volatile/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "volatile"; + version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mbr"; + repo = "volatile"; + rev = "refs/tags/${version}"; + hash = "sha256-TYUvr0bscM/FaPk9oiF4Ob7HdKa2HlbpEFmaPfh4ir0="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "volatile" + ]; + + meta = with lib; { + description = "A small extension for the tempfile module"; + homepage = "https://github.com/mbr/volatile"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/nixpkgs/pkgs/development/python-modules/vsure/default.nix index b51622ed077d..583a17c0704a 100644 --- a/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -2,17 +2,20 @@ , buildPythonPackage , fetchPypi , click +, pythonOlder , requests }: buildPythonPackage rec { pname = "vsure"; - version = "2.6.1"; + version = "2.6.4"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-D6Q76L1BVx5hpFSShP1rUOmgTogEO+6Jj5x8GaepC+c="; + hash = "sha256-d9t/zO1ROCndS+5kiFVyDbs+96z7GMHaH6T82b8hl40="; }; propagatedBuildInputs = [ @@ -30,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for working with verisure devices"; homepage = "https://github.com/persandstrom/python-verisure"; + changelog = "https://github.com/persandstrom/python-verisure#version-history"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/vulcan-api/default.nix b/nixpkgs/pkgs/development/python-modules/vulcan-api/default.nix index a3e4c0c561a8..eeeb24688811 100644 --- a/nixpkgs/pkgs/development/python-modules/vulcan-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vulcan-api/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for UONET+ e-register API"; homepage = "https://vulcan-api.readthedocs.io/"; + changelog = "https://github.com/kapi2289/vulcan-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/w3lib/default.nix b/nixpkgs/pkgs/development/python-modules/w3lib/default.nix index a01b1e5f5f9d..08ce68fdd616 100644 --- a/nixpkgs/pkgs/development/python-modules/w3lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/w3lib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -25,8 +26,10 @@ buildPythonPackage rec { "w3lib" ]; - disabledTests = [ - "test_add_or_replace_parameter" + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # regressed on Python 3.11.4 + # https://github.com/scrapy/w3lib/issues/212 + "test_safe_url_string_url" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix b/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix index fdd2e0e39a0e..085eca293d11 100644 --- a/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.5"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-aNz4OoUUXWMCahMxuYBxvNWnw7Inxd5svBgwLgoirW8="; + hash = "sha256-RjJyx3sr69voJxa3lH8Nq/liZ3eMoTfZ4phykj7neZA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/wagtail/default.nix b/nixpkgs/pkgs/development/python-modules/wagtail/default.nix index 2bbff0485b21..c01464f27ceb 100644 --- a/nixpkgs/pkgs/development/python-modules/wagtail/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wagtail/default.nix @@ -7,7 +7,7 @@ , django-filter , django-modelcluster , django-taggit -, django_treebeard +, django-treebeard , djangorestframework , draftjs-exporter , fetchPypi @@ -43,7 +43,7 @@ buildPythonPackage rec { anyascii beautifulsoup4 django - django_treebeard + django-treebeard django-filter django-modelcluster django-taggit diff --git a/nixpkgs/pkgs/development/python-modules/wandb/default.nix b/nixpkgs/pkgs/development/python-modules/wandb/default.nix index aeeece5151a3..fa57b0072892 100644 --- a/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -1,7 +1,10 @@ { lib , stdenv , appdirs +, azure-containerregistry , azure-core +, azure-identity +, azure-storage-blob , bokeh , boto3 , buildPythonPackage @@ -11,6 +14,7 @@ , flask , git , gitpython +, google-cloud-artifact-registry , google-cloud-compute , google-cloud-storage , hypothesis @@ -51,7 +55,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.15.3"; + version = "0.15.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -60,7 +64,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-i1Lo6xbkCgRTJwRjk2bXkZ5a/JRUCzFzmEuPQlPvZf4="; + hash = "sha256-etS1NkkskA5Lg/38QIdzCVWgqZpjpT2LwaWF1k7WVXs="; }; patches = [ @@ -94,10 +98,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + azure-containerregistry azure-core + azure-identity + azure-storage-blob bokeh boto3 flask + google-cloud-artifact-registry google-cloud-compute google-cloud-storage hypothesis @@ -213,17 +221,17 @@ buildPythonPackage rec { "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py" "tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py" "tests/pytest_tests/system_tests/test_system_metrics/test_open_metrics.py" - "tests/pytest_tests/system_tests/tests_launch/test_github_reference.py" - "tests/pytest_tests/system_tests/tests_launch/test_job.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_add.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_cli.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_kubernetes.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_local_container.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_run.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_sweep_cli.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_sweep.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch.py" - "tests/pytest_tests/system_tests/tests_launch/test_wandb_reference.py" + "tests/pytest_tests/system_tests/test_launch/test_github_reference.py" + "tests/pytest_tests/system_tests/test_launch/test_job.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_add.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_cli.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_kubernetes.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_local_container.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_run.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_sweep_cli.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_sweep.py" + "tests/pytest_tests/system_tests/test_launch/test_launch.py" + "tests/pytest_tests/system_tests/test_launch/test_wandb_reference.py" # Tries to access /homeless-shelter "tests/pytest_tests/unit_tests/test_tables.py" @@ -256,9 +264,12 @@ buildPythonPackage rec { "tests/pytest_tests/unit_tests/test_lib/test_filesystem.py" ]; - # Disable test that fails on darwin due to issue with python3Packages.psutil: - # https://github.com/giampaolo/psutil/issues/1219 - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # Timing sensitive + "test_login_timeout" + ] ++ lib.optionals stdenv.isDarwin [ + # Disable test that fails on darwin due to issue with python3Packages.psutil: + # https://github.com/giampaolo/psutil/issues/1219 "test_tpu_system_stats" ]; diff --git a/nixpkgs/pkgs/development/python-modules/warble/default.nix b/nixpkgs/pkgs/development/python-modules/warble/default.nix new file mode 100644 index 000000000000..c2c930d0f0a5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/warble/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, boost +, bluez +}: + +buildPythonPackage rec { + pname = "warble"; + version = "1.2.9"; + format = "setuptools"; + + enableParallelBuilding = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-oezcRD1AddWmDYDxueE0EwK0+UN/EZ5GQxwkdCz4xoY="; + }; + + nativeBuildInputs = [ + cython + ]; + + buildInputs = [ + boost + bluez + ]; + + pythonImportsCheck = [ "mbientlab" "mbientlab.warble" ]; + + meta = with lib; { + description = "Python bindings for MbientLab's Warble library"; + homepage = "https://github.com/mbientlab/pywarble"; + license = with licenses; [ unfree ]; + maintainers = with maintainers; [ stepbrobd ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/nixpkgs/pkgs/development/python-modules/wasmer/default.nix index 3cf2ad0e73e4..9feee98f7868 100644 --- a/nixpkgs/pkgs/development/python-modules/wasmer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wasmer/default.nix @@ -73,7 +73,7 @@ let homepage = "https://github.com/wasmerio/wasmer-python"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in diff --git a/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix b/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix index 523d06a401ad..e46c9f7ac670 100644 --- a/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix +++ b/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix @@ -6,7 +6,7 @@ , wasmer-compiler-singlepass }: -buildPythonPackage rec { +buildPythonPackage { pname = "wasmer-tests"; inherit (wasmer) version; diff --git a/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix index b3ed1b0b1ef7..1a906934a531 100644 --- a/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Library for computing contrast ratios, as required by WCAG 2.0"; homepage = "https://github.com/gsnedders/wcag-contrast-ratio"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix b/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix index dc8aae05f475..689c27a470e2 100644 --- a/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Wilcard File Name matching library"; homepage = "https://github.com/facelessuser/wcmatch"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix b/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix index 21f3a7b44099..1d23225c2fd6 100644 --- a/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix @@ -1,6 +1,4 @@ { lib, fetchPypi, buildPythonPackage, pytestCheckHook -, isPy3k -, backports_functools_lru_cache , setuptools }: @@ -15,9 +13,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ setuptools ] ++ lib.optionals (!isPy3k) [ - backports_functools_lru_cache - ]; + propagatedBuildInputs = [ setuptools ]; # To prevent infinite recursion with pytest doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix b/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix index b671d262d49d..8fc5fe72aca7 100644 --- a/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.19.2"; + version = "3.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZiyypfbazCyc322y33Dpo6ydGLQE0ML/lx2cuF2E6+0="; + hash = "sha256-7JSsVUiDx2XpTaiylHxPD6SgN47Tu+nzZT3zpbF0Wm0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/web/default.nix b/nixpkgs/pkgs/development/python-modules/web/default.nix index 35d89947c7c0..33017b3a4650 100644 --- a/nixpkgs/pkgs/development/python-modules/web/default.nix +++ b/nixpkgs/pkgs/development/python-modules/web/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; homepage = "https://webpy.org/"; license = licenses.publicDomain; - maintainers = with maintainers; [ layus SuperSandro2000 ]; + maintainers = with maintainers; [ layus ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/web3/default.nix b/nixpkgs/pkgs/development/python-modules/web3/default.nix index 0b285bd514d1..f4afe0646158 100644 --- a/nixpkgs/pkgs/development/python-modules/web3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/web3/default.nix @@ -16,16 +16,12 @@ , requests , typing-extensions , websockets -# , eth-tester -# , py-geth -, pytestCheckHook , pythonOlder -, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "web3"; - version = "6.3.0"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,13 +30,9 @@ buildPythonPackage rec { owner = "ethereum"; repo = "web3.py"; rev = "v${version}"; - hash = "sha256-p3Dpmb0BST1nbh42q/eK/DjQqoIPHvNr2KllRpTgFFw="; + hash = "sha256-RNWCZQjcse415SSNkHhMWckDcBJGFZnjisckF7gbYY8="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = [ aiohttp eth-abi @@ -60,16 +52,7 @@ buildPythonPackage rec { typing-extensions ] ++ eth-hash.optional-dependencies.pycryptodome; - pythonRelaxDeps = true; - - # TODO: package eth-tester - #nativeCheckInputs = [ - # eth-tester - # eth-tester.optional-dependencies.py-evm - # py-geth - # pytestCheckHook - #]; - + # TODO: package eth-tester required for tests doCheck = false; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/webargs/default.nix b/nixpkgs/pkgs/development/python-modules/webargs/default.nix index b69ff310a271..91d62cf849b8 100644 --- a/nixpkgs/pkgs/development/python-modules/webargs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.2.0"; + version = "8.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-mdaJQMRS4HcmSFoV/vQ/EviubAxbORvLp2Bl1FJ/uF0="; + hash = "sha256-yrIHlBsGhsTQhsgjYy3c1DQxUWRDQaMvz1C46qceMcc="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/nixpkgs/pkgs/development/python-modules/webauthn/default.nix index 6d39ed74dda3..39795ac6ce7f 100644 --- a/nixpkgs/pkgs/development/python-modules/webauthn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webauthn/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/duo-labs/py_webauthn"; changelog = "https://github.com/duo-labs/py_webauthn/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index 5803f20c07a3..0111a43b06ce 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.42.3"; + version = "0.45.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,10 +19,12 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-TEB2UtXH73CCJhbuQjnABcG3XLHB6VybDwjhixnpt0w="; + hash = "sha256-lZa8HIGLSDd/avNuoYSUHJ0b3rSx8uHLuUz8lABQHO4="; }; postPatch = '' + substituteInPlace requirements.txt \ + --replace "weconnect[Images]~=" "weconnect>=" substituteInPlace weconnect_mqtt/__version.py \ --replace "develop" "${version}" substituteInPlace pytest.ini \ diff --git a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index 12b10e17446f..a70e833da9fc 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.55.0"; + version = "0.57.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+ISWPrpY/urpZZZrn6+Ii8gbrwkQMLL6gXhydXd8HqI="; + hash = "sha256-EqKjDPSjhI03ZwkHyNG4ZbIdrzn7wrjpGfze1Qkk0lk="; }; propagatedBuildInputs = [ @@ -47,6 +47,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," + substituteInPlace requirements.txt \ + --replace "requests~=2.29.0" "requests" substituteInPlace image_extra_requirements.txt \ --replace "pillow~=" "pillow>=" \ --replace "ascii_magic~=" "ascii_magic>=" diff --git a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index fdce818b4d3e..e5b6a93eae6d 100644 --- a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { utility libraries. ''; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/west/default.nix b/nixpkgs/pkgs/development/python-modules/west/default.nix index f8e8cb72d5a4..39aa19c8ad60 100644 --- a/nixpkgs/pkgs/development/python-modules/west/default.nix +++ b/nixpkgs/pkgs/development/python-modules/west/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "west"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ZvhwIhkoES71jyv8Xv0dd44Z7tFAZzmE2XsiH7wFJfQ="; + hash = "sha256-40h/VLa9kEWASJtgPvGm4JnG8uZWAUwrg8SzwhdfpN8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 36ba90d6d715..5985b96d6dc9 100644 --- a/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.3"; + version = "0.18.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GvebWPO+jKDJk7yuMgEctlvKLXeo95GlJUSuI+FMCRU="; + hash = "sha256-9dwkylr+aCTGw/VIY90nxq8IkqBASeEfdr5JGz7pZrc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix b/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix new file mode 100644 index 000000000000..dce8160e7ff8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/wikipedia/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, requests +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "wikipedia"; + version = "1.4.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-2w+tGCn91EGxhSMG6YVjmCBNwHhtKZbdLgyLuOJhM7I="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + requests + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ + "tests/ '*test.py'" + ]; + + meta = with lib; { + description = "A Pythonic wrapper for the Wikipedia API"; + homepage = "https://github.com/goldsmith/Wikipedia"; + changelog = "https://github.com/goldsmith/Wikipedia/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix b/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix index 78b3486c72e6..77d5ea8a4eba 100644 --- a/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "http://wrf-python.rtfd.org"; license = licenses.asl20; maintainers = with maintainers; [ mhaselsteiner ]; - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix b/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix index 2d6b5911d11f..6e943a0b34f7 100644 --- a/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "wsgi-intercept"; - version = "1.11.0"; + version = "1.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "wsgi_intercept"; inherit version; - hash = "sha256-KvrZs+EgeK7Du7ni6icKHfcF0W0RDde0W6Aj/EPZ2Hw="; + hash = "sha256-StUxEN91fU7qoptH9iKJFpZWIBIOtIe6S4gvdBgN48E="; }; propagatedBuildInputs = [ @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "Module that acts as a WSGI application in place of a real URI for testing"; homepage = "https://github.com/cdent/wsgi-intercept"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wsproto/default.nix b/nixpkgs/pkgs/development/python-modules/wsproto/default.nix index fc78d23fead8..2c06d187c35f 100644 --- a/nixpkgs/pkgs/development/python-modules/wsproto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wsproto/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Pure Python, pure state-machine WebSocket implementation"; homepage = "https://github.com/python-hyper/wsproto/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix b/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix index 35be8ba260c4..326a56461a45 100644 --- a/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "WTForms integration for peewee models"; homepage = "https://github.com/coleifer/wtf-peewee/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wxPython/4.2.nix b/nixpkgs/pkgs/development/python-modules/wxPython/4.2.nix index 3d4ddb1e7061..0ed40b8a9173 100644 --- a/nixpkgs/pkgs/development/python-modules/wxPython/4.2.nix +++ b/nixpkgs/pkgs/development/python-modules/wxPython/4.2.nix @@ -41,13 +41,13 @@ buildPythonPackage rec { pname = "wxPython"; - version = "4.2.0"; + version = "4.2.1"; format = "other"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc="; + hash = "sha256-5I3iEaZga/By7D+neHcda3RsALf0uXDrWHKN31bRPVw="; }; patches = [ @@ -127,6 +127,7 @@ buildPythonPackage rec { meta = with lib; { + changelog = "https://github.com/wxWidgets/Phoenix/blob/wxPython-${version}/CHANGES.rst"; description = "Cross platform GUI toolkit for Python, Phoenix version"; homepage = "http://wxpython.org/"; license = licenses.wxWindows; diff --git a/nixpkgs/pkgs/development/python-modules/wyoming/default.nix b/nixpkgs/pkgs/development/python-modules/wyoming/default.nix index 984e3a285d52..feb7106c513c 100644 --- a/nixpkgs/pkgs/development/python-modules/wyoming/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wyoming/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "wyoming"; - version = "0.0.1"; + version = "1.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-EIUbKL8DNFNNGmLRcu12mlw4H+gAHmCUw09eLG0s8+M="; + hash = "sha256-I5GgDu9HRj6fIX66q3RuDeB13h6dpwxrSBxKhzE+Fus="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/xapian/default.nix b/nixpkgs/pkgs/development/python-modules/xapian/default.nix index 75f931790347..cafc66dab9e3 100644 --- a/nixpkgs/pkgs/development/python-modules/xapian/default.nix +++ b/nixpkgs/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-578eSYK5H4QSidGSFAIdiDccoqbHME31kEnX2ni4PO0="; + hash = "sha256-a1RUgzrFKj4ywLs6cpClorUEiNiRjypFJpVX5N6aMeU="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/python-modules/xapp/default.nix b/nixpkgs/pkgs/development/python-modules/xapp/default.nix index cc8e3b62c45b..58de4e7124ad 100644 --- a/nixpkgs/pkgs/development/python-modules/xapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xapp/default.nix @@ -10,6 +10,7 @@ , gobject-introspection , xapp , polkit +, gitUpdater }: buildPythonPackage rec { @@ -53,6 +54,10 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "xapp" ]; + passthru.updateScript = gitUpdater { + ignoredVersions = "^master.*"; + }; + meta = with lib; { homepage = "https://github.com/linuxmint/python-xapp"; description = "Cross-desktop libraries and common resources for python"; diff --git a/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix b/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix index c795568149ea..78f7c101fd3f 100644 --- a/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "xarray-einstats"; - version = "0.5.1"; + version = "0.6.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "arviz-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oDrNR7iVDg7Piti6JNaXGekfrUfK5GWJYbH/g6m4570="; + hash = "sha256-TXuNqXsny7VpJqV5/3riKzXLheZl+qF+zf4SCMipzmw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/nixpkgs/pkgs/development/python-modules/xarray/default.nix index 2171db6e9466..e700f630b665 100644 --- a/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-qnYFAKLY+L6O/Y87J6lLKvOwqMLANzR9WV6vb/Cdinc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptoolsBuildHook diff --git a/nixpkgs/pkgs/development/python-modules/xformers/default.nix b/nixpkgs/pkgs/development/python-modules/xformers/default.nix new file mode 100644 index 000000000000..cd6c6aa0ebdb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/xformers/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pythonRelaxDepsHook +, which +# runtime dependencies +, numpy +, torch +, pyre-extensions +# check dependencies +, pytestCheckHook +, pytest-cov +# , pytest-mpi +, pytest-timeout +# , pytorch-image-models +, hydra-core +, fairscale +, scipy +, cmake +, openai-triton +, networkx +}: +let + version = "0.0.20"; +in +buildPythonPackage { + pname = "xformers"; + inherit version; + format = "setuptools"; + + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "xformers"; + rev = "v${version}"; + hash = "sha256-OFH4I3eTKw1bQEKHh1AvkpcoShKK5R5674AoJ/mY85I="; + fetchSubmodules = true; + }; + + preBuild = '' + cat << EOF > ./xformers/version.py + # noqa: C801 + __version__ = "${version}" + EOF + ''; + + nativeBuildInputs = [ + pythonRelaxDepsHook + which + ]; + + pythonRelaxDeps = [ + "pyre-extensions" + ]; + + propagatedBuildInputs = [ + numpy + torch + pyre-extensions + ]; + + pythonImportsCheck = [ "xformers" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + pytest-timeout + hydra-core + fairscale + scipy + cmake + networkx + openai-triton + ]; + + meta = with lib; { + description = "XFormers: A collection of composable Transformer building blocks"; + homepage = "https://github.com/facebookresearch/xformers"; + changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix index 2005879e5191..45edddf408c0 100644 --- a/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,8 +1,10 @@ { lib +, bleak , bleak-retry-connector , bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage +, cryptography , fetchFromGitHub , home-assistant-bluetooth , poetry-core @@ -14,7 +16,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.17.2"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,17 +25,25 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2zS34feelJNVarfe8GEZxBNL45IK+Owl6TlBDOTVvSs="; + hash = "sha256-5AzqsCWDgGhJ1EgJrbA8QHjP/Y14cIdSA0GKwZMrxX0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" \ + --replace 'pycryptodomex = ">=3.18.0"' 'pycryptodomex = ">=3.17.0"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + bleak bleak-retry-connector bluetooth-data-tools bluetooth-sensor-state-data + cryptography home-assistant-bluetooth pycryptodomex sensor-state-data @@ -43,11 +53,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "xiaomi_ble" ]; diff --git a/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 3f5fbe9f7fb0..07615180608e 100644 --- a/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.10.0"; + version = "2.11.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3eSS3V1EgLRf8lB3icG4pNGq0VbXjfgwEQ91mMRKyAE="; + hash = "sha256-rKvHb0wkWVuZO8M8uIQdOiY1N6DmGSpqUgz4YYbUfSM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix b/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix index 6aa5bc1b5558..67a606690269 100644 --- a/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.1.1"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-4FZJsw/x7yYPyAc26YTMWMzJuSGC3fkh3PunfUXmEUw="; + hash = "sha256-ZLBvhuLXEOgqS7tRwP/e1Dv1/EMqxqXgpAZtLQGIt/o="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index 6803441e2b06..a04ff8b72eed 100644 --- a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.17.2"; + version = "3.17.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-LwM0lfBJNSCMsa0AiGBRmuihc/kSLYQ4V6hgY5fM6/w="; + hash = "sha256-5RL4DkWcQRxzi1dhSJlGgoU0BU3aUWOfBNINFKiOwLg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix index 389ee4395954..42af3b86d4bc 100644 --- a/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-ERA6u2bDFxA/vjl2GNZUaBto4RqrScPelHaABkpY0lQ="; + hash = "sha256-0xXA3IguVAyFp5dFvuzAQhzJlGMmNthmPXcja9FYV44="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix b/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix index 38185102a08d..bd4e2cbb0f2d 100644 --- a/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Makes working with XML feel like you are working with JSON"; homepage = "https://github.com/martinblech/xmltodict"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/xmodem/default.nix b/nixpkgs/pkgs/development/python-modules/xmodem/default.nix index 7358f843eb64..652c0f43be40 100644 --- a/nixpkgs/pkgs/development/python-modules/xmodem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xmodem/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "xmodem"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "tehmaze"; repo = "xmodem"; - rev = version; - sha256 = "1xx7wd8bnswxa1fv3bfim2gcamii79k7qmwg7dbxbjvrhbcjjc0l"; + rev = "refs/tags/${version}"; + sha256 = "sha256-kwPA/lYiv6IJSKGRuH13tBofZwp19vebwQniHK7A/i8="; }; nativeCheckInputs = [ pytest which lrzsz ]; diff --git a/nixpkgs/pkgs/development/python-modules/xstatic-asciinema-player/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic-asciinema-player/default.nix new file mode 100644 index 000000000000..d970f0888aa8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/xstatic-asciinema-player/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-asciinema-player"; + version = "2.6.1.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw="; + }; + + # no tests implemented + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/python-xstatic/asciinema-player"; + description = "Asciinema-player packaged for python"; + license = licenses.asl20; + maintainers = with maintainers; [ aither64 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/xstatic-font-awesome/default.nix b/nixpkgs/pkgs/development/python-modules/xstatic-font-awesome/default.nix new file mode 100644 index 000000000000..71028393dc8c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/xstatic-font-awesome/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Font-Awesome"; + version = "6.2.1.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; + }; + + # no tests implemented + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/python-xstatic/font-awesome"; + description = "Font Awesome packaged for python"; + license = licenses.ofl; + maintainers = with maintainers; [ aither64 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix b/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix index c83b61bafe5d..bc8146a91489 100644 --- a/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yabadaba"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = pname; rev = "v${version}"; - hash = "sha256-PXmkRbCFag2WAtodwgb3kX+hRDZdCKKi/YwAMSQePxQ="; + hash = "sha256-D3dzO+vhf1utBMmX2RUgvxuaPneFnXDseqfz6CMDmv4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yacs/default.nix b/nixpkgs/pkgs/development/python-modules/yacs/default.nix index a105a18b2f65..e5712b240f8c 100644 --- a/nixpkgs/pkgs/development/python-modules/yacs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yacs/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Yet Another Configuration System"; homepage = "https://github.com/rbgirshick/yacs"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ lucasew ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix index 92ee25c29a50..727306bea22d 100644 --- a/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix @@ -1,4 +1,5 @@ { lib +, async-interrupt , async-timeout , bleak , bleak-retry-connector @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.1.17"; + version = "2.2.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mN3/spDTWJfSCsKcRV24+tIjWmxI1gsO5qGuAZykWY0="; + hash = "sha256-Z8pPN9cO/8jv66yrG2EKRDXNjKPbYarOOB5t9ObMzek="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + async-interrupt async-timeout bleak bleak-retry-connector diff --git a/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix b/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix index bf29fdb831c4..21d3d810f1e8 100644 --- a/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.10.0"; + version = "1.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lyz-code"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tRF2mi2xAjCKKbPVcJ7YEc4UVmSorgP9DFm8t1z0XoA="; + hash = "sha256-NWlZYpdiJ3SWY0L9IhGhCAUrurWe6mPt+AK64szCQco="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index ba5e9e85ea49..7db56a0d617a 100644 --- a/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , pathspec , pytestCheckHook , pythonOlder @@ -10,16 +11,22 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.31.0"; - format = "setuptools"; + version = "1.32.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-LYPx0S9zPhYqh+BrF2FJ17ucW65Knl/OHHcdf3A/emU="; + src = fetchFromGitHub { + owner = "adrienverge"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-DtIQ/gUBFQBm0OOJC2c/ONn2ZKsMAzdwMx7FbUo+uIU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyyaml pathspec diff --git a/nixpkgs/pkgs/development/python-modules/yapf/default.nix b/nixpkgs/pkgs/development/python-modules/yapf/default.nix index f5cba78a2026..6e402627245b 100644 --- a/nixpkgs/pkgs/development/python-modules/yapf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yapf/default.nix @@ -3,25 +3,34 @@ , fetchPypi , isPyPy , nose +, importlib-metadata +, platformdirs +, tomli }: buildPythonPackage rec { pname = "yapf"; - version = "0.32.0"; + version = "0.40.1"; src = fetchPypi { inherit pname version; - hash = "sha256-o/UIXTfvfj4ATEup+bPkDFT/GQHNER8FFFrjE6fGfRs="; + hash = "sha256-lYWH61yOxshgEZqcJdAq3fMKRPdaoVKkIg0w5WqYA3w="; }; # nose is unavailable on pypy doCheck = !isPyPy; + propagatedBuildInputs = [ + importlib-metadata + platformdirs + tomli + ]; + nativeCheckInputs = [ nose ]; - meta = with lib; { + meta = { homepage = "https://github.com/google/yapf"; description = "Yet Another Python Formatter"; longDescription = '' @@ -44,7 +53,7 @@ buildPythonPackage rec { that a programmer would write if they were following the style guide. It takes away some of the drudgery of maintaining your code. ''; - license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres siddharthist ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ AndersonTorres siddharthist ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/yaramod/default.nix b/nixpkgs/pkgs/development/python-modules/yaramod/default.nix index e0a50279def6..83f1f87c2c5d 100644 --- a/nixpkgs/pkgs/development/python-modules/yaramod/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yaramod/default.nix @@ -20,7 +20,7 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "3.19.1"; + version = "3.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ in owner = "avast"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HYagARlppQpM43ND/CkLL0iHmOmhl/wBDGVlJyOc9dU="; + hash = "sha256-je4BBJ34VcA8pkvIBXfqrHAhWF+DdakSqeFma3mHpWo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/yarl/default.nix b/nixpkgs/pkgs/development/python-modules/yarl/default.nix index 1a1295d29bee..c4d8dac9995c 100644 --- a/nixpkgs/pkgs/development/python-modules/yarl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yarl/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonAtLeast , pythonOlder , idna @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.8.2"; + version = "1.9.2"; disabled = pythonOlder "3.7"; @@ -19,9 +20,17 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-SdQ0AsbjATrQl4YCv2v1MoU1xI0ZIwS5G5ejxnkLFWI="; + hash = "sha256-BKudS59YfAbYAcKr/pMXt3zfmWxlqQ1ehOzEUBCCNXE="; }; + patches = [ + # https://github.com/aio-libs/yarl/issues/876 + (fetchpatch { + url = "https://github.com/aio-libs/yarl/commit/0a94c6e4948e00fff072c0cf367afbf4ac36f906.patch"; + hash = "sha256-bqT46OLZLkBef8FQ1L95ITD70mC3+WIkr3+h2ekKrvE="; + }) + ]; + postPatch = '' sed -i '/^addopts/d' setup.cfg ''; @@ -42,10 +51,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.11") [ - "test_not_a_scheme2" - ]; - postCheck = '' popd ''; diff --git a/nixpkgs/pkgs/development/python-modules/yeelight/default.nix b/nixpkgs/pkgs/development/python-modules/yeelight/default.nix index e31a9e45817a..05ca35fa759e 100644 --- a/nixpkgs/pkgs/development/python-modules/yeelight/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yeelight/default.nix @@ -1,6 +1,8 @@ { lib +, async-timeout , buildPythonPackage , fetchFromGitLab +, flit-core , future , ifaddr , pytestCheckHook @@ -9,21 +11,25 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.10"; - format = "setuptools"; + version = "0.7.12"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; - rev = "v${version}"; - hash = "sha256-vUsL1CvhYRtv75gkmiPe/UkAtBDZPy1iK2BPUupMXz8="; + rev = "refs/tags/v${version}"; + hash = "sha256-oTlfrx3YN6mPxu7+xzTmYG2L7KulFDlB3+oOhVOFSA8="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ future ifaddr + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; nativeCheckInputs = [ @@ -41,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for controlling YeeLight RGB bulbs"; homepage = "https://gitlab.com/stavros/python-yeelight/"; + changelog = "https://gitlab.com/stavros/python-yeelight/-/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/nixpkgs/pkgs/development/python-modules/yfinance/default.nix index 935a82415293..dcdbb578d18a 100644 --- a/nixpkgs/pkgs/development/python-modules/yfinance/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yfinance/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.20"; + version = "0.2.24"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uFIfhu7Sq4yQAzEfegIo0xyok1Bo8M/esg6bZCIWO18="; + hash = "sha256-V8yPB01HR+DGrKRXnmERFeC0WZal0nG3lMNVKTa519k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix b/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix index 766cfbe6b0e5..a2ac657c9d6a 100644 --- a/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix @@ -1,8 +1,8 @@ { lib , aiohttp +, aiomqtt , buildPythonPackage , fetchFromGitHub -, asyncio-mqtt , pydantic , pythonOlder , setuptools @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.2.9"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DbdoGNwz7HtscnDv+rOI2zcs4i4Dl1DpRZNH/DOcJHc="; + hash = "sha256-t/e3DSpmrH48I6ZAmDljL5YblsY2/UWgPCcodi2A7Ro="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - asyncio-mqtt + aiomqtt pydantic tenacity ]; diff --git a/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix b/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix index f2269001b848..560810323f2d 100644 --- a/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "youtube-transcript-api"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jdepoix"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TJlyWO1knP07gHVgbz1K0pBtvkTYrNJWZsassllko+I="; + hash = "sha256-7s2qzmfYkaQ7xAi/U+skOEVTAj2gp+2WnODu9k1ojJY="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API which allows you to get the transcripts/subtitles for a given YouTube video"; homepage = "https://github.com/jdepoix/youtube-transcript-api"; + changelog = "https://github.com/jdepoix/youtube-transcript-api/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/yowsup/default.nix b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix index 08b137402b45..b95445192468 100644 --- a/nixpkgs/pkgs/development/python-modules/yowsup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/tgalal/yowsup"; description = "The python WhatsApp library"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix index 843c42b6283c..796118abc25c 100644 --- a/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix @@ -3,18 +3,19 @@ , pythonOlder , fetchFromGitHub , hatchling -, aiofiles , aiosqlite +, anyio , y-py , pytest-asyncio , pytestCheckHook , pythonRelaxDepsHook +, uvicorn , websockets }: buildPythonPackage rec { pname = "ypy-websocket"; - version = "0.8.4"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "y-crdt"; repo = "ypy-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-jl2ciIA3enJRfPgcu96MZN+BmNL+bBet54AFDBy3seY="; + hash = "sha256-JsSOh7CSHUnGJmNAP87fMMsRgdj6nNna1XVe15MYqoA="; }; pythonRelaxDeps = [ @@ -36,8 +37,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aiofiles aiosqlite + anyio y-py ]; @@ -48,6 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook + uvicorn websockets ]; @@ -57,7 +59,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/y-crdt/ypy-websocket/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/y-crdt/ypy-websocket/blob/${src.rev}/CHANGELOG.md"; description = "WebSocket Connector for Ypy"; homepage = "https://github.com/y-crdt/ypy-websocket"; license = lib.licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/yq/default.nix b/nixpkgs/pkgs/development/python-modules/yq/default.nix index 787c74d5c2ab..5b652910ea14 100644 --- a/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -1,23 +1,23 @@ { lib +, argcomplete , buildPythonPackage , fetchPypi -, substituteAll -, argcomplete -, pyyaml -, toml -, xmltodict , jq -, setuptools-scm , pytestCheckHook +, pyyaml +, setuptools-scm +, substituteAll +, tomlkit +, xmltodict }: buildPythonPackage rec { pname = "yq"; - version = "3.1.1"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-hT80KxVi3e6XkDjsjs7lQFzdm2p8uB7WzbgBjJ6AJjM="; + hash = "sha256-jbt6DJN92/w90XXmR49AlgwUDT6LHxoDFd52OE1mZQo="; }; patches = [ @@ -32,10 +32,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + argcomplete pyyaml + tomlkit xmltodict - toml - argcomplete ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 8cb0c036e344..72d5e4035519 100644 --- a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.0.2"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-95i/7dSXOL7OgqrBWy2X8EV4zLFXLzR6NQy3BN9NDhA="; + hash = "sha256-UCWNub0FErdmF3kGSIJlpIcKdPZdPzJ5y8yx9ZPBUlw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix b/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix index 7678b223297c..67c8c016e3f3 100644 --- a/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "z3c-checkversions"; - version = "2.0"; + version = "2.1"; src = fetchPypi { inherit version; pname = "z3c.checkversions"; - hash = "sha256-rn4kl8Pn6YNqbE+VD6L8rVBQHkQqXSD47ZIy77+ashE="; + hash = "sha256-j5So40SyJf7XfCz3P9YFR/6z94up3LY2/dfEmmIbxAk="; }; propagatedBuildInputs = [ zc-buildout ]; diff --git a/nixpkgs/pkgs/development/python-modules/zake/default.nix b/nixpkgs/pkgs/development/python-modules/zake/default.nix deleted file mode 100644 index a9a5902b4c06..000000000000 --- a/nixpkgs/pkgs/development/python-modules/zake/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, kazoo -, six -, testtools -, unittestCheckHook -}: - -buildPythonPackage rec { - pname = "zake"; - version = "0.2.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1rp4xxy7qp0s0wnq3ig4ji8xsl31g901qkdp339ndxn466cqal2s"; - }; - - propagatedBuildInputs = [ kazoo six ]; - buildInputs = [ testtools ]; - nativeCheckInputs = [ unittestCheckHook ]; - preCheck = '' - # Skip test - fails with our new kazoo version - substituteInPlace zake/tests/test_client.py \ - --replace "test_child_watch_no_create" "_test_child_watch_no_create" - ''; - - unittestFlagsArray = [ "zake/tests" ]; - - meta = with lib; { - homepage = "https://github.com/yahoo/Zake"; - description = "A python package that works to provide a nice set of testing utilities for the kazoo library"; - license = licenses.asl20; - broken = true; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/zamg/default.nix b/nixpkgs/pkgs/development/python-modules/zamg/default.nix index 9f363bd150c5..6e3d7908bac2 100644 --- a/nixpkgs/pkgs/development/python-modules/zamg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-4q6/+/neWw0BFPjhCPXuLiCwyGqQn96D2pSyK/Yl6U8="; + hash = "sha256-o1FMhwAHdkcfArT9QRgVi0ieRw4aVdBoqwdlV0sxpQ0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/nixpkgs/pkgs/development/python-modules/zarr/default.nix index 43ccf906ad78..552a1333e8fb 100644 --- a/nixpkgs/pkgs/development/python-modules/zarr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zarr/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/zarr-developers/zarr"; changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix b/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix index 8695c2c6927e..4434ceb09545 100644 --- a/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zdaemon"; - version = "4.4"; + version = "5.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw="; + hash = "sha256-ml7GxRmigLvPqPfnP04Q2AjnuCcQq2COD0Sb88BtQ9U="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { description = "A daemon process control library and tools for Unix-based systems"; homepage = "https://pypi.python.org/pypi/zdaemon"; changelog = "https://github.com/zopefoundation/zdaemon/blob/${version}/CHANGES.rst"; - license = licenses.zpl20; + license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/zeep/default.nix b/nixpkgs/pkgs/development/python-modules/zeep/default.nix index dc37c5315ac4..ab5f7b8147c8 100644 --- a/nixpkgs/pkgs/development/python-modules/zeep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeep/default.nix @@ -3,10 +3,8 @@ , aioresponses , attrs , buildPythonPackage -, cached-property , defusedxml , fetchFromGitHub -, fetchpatch , freezegun , httpx , isodate @@ -29,6 +27,7 @@ buildPythonPackage rec { pname = "zeep"; version = "4.2.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -41,9 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - cached-property defusedxml - httpx isodate lxml platformdirs @@ -51,7 +48,19 @@ buildPythonPackage rec { requests requests-file requests-toolbelt - xmlsec + ]; + + passthru.optional-dependencies = { + async_require = [ + httpx + ]; + xmlsec_require = [ + xmlsec + ]; + }; + + pythonImportsCheck = [ + "zeep" ]; nativeCheckInputs = [ @@ -64,26 +73,15 @@ buildPythonPackage rec { pytest-httpx pytestCheckHook requests-mock - ]; + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' - export HOME=$(mktemp -d); + export HOME=$TMPDIR ''; - disabledTests = [ - # lxml.etree.XMLSyntaxError: Extra content at the end of the document, line 2, column 64 - "test_mime_content_serialize_text_xml" - # Tests are outdated - "test_load" - "test_load_cache" - "test_post" - ]; - - pythonImportsCheck = [ - "zeep" - ]; - meta = with lib; { + changelog = "https://github.com/mvantellingen/python-zeep/releases/tag/${version}"; description = "Python SOAP client"; homepage = "http://docs.python-zeep.org"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix index 59e8d5ca3a9a..3c1627eb9e1b 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.9"; + version = "3.7.9.1"; src = fetchPypi { inherit version pname; - hash = "sha256-q994axJexRU1SUlg9P71NvaZRpR9dj46GX85cbvMEy8="; + hash = "sha256-MOVsYfUq3n62hPEUIOGA75RviGofHcXaJKMnYERxg74="; }; buildInputs = [ openssl bzip2 ]; diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 075f2c58f491..6cd8253cfc32 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.64.0"; + version = "0.74.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-u9MZoJyTmbUBeFbsw2EtwfNDzXKAZOwNc+4TanbQg3A="; + hash = "sha256-0QmAq1+dRfRkomZgh4Q0YF20omQBDUTgGt8cP1L6cx0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 2e9c3eb80f7b..29ffbdeb3709 100644 --- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.100"; + version = "0.0.102"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-EWGsnUnr83YuhEdGJ3YtlYm9VT+aTuUjfganhOeqt7o="; + hash = "sha256-TsL6JRxYf8KqmLqfN0nosxaTbzezlP4Q0Fb876WeTHI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ziamath/default.nix b/nixpkgs/pkgs/development/python-modules/ziamath/default.nix index b9dd7224d41a..5e24f3c41670 100644 --- a/nixpkgs/pkgs/development/python-modules/ziamath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ziamath/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { pname = "ziamath"; - version = "0.7"; + version = "0.8.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-JuuCDww0EZEHZLxB5oQrWEJpv0szjwe4iXCRGl7OYTA="; + hash = "sha256-Bbwq4Ods3P/724KO94jSmMLD1ubfaMHP/gTlOL/2pnE="; }; propagatedBuildInputs = [ @@ -33,6 +34,13 @@ buildPythonPackage rec { pytestFlagsArray = [ "--nbval-lax" ]; + # Prevent the test suite from attempting to download fonts + postPatch = '' + substituteInPlace test/styles.ipynb \ + --replace '"def testfont(exprs, fonturl):\n",' '"def testfont(exprs, fonturl):\n", " return\n",' \ + --replace "mathfont='FiraMath-Regular.otf', " "" + ''; + pythonImportsCheck = [ "ziamath" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix index 96b95ee4e640..a44d3c3265bf 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.18.0"; + version = "0.18.1"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-zSaT9WdA4tR8tJAShSzqL+f/nTLQJbeIZnbSBe1EOks="; + hash = "sha256-vR+oLshiIYmMdAvir+TGBqVkTGXKAVnUWnQPR3YwuUk="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index e110e001c616..6b5c0fd41a85 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.11.1"; + version = "0.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gYzk3XHXlF4+lnrRHYS5RB2QD0oDHgnMov9UFmXder8="; + hash = "sha256-wt7ZsMXOh+CbhJCUMS7RhzozYlyINRs0xOF7ecwkNCU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index d7263a802d28..fb08f30623e2 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -12,13 +12,14 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , voluptuous }: buildPythonPackage rec { pname = "zigpy"; - version = "0.55.0"; - format = "setuptools"; + version = "0.56.4"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,9 +27,18 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-fc98V6KJ7zROgNktHZlWj9/BQRbCIWYT5Px09mFrwHQ="; + hash = "sha256-PxvTg/z7WmJaH/iwHoJu2bQDLR4G5nkMS5fSP46C3mQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aiosqlite diff --git a/nixpkgs/pkgs/development/python-modules/zimports/default.nix b/nixpkgs/pkgs/development/python-modules/zimports/default.nix index 53c4bd8ed208..ee9d683c8642 100644 --- a/nixpkgs/pkgs/development/python-modules/zimports/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zimports/default.nix @@ -1,5 +1,4 @@ { lib -, isPy3k , fetchFromGitHub , buildPythonPackage , flake8-import-order @@ -7,6 +6,7 @@ , tomli , setuptools , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -15,7 +15,8 @@ buildPythonPackage rec { version = "0.6.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + # upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error + disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "sqlalchemyorg"; diff --git a/nixpkgs/pkgs/development/python-modules/zipp/default.nix b/nixpkgs/pkgs/development/python-modules/zipp/default.nix index e2a9add8af37..b16248fb9fc0 100644 --- a/nixpkgs/pkgs/development/python-modules/zipp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zipp/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , func-timeout -, jaraco_itertools +, jaraco-itertools , pythonOlder , setuptools-scm }: @@ -28,7 +28,7 @@ let zipp = buildPythonPackage rec { nativeCheckInputs = [ func-timeout - jaraco_itertools + jaraco-itertools ]; pythonImportsCheck = [ @@ -43,6 +43,6 @@ let zipp = buildPythonPackage rec { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in zipp diff --git a/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix b/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix index 35708162ff1f..18cfe8b658cb 100644 --- a/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "zipstream-ng"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "pR0Ps"; repo = "zipstream-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-4pS2t5IEIUHGJRaO6f9r8xnvXWA6p1EsDQ/jpD8CMLI="; + hash = "sha256-mY0dbHho/K1nTmhlv8i8KPa4HW7epBhfEksX3E2df2M="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/zope_component/default.nix b/nixpkgs/pkgs/development/python-modules/zope-component/default.nix index c59aa01b5884..93373d8a310e 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_component/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope-component/default.nix @@ -1,35 +1,47 @@ { lib , buildPythonPackage , fetchPypi +, zope_configuration , zope-deferredimport , zope_deprecation , zope_event , zope-hookable -, zope_interface -, zope_configuration , zope_i18nmessageid +, zope_interface }: buildPythonPackage rec { - pname = "zope.component"; - version = "5.1.0"; + pname = "zope-component"; + version = "6.0"; + format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-pQj5/vG29ShkYtM0DNif+rXHiZ3KBAEzcjnLa6fGuwo="; + pname = "zope.component"; + inherit version; + hash = "sha256-mgoEcq0gG5S0/mdBzprCwwuLsixRYHe/A2kt7E37aQY="; }; propagatedBuildInputs = [ - zope-deferredimport zope_deprecation zope_event zope-hookable zope_interface - zope_configuration zope_i18nmessageid + zope_configuration + zope-deferredimport + zope_deprecation + zope_event + zope-hookable + zope_i18nmessageid + zope_interface ]; # ignore tests because of a circular dependency on zope_security doCheck = false; + pythonImportsCheck = [ + "zope.component" + ]; + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.component"; description = "Zope Component Architecture"; + changelog = "https://github.com/zopefoundation/zope.component/blob/${version}/CHANGES.rst"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix b/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix deleted file mode 100644 index a3583654e660..000000000000 --- a/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zope_interface -}: - -buildPythonPackage rec { - pname = "zope.broken"; - version = "3.6.0"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "b9b8776002da4f7b6b12dfcce77eb642ae62b39586dbf60e1d9bdc992c9f2999"; - }; - - buildInputs = [ zope_interface ]; - - meta = with lib; { - homepage = "http://pypi.python.org/pypi/zope.broken"; - description = "Zope Broken Object Interfaces"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 1d230c732bb8..807deb097feb 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy3k , zope_event -, zope_component +, zope-component }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; }; - propagatedBuildInputs = [ zope_event zope_component ]; + propagatedBuildInputs = [ zope_event zope-component ]; # namespace colides with local directory doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/nixpkgs/pkgs/development/python-modules/zstd/default.nix index d528f423972c..bc233a6555b7 100644 --- a/nixpkgs/pkgs/development/python-modules/zstd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zstd/default.nix @@ -1,14 +1,19 @@ -{ lib, pkg-config, fetchPypi, buildPythonPackage +{ lib +, pkg-config +, fetchPypi +, buildPythonPackage , buildPackages -, zstd, pytest }: +, zstd +, pytest +}: buildPythonPackage rec { pname = "zstd"; - version = "1.5.4.0"; + version = "1.5.5.1"; src = fetchPypi { inherit pname version; - hash = "sha256-oNEd9wqXhSk0G1duaaTwsqI+dGaG4k+bkCYKM85JBC0="; + hash = "sha256-HvmAq/Dh4HKwKNLXbvlbR2YyZRyWIlzzC2Gcbu9iVnI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix b/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix index 9c43844888c9..2427e1256998 100644 --- a/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zxing_cpp"; inherit (zxing-cpp) src version; - sourceRoot = "source/wrappers/python"; + sourceRoot = "${src.name}/wrappers/python"; patches = [ ./use-nixpkgs-pybind11.patch ]; |