From 8b6dd73c041219832052ebc58eccccffc63411e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 09:01:01 +0200 Subject: [PATCH 1/7] python311Packages.azure-core: 1.26.3 -> 1.28.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/CHANGELOG.md --- .../python-modules/azure-core/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 1206bf48710c..44f3c1b81085 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/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 ]; }; From 352032d4331a4862246e1878a1dde5bb29a320f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 09:01:34 +0200 Subject: [PATCH 2/7] python311Packages.azure-storage-blob: 12.16.0 -> 12.17.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-blob_12.17.0/sdk/storage/azure-storage-blob/CHANGELOG.md --- .../development/python-modules/azure-storage-blob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 3dd83966a29c..a537e32c2545 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/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 = [ From 20859e8f14931cd71d19e1653b09847ed21052be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 09:01:55 +0200 Subject: [PATCH 3/7] python311Packages.azure-storage-file-share: 12.12.0 -> 12.13.0 --- .../python-modules/azure-storage-file-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index df5ab11e6c93..1582ea52bc9d 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/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 = [ From 39a2263bb0524bb397ea5b771e80d2001c4bec8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 09:02:29 +0200 Subject: [PATCH 4/7] python311Packages.azure-containerregistry: 1.1.0 -> 1.2.0 --- .../python-modules/azure-containerregistry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-containerregistry/default.nix b/pkgs/development/python-modules/azure-containerregistry/default.nix index 5bc1bde1ad83..7b6d8ba17915 100644 --- a/pkgs/development/python-modules/azure-containerregistry/default.nix +++ b/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"; }; From c5e977067b794efaca9bb629b3649bb169762d38 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 09:02:47 +0200 Subject: [PATCH 5/7] python311Packages.azure-eventhub: 5.11.2 -> 5.11.3 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-eventhub_5.11.3/sdk/eventhub/azure-eventhub/CHANGELOG.md --- pkgs/development/python-modules/azure-eventhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 571279f7ffe0..8d47f60afcb9 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/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 = [ From 1a7901ad234979d583e8d3920aa56fceb3b0e20e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 09:03:20 +0200 Subject: [PATCH 6/7] python311Packages.azure-servicebus: 7.11.0 -> 7.11.1 --- pkgs/development/python-modules/azure-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index ab62978e2bd7..abc9aa64b22d 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.11.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-JMmfs1d1EFilHJ1Dud4mGJynRHLx+Uq95nZM2D+NecE="; + hash = "sha256-iWbHtpFSiQTcpSQ6S8lrUWAi9kjesh1ZvKPVvNquxYU="; }; propagatedBuildInputs = [ From 95864211d262796d7adfc9f8b8aaabfbd7b04950 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 13:34:59 +0200 Subject: [PATCH 7/7] python311Packages.qcodes: 0.38.1 -> 0.39.0 Changelog: https://github.com/QCoDeS/Qcodes/releases/tag/v0.39.0 --- .../python-modules/qcodes/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 783194fdaa91..db565e11d02d 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/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,20 +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 @@ -111,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 ]; }; }