Changing import statement to support package

21 files changed, 75 insertions, 56 deletions

diff --git a/.gitignore b/.gitignore
index 244f283..0fc2a9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *__pycache__*
 *.log
-bin
+bin/
 tags
-dist
+dist/
 *.egg-info
+build/
diff --git a/minishell_test/__init__.py b/minishell_test/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/minishell_test/__init__.py
@@ -0,0 +1 @@
+
diff --git a/minishell_test/__main__.py b/minishell_test/__main__.py
index fe48b5e..424867c 100755
--- a/minishell_test/__main__.py
+++ b/minishell_test/__main__.py
@@ -18,11 +18,11 @@ import shutil
 import distutils.spawn
 import subprocess
 
-import config
-import sandbox
-from args import parse_args
-from suite import Suite
-from suites import *  # noqa: F403,F401
+import minishell_test.config as config
+import minishell_test.sandbox as sandbox
+from minishell_test.args import parse_args
+from minishell_test.suite.suite import Suite
+from minishell_test.suites import *  # noqa: F403,F401
 
 
 def main():
diff --git a/minishell_test/hooks.py b/minishell_test/hooks.py
index e37f2aa..9881354 100644
--- a/minishell_test/hooks.py
+++ b/minishell_test/hooks.py
@@ -6,7 +6,7 @@
 #    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/09/11 16:10:20 by charles           #+#    #+#              #
-#    Updated: 2020/11/25 21:36:18 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 15:13:30 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
@@ -14,7 +14,7 @@ import re
 import sys
 import os
 
-import config
+import minishell_test.config as config
 
 
 def sort_lines(output):
diff --git a/minishell_test/sandbox.py b/minishell_test/sandbox.py
index bd49d1e..f10eacf 100644
--- a/minishell_test/sandbox.py
+++ b/minishell_test/sandbox.py
@@ -6,7 +6,7 @@
 #    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/09/11 13:48:07 by charles           #+#    #+#              #
-#    Updated: 2021/01/31 03:59:30 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:54:37 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
@@ -16,7 +16,7 @@ import shutil
 import subprocess
 from contextlib import contextmanager
 
-import config
+import minishell_test.config as config
 
 
 def create():
diff --git a/minishell_test/suite/__init__.py b/minishell_test/suite/__init__.py
index 6f7f321..e7677b6 100644
--- a/minishell_test/suite/__init__.py
+++ b/minishell_test/suite/__init__.py
@@ -1,2 +1,2 @@
-from suite.suite import Suite  # noqa: F401
-from suite.decorator import suite  # noqa: F401
+from minishell_test.suite.suite import Suite  # noqa: F401
+# from minishell_test.suite.decorator import suite  # noqa: F401
diff --git a/minishell_test/suite/decorator.py b/minishell_test/suite/decorator.py
index fdc7fb6..a843bc4 100644
--- a/minishell_test/suite/decorator.py
+++ b/minishell_test/suite/decorator.py
@@ -6,15 +6,15 @@
 #    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/09/11 12:28:00 by charles           #+#    #+#              #
-#    Updated: 2021/02/04 16:18:11 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:50:41 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
 import inspect
 from typing import List
 
-from suite import Suite
-from test import Test
+from minishell_test.suite import Suite
+from minishell_test.test import Test
 
 
 def suite(groups: List[str] = [], bonus: bool = False):  # type: ignore
diff --git a/minishell_test/suite/suite.py b/minishell_test/suite/suite.py
index 836cac0..df342a0 100644
--- a/minishell_test/suite/suite.py
+++ b/minishell_test/suite/suite.py
@@ -6,15 +6,15 @@
 #    By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/07/15 18:24:29 by charles           #+#    #+#              #
-#    Updated: 2021/02/04 16:13:08 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:24:36 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
 import sys
 from typing import List, Tuple, Optional, Callable
 
-import config
-from test import Test
+import minishell_test.config as config
+from minishell_test.test import Test
 
 
 class Suite:
