diff --git a/.github/workflows/job_cx-freeze-appimage.yml b/.github/workflows/job_cx-freeze-appimage.yml index 248c80daf..4ceeae32b 100644 --- a/.github/workflows/job_cx-freeze-appimage.yml +++ b/.github/workflows/job_cx-freeze-appimage.yml @@ -33,7 +33,6 @@ jobs: pip3 install -r misc/requirements.in - name: Generate version information run: | - pip3 install setuptools-scm python3 -m setuptools_scm --force-write-version-files - name: Build run: | diff --git a/.github/workflows/job_cx-freeze-dmg.yml b/.github/workflows/job_cx-freeze-dmg.yml index 2b5814b3b..8dc1d10e9 100644 --- a/.github/workflows/job_cx-freeze-dmg.yml +++ b/.github/workflows/job_cx-freeze-dmg.yml @@ -39,7 +39,6 @@ jobs: pip3 install -r misc/requirements.in - name: Generate version information run: | - pip3 install setuptools-scm python3 -m setuptools_scm --force-write-version-files - name: Build run: | diff --git a/.github/workflows/job_cx-freeze-msi.yml b/.github/workflows/job_cx-freeze-msi.yml index 97e6cbfc3..a4d22084b 100644 --- a/.github/workflows/job_cx-freeze-msi.yml +++ b/.github/workflows/job_cx-freeze-msi.yml @@ -29,7 +29,6 @@ jobs: pip3 install -r misc/requirements.in - name: Generate version information run: | - pip3 install setuptools-scm python3 -m setuptools_scm --force-write-version-files - name: Build run: | diff --git a/.github/workflows/job_nuitka-linux.yml b/.github/workflows/job_nuitka-linux.yml index fca3b05a4..ec8632a0f 100644 --- a/.github/workflows/job_nuitka-linux.yml +++ b/.github/workflows/job_nuitka-linux.yml @@ -28,7 +28,6 @@ jobs: pip3 install -r misc/requirements.in - name: Generate version information run: | - pip3 install setuptools-scm python3 -m setuptools_scm --force-write-version-files - name: Build run: >- diff --git a/.github/workflows/job_nuitka-macos.yml b/.github/workflows/job_nuitka-macos.yml index 8afd2d7c6..ced5b138d 100644 --- a/.github/workflows/job_nuitka-macos.yml +++ b/.github/workflows/job_nuitka-macos.yml @@ -36,7 +36,6 @@ jobs: pip3 install -r misc/requirements.in - name: Generate version information run: | - pip3 install setuptools-scm python3 -m setuptools_scm --force-write-version-files - name: Build run: >- diff --git a/.github/workflows/job_nuitka-windows.yml b/.github/workflows/job_nuitka-windows.yml index e806b155d..e5343ef6f 100644 --- a/.github/workflows/job_nuitka-windows.yml +++ b/.github/workflows/job_nuitka-windows.yml @@ -28,7 +28,6 @@ jobs: pip3 install -r misc/requirements.in - name: Generate version information run: | - pip3 install setuptools-scm python3 -m setuptools_scm --force-write-version-files - name: Build run: >- diff --git a/.github/workflows/job_pypi.yml b/.github/workflows/job_pypi.yml index 875fe5265..5091f2833 100644 --- a/.github/workflows/job_pypi.yml +++ b/.github/workflows/job_pypi.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | python3 -m pip install --upgrade pip - pip3 install setuptools build wheel twine + pip3 install build twine - name: Build run: | python3 -m build --sdist --wheel diff --git a/README.md b/README.md index f5f47a5c4..77284d6ea 100644 --- a/README.md +++ b/README.md @@ -130,14 +130,14 @@ After installing Rare, if macOS complains that it is damaged, open a terminal an ```shell sudo xattr -dr com.apple.quarantine /Applications/Rare.app ``` -which will allow the application run normally. +which will allow the application to run normally. -Alternatively, you can install from `pip` or from source. +Alternatively, you can install using `pip`/`pipx` or from source. ### Latest development version -In the [actions](https://github.com/RareDevs/Rare/actions) tab you can find packages for the latest commits. +In the [actions](https://github.com/RareDevs/Rare/actions/workflows/snapshot.yml) tab you can find packages for the latest commits. **Note**: They might be unstable and likely broken. diff --git a/misc/requirements-flatpak.in b/misc/requirements-flatpak.in index 0dc200568..58395060c 100644 --- a/misc/requirements-flatpak.in +++ b/misc/requirements-flatpak.in @@ -1,7 +1,9 @@ requests < 3.0 +# PySide6-Essentials # from flatpak QtAwesome setuptools -legendary-gl >= 0.20.34 +setuptools-scm +legendary-gl @ https://github.com/derrod/legendary/archive/3963382b3f33116154399be5dd2d2913336a1f0e.zip # orjson # needs the binary release, use req2flatpak vdf pypresence diff --git a/misc/requirements.in b/misc/requirements.in index ccb7059e1..54b7d1928 100644 --- a/misc/requirements.in +++ b/misc/requirements.in @@ -2,6 +2,7 @@ requests < 3.0 PySide6-Essentials QtAwesome setuptools +setuptools-scm legendary-gl @ https://github.com/derrod/legendary/archive/3963382b3f33116154399be5dd2d2913336a1f0e.zip orjson vdf diff --git a/tools/version.py b/misc/version.py similarity index 100% rename from tools/version.py rename to misc/version.py diff --git a/pyproject.toml b/pyproject.toml index e5828ad0f..ab21f4e5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ webview = [ "pyobjc; platform_system == 'Darwin'", "pywebview; platform_system == 'Darwin'", ] -presence = [ +discordrpc = [ "pypresence", ] dev = [ @@ -83,14 +83,11 @@ namespaces = true "rare.resources.images" = [ "Rare.ico", "Rare.icns", "Rare.png", "cover.png", "logo.png" ] "rare.resources.languages" = [ "rare_*.qm" ] -[tool.setuptools.dynamic] -version = { attr = "rare.__version__" } - [tool.setuptools_scm] # use only annotated tags ( omit `--tags` argument from `git describe`) git_describe_command = [ "git", "describe", "--dirty", "--long" ] #tag_regex = "(?P^[0-9]+\\.[0-9]+\\.[0-9]+)(?P.[0-9]+)?$" -version_scheme = "tools.version:mkversion" +version_scheme = "misc.version:mkversion" local_scheme = "no-local-version" version_file = "rare/_version.py" fallback_version = "1.10.11.0"