Move legendary submodule to rare/legendary, to fix conflicts with already installed legendary

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
           sudo pip install -r requirements.txt
       - name: Install legendary
         run: |
-          pip install ./legendary
+          pip install ./rare/legendary
       - name: run python setup
         run: |
           python3 setup.py sdist
@@ -73,7 +73,7 @@ jobs:
           sudo pip3 install appimage-builder
       - name: Install legendary
         run: |
-          pip install ./legendary
+          pip install ./rare/legendary
       - name: Prepare Build directory
         run: |
           mkdir build
@@ -117,7 +117,7 @@ jobs:
         run: pip3 install --upgrade cx_freeze wheel
       - name: Install legendary
         run: |
-          pip install ./legendary
+          pip install ./rare/legendary
       - name: Build
         run: python freeze.py bdist_msi
 
@@ -145,7 +145,7 @@ jobs:
       - name: Pip Dependencies
         run: |
           pip install -r requirements.txt
-          pip install ./legendary
+          pip install ./rare/legendary
           pip install pyinstaller
 
       - name: copy files

.github/workflows/tests.yml

@@ -61,7 +61,7 @@ jobs:
           sudo pip3 install appimage-builder
       - name: Install legendary
         run: |
-          pip install ./legendary
+          pip install ./rare/legendary
       - name: Prepare Build directory
         run: |
           mkdir build
@@ -93,7 +93,7 @@ jobs:
         run: pip3 install --upgrade cx_freeze wheel
       - name: Install legendary
         run: |
-          pip install ./legendary
+          pip install ./rare/legendary
       - name: Build
         run: python freeze.py bdist_msi
 
@@ -115,7 +115,7 @@ jobs:
       - name: Pip Dependencies
         run: |
           pip install -r requirements.txt
-          pip install ./legendary
+          pip install ./rare/legendary
           pip install pyinstaller
 
       - name: copy files

.gitignore

@@ -14,3 +14,4 @@ __pycache__
 /venv310/
 /venv311/
 /test.py
+/.eggs

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "legendary"]
-	path = legendary
+	path = rare/legendary
 	url = https://github.com/dummerle/legendary
 	branch = rare

rare/__main__.py

@@ -15,8 +15,9 @@ def main():
     import multiprocessing
     multiprocessing.freeze_support()
 
-    # insert legendary submodule to path
-    sys.path.insert(0, os.path.join(pathlib.Path(__file__).parent.parent.absolute(), "legendary"))
+    # insert legendary for installed via pip/setup.py submodule to path
+    if not __name__ == "__main__":
+        sys.path.insert(0, os.path.join(os.path.dirname(__file__), "legendary"))
 
     # insert source directory
     sys.path.insert(0, str(pathlib.Path(__file__).parent.parent.absolute()))
@@ -81,4 +82,5 @@ def main():
 
 
 if __name__ == '__main__':
+    sys.path.insert(0, os.path.join(pathlib.Path(__file__).parent.parent.absolute(), "legendary"))
     main()

setup.py

@@ -31,8 +31,10 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     include_package_data=True,
     url="https://github.com/Dummerle/Rare",
-    packages=setuptools.find_packages() + setuptools.find_packages(where='legendary'),
-    package_dir={'rare': 'rare', '': 'legendary'},
+    packages=setuptools.find_packages() + [
+        "rare.legendary." + i for i in setuptools.find_packages(where="rare/legendary")
+    ],
+    # package_dir={'rare': 'rare'},
     classifiers=[
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",