diff --git a/minishell_test/suites/__init__.py b/minishell_test/suites/__init__.py
index b6b3b68..4c5687d 100644
--- a/minishell_test/suites/__init__.py
+++ b/minishell_test/suites/__init__.py
@@ -6,7 +6,7 @@
 #    By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/07/15 18:24:48 by charles           #+#    #+#              #
-#    Updated: 2020/09/11 13:25:26 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 15:16:25 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
diff --git a/minishell_test/suites/builtin.py b/minishell_test/suites/builtin.py
index 9ab2af8..768850a 100644
--- a/minishell_test/suites/builtin.py
+++ b/minishell_test/suites/builtin.py
@@ -6,17 +6,17 @@
 #    By: juligonz <juligonz@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/07/15 18:24:43 by charles           #+#    #+#              #
-#    Updated: 2020/11/28 06:17:19 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:48:47 by charles          ###   ########.fr        #
 #    Updated: 2020/09/11 18:01:27 by juligonz         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 import os
 
-import config
-import hooks
-from suite import suite
-from hooks import linux_discard
+import minishell_test.config as config
+import minishell_test.hooks as hooks
+from minishell_test.suite.decorator import suite
+from minishell_test.hooks import linux_discard
 
 
 @suite()
diff --git a/minishell_test/suites/cmd.py b/minishell_test/suites/cmd.py
index 53b1f97..da3b14a 100644
--- a/minishell_test/suites/cmd.py
+++ b/minishell_test/suites/cmd.py
@@ -6,15 +6,15 @@
 #    By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/07/15 15:11:46 by charles           #+#    #+#              #
-#    Updated: 2021/02/04 16:14:54 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 16:15:42 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
 import distutils
 
-import hooks
-import config
-from suite import suite
+import minishell_test.hooks as hooks
+import minishell_test.config as config
+from minishell_test.suite.decorator import suite
 
 
 @suite()
diff --git a/minishell_test/suites/flow.py b/minishell_test/suites/flow.py
index 2c00b2f..90aef7f 100644
--- a/minishell_test/suites/flow.py
+++ b/minishell_test/suites/flow.py
@@ -6,14 +6,19 @@
 #    By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/07/15 18:24:52 by charles           #+#    #+#              #
-#    Updated: 2020/11/10 13:16:28 by cacharle         ###   ########.fr        #
+#    Updated: 2021/02/05 15:11:21 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
-import config
-from suite import suite
-from hooks import error_line0, platform_status, discard, replace_double_semi_colon, error_eof_to_expected_token
-
+import minishell_test.config as config
+from minishell_test.suite.decorator import suite
+from minishell_test.hooks import (
+    error_line0,
+    platform_status,
+    discard,
+    replace_double_semi_colon,
+    error_eof_to_expected_token
+)
 
 @suite()
 def suite_end(test):
@@ -53,7 +58,6 @@ def suite_end(test):
     test("ls " + 40 * " ; ls" + ";", setup="touch a b c")
     test("ls " + 80 * " ; ls" + ";", setup="touch a b c")
 
-
 @suite()
 def suite_pipe(test):
     """ `|` tests """
diff --git a/minishell_test/suites/misc.py b/minishell_test/suites/misc.py
index a6b9bf2..6a351cc 100644
--- a/minishell_test/suites/misc.py
+++ b/minishell_test/suites/misc.py
@@ -6,11 +6,11 @@
 #    By: cacharle <me@cacharle.xyz>                 +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/10/10 13:06:19 by cacharle          #+#    #+#              #
-#    Updated: 2020/11/28 06:10:12 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:49:39 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
-from suite import suite
+from minishell_test.suite.decorator import suite
 
 
 @suite()
diff --git a/minishell_test/suites/path.py b/minishell_test/suites/path.py
index 93d4232..b350168 100644
--- a/minishell_test/suites/path.py
+++ b/minishell_test/suites/path.py
@@ -6,13 +6,13 @@
 #    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/09/09 15:12:58 by charles           #+#    #+#              #
-#    Updated: 2021/02/04 16:14:20 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:50:19 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
 import distutils.spawn
 
-from suite import suite
+from minishell_test.suite.decorator import suite
 
 
 @suite()
