Merge remote-tracking branch 'upstream/staging-next' into staging

This commit is contained in:
John Ericson
2021-05-06 15:48:25 -04:00
34 changed files with 616 additions and 292 deletions
+4
View File
@@ -1733,6 +1733,8 @@ in {
decorator = callPackage ../development/python-modules/decorator { };
decopatch = callPackage ../development/python-modules/decopatch { };
deep_merge = callPackage ../development/python-modules/deep_merge { };
deepdiff = callPackage ../development/python-modules/deepdiff { };
@@ -6275,6 +6277,8 @@ in {
pytest-cache = self.pytestcache; # added 2021-01-04
pytestcache = callPackage ../development/python-modules/pytestcache { };
pytest-cases = callPackage ../development/python-modules/pytest-cases{ };
pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { };
pytest-celery = callPackage ../development/python-modules/pytest-celery { };