diff --git a/.github/workflows/job_cx-freeze-msi.yml b/.github/workflows/job_cx-freeze-msi.yml index c55309ef6..5dd34b7cf 100644 --- a/.github/workflows/job_cx-freeze-msi.yml +++ b/.github/workflows/job_cx-freeze-msi.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v5 with: cache: pip - python-version: '3.12' + python-version: '3.13' check-latest: true architecture: x64 - name: Install build dependencies diff --git a/.github/workflows/job_cx-freeze-zip.yml b/.github/workflows/job_cx-freeze-zip.yml index de56341db..1fc28c46c 100644 --- a/.github/workflows/job_cx-freeze-zip.yml +++ b/.github/workflows/job_cx-freeze-zip.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v5 with: cache: pip - python-version: '3.12' + python-version: '3.13' check-latest: true architecture: x64 - name: Install build dependencies diff --git a/.github/workflows/job_macos.yml b/.github/workflows/job_macos.yml index a3329acbc..57cc143c4 100644 --- a/.github/workflows/job_macos.yml +++ b/.github/workflows/job_macos.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v5 with: cache: pip - python-version: '3.12' + python-version: '3.13' check-latest: true - name: Install Build Dependencies run: pip install pyinstaller diff --git a/.github/workflows/job_nuitka-linux.yml b/.github/workflows/job_nuitka-linux.yml index d4bb74ec1..40ee4725d 100644 --- a/.github/workflows/job_nuitka-linux.yml +++ b/.github/workflows/job_nuitka-linux.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v5 with: cache: pip - python-version: '3.12' + python-version: '3.13' check-latest: true architecture: x64 - name: Install build dependencies @@ -29,6 +29,7 @@ jobs: run: >- python -m nuitka --assume-yes-for-downloads + --show-scons --clang --lto=no --jobs=4 diff --git a/.github/workflows/job_nuitka-macos.yml b/.github/workflows/job_nuitka-macos.yml index cec729446..4f8741c8a 100644 --- a/.github/workflows/job_nuitka-macos.yml +++ b/.github/workflows/job_nuitka-macos.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-python@v5 with: cache: pip - python-version: '3.12' + python-version: '3.13' check-latest: true architecture: x64 - name: Install build dependencies @@ -32,6 +32,7 @@ jobs: run: >- arch -${{ matrix.arch }} python -m nuitka --assume-yes-for-downloads + --show-scons --clang --lto=no --jobs=4 diff --git a/.github/workflows/job_nuitka-win.yml b/.github/workflows/job_nuitka-win.yml index c4cff9005..d7516ce60 100644 --- a/.github/workflows/job_nuitka-win.yml +++ b/.github/workflows/job_nuitka-win.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v5 with: cache: pip - python-version: '3.12' + python-version: '3.13' check-latest: true architecture: x64 - name: Install build dependencies @@ -29,6 +29,7 @@ jobs: run: >- python -m nuitka --assume-yes-for-downloads + --show-scons --clang --lto=no --jobs=4 diff --git a/misc/nuitka_build.ps1 b/misc/nuitka_build.ps1 index d704162e1..377398e63 100644 --- a/misc/nuitka_build.ps1 +++ b/misc/nuitka_build.ps1 @@ -1,9 +1,11 @@ $nuitka_opts = @( '--assume-yes-for-downloads' + '--show-scons' '--mingw64' + '--clang' '--lto=no' - '--jobs=3' + '--jobs=4' '--static-libpython=no' '--standalone' '--enable-plugin=anti-bloat' diff --git a/misc/nuitka_build.sh b/misc/nuitka_build.sh index 8fb02deec..e455911c5 100755 --- a/misc/nuitka_build.sh +++ b/misc/nuitka_build.sh @@ -2,9 +2,10 @@ nuitka_opts=( '--assume-yes-for-downloads' - '--mingw64' + '--show-scons' + '--clang' '--lto=no' - '--jobs=3' + '--jobs=4' '--static-libpython=no' '--standalone' '--enable-plugin=anti-bloat' diff --git a/pyproject.toml b/pyproject.toml index ddeabc3d5..fada7690a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,11 +22,12 @@ repository = "https://github.com/RareDevs/Rare" [tool.poetry.dependencies] python = "^3.9" requests = "^2.28.1" -PySide6-Essentials = ">=6.6.0, <6.8.0" +PySide6-Essentials = "^6.8.1" QtAwesome = "^1.1.1" legendary-gl = "^0.20.34" pywebview = [ - { version = "^3.6.3", extras = ["cef"], platform = "windows", optional = true }, + { version = "^3.6.3", platform = "windows", optional = true }, + { version = "^3.6.3", platform = "darwin", optional = true }, { version = "^3.6.3", extras = ["gtk"], platform = "linux", optional = true }, { version = "^3.6.3", extras = ["gtk"], platform = "freebsd", optional = true }, ] diff --git a/requirements.txt b/requirements.txt index c74b5cf14..fa2321f9d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ requests -PySide6-Essentials >=6.6.0, <6.8.0 +PySide6-Essentials QtAwesome setuptools legendary-gl >=0.20.34; platform_system != "Windows" or platform_system != "Darwin" diff --git a/setup.py b/setup.py index 235ca9f86..671b8c6f5 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ -import setuptools +from setuptools import setup, find_packages +from setuptools_scm import ScmVersion from rare import __version__ as version @@ -19,22 +20,24 @@ def parse_requirements(filename): pypresence=parse_requirements("requirements-presence.txt"), ) -setuptools.setup( +setup( name="Rare", version=version, + use_scm_version={"version_scheme": "only-version", "local_scheme": "no-local-version"}, author="RareDevs", license="GPL-3", description="A gui for legendary", long_description=long_description, long_description_content_type="text/markdown", url="https://github.com/Dummerle/Rare", - packages=setuptools.find_packages(), + packages=find_packages(), classifiers=[ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', "Operating System :: OS Independent" ],