glitchtip: 5.1.1 -> 5.2.1 (#461017)

2026-03-05 23:25:49 +00:00
parent 2e790cd686 385281f305
commit c23a8fa6c7
7 changed files with 203 additions and 28 deletions
@@ -9,18 +9,18 @@

 buildNpmPackage (finalAttrs: {
  pname = "glitchtip-frontend";
-  version = "5.1.1";
+  version = "5.2.1";

  src = fetchFromGitLab {
    owner = "glitchtip";
    repo = "glitchtip-frontend";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-WKh5w6AVyKhkGvGsy2Wv4Z01UaKTctDSfEhOek2Y84w=";
+    hash = "sha256-aqGgaVjJogG3mDooQVpR59SR0HDuMPfKuB1i0Z/AMs8=";
  };

  npmDeps = fetchNpmDeps {
    inherit (finalAttrs) src;
-    hash = "sha256-G2DZhHfTWi0qCAMs+IP7T2XEecBwTX12Dk3O0pD8ZJw=";
+    hash = "sha256-urho5XwUJL7m8/xxv9EvH0MxQIW5TG7nOBSIa77RhJc=";
  };

  postPatch = ''
@@ -53,9 +53,10 @@ let
      django-organizations
      django-postgres-partition
      django-prometheus
-      django-redis
      django-storages
+      django-valkey
      google-cloud-logging
+      granian
      gunicorn
      orjson
      psycopg
@@ -68,13 +69,17 @@ let
      whitenoise
    ]
    ++ celery.optional-dependencies.redis
+    ++ celery.optional-dependencies.sqlalchemy
    ++ django-allauth.optional-dependencies.headless-spec
    ++ django-allauth.optional-dependencies.mfa
    ++ django-allauth.optional-dependencies.socialaccount
-    ++ django-redis.optional-dependencies.hiredis
    ++ django-storages.optional-dependencies.boto3
    ++ django-storages.optional-dependencies.azure
    ++ django-storages.optional-dependencies.google
+    ++ django-valkey.optional-dependencies.libvalkey
+    ++ django-valkey.optional-dependencies.lz4
+    ++ granian.optional-dependencies.reload
+    ++ granian.optional-dependencies.uvloop
    ++ psycopg.optional-dependencies.c
    ++ psycopg.optional-dependencies.pool
    ++ pydantic.optional-dependencies.email;
@@ -84,14 +89,14 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "glitchtip";
-  version = "5.1.1";
+  version = "5.2.1";
  pyproject = true;

  src = fetchFromGitLab {
    owner = "glitchtip";
    repo = "glitchtip-backend";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-P5J4nFXQHt+vP2W1bzdw4V9Pq+YnYsjgJPnU89RYofI=";
+    hash = "sha256-FxkIbSrIyvLnD9n/Cb2udOhsnoC/bwGAfCRB1L/fhwo=";
  };

  propagatedBuildInputs = pythonPackages;
@@ -4,33 +4,48 @@
  azure-identity,
  azure-storage-blob,
  billiard,
+  boto3,
+  brotli,
+  brotlipy,
  buildPythonPackage,
+  cassandra-driver,
+  click,
  click-didyoumean,
  click-plugins,
  click-repl,
-  click,
  cryptography,
  exceptiongroup,
+  django,
+  elastic-transport,
+  elasticsearch,
+  ephem,
  fetchFromGitHub,
  gevent,
  google-cloud-firestore,
  google-cloud-storage,
+  grpcio,
+  isPyPy,
+  kazoo,
  kombu,
  moto,
-  msgpack,
-  pymongo,
-  redis,
  pydantic,
+  pydocumentdb,
+  pylibmc,
  pytest-celery,
  pytest-click,
  pytest-timeout,
  pytest-xdist,
  pytestCheckHook,
  python-dateutil,
-  pyyaml,
+  python-memcached,
+  pyzmq,
  setuptools,
  tzlocal,
+  sphinx-autobuild,
+  tblib,
+  urllib3,
  vine,
+  zstandard,
  # The AMQP REPL depends on click-repl, which is incompatible with our version
  # of click.
  withAmqpRepl ? false,
@@ -70,21 +85,68 @@ buildPythonPackage rec {
  ];

  optional-dependencies = {
+    # Everything commented is not packaged
+    # see https://github.com/celery/celery/tree/main/requirements/extras
+    arangodb = [
+      # pyarango
+    ];
    auth = [ cryptography ];
    azureblockblob = [
      azure-identity
      azure-storage-blob
    ];
-    gevent = [ gevent ];
+    brotli = if isPyPy then [ brotlipy ] else [ brotli ];
+    cassandra = [ cassandra-driver ];
+    consul = [
+      # python-consul2
+    ];
+    cosmosdbsql = [ pydocumentdb ];
+    couchbase = [ ];
+    couchdb = [
+      # pycouchdb
+    ];
+    django = [ django ];
+    dynamodb = [ boto3 ];
+    elasticsearch = [
+      elasticsearch
+      elastic-transport
+    ];
+    eventlet = [ ];
    gcs = [
      google-cloud-firestore
      google-cloud-storage
+      grpcio
    ];
-    mongodb = [ pymongo ];
-    msgpack = [ msgpack ];
-    yaml = [ pyyaml ];
-    redis = [ redis ];
+    gevent = [ gevent ];
+    memcache = [ pylibmc ];
+    mongodb = kombu.optional-dependencies.mongodb;
+    msgpack = kombu.optional-dependencies.msgpack;
    pydantic = [ pydantic ];
+    pymemcache = [ python-memcached ];
+    pyro = [ ];
+    pytest = [
+      pytest-celery
+    ]
+    ++ pytest-celery.optional-dependencies.all;
+    redis = kombu.optional-dependencies.redis;
+    s3 = [ boto3 ];
+    slmq = [
+      # softlayer-messaging
+    ];
+    solar = lib.optionals isPyPy [ ephem ];
+    sphinxautobuild = [ sphinx-autobuild ];
+    sqlalchemy = kombu.optional-dependencies.sqlalchemy;
+    sqs = [
+      boto3
+      urllib3
+    ]
+    ++ kombu.optional-dependencies.sqs;
+    tblib = [ tblib ];
+    thread = [ ];
+    yaml = kombu.optional-dependencies.yaml;
+    zeromq = [ pyzmq ];
+    zookeeper = [ kazoo ];
+    zsdt = [ zstandard ];
  };

  nativeCheckInputs = [
@@ -0,0 +1,92 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  hatchling,
+
+  # propagated
+  backports-zstd,
+  brotli,
+  django,
+  libvalkey,
+  lz4,
+  msgpack,
+  msgspec,
+  valkey,
+
+  # testing
+  anyio,
+  pytest-django,
+  pytest-mock,
+  pytestCheckHook,
+  redisTestHook,
+}:
+
+buildPythonPackage rec {
+  pname = "django-valkey";
+  version = "0.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "django-commons";
+    repo = "django-valkey";
+    tag = version;
+    hash = "sha256-F6BycXVBmfmtRL1C05lgg/2wehcmlqA5WWGgAIxuAsE=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    django
+    valkey
+  ];
+
+  optional-dependencies = {
+    brotli = [ brotli ];
+    libvalkey = [ libvalkey ];
+    lz4 = [ lz4 ];
+    msgpack = [ msgpack ];
+    msgspec = [ msgspec ];
+    pyzstd = [ backports-zstd ];
+    zstd = [ backports-zstd ];
+  };
+
+  pythonImportsCheck = [ "django_valkey" ];
+
+  nativeCheckInputs = [
+    anyio
+    pytest-django
+    pytest-mock
+    pytestCheckHook
+    redisTestHook # contains valkey
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  disabledTestPaths = [
+    # requires valkey cluster
+    "tests/tests_cluster/test_backend.py"
+    "tests/tests_cluster/test_cache_options.py"
+    "tests/tests_cluster/test_client.py"
+
+    # AttributeError: 'ValkeyCache' object has no attribute 'aset'
+    "tests/tests_async/test_backend.py"
+    # TypeError: object NoneType can't be used in 'await' expression
+    "tests/tests_async/test_cache_options.py"
+    # AttributeError: 'DefaultClient' object has no attribute 'aset'. Did you mean: 'hset'?
+    "tests/tests_async/test_client.py"
+    # AttributeError: 'ValkeyCache' object has no attribute 'ahas_key'
+    "tests/tests_async/test_session.py"
+
+    "tests/tests_async/test_requests.py"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = with lib; {
+    description = "Valkey backend for django";
+    homepage = "https://github.com/django-commons/django-valkey";
+    changelog = "https://github.com/django-commons/django-valkey/releases/tag/${version}";
+    license = licenses.bsd3;
+    maintainers = [ ];
+  };
+}
@@ -8,7 +8,6 @@
  isodate,
  nest-asyncio,
  pytestCheckHook,
-  mock,
  pyhamcrest,
  pyyaml,
  radish-bdd,
@@ -60,7 +59,6 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytestCheckHook
-    mock
    pyhamcrest
    pyyaml
    radish-bdd
@@ -79,6 +77,7 @@ buildPythonPackage rec {
    "tests/driver/test_driver_remote_connection_threaded.py"
    "tests/driver/test_web_socket_client_behavior.py"
    "tests/process/test_dsl.py"
+    "tests/process/test_traversal.py" # dead locks
    "tests/structure/io/test_functionalityio.py"
  ];

@@ -86,14 +85,6 @@ buildPythonPackage rec {
    "TestFunctionalGraphSONIO and test_timestamp"
    "TestFunctionalGraphSONIO and test_datetime"
    "TestFunctionalGraphSONIO and test_uuid"
-    "test_transaction_commit"
-    "test_transaction_rollback"
-    "test_transaction_no_begin"
-    "test_multi_commit_transaction"
-    "test_multi_rollback_transaction"
-    "test_multi_commit_and_rollback"
-    "test_transaction_close_tx"
-    "test_transaction_close_tx_from_parent"
  ];

  meta = {
@@ -1,7 +1,6 @@
 {
  lib,
  buildPythonPackage,
-  celery,
  debugpy,
  docker,
  fetchFromGitHub,
@@ -11,6 +10,13 @@
  pytest-docker-tools,
  pytest,
  tenacity,
+
+  # optional dependencies
+  redis,
+  python-memcached,
+  boto3,
+  botocore,
+  urllib3,
 }:

 buildPythonPackage rec {
@@ -53,6 +59,23 @@ buildPythonPackage rec {
    tenacity
  ];

+  optional-dependencies = {
+    all = [
+      redis
+      python-memcached
+      boto3
+      botocore
+      urllib3
+    ];
+    redis = [ redis ];
+    memcached = [ python-memcached ];
+    sqs = [
+      boto3
+      botocore
+      urllib3
+    ];
+  };
+
  # Infinite recursion with celery
  doCheck = false;

@@ -4400,6 +4400,8 @@ self: super: with self; {

  django-types = callPackage ../development/python-modules/django-types { };

+  django-valkey = callPackage ../development/python-modules/django-valkey { };
+
  django-versatileimagefield =
    callPackage ../development/python-modules/django-versatileimagefield
      { };