summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-02-09 18:28:38 +0100
committerGitHub <noreply@github.com>2022-02-09 18:28:38 +0100
commitb2c910f59887bf65d1cea9cbe37d6c44a4793e61 (patch)
tree2b57bdd38a3e8afbeb7e113b906bef8891039588 /pkgs
parent73dec3d162e68399bccde6b595e1ac32561085f0 (diff)
parent6b9adcbbe1a5cf12e1d115092fe8282d8a4fc0bd (diff)
downloadnixpkgs-b2c910f59887bf65d1cea9cbe37d6c44a4793e61.tar
nixpkgs-b2c910f59887bf65d1cea9cbe37d6c44a4793e61.tar.gz
nixpkgs-b2c910f59887bf65d1cea9cbe37d6c44a4793e61.tar.bz2
nixpkgs-b2c910f59887bf65d1cea9cbe37d6c44a4793e61.tar.lz
nixpkgs-b2c910f59887bf65d1cea9cbe37d6c44a4793e61.tar.xz
nixpkgs-b2c910f59887bf65d1cea9cbe37d6c44a4793e61.tar.zst
nixpkgs-b2c910f59887bf65d1cea9cbe37d6c44a4793e61.zip
Merge pull request #158695 from SuperSandro2000/pytest-celery
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/pytest-celery/default.nix27
-rw-r--r--pkgs/development/python-modules/pytest-celery/no-celery.patch9
2 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix
index 77de2d9698b..9efd9f49f2b 100644
--- a/pkgs/development/python-modules/pytest-celery/default.nix
+++ b/pkgs/development/python-modules/pytest-celery/default.nix
@@ -1,21 +1,30 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
   pname = "pytest-celery";
-  version = "0.0.0";
+  version = "0.1.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "cfd060fc32676afa1e4f51b2938f903f7f75d952186b8c6cf631628c4088f406";
+  format = "flit";
+
+  src = fetchFromGitHub {
+    owner = "celery";
+    repo = "pytest-celery";
+    rev = "v${version}";
+    sha256 = "sha256-vzWwkOS3BLOInaFDk+PegvEmC88ZZ1sG1CmHwhn7r9w=";
   };
 
-  patches = [ ./no-celery.patch ];
+  postPatch = ''
+    # avoid infinite recursion with celery
+    substituteInPlace pyproject.toml \
+      --replace '"celery >= 4.4.0"' ""
+  '';
 
-  doCheck = false; # This package has nothing to test or import.
+  # This package has nothing to test or import.
+  doCheck = false;
 
   meta = with lib; {
-    description = "pytest plugin for unittest subTest() support and subtests fixture";
-    homepage = "https://github.com/pytest-dev/pytest-subtests";
+    description = "Pytest plugin to enable celery.contrib.pytest";
+    homepage = "https://github.com/celery/pytest-celery";
     license = licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/pytest-celery/no-celery.patch b/pkgs/development/python-modules/pytest-celery/no-celery.patch
deleted file mode 100644
index 65337489883..00000000000
--- a/pkgs/development/python-modules/pytest-celery/no-celery.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-This plugin is needed to test celery itself, so it can't depend on celery.
-
---- a/setup.py
-+++ b/setup.py
-@@ -6,3 +6,3 @@ from distutils.core import setup
- install_requires = \
--['celery >= 4.4.0']
-+[]
-