Unverified Commit 175ac336 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

weblate: 5.12.2 -> 5.13 (#436485)

parents 74bbdd00 15f1903f
Loading
Loading
Loading
Loading
+0 −22
Original line number Diff line number Diff line
diff --git a/weblate/utils/lock.py b/weblate/utils/lock.py
index 53c1486bc9..a0a5fc5a74 100644
--- a/weblate/utils/lock.py
+++ b/weblate/utils/lock.py
@@ -43,8 +43,6 @@ class WeblateLock:
             self._name = self._format_template(cache_template)
             self._lock = cache.lock(
                 key=self._name,
-                expire=3600,
-                auto_renewal=True,
             )
             self._enter_implementation = self._enter_redis
         else:
@@ -62,7 +60,7 @@ class WeblateLock:
 
     def _enter_redis(self):
         try:
-            lock_result = self._lock.acquire(timeout=self._timeout)
+            lock_result = self._lock.acquire()
         except AlreadyAcquired:
             return
 
+3 −14
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ let
in
python.pkgs.buildPythonApplication rec {
  pname = "weblate";
  version = "5.12.2";
  version = "5.13";

  pyproject = true;

@@ -40,14 +40,9 @@ python.pkgs.buildPythonApplication rec {
    owner = "WeblateOrg";
    repo = "weblate";
    tag = "weblate-${version}";
    hash = "sha256-YaP0lhL7E0pv3ZyfpQ47CjhrzjJPDwGpSTcgXDaMZdA=";
    hash = "sha256-fx07SmQodgC4bI/zQT6TNcvGYzVoKT42aXpUx5SlUrk=";
  };

  patches = [
    # FIXME This shouldn't be necessary and probably has to do with some dependency mismatch.
    ./cache.lock.patch
  ];

  build-system = with python.pkgs; [ setuptools ];

  nativeBuildInputs = [ gettext ];
@@ -83,6 +78,7 @@ python.pkgs.buildPythonApplication rec {
      certifi
      charset-normalizer
      crispy-bootstrap3
      crispy-bootstrap5
      cryptography
      cssselect
      cython
@@ -125,7 +121,6 @@ python.pkgs.buildPythonApplication rec {
      pyicumessageformat
      pyparsing
      python-dateutil
      python-redis-lock
      qrcode
      rapidfuzz
      redis
@@ -145,16 +140,10 @@ python.pkgs.buildPythonApplication rec {
      weblate-schemas
    ]
    ++ django.optional-dependencies.argon2
    ++ python-redis-lock.optional-dependencies.django
    ++ celery.optional-dependencies.redis
    ++ drf-spectacular.optional-dependencies.sidecar
    ++ drf-standardized-errors.optional-dependencies.openapi;

  pythonRelaxDeps = [
    "certifi"
    "lxml"
  ];

  optional-dependencies = {
    postgres = with python.pkgs; [ psycopg ];
  };
+2 −2
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@

buildPythonPackage rec {
  pname = "weblate-schemas";
  version = "2025.2";
  version = "2025.5";

  pyproject = true;

  src = fetchPypi {
    pname = "weblate_schemas";
    inherit version;
    hash = "sha256-C8+p+NHCAbLnHh8ujV5YdbjFSzXsKAoUyNhM3iIRPG4=";
    hash = "sha256-ZhFF3UD7lX/KXVDZFOn+Gc1w/cpzzVYVrbpVeJ9/wiE=";
  };

  build-system = [ setuptools ];