Merge pull request #335747 from dotlambda/python3Packages.flask-limiter

python312Packages.flask-limiter: 3.7.0 -> 3.8.0

Author: dotlambda

pkgs/development/python-modules/flask-limiter/default.nix

@@ -9,6 +9,7 @@
   ordered-set,
   pymemcache,
   pymongo,
+  pytest-cov-stub,
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
@@ -20,28 +21,27 @@
 
 buildPythonPackage rec {
   pname = "flask-limiter";
-  version = "3.7.0";
+  version = "3.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "alisaifee";
     repo = "flask-limiter";
     rev = "refs/tags/${version}";
-    hash = "sha256-W40zuQ/xkoV35DXehwMUJwbX0grJMfRXawiPfpRKL/g=";
+    hash = "sha256-RkeG5XdanSp2syKrQgYUZ4r8D28Zt33/MsW0UxWxaU0=";
   };
 
   postPatch = ''
-    sed -i "/--cov/d" pytest.ini
-
     # flask-restful is unmaintained and breaks regularly, don't depend on it
-    sed -i "/import flask_restful/d" tests/test_views.py
+    substituteInPlace tests/test_views.py \
+      --replace-fail "import flask_restful" ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     flask
     limits
     ordered-set
@@ -57,6 +57,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     asgiref
+    pytest-cov-stub
     pytest-mock
     pytestCheckHook
     hiro

pkgs/development/python-modules/limits/default.nix

@@ -6,13 +6,16 @@
   deprecated,
   etcd3,
   fetchFromGitHub,
+  fetchpatch2,
+  flaky,
   hiro,
   importlib-resources,
   motor,
   packaging,
   pymemcache,
   pymongo,
   pytest-asyncio,
+  pytest-benchmark,
   pytest-lazy-fixture,
   pytestCheckHook,
   pythonOlder,
@@ -23,10 +26,10 @@
 
 buildPythonPackage rec {
   pname = "limits";
-  version = "3.12.0";
+  version = "3.13.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "alisaifee";
@@ -38,9 +41,20 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/limits/_version.py"
     '';
-    hash = "sha256-EH2/75tcKuS11XKuo4lCQrFe4/XJZpcWhuGlSuhIk18=";
+    hash = "sha256-y5iMx+AC52ZgGvAvThRaeKFqCGkwmukyZsJ+nzR2AFM=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-incompatibility-with-latest-pytest-asyncio.patch";
+      url = "https://github.com/alisaifee/limits/commit/f6dcdb253cd44ca8dc7380c481da1afd8b57af6b.patch";
+      excludes = [ "requirements/test.txt" ];
+      hash = "sha256-NwtN8WHNrwsRcIq18pRjzzGmm7XCzn6O5y+jo9Qr6iQ=";
+    })
+    ./remove-fixed-start-from-async-tests.patch
+    ./only-test-in-memory.patch
+  ];
+
   postPatch = ''
     substituteInPlace pytest.ini \
       --replace-fail "--cov=limits" "" \
@@ -53,16 +67,16 @@ buildPythonPackage rec {
     echo 'def get_versions(): return {"version": "${version}"}' > limits/_version.py
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     deprecated
     importlib-resources
     packaging
     typing-extensions
   ];
 
-  passthru.optional-dependencies = {
+  optional-dependencies = {
     redis = [ redis ];
     rediscluster = [ redis ];
     memcached = [ pymemcache ];
@@ -79,20 +93,17 @@ buildPythonPackage rec {
   doCheck = pythonOlder "3.12"; # SystemError in protobuf
 
   nativeCheckInputs = [
+    flaky
     hiro
     pytest-asyncio
+    pytest-benchmark
     pytest-lazy-fixture
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  pythonImportsCheck = [ "limits" ];
+  disabledTests = [ "test_moving_window_memcached" ];
 
-  pytestFlagsArray = [
-    # All other tests require a running Docker instance
-    "tests/test_limits.py"
-    "tests/test_ratelimit_parser.py"
-    "tests/test_limit_granularities.py"
-  ];
+  pythonImportsCheck = [ "limits" ];
 
   meta = with lib; {
     description = "Rate limiting using various strategies and storage backends such as redis & memcached";