From edcfe3f6b979a10feb6485b81ad592d3ac4fba45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Feb 2023 10:58:33 +0100 Subject: [PATCH 1/3] python310Packages.mocket: add changelog to meta python310Packages.mocket: disable on unsupported Python releases python310Packages.mocket: add optional-dependencies --- .../python-modules/mocket/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index c36747d3ddc7..3e2294bfd564 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -17,16 +17,19 @@ , requests , sure , pook +, pythonOlder }: buildPythonPackage rec { pname = "mocket"; version = "3.10.9"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; + hash = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; }; propagatedBuildInputs = [ @@ -36,6 +39,12 @@ buildPythonPackage rec { urllib3 ]; + passthru.optional-dependencies = { + pook = [ + pook + ]; + }; + nativeCheckInputs = [ pytestCheckHook pytest-mock @@ -46,11 +55,11 @@ buildPythonPackage rec { redis requests sure - pook - ]; + ] ++ passthru.optional-dependencies.pook; # skip http tests SKIP_TRUE_HTTP = true; + pytestFlagsArray = [ # Requires a live Redis instance "--ignore=tests/main/test_redis.py" @@ -77,8 +86,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "mocket" ]; meta = with lib; { - description = "A socket mock framework - for all kinds of socket animals, web-clients included"; + description = "A socket mock framework for all kinds of sockets including web-clients"; homepage = "https://github.com/mindflayer/python-mocket"; + changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; From 65f898d6e4195214230707b00fb34c30b910ee70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Feb 2023 11:35:03 +0100 Subject: [PATCH 2/3] python310Packages.geoip2: add changelog to meta python310Packages.geoip2: remove postPatch section python311Packages.geoip2: disable failing tests --- .../python-modules/geoip2/default.nix | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 0563b8ae997a..c821c5a0cda3 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -1,28 +1,35 @@ -{ buildPythonPackage, lib, fetchPypi, pythonOlder +{ lib , aiohttp +, buildPythonPackage +, fetchPypi , maxminddb , mocket +, pytestCheckHook +, pythonAtLeast +, pythonOlder , requests , requests-mock , urllib3 -, pytestCheckHook }: buildPythonPackage rec { - version = "4.6.0"; pname = "geoip2"; + version = "4.6.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8OgLzoCwa7OL0Iv0h31ahONU6TIJXmzPtNJ7tZj6T4M="; + hash = "sha256-8OgLzoCwa7OL0Iv0h31ahONU6TIJXmzPtNJ7tZj6T4M="; }; - patchPhase = '' - substituteInPlace requirements.txt --replace "requests>=2.24.0,<3.0.0" "requests" - ''; - - propagatedBuildInputs = [ aiohttp maxminddb requests urllib3 ]; + propagatedBuildInputs = [ + aiohttp + maxminddb + requests + urllib3 + ]; nativeCheckInputs = [ mocket @@ -30,11 +37,21 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "geoip2" ]; + pythonImportsCheck = [ + "geoip2" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/maxmind/GeoIP2-python/pull/136 + "TestAsyncClient" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_request" + ]; meta = with lib; { description = "GeoIP2 webservice client and database reader"; homepage = "https://github.com/maxmind/GeoIP2-python"; + changelog = "https://github.com/maxmind/GeoIP2-python/blob/v${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 8eee919c90f19fadf4b14693525078845a48ddec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Feb 2023 12:41:36 +0100 Subject: [PATCH 3/3] python310Packages.mocket: 3.10.9 -> 3.11.0 --- .../python-modules/mocket/default.nix | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 3e2294bfd564..ff8d2856cc99 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,40 +1,40 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, isPy3k -, decorator -, http-parser -, python-magic -, urllib3 -, pytestCheckHook -, pytest-mock , aiohttp +, asgiref +, buildPythonPackage +, decorator , fastapi +, fetchPypi , gevent +, httptools , httpx +, isPy3k +, pook +, pytest-mock +, pytestCheckHook +, python-magic +, pythonOlder , redis , requests , sure -, pook -, pythonOlder +, urllib3 }: buildPythonPackage rec { pname = "mocket"; - version = "3.10.9"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; + hash = "sha256-OIdLP3hHnPZ9MqrHt6G5t2SSO342+jTACgzxM6RjVYM="; }; propagatedBuildInputs = [ decorator - http-parser + httptools python-magic urllib3 ]; @@ -46,26 +46,24 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytestCheckHook - pytest-mock aiohttp + asgiref fastapi gevent httpx + pytest-mock + pytestCheckHook redis requests sure ] ++ passthru.optional-dependencies.pook; - # skip http tests + # Skip http tests SKIP_TRUE_HTTP = true; - pytestFlagsArray = [ + disabledTestPaths = [ # Requires a live Redis instance - "--ignore=tests/main/test_redis.py" - ] ++ lib.optionals (pythonOlder "3.8") [ - # Uses IsolatedAsyncioTestCase which is only available >= 3.8 - "--ignore=tests/tests38/test_http_aiohttp.py" + "tests/main/test_redis.py" ]; disabledTests = [ @@ -83,7 +81,9 @@ buildPythonPackage rec { "test_gethostbyname" ]; - pythonImportsCheck = [ "mocket" ]; + pythonImportsCheck = [ + "mocket" + ]; meta = with lib; { description = "A socket mock framework for all kinds of sockets including web-clients";