OpenConceptLab/ocl_issues#1635 | fixing merge conflicts

OpenConceptLab · Aug 7, 2023 · af87d0c · af87d0c
1 parent 5cd11de
commit af87d0c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/core/common/tests.py b/core/common/tests.py
@@ -4,8 +4,6 @@
 from collections import OrderedDict
 from unittest.mock import patch, Mock, mock_open, ANY
 
-import factory
-
 import boto3
 import django
 import factory
@@ -232,13 +230,6 @@ def factory_to_params(factory_klass, **kwargs):
             **kwargs
         }
 
-    @staticmethod
-    def factory_to_params(factory_klass, **kwargs):
-        return {
-            **factory.build(dict, FACTORY_CLASS=factory_klass),
-            **kwargs
-        }
-
 
 class S3Test(TestCase):
     @mock_s3

diff --git a/core/common/views.py b/core/common/views.py
@@ -1078,4 +1078,4 @@ def post(_):
                     'state': mapping_task.state,
                 }
             }
-        )
+        )