From 9c75782a5cf6ee9051b04357c4cde597b42cd6a5 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:28:38 +0200 Subject: [PATCH 1/9] python311Packages.hacking: 6.1.0 -> 7.0.0 https://github.com/openstack/hacking/releases/tag/7.0.0 https://github.com/openstack/hacking/compare/6.1.0...7.0.0 --- .../python-modules/hacking/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index 2e4952b80f9d..374721f60644 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -7,29 +7,32 @@ stestr, ddt, testscenarios, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "hacking"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3lBqMSQDThi046acld5JjDRgvLxJwWQ9MXjRW8barBQ="; + hash = "sha256-ubbC5SgPfVT6gsWP4JmD9oxbb2NKw/ozn4uhalcVyrc="; }; postPatch = '' sed -i 's/flake8.*/flake8/' requirements.txt - substituteInPlace hacking/checks/python23.py \ - --replace 'H236: class Foo(object):\n __metaclass__ = \' 'Okay: class Foo(object):\n __metaclass__ = \' - substituteInPlace hacking/checks/except_checks.py \ - --replace 'H201: except:' 'Okay: except:' ''; - nativeBuildInputs = [ pbr ]; + build-system = [ + pbr + setuptools + ]; - propagatedBuildInputs = [ flake8 ]; + dependencies = [ flake8 ]; nativeCheckInputs = [ ddt @@ -38,10 +41,9 @@ buildPythonPackage rec { ]; checkPhase = '' - # tries to trigger flake8 and fails - rm hacking/tests/test_doctest.py - + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "hacking" ]; From 234e59830181a43f26ccf95fefb28b2ee04694a9 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:36:02 +0200 Subject: [PATCH 2/9] python311Packages.hacking: reformat with nixfmt-rfc-style --- pkgs/development/python-modules/hacking/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index 374721f60644..02690ec7b936 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, - fetchPypi, - pbr, - flake8, - stestr, ddt, - testscenarios, - setuptools, + fetchPypi, + flake8, + pbr, pythonOlder, + setuptools, + stestr, + testscenarios, }: buildPythonPackage rec { From 7e8726472d00b32c9682f0bbd31ea5c4166f13c4 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:40:21 +0200 Subject: [PATCH 3/9] python311Packages.oslo-concurrency: 6.0.0 -> 6.1.0 https://github.com/openstack/oslo.concurrency/compare/6.0.0...6.1.0 --- .../oslo-concurrency/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 5aa9bc1a58b7..903a24d3306c 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -13,18 +13,19 @@ oslo-utils, oslotest, pbr, + setuptools, stestr, }: buildPythonPackage rec { pname = "oslo-concurrency"; - version = "6.0.0"; - format = "setuptools"; + version = "6.1.0"; + pyproject = true; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - hash = "sha256-tS8CtORvXydLkfuOG/xcv5pBjfzUqDvggDRUlePSboo="; + hash = "sha256-tWSuCvLuV3DztuYw3yakuGdsf+Qih/GIPiWaUard8Jc="; }; postPatch = '' @@ -33,13 +34,15 @@ buildPythonPackage rec { rm test-requirements.txt substituteInPlace oslo_concurrency/tests/unit/test_processutils.py \ - --replace "/bin/bash" "${bash}/bin/bash" \ - --replace "/bin/true" "${coreutils}/bin/true" \ - --replace "/usr/bin/env" "${coreutils}/bin/env" \ - --replace "/usr/bin/true" "${coreutils}/bin/true" + --replace-fail "/bin/bash" "${bash}/bin/bash" \ + --replace-fail "/usr/bin/true" "${coreutils}/bin/true" \ + --replace-fail "/bin/true" "${coreutils}/bin/true" \ + --replace-fail "/usr/bin/env" "${coreutils}/bin/env" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ fasteners oslo-config oslo-utils From 2d93badd41202dcc18b1614d73d315fb820dfe16 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:44:21 +0200 Subject: [PATCH 4/9] python311Packages.oslo-i18n: 6.3.0 -> 6.4.0 https://github.com/openstack/oslo.i18n/releases/tag/6.4.0 https://github.com/openstack/oslo.i18n/compare/6.3.0...6.4.0 --- pkgs/development/python-modules/oslo-i18n/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index ca79dec476ea..42358d6f59e1 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oslo-i18n"; - version = "6.3.0"; + version = "6.4.0"; pyproject = true; src = fetchPypi { pname = "oslo.i18n"; inherit version; - hash = "sha256-ZKJR7e+L8bsdTm9403fhSdTxXBqSRd538XIBbaYmdEQ="; + hash = "sha256-ZuBMBB6f8X0H4T7H9IKV+8NhaRQ8csojUqPvzJjntgg="; }; postPatch = '' @@ -26,7 +26,7 @@ buildPythonPackage rec { rm test-requirements.txt ''; - nativeBuildInputs = [ + build-system = [ pbr setuptools ]; From 76ae52e53ede212c89b8b8901ca47ff3f2f161d0 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:45:24 +0200 Subject: [PATCH 5/9] python311Packages.oslo-log: 6.1.1 -> 6.1.2 https://github.com/openstack/oslo.log/compare/6.1.1...6.1.2 --- pkgs/development/python-modules/oslo-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 7f0944134f18..b6cdf9661953 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "6.1.1"; + version = "6.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-41oSz+TK0T/7Cu2pn8yiCnBdD2lKhMLvewe0WWD4j7Q="; + hash = "sha256-92gEffnXBsSE3WZl3LvqKJAh1Iy3zlq/eh9poJSR9f4="; }; build-system = [ setuptools ]; From 366d83771e8ca59aaf79c244dd0d736737312074 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:47:17 +0200 Subject: [PATCH 6/9] python311Packages.oslo-serialization: 5.4.0 -> 5.5.0 https://github.com/openstack/oslo.serialization/compare/5.4.0...5.5.0 --- .../oslo-serialization/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index 28be76c8d13f..16b718161b35 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -7,18 +7,19 @@ oslotest, pbr, pytz, + setuptools, stestr, }: buildPythonPackage rec { pname = "oslo-serialization"; - version = "5.4.0"; - format = "setuptools"; + version = "5.5.0"; + pyproject = true; src = fetchPypi { pname = "oslo.serialization"; inherit version; - hash = "sha256-MVyzRl6ZxoXLCRuQNly3Ab7nFA4gS6Pl/C2KILTsbnY="; + hash = "sha256-nnUvxdipdZVnKN2WqCGGeDs/78rLs1U6zZMwWIYeFaY="; }; postPatch = '' @@ -27,9 +28,12 @@ buildPythonPackage rec { rm test-requirements.txt ''; - nativeBuildInputs = [ pbr ]; + build-system = [ + pbr + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ msgpack oslo-utils pytz @@ -41,7 +45,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "oslo_serialization" ]; From 1e06b691107e3d1c7e9fe7a50580ce07d54c8bcb Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:48:09 +0200 Subject: [PATCH 7/9] python311Packages.oslo-utils: 7.2.0 -> 7.3.0 https://github.com/openstack/oslo.utils/compare/7.2.0...7.3.0 --- pkgs/development/python-modules/oslo-utils/default.nix | 6 ++++-- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index d5573a7db850..dab2af567be3 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -15,6 +15,7 @@ pbr, pyparsing, pytz, + qemu, setuptools, stestr, testscenarios, @@ -26,13 +27,13 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "7.2.0"; + version = "7.3.0"; pyproject = true; src = fetchPypi { pname = "oslo.utils"; inherit version; - hash = "sha256-lPgFM5GjNQLatNhEZUAyYsoZ/9jP0poaXqPIqmIO9hA="; + hash = "sha256-WaXT5Oe7x42AHM68K4I+QptiTBK7bjtudvccKfK/Id8="; }; postPatch = '' @@ -63,6 +64,7 @@ buildPythonPackage rec { eventlet fixtures oslotest + qemu stestr testscenarios pyyaml diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7fca1b3036eb..adf16544281c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9747,7 +9747,9 @@ self: super: with self; { oslo-serialization = callPackage ../development/python-modules/oslo-serialization { }; - oslo-utils = callPackage ../development/python-modules/oslo-utils { }; + oslo-utils = callPackage ../development/python-modules/oslo-utils { + qemu = pkgs.qemu; + }; oslotest = callPackage ../development/python-modules/oslotest { }; From 5e6a1b86fccdddbf3c775f2de3149d54245baae0 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:51:04 +0200 Subject: [PATCH 8/9] python311Packages.oslo-context: 5.5.0 -> 5.6.0 https://github.com/openstack/oslo.context/compare/5.5.0...5.6.0 --- .../python-modules/oslo-context/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index cbb8cad1bbae..41d56c34ac4b 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -6,15 +6,17 @@ oslotest, stestr, pbr, + setuptools, }: buildPythonPackage rec { pname = "oslo.context"; - version = "5.5.0"; + version = "5.6.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6uAxeymSjxk030xguGD+hiUkfLKXxcxi/vjrWCexL6w="; + hash = "sha256-UiLDJja+BwojDfnTFBoLJ6lfCjtpePTBSFvK2kekw8s="; }; postPatch = '' @@ -23,7 +25,9 @@ buildPythonPackage rec { rm test-requirements.txt ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ debtcollector pbr ]; @@ -34,7 +38,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "oslo_context" ]; From f3a7aca6e7fd711bb58628f0b9212bbee9700325 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Mon, 26 Aug 2024 20:16:19 +0200 Subject: [PATCH 9/9] python311Packages.keystoneauth1: 5.7.0 -> 5.8.0 https://github.com/openstack/keystoneauth/compare/5.7.0...5.8.0 --- pkgs/development/python-modules/keystoneauth1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 045da70affff..a9efd42dc9d2 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -26,12 +26,12 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.7.0"; + version = "5.8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-sswtaNGkjpwsbZsbH9ANfHvf4IboBAtR5wk4qLo639E="; + hash = "sha256-MVfCEuEhFk3mTWPl734dqtK9NkmmjeHpcbdodwGe8cQ="; }; postPatch = ''