coding-kitties · coding-kitties · Jun 19, 2020 · Jun 19, 2020 · Jun 19, 2020 · Jun 19, 2020
diff --git a/Remove_states_from_context.patch b/Remove_states_from_context.patch
diff --git a/...k/bin/investing-algorithm-framework-admin → bin/investing-algorithm-framework-admin b/...k/bin/investing-algorithm-framework-admin → bin/investing-algorithm-framework-admin
diff --git a/ci/test.sh b/ci/test.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-python3 -m unittest discover -s ../
+pytest ../.
diff --git a/investing_algorithm_framework/__init__.py b/investing_algorithm_framework/__init__.py
@@ -1,4 +1,4 @@
 from investing_algorithm_framework.utils.version import get_version
 
-VERSION = (1, 0, 0, 'alpha', 0)
+VERSION = (0, 1, 0, 'alpha', 0)
 
diff --git a/investing_algorithm_framework/tests/resources/__init__.py b/investing_algorithm_framework/tests/resources/__init__.py
diff --git a/investing_algorithm_framework/tests/utils/__init__.py b/investing_algorithm_framework/tests/utils/__init__.py
diff --git a/setup.py b/setup.py
@@ -19,6 +19,6 @@
         'colorama', 'wrapt', 'requests'
     ],
     python_requires='>=3.6',
-    scripts=['investing_algorithm_framework/bin/investing-algorithm-framework-admin'],
+    scripts=['bin/investing-algorithm-framework-admin'],
     include_package_data=True,
 )
diff --git a/...ing_algorithm_framework/tests/__init__.py → tests/__init__.py b/...ing_algorithm_framework/tests/__init__.py → tests/__init__.py
diff --git a/...lgorithm_framework/tests/core/__init__.py → tests/core/__init__.py b/...lgorithm_framework/tests/core/__init__.py → tests/core/__init__.py
diff --git a/...thm_framework/tests/core/data/__init__.py → tests/core/data_providers/__init__.py b/...thm_framework/tests/core/data/__init__.py → tests/core/data_providers/__init__.py
diff --git a/...core/data/data_providers/data_provider.py → tests/core/data_providers/data_provider.py b/...core/data/data_providers/data_provider.py → tests/core/data_providers/data_provider.py
@@ -1,5 +1,4 @@
-from investing_algorithm_framework.tests.core.data.data_providers.resources import TestDataProviderOne, \
-    TestDataProviderTwo, TestObserver
+from tests.core.data_providers.resources import TestDataProviderOne, TestDataProviderTwo, TestObserver
 
 
 def test():

diff --git a/...sts/core/data/data_providers/resources.py → tests/core/data_providers/resources.py b/...sts/core/data/data_providers/resources.py → tests/core/data_providers/resources.py
diff --git a/...ests/core/data/data_providers/__init__.py → tests/core/executors/__init__.py b/...ests/core/data/data_providers/__init__.py → tests/core/executors/__init__.py
diff --git a/...amework/tests/core/executors/resources.py → tests/core/executors/resources.py b/...amework/tests/core/executors/resources.py → tests/core/executors/resources.py
diff --git a/...ork/tests/core/executors/test_executor.py → tests/core/executors/test_executor.py b/...ork/tests/core/executors/test_executor.py → tests/core/executors/test_executor.py
@@ -1,8 +1,7 @@
 from threading import active_count
-from unittest import TestCase
 from time import sleep
 
-from investing_algorithm_framework.tests.core.executors.resources import TestExecutor, TestWorkerOne, TestWorkerTwo, \
+from tests.core.executors.resources import TestExecutor, TestWorkerOne, TestWorkerTwo, \
     TestObserver, TestWorkerThree
 
 

diff --git a/...rk/tests/core/executors/test_scheduler.py → tests/core/executors/test_scheduler.py b/...rk/tests/core/executors/test_scheduler.py → tests/core/executors/test_scheduler.py
diff --git a/...ramework/tests/core/executors/__init__.py → tests/core/resolvers/__init__.py b/...ramework/tests/core/executors/__init__.py → tests/core/resolvers/__init__.py
diff --git a/.../core/resolvers/test_database_resolver.py → .../core/resolvers/test_database_resolver.py b/.../core/resolvers/test_database_resolver.py → .../core/resolvers/test_database_resolver.py
@@ -1,7 +1,8 @@
 import os
 from sqlalchemy import Column, String, Integer
 
-from investing_algorithm_framework.tests.resources import BaseTestMixin, utils
+from tests.resources import BaseTestMixin
+from tests.resources import utils
 from investing_algorithm_framework.core.configuration import settings
 from investing_algorithm_framework.core.extensions import db
 

diff --git a/tests/resources/__init__.py b/tests/resources/__init__.py
@@ -0,0 +1,13 @@
+import os
+
+import tests.resources.standard_settings
+
+
+class BaseTestMixin:
+
+    @staticmethod
+    def initialize_environment():
+        os.environ.setdefault(
+            'INVESTING_BOT_FRAMEWORK_SETTINGS_MODULE', 'tests.resources.standard_settings'
+        )
+
diff --git a/...work/tests/resources/standard_settings.py → tests/resources/standard_settings.py b/...work/tests/resources/standard_settings.py → tests/resources/standard_settings.py
diff --git a/...orithm_framework/tests/resources/utils.py → tests/resources/utils.py b/...orithm_framework/tests/resources/utils.py → tests/resources/utils.py
@@ -1,6 +1,7 @@
 import random
 import string
 
+
 def random_string(n, spaces: bool = False):
 
     if spaces:

diff --git a/...ramework/tests/core/resolvers/__init__.py → tests/utils/__init__.py b/...ramework/tests/core/resolvers/__init__.py → tests/utils/__init__.py
diff --git a/...thm_framework/tests/utils/test_version.py → tests/utils/test_version.py b/...thm_framework/tests/utils/test_version.py → tests/utils/test_version.py