From 43f15734f34dd98672719f4c1e0fec8818db1b54 Mon Sep 17 00:00:00 2001
From: Dummerle <44114474+Dummerle@users.noreply.github.com>
Date: Sun, 28 Aug 2022 22:00:42 +0200
Subject: [PATCH] Remove manually legendary installation from workflows

---
 .github/workflows/release.yml | 4 ----
 .github/workflows/tests.yml   | 8 +-------
 AppImageBuilder.yml           | 5 +----
 setup.py                      | 5 ++---
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f1f3db6a..832be806 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -109,9 +109,6 @@ jobs:
         run: pip3 install -r requirements.txt
       - name: cx_freeze
         run: pip3 install --upgrade cx_freeze wheel
-      - name: Install legendary
-        run: |
-          pip install ./rare/legendary
       - name: Build
         run: python freeze.py bdist_msi
 
@@ -139,7 +136,6 @@ jobs:
       - name: Pip Dependencies
         run: |
           pip install -r requirements.txt
-          pip install ./rare/legendary
           pip install pyinstaller
 
       - name: copy files
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e1269775..970c8334 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,12 +20,10 @@ jobs:
           python -m pip install --upgrade pip
           pip install pylint
           pip install -r requirements.txt
-      - name: Install legendary
-        run: |
-          pip install ./rare/legendary
       - name: Analysing the code with pylint
         run: |
           pylint -E rare --disable=E0611,E1123,E1120 --ignore=ui,singleton.py --extension-pkg-whitelist=PyQt5
+
   deb-package:
     runs-on: ubuntu-latest
     steps:
@@ -92,9 +90,6 @@ jobs:
         run: pip3 install -r requirements.txt
       - name: cx_freeze
         run: pip3 install --upgrade cx_freeze wheel
-      - name: Install legendary
-        run: |
-          pip install ./rare/legendary
       - name: Build
         run: python freeze.py bdist_msi
 
@@ -116,7 +111,6 @@ jobs:
       - name: Pip Dependencies
         run: |
           pip install -r requirements.txt
-          pip install ./rare/legendary
           pip install pyinstaller
 
       - name: copy files
diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml
index a3cfff36..91151ef3 100644
--- a/AppImageBuilder.yml
+++ b/AppImageBuilder.yml
@@ -13,10 +13,7 @@ script:
   # copy Logo
   - cp AppDir/usr/src/rare/resources/images/Rare.png AppDir/usr/share/icons/hicolor/256x256/apps/
   # Install application dependencies
-  - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir pypresence qtawesome
-  - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir ./rare/legendary
-  # remove duplicate legendary
-  - rm -rf AppDir/usr/src/rare/legendary
+  - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir pypresence qtawesome legendary-gl
 
 AppDir:
   path: AppDir
diff --git a/setup.py b/setup.py
index aeb4f9e2..6b495a93 100644
--- a/setup.py
+++ b/setup.py
@@ -7,6 +7,7 @@ with open("README.md", "r") as fh:
 
 requirements = [
     "requests<3.0",
+    "legendary-gl",
     "setuptools",
     "wheel",
     "PyQt5",
@@ -32,9 +33,7 @@ setuptools.setup(
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/Dummerle/Rare",
-    packages=setuptools.find_packages() + [
-        "rare.legendary." + i for i in setuptools.find_packages(where="rare/legendary")
-    ] + ["rare.resources"],
+    packages=setuptools.find_packages(),
     classifiers=[
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",