Move legendary submodule to rare/legendary, to fix conflicts with already installed legendary
This commit is contained in:
parent
37e3c624ba
commit
ea13fc9433
7 changed files with 17 additions and 12 deletions
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
|
@ -40,7 +40,7 @@ jobs:
|
||||||
sudo pip install -r requirements.txt
|
sudo pip install -r requirements.txt
|
||||||
- name: Install legendary
|
- name: Install legendary
|
||||||
run: |
|
run: |
|
||||||
pip install ./legendary
|
pip install ./rare/legendary
|
||||||
- name: run python setup
|
- name: run python setup
|
||||||
run: |
|
run: |
|
||||||
python3 setup.py sdist
|
python3 setup.py sdist
|
||||||
|
@ -73,7 +73,7 @@ jobs:
|
||||||
sudo pip3 install appimage-builder
|
sudo pip3 install appimage-builder
|
||||||
- name: Install legendary
|
- name: Install legendary
|
||||||
run: |
|
run: |
|
||||||
pip install ./legendary
|
pip install ./rare/legendary
|
||||||
- name: Prepare Build directory
|
- name: Prepare Build directory
|
||||||
run: |
|
run: |
|
||||||
mkdir build
|
mkdir build
|
||||||
|
@ -117,7 +117,7 @@ jobs:
|
||||||
run: pip3 install --upgrade cx_freeze wheel
|
run: pip3 install --upgrade cx_freeze wheel
|
||||||
- name: Install legendary
|
- name: Install legendary
|
||||||
run: |
|
run: |
|
||||||
pip install ./legendary
|
pip install ./rare/legendary
|
||||||
- name: Build
|
- name: Build
|
||||||
run: python freeze.py bdist_msi
|
run: python freeze.py bdist_msi
|
||||||
|
|
||||||
|
@ -145,7 +145,7 @@ jobs:
|
||||||
- name: Pip Dependencies
|
- name: Pip Dependencies
|
||||||
run: |
|
run: |
|
||||||
pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
pip install ./legendary
|
pip install ./rare/legendary
|
||||||
pip install pyinstaller
|
pip install pyinstaller
|
||||||
|
|
||||||
- name: copy files
|
- name: copy files
|
||||||
|
|
6
.github/workflows/tests.yml
vendored
6
.github/workflows/tests.yml
vendored
|
@ -61,7 +61,7 @@ jobs:
|
||||||
sudo pip3 install appimage-builder
|
sudo pip3 install appimage-builder
|
||||||
- name: Install legendary
|
- name: Install legendary
|
||||||
run: |
|
run: |
|
||||||
pip install ./legendary
|
pip install ./rare/legendary
|
||||||
- name: Prepare Build directory
|
- name: Prepare Build directory
|
||||||
run: |
|
run: |
|
||||||
mkdir build
|
mkdir build
|
||||||
|
@ -93,7 +93,7 @@ jobs:
|
||||||
run: pip3 install --upgrade cx_freeze wheel
|
run: pip3 install --upgrade cx_freeze wheel
|
||||||
- name: Install legendary
|
- name: Install legendary
|
||||||
run: |
|
run: |
|
||||||
pip install ./legendary
|
pip install ./rare/legendary
|
||||||
- name: Build
|
- name: Build
|
||||||
run: python freeze.py bdist_msi
|
run: python freeze.py bdist_msi
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ jobs:
|
||||||
- name: Pip Dependencies
|
- name: Pip Dependencies
|
||||||
run: |
|
run: |
|
||||||
pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
pip install ./legendary
|
pip install ./rare/legendary
|
||||||
pip install pyinstaller
|
pip install pyinstaller
|
||||||
|
|
||||||
- name: copy files
|
- name: copy files
|
||||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -14,3 +14,4 @@ __pycache__
|
||||||
/venv310/
|
/venv310/
|
||||||
/venv311/
|
/venv311/
|
||||||
/test.py
|
/test.py
|
||||||
|
/.eggs
|
||||||
|
|
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -1,4 +1,4 @@
|
||||||
[submodule "legendary"]
|
[submodule "legendary"]
|
||||||
path = legendary
|
path = rare/legendary
|
||||||
url = https://github.com/dummerle/legendary
|
url = https://github.com/dummerle/legendary
|
||||||
branch = rare
|
branch = rare
|
||||||
|
|
|
@ -15,8 +15,9 @@ def main():
|
||||||
import multiprocessing
|
import multiprocessing
|
||||||
multiprocessing.freeze_support()
|
multiprocessing.freeze_support()
|
||||||
|
|
||||||
# insert legendary submodule to path
|
# insert legendary for installed via pip/setup.py submodule to path
|
||||||
sys.path.insert(0, os.path.join(pathlib.Path(__file__).parent.parent.absolute(), "legendary"))
|
if not __name__ == "__main__":
|
||||||
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "legendary"))
|
||||||
|
|
||||||
# insert source directory
|
# insert source directory
|
||||||
sys.path.insert(0, str(pathlib.Path(__file__).parent.parent.absolute()))
|
sys.path.insert(0, str(pathlib.Path(__file__).parent.parent.absolute()))
|
||||||
|
@ -81,4 +82,5 @@ def main():
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
sys.path.insert(0, os.path.join(pathlib.Path(__file__).parent.parent.absolute(), "legendary"))
|
||||||
main()
|
main()
|
||||||
|
|
6
setup.py
6
setup.py
|
@ -31,8 +31,10 @@ setuptools.setup(
|
||||||
long_description_content_type="text/markdown",
|
long_description_content_type="text/markdown",
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
url="https://github.com/Dummerle/Rare",
|
url="https://github.com/Dummerle/Rare",
|
||||||
packages=setuptools.find_packages() + setuptools.find_packages(where='legendary'),
|
packages=setuptools.find_packages() + [
|
||||||
package_dir={'rare': 'rare', '': 'legendary'},
|
"rare.legendary." + i for i in setuptools.find_packages(where="rare/legendary")
|
||||||
|
],
|
||||||
|
# package_dir={'rare': 'rare'},
|
||||||
classifiers=[
|
classifiers=[
|
||||||
"Programming Language :: Python :: 3",
|
"Programming Language :: Python :: 3",
|
||||||
"Programming Language :: Python :: 3.8",
|
"Programming Language :: Python :: 3.8",
|
||||||
|
|
Loading…
Reference in a new issue