Unverified Commit cbd5a8b2 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

weblate: 5.16.2 -> 5.17 (#510728)

parents e8ac1bbf 652e7b6f

pkgs/by-name/we/weblate/package.nix

+53 −16
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ 


let

  python = python3.override {

    self = python;

    packageOverrides = _final: prev: {

      django = prev.django_5;

      django = prev.django_6;

      pygobject = prev.pygobject3;

    };

  };

  python3Packages = python3.pkgs;

  python3Packages = python.pkgs;



  GI_TYPELIB_PATH = lib.makeSearchPathOutput "out" "lib/girepository-1.0" [

    pango
@@ -48,7 +50,7 @@ let 
in

python3Packages.buildPythonApplication (finalAttrs: {

  pname = "weblate";

  version = "5.16.2";

  version = "5.17";

  pyproject = true;



  outputs = [
@@ -60,7 +62,7 @@ python3Packages.buildPythonApplication (finalAttrs: { 
    owner = "WeblateOrg";

    repo = "weblate";

    tag = "weblate-${finalAttrs.version}";

    hash = "sha256-er3KtCAFtHh3UtM58Kni/PTBfXpWW/GOarRGJeAanL8=";

    hash = "sha256-+czdS1cICvm8esXxJG9BjzPTJExajxvDoRVH7f+t6lY=";

  };



  postPatch = ''
@@ -92,15 +94,14 @@ python3Packages.buildPythonApplication (finalAttrs: { 
    '';



  pythonRelaxDeps = [

    "requests"

    "pygobject"

    "certifi"

    "crispy-bootstrap5"

    "dateparser"

  ];



  dependencies =

    with python3Packages;

    [

      aeidon

      ahocorasick-rs

      altcha

      (toPythonModule (borgbackup.override { python3 = python; }))
@@ -108,7 +109,6 @@ python3Packages.buildPythonApplication (finalAttrs: { 
      certifi

      charset-normalizer

      confusable-homoglyphs

      crispy-bootstrap3

      crispy-bootstrap5

      cryptography

      cssselect
@@ -134,23 +134,20 @@ python3Packages.buildPythonApplication (finalAttrs: { 
      drf-standardized-errors

      fedora-messaging

      filelock

      fluent-syntax

      gitpython

      hiredis

      html2text

      iniparse

      jsonschema

      lxml

      mistletoe

      nh3

      openpyxl

      packaging

      phply

      pillow

      pyaskalono

      pycairo

      pygments

      pygobject3

      pygobject

      pyicumessageformat

      pyparsing

      python-dateutil
@@ -178,7 +175,15 @@ python3Packages.buildPythonApplication (finalAttrs: { 
    ++ celery.optional-dependencies.redis

    ++ drf-spectacular.optional-dependencies.sidecar

    ++ drf-standardized-errors.optional-dependencies.openapi

    ++ translate-toolkit.optional-dependencies.chardet

    ++ translate-toolkit.optional-dependencies.fluent

    ++ translate-toolkit.optional-dependencies.ini

    ++ translate-toolkit.optional-dependencies.markdown

    ++ translate-toolkit.optional-dependencies.toml

    ++ translate-toolkit.optional-dependencies.php

    ++ translate-toolkit.optional-dependencies.rc

    ++ translate-toolkit.optional-dependencies.subtitles

    ++ translate-toolkit.optional-dependencies.yaml

    ++ urllib3.optional-dependencies.brotli

    ++ urllib3.optional-dependencies.zstd;
@@ -197,12 +202,12 @@ python3Packages.buildPythonApplication (finalAttrs: { 
    ];

    ldap = [ django-auth-ldap ];

    # mercurial = [ mercurial ];

    mysql = [ mysqlclient ];

    openai = [ openai ];

    postgres = [ psycopg ];

    saml = [ python3-saml ];

    # saml2idp = [ djangosaml2idp ];

    # wlhosted = [ wlhosted ];

    # saml2idp = [ djangosaml2idp2 ];

    sphinx = [ sphinx ];

    # wllegal = [ wllegal ];

    wsgi = [ granian ];

    # zxcvbn = [ django-zxcvbn-password-validator ];

  };
@@ -243,7 +248,7 @@ python3Packages.buildPythonApplication (finalAttrs: { 
      openssh

    ]

    ++ social-auth-core.optional-dependencies.saml

    ++ (lib.concatLists (builtins.attrValues finalAttrs.passthru.optional-dependencies));

    ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;



  env = {

    CI_DATABASE = "postgresql";
@@ -277,6 +282,38 @@ python3Packages.buildPythonApplication (finalAttrs: { 
    "test_ocr_backend"

  ];



  disabledTestPaths = [

    # Probably network access?

    "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_component_scopes"

    "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_connection_error"

    "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_invalid_response"

    "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_project_scopes"

    "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_site_wide_scope"

    "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_translation_added"

    "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_announcement"

    "weblate/addons/tests.py::SlackWebhooksAddonsTest::test_bulk_changes"

    "weblate/addons/tests.py::WebhooksAddonTest::test_announcement"

    "weblate/addons/tests.py::WebhooksAddonTest::test_bulk_changes"

    "weblate/addons/tests.py::WebhooksAddonTest::test_category_in_payload"

    "weblate/addons/tests.py::WebhooksAddonTest::test_component_scopes"

    "weblate/addons/tests.py::WebhooksAddonTest::test_connection_error"

    "weblate/addons/tests.py::WebhooksAddonTest::test_invalid_response"

    "weblate/addons/tests.py::WebhooksAddonTest::test_project_scopes"

    "weblate/addons/tests.py::WebhooksAddonTest::test_site_wide_scope"

    "weblate/addons/tests.py::WebhooksAddonTest::test_translation_added"

    "weblate/addons/tests.py::WebhooksAddonTest::test_webhook_signature"

    "weblate/addons/tests.py::WebhooksAddonTest::test_webhook_signature_prefix"



    # Tries to resolve DNS

    "weblate/api/tests.py::ProjectAPITest::test_install_machinery"



    # djangosaml2idp2 is not packaged yet

    "weblate/utils/tests/test_djangosaml2idp.py"



    # Don't understand why

    "weblate/trans/tests/test_alert.py::WebsiteAlertSettingTest::test_website_alerts_enabled"

  ];



  passthru = {

    inherit python;

    # We need to expose this so weblate can work outside of calling its bin output

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

+5 −5
Original line number Diff line number Diff line
@@ -6,16 +6,16 @@ 
  pytestCheckHook,

}:



buildPythonPackage rec {

buildPythonPackage (finalAttrs: {

  pname = "altcha";

  version = "1.0.0";

  version = "2.0.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "altcha-org";

    repo = "altcha-lib-py";

    tag = "v${version}";

    hash = "sha256-N30luHhGFkd+XvVKhVnR6degEf0Nm/K/GEaqoEEuZMU=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-k5vy6lalC3idiquXbDCwF+mObzja/QC3PRBGQJMZ6fA=";

  };



  build-system = [ setuptools ];
@@ -30,4 +30,4 @@ buildPythonPackage rec { 
    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ erictapen ];

  };

}
 
})

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

+3 −0
Original line number Diff line number Diff line
@@ -194,6 +194,9 @@ buildPythonPackage (finalAttrs: { 
    "test_regression_worker_startup_info"

    "test_check_privileges"



    # FileNotFoundError: [Errno 2] No such file or directory: 'test.db'

    "test_forget"



    # Flaky: Unclosed temporary file handle under heavy load (as in nixpkgs-review)

    "test_check_privileges_without_c_force_root_and_no_group_entry"

  ]

pkgs/development/python-modules/dj-rest-auth/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ buildPythonPackage (finalAttrs: { 
    hash = "sha256-eUcve2KPcLjKKWU7AxQEZ0mokP185E43Xjm4b+4hQzA=";

  };



  postPatch = ''

    substituteInPlace setup.py \

      --replace-fail "==" ">="

  '';



  build-system = [ setuptools ];



  buildInputs = [ django ];
@@ -49,6 +44,7 @@ buildPythonPackage (finalAttrs: { 
  };



  nativeCheckInputs = [

    pytest-django

    djangorestframework-simplejwt

    pytestCheckHook

    pytest-django

pkgs/development/python-modules/django-celery-beat/default.nix

+43 −11
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch,



  # build-system

  setuptools,
@@ -20,18 +21,54 @@ 
  pytestCheckHook,

}:



buildPythonPackage rec {

buildPythonPackage (finalAttrs: {

  pname = "django-celery-beat";

  version = "2.8.1";

  version = "2.9.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "celery";

    repo = "django-celery-beat";

    tag = "v${version}";

    hash = "sha256-pakOpch5r2ug0UDSqEU34qr4Tz1/mkuFiHW+IOUuGcc=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-UGKMSXB+Hg865sAk5ePc/noO3eNTr7b3pp7tvNvn1T8=";

  };



  # https://github.com/celery/django-celery-beat/pull/1009

  patches = [

    (fetchpatch {

      url = "https://github.com/celery/django-celery-beat/commit/dc11bdfa06858409da01f2d407bb68486870a559.patch";

      hash = "sha256-aK8u2CfmNYFwE9CQvKjnwywVcw8MQfXvev7JYU9kz4E=";

    })

    (fetchpatch {

      url = "https://github.com/celery/django-celery-beat/commit/ddcbe8bf2c970a82e87f50c0e9c232b0ae951a85.patch";

      hash = "sha256-uw3l6CA0lnbF1HnNeSgZ91l1ujkB4V3831Yj+L4i+L0=";

    })

    (fetchpatch {

      url = "https://github.com/celery/django-celery-beat/commit/088355dc6531bfffc19272c9de55f4d18606634e.patch";

      hash = "sha256-6pamaLcHbNUGJMw6nCWeY/C1O58choDbJ1j/4SqDPx4=";

    })

    (fetchpatch {

      url = "https://github.com/celery/django-celery-beat/commit/273e2f23edee26404a1691320a69dee280f9639b.patch";

      hash = "sha256-8wZrDi9GDIF+w5ZZDssJGLG3UyE45xqld95nnG3SV0A=";

    })

    (fetchpatch {

      url = "https://github.com/celery/django-celery-beat/commit/69f4a231f30df9ff028f8fc0f67cb115e5d53246.patch";

      hash = "sha256-74p2XxB9ssWpVokY8XVUjkyyE4+/2lijDYZcZSu9ms0=";

    })

    (fetchpatch {

      url = "https://github.com/celery/django-celery-beat/commit/4b8246a44a69e79d7648a9f4658abd8b7937b2b8.patch";

      hash = "sha256-c1ZJHgnxvOoEWAc9oRkcCLRG7sLLsSER/Dq0H8TIOYU=";

    })

    (fetchpatch {

      url = "https://github.com/celery/django-celery-beat/commit/17dd67625f99a0e6dbe7fb779f61f336e7af1730.patch";

      hash = "sha256-w+MynocR80jUARgvuk5cUIdzmdAYGglvrNXph/8XdBE=";

    })

    (fetchpatch {

      url = "https://github.com/celery/django-celery-beat/commit/03018882f088be83e1c78b4ca657b960b3080081.patch";

      hash = "sha256-YE121p2aGqoj9mRFSQu+oi+8xaz0QE+CsJHdBB7xwUM=";

    })

  ];



  pythonRelaxDeps = [ "django" ];



  build-system = [ setuptools ];
@@ -56,18 +93,13 @@ buildPythonPackage rec { 
    "t/unit/test_schedulers.py"

  ];



  disabledTests = [

    # AssertionError: 'At 02:00, only on Monday UTC' != 'At 02:00 AM, only on Monday UTC'

    "test_long_name"

  ];



  pythonImportsCheck = [ "django_celery_beat" ];



  meta = {

    description = "Celery Periodic Tasks backed by the Django ORM";

    homepage = "https://github.com/celery/django-celery-beat";

    changelog = "https://github.com/celery/django-celery-beat/releases/tag/${src.tag}";

    changelog = "https://github.com/celery/django-celery-beat/releases/tag/${finalAttrs.src.tag}";

    license = lib.licenses.bsd3;

    maintainers = with lib.maintainers; [ onny ];

  };

}
 
})