Merge pull request #494 from loathingKernel/develop

Packaging updates

.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: |

.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: |

.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: |

.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: >-

.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: >-

.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: >-

.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

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.
 

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

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

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<version>^[0-9]+\\.[0-9]+\\.[0-9]+)(?P<suffix>.[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"