diff --git a/minishell_test/suites/preprocess.py b/minishell_test/suites/preprocess.py
index 0176399..d7d6bbc 100644
--- a/minishell_test/suites/preprocess.py
+++ b/minishell_test/suites/preprocess.py
@@ -6,13 +6,13 @@
 #    By: juligonz <juligonz@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/07/15 18:25:00 by charles           #+#    #+#              #
-#    Updated: 2021/01/21 13:06:55 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:43:27 by charles          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-import config
-import hooks
-from suite import suite
+import minishell_test.config as config
+import minishell_test.hooks as hooks
+from minishell_test.suite.decorator import suite
 
 
 @suite()
diff --git a/minishell_test/test/__init__.py b/minishell_test/test/__init__.py
index cf9949f..534da32 100644
--- a/minishell_test/test/__init__.py
+++ b/minishell_test/test/__init__.py
@@ -6,8 +6,8 @@
 #    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/09/11 12:18:14 by charles           #+#    #+#              #
-#    Updated: 2020/09/11 20:18:10 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:42:47 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
-from test.test import Test  # noqa: F401
+from minishell_test.test.test import Test  # noqa: F401
diff --git a/minishell_test/test/captured.py b/minishell_test/test/captured.py
index f7dae3e..d24bcdf 100644
--- a/minishell_test/test/captured.py
+++ b/minishell_test/test/captured.py
@@ -6,13 +6,13 @@
 #    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/09/11 12:16:25 by charles           #+#    #+#              #
-#    Updated: 2021/02/04 15:52:19 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:55:31 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
 from typing import List, Optional
 
-import config
+import minishell_test.config as config
 
 
 class Captured:
diff --git a/minishell_test/test/result.py b/minishell_test/test/result.py
index eff7b8b..ec0f192 100644
--- a/minishell_test/test/result.py
+++ b/minishell_test/test/result.py
@@ -6,7 +6,7 @@
 #    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/09/11 12:17:34 by charles           #+#    #+#              #
-#    Updated: 2021/02/05 01:36:44 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:55:23 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
@@ -14,8 +14,8 @@ import sys
 import re
 from typing import Match, List, Optional
 
-import config
-from test.captured import Captured
+import minishell_test.config as config
+from minishell_test.test.captured import Captured
 
 
 class BaseResult:
diff --git a/minishell_test/test/test.py b/minishell_test/test/test.py
index ab68d1e..a6305b9 100644
--- a/minishell_test/test/test.py
+++ b/minishell_test/test/test.py
@@ -6,7 +6,7 @@
 #    By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2020/06/16 21:48:50 by charles           #+#    #+#              #
-#    Updated: 2021/02/05 01:37:44 by charles          ###   ########.fr        #
+#    Updated: 2021/02/05 14:42:26 by charles          ###   ########.fr        #
 #                                                                              #
 # ############################################################################ #
 
@@ -15,10 +15,10 @@ import sys
 import subprocess
 from typing import Optional, List, Dict, Union, Callable
 
-import config
-from test.captured import Captured
-from test.result import Result, LeakResult
-import sandbox
+import minishell_test.config as config
+from minishell_test.test.captured import Captured
+from minishell_test.test.result import Result, LeakResult
+import minishell_test.sandbox as sandbox
 
 HookType =       Union[Callable[[str], str], List[Callable[[str], str]]]
 HookStatusType = Union[Callable[[int], int], List[Callable[[int], int]]]
diff --git a/setup.cfg b/setup.cfg
index d9fec95..779fe62 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = minishell_test
-version = 0.0.2
+version = 0.0.7
 license = GPL2
 license_file = LICENSE
 description = test for the minishell project of school 42
@@ -24,6 +24,9 @@ classifiers =
 packages = find:
 python_requires = >=3.6
 
+# [options.packages.find]
+# where = minishell_test
+
 [flake8]
 ignore = E501,E221,W503,E241
 select = E,F,W,C4,N,ECE,CCR
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..6b1467d
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+"""Packaging logic for Flake8."""
+import os
+import sys
+
+import setuptools
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'minishell_test'))  # noqa
+
+setuptools.setup()