1
0
Fork 0
mirror of synced 2024-06-30 12:11:19 +12:00

Remove manually legendary installation from workflows

This commit is contained in:
Dummerle 2022-08-28 22:00:42 +02:00
parent 002bf908e6
commit 43f15734f3
No known key found for this signature in database
GPG key ID: AB68CC59CA39F2F1
4 changed files with 4 additions and 18 deletions

View file

@ -109,9 +109,6 @@ jobs:
run: pip3 install -r requirements.txt run: pip3 install -r requirements.txt
- name: cx_freeze - name: cx_freeze
run: pip3 install --upgrade cx_freeze wheel run: pip3 install --upgrade cx_freeze wheel
- name: Install legendary
run: |
pip install ./rare/legendary
- name: Build - name: Build
run: python freeze.py bdist_msi run: python freeze.py bdist_msi
@ -139,7 +136,6 @@ jobs:
- name: Pip Dependencies - name: Pip Dependencies
run: | run: |
pip install -r requirements.txt pip install -r requirements.txt
pip install ./rare/legendary
pip install pyinstaller pip install pyinstaller
- name: copy files - name: copy files

View file

@ -20,12 +20,10 @@ jobs:
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pylint pip install pylint
pip install -r requirements.txt pip install -r requirements.txt
- name: Install legendary
run: |
pip install ./rare/legendary
- name: Analysing the code with pylint - name: Analysing the code with pylint
run: | run: |
pylint -E rare --disable=E0611,E1123,E1120 --ignore=ui,singleton.py --extension-pkg-whitelist=PyQt5 pylint -E rare --disable=E0611,E1123,E1120 --ignore=ui,singleton.py --extension-pkg-whitelist=PyQt5
deb-package: deb-package:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -92,9 +90,6 @@ jobs:
run: pip3 install -r requirements.txt run: pip3 install -r requirements.txt
- name: cx_freeze - name: cx_freeze
run: pip3 install --upgrade cx_freeze wheel run: pip3 install --upgrade cx_freeze wheel
- name: Install legendary
run: |
pip install ./rare/legendary
- name: Build - name: Build
run: python freeze.py bdist_msi run: python freeze.py bdist_msi
@ -116,7 +111,6 @@ jobs:
- name: Pip Dependencies - name: Pip Dependencies
run: | run: |
pip install -r requirements.txt pip install -r requirements.txt
pip install ./rare/legendary
pip install pyinstaller pip install pyinstaller
- name: copy files - name: copy files

View file

@ -13,10 +13,7 @@ script:
# copy Logo # copy Logo
- cp AppDir/usr/src/rare/resources/images/Rare.png AppDir/usr/share/icons/hicolor/256x256/apps/ - cp AppDir/usr/src/rare/resources/images/Rare.png AppDir/usr/share/icons/hicolor/256x256/apps/
# Install application dependencies # 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 pypresence qtawesome legendary-gl
- python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir ./rare/legendary
# remove duplicate legendary
- rm -rf AppDir/usr/src/rare/legendary
AppDir: AppDir:
path: AppDir path: AppDir

View file

@ -7,6 +7,7 @@ with open("README.md", "r") as fh:
requirements = [ requirements = [
"requests<3.0", "requests<3.0",
"legendary-gl",
"setuptools", "setuptools",
"wheel", "wheel",
"PyQt5", "PyQt5",
@ -32,9 +33,7 @@ setuptools.setup(
long_description=long_description, long_description=long_description,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
url="https://github.com/Dummerle/Rare", url="https://github.com/Dummerle/Rare",
packages=setuptools.find_packages() + [ packages=setuptools.find_packages(),
"rare.legendary." + i for i in setuptools.find_packages(where="rare/legendary")
] + ["rare.resources"],
classifiers=[ classifiers=[
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.8",