Release (Makefile) - Deletes .whl and adds them to the .gitignore, now uses cargo-make
This commit is contained in:
parent
2883f14d71
commit
021d42c2fd
|
|
@ -4,10 +4,9 @@
|
|||
/bin.py
|
||||
python/dontlook.py
|
||||
expected_values.md
|
||||
/bin.py
|
||||
python/dontlook.py
|
||||
expected_values.md
|
||||
releases/*
|
||||
.whl
|
||||
pyinstaller_log.txt
|
||||
|
||||
# Byte-compiled / optimized / DLL files
|
||||
__pycache__/
|
||||
|
|
@ -161,4 +160,4 @@ dmypy.json
|
|||
.pytype/
|
||||
|
||||
# Cython debug symbols
|
||||
cython_debug/
|
||||
cython_debug/
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "xiv_craft_solver"
|
||||
version = "0.1.3"
|
||||
version = "0.1.4"
|
||||
edition = "2021"
|
||||
authors = ["谭俊健","Dandaedre","Vkyfox"]
|
||||
description = "Small XIV solver library in rust, with python and rust bindings"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,23 @@
|
|||
[tasks.release]
|
||||
dependencies = [
|
||||
"format",
|
||||
"clean",
|
||||
"build",
|
||||
"maturin",
|
||||
"maturin_build",
|
||||
"pip",
|
||||
"pyinstaller",
|
||||
"zip",
|
||||
]
|
||||
|
||||
[tasks.upload]
|
||||
script_runner="@shell"
|
||||
ignore_errors = true
|
||||
script = [
|
||||
"twine upload releases/ffcraft_solver*.whl --repository gitea",
|
||||
"twine upload releases/xiv_craft_solver*.whl --repository gitea",
|
||||
]
|
||||
|
||||
[tasks.format]
|
||||
install_crate = "rustfmt"
|
||||
command = "cargo"
|
||||
|
|
@ -6,6 +26,7 @@ args = ["fmt", "--", "--emit=files"]
|
|||
[tasks.clean]
|
||||
command = "cargo"
|
||||
args = ["clean"]
|
||||
dependencies = ["remove_tmp"]
|
||||
|
||||
[tasks.remove_tmp]
|
||||
script_runner = "@shell"
|
||||
|
|
@ -15,23 +36,56 @@ script = '''
|
|||
rm -rf python/dist
|
||||
'''
|
||||
|
||||
[tasks.zip]
|
||||
script_runner = "@shell"
|
||||
script = '''
|
||||
mkdir -p releases # Add version as an arg and things
|
||||
cp target/wheels/*.whl releases/
|
||||
zip releases/ffcraft_solver_cli.zip -q -j target/release/ffcraft_solver_cli craft.toml -j target/release/libxiv_craft_solver.so
|
||||
cd python/dist/ && zip -q ../../releases/ffcraft_solver_gui.zip -r ffcraft_solver_gui/
|
||||
'''
|
||||
|
||||
[tasks.pip]
|
||||
script_runner = "@shell"
|
||||
script = '''
|
||||
cd python
|
||||
rm -rf build dist
|
||||
pip install -q -r requirements_dev.txt
|
||||
pip install -q -e .
|
||||
python -m pip wheel . --wheel-dir=../releases/
|
||||
'''
|
||||
|
||||
[tasks.pyinstaller]
|
||||
windows_alias = "windows_pyinstaller"
|
||||
linux_alias = "linux_pyinstaller"
|
||||
|
||||
[tasks.linux_pyinstaller]
|
||||
script_runner = "@shell"
|
||||
script = '''
|
||||
cd python
|
||||
pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/:ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/:ffcraft_solver/ressources" --name ffcraft_solver_gui -y > /dev/null
|
||||
'''
|
||||
|
||||
[tasks.windows_pyinstaller]
|
||||
script_runner = "@shell"
|
||||
script = '''
|
||||
cd python
|
||||
pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/;ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/;ffcraft_solver/ressources" --name ffcraft_solver_gui -y > /dev/null 2>pyinstaller_log.txt
|
||||
'''
|
||||
|
||||
[tasks.build]
|
||||
command = "cargo"
|
||||
args = ["build","--release","-q"]
|
||||
args = ["build","--release"]
|
||||
dependencies = ["clean"]
|
||||
|
||||
[tasks.maturin]
|
||||
command = "maturin"
|
||||
args = ["develop", "--release", "-q"]
|
||||
args = ["develop", "--release"]
|
||||
|
||||
[tasks.maturin_build]
|
||||
command = "maturin"
|
||||
args = ["build", "--release"]
|
||||
|
||||
|
||||
[tasks.rust]
|
||||
dependencies = ["build","maturin"]
|
||||
|
||||
|
||||
[tasks.my-flow]
|
||||
dependencies = [
|
||||
"format",
|
||||
"build",
|
||||
"test"
|
||||
]
|
||||
|
||||
dependencies = ["build","maturin"]
|
||||
|
|
@ -5,7 +5,7 @@ build-backend = "maturin"
|
|||
[project] # The rust bindings
|
||||
name = "xiv_craft_solver"
|
||||
requires-python = ">=3.7"
|
||||
version = "0.0.4"
|
||||
version = "0.1.4"
|
||||
classifiers = [
|
||||
"Programming Language :: Rust",
|
||||
"Programming Language :: Python :: Implementation :: CPython",
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,58 +0,0 @@
|
|||
71 INFO: PyInstaller: 5.8.0
|
||||
71 INFO: Python: 3.10.6
|
||||
72 INFO: Platform: Linux-6.1.11-76060111-generic-x86_64-with-glibc2.35
|
||||
72 INFO: wrote /home/dandaedre/Documents/Git/ffcraft_solver/python/ffcraft_solver_gui.spec
|
||||
74 INFO: UPX is available.
|
||||
74 INFO: Extending PYTHONPATH with paths
|
||||
['/home/dandaedre/Documents/Git/ffcraft_solver/python/src']
|
||||
166 INFO: checking Analysis
|
||||
166 INFO: Building Analysis because Analysis-00.toc is non existent
|
||||
166 INFO: Initializing module dependency graph...
|
||||
167 INFO: Caching module graph hooks...
|
||||
176 INFO: Analyzing base_library.zip ...
|
||||
581 INFO: Loading module hook 'hook-heapq.py' from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks'...
|
||||
625 INFO: Loading module hook 'hook-encodings.py' from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks'...
|
||||
1292 INFO: Loading module hook 'hook-pickle.py' from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks'...
|
||||
2161 INFO: Caching module dependency graph...
|
||||
2221 INFO: running Analysis Analysis-00.toc
|
||||
2236 INFO: Analyzing /home/dandaedre/Documents/Git/ffcraft_solver/python/src/ffcraft_solver/__main__.py
|
||||
2508 INFO: Loading module hook 'hook-platform.py' from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks'...
|
||||
2672 INFO: Loading module hook 'hook-pygments.py' from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks'...
|
||||
3097 INFO: Loading module hook 'hook-pkg_resources.py' from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks'...
|
||||
3438 INFO: Loading module hook 'hook-xml.py' from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks'...
|
||||
3457 INFO: Loading module hook 'hook-sysconfig.py' from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks'...
|
||||
4100 INFO: Processing module hooks...
|
||||
5030 INFO: Processing pre-safe import module hook win32com from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/_pyinstaller_hooks_contrib/hooks/pre_safe_import_module/hook-win32com.py'.
|
||||
5209 INFO: Loading module hook 'hook-packaging.py' from '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks'...
|
||||
5271 INFO: Looking for ctypes DLLs
|
||||
5276 INFO: Analyzing run-time hooks ...
|
||||
5278 INFO: Including run-time hook '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks/rthooks/pyi_rth_inspect.py'
|
||||
5279 INFO: Including run-time hook '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks/rthooks/pyi_rth_pkgres.py'
|
||||
5281 INFO: Including run-time hook '/home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/hooks/rthooks/pyi_rth_pkgutil.py'
|
||||
5288 INFO: Looking for dynamic libraries
|
||||
5630 INFO: Looking for eggs
|
||||
5630 INFO: Python library not among binary dependencies. Performing additional search...
|
||||
5642 INFO: Using Python library /lib/x86_64-linux-gnu/libpython3.10.so.1.0
|
||||
5644 INFO: Warnings written to /home/dandaedre/Documents/Git/ffcraft_solver/python/build/ffcraft_solver_gui/warn-ffcraft_solver_gui.txt
|
||||
5669 INFO: Graph cross-reference written to /home/dandaedre/Documents/Git/ffcraft_solver/python/build/ffcraft_solver_gui/xref-ffcraft_solver_gui.html
|
||||
5679 INFO: Appending 'datas' from .spec
|
||||
5684 INFO: checking PYZ
|
||||
5684 INFO: Building PYZ because PYZ-00.toc is non existent
|
||||
5684 INFO: Building PYZ (ZlibArchive) /home/dandaedre/Documents/Git/ffcraft_solver/python/build/ffcraft_solver_gui/PYZ-00.pyz
|
||||
6064 INFO: Building PYZ (ZlibArchive) /home/dandaedre/Documents/Git/ffcraft_solver/python/build/ffcraft_solver_gui/PYZ-00.pyz completed successfully.
|
||||
6073 WARNING: Ignoring icon; supported only on Windows and macOS!
|
||||
6073 INFO: checking PKG
|
||||
6073 INFO: Building PKG because PKG-00.toc is non existent
|
||||
6073 INFO: Building PKG (CArchive) ffcraft_solver_gui.pkg
|
||||
6087 INFO: Building PKG (CArchive) ffcraft_solver_gui.pkg completed successfully.
|
||||
6087 INFO: Bootloader /home/dandaedre/Documents/Git/ffcraft_solver/.venv/lib/python3.10/site-packages/PyInstaller/bootloader/Linux-64bit-intel/run
|
||||
6087 INFO: checking EXE
|
||||
6087 INFO: Building EXE because EXE-00.toc is non existent
|
||||
6087 INFO: Building EXE from EXE-00.toc
|
||||
6087 INFO: Copying bootloader EXE to /home/dandaedre/Documents/Git/ffcraft_solver/python/build/ffcraft_solver_gui/ffcraft_solver_gui
|
||||
6088 INFO: Appending PKG archive to custom ELF section in EXE
|
||||
6096 INFO: Building EXE from EXE-00.toc completed successfully.
|
||||
6096 INFO: checking COLLECT
|
||||
6096 INFO: Building COLLECT because COLLECT-00.toc is non existent
|
||||
6096 INFO: Building COLLECT COLLECT-00.toc
|
||||
6236 INFO: Building COLLECT COLLECT-00.toc completed successfully.
|
||||
|
|
@ -9,7 +9,7 @@ authors = [
|
|||
{name="Dandaedre"},
|
||||
]
|
||||
requires-python = ">=3.7"
|
||||
version = "0.0.4"
|
||||
version = "0.1.4"
|
||||
license = {text="Mozilla Public License Version 2.0"}
|
||||
classifiers = [
|
||||
"Programming Language :: Rust",
|
||||
|
|
|
|||
|
|
@ -5,9 +5,5 @@ pytest-cov==3.0.0
|
|||
mypy==0.941
|
||||
dearpygui==1.8.0
|
||||
PyYAML==6.0
|
||||
<<<<<<< HEAD
|
||||
rich==13.3.1
|
||||
pyinstaller==5.8.0
|
||||
=======
|
||||
rich==13.3.1
|
||||
>>>>>>> develop
|
||||
pyinstaller==5.8.0
|
||||
Reference in New Issue