Merge pull request #498 from loathingKernel/develop

More packaging cleanup

.github/workflows/job_publish.yml

@@ -31,7 +31,7 @@ jobs:
           - name: ${{ inputs.name2 }}
             file: ${{ inputs.file2 }}
     steps:
-    - name: Download ${{ matrix.name }} from artifact
+    - name: Download ${{ matrix.name }} from artifacts
       uses: actions/download-artifact@v4
       if: ${{ matrix.name != '' }}
       with:

README.md

@@ -97,6 +97,8 @@ Run it via:
 flatpak run io.github.dummerle.rare
 ```
 
+Alternatively, you can download the flatpak package from [our repository](https://github.com/RareDevs/io.github.dummerle.rare/releases)
+
 ### AppImage
 
 Available in [releases page](https://github.com/RareDevs/Rare/releases).

docs/index.md

@@ -84,6 +84,8 @@ Run it via:
 flatpak run io.github.dummerle.rare
 ```
 
+Alternatively, you can download the flatpak package from [our repository](https://github.com/RareDevs/io.github.dummerle.rare/releases)
+
 ### AppImage
 
 Available in [releases page](https://github.com/RareDevs/Rare/releases).

misc/version.py → misc/mkversion.py

@@ -3,7 +3,7 @@
 
 from setuptools_scm import ScmVersion, get_version
 
-def mkversion(ver: ScmVersion) -> str:
+def mknumeric(ver: ScmVersion) -> str:
     return f"{ver.tag}.{ver.distance}"
 
 
@@ -26,7 +26,7 @@ def mkname() -> str:
         root='..',
         relative_to=__file__,
         git_describe_command=["git", "describe", "--dirty", "--long"],
-        version_scheme=mkversion,
+        version_scheme=mknumeric,
         local_scheme="no-local-version"
     )
     sys.stdout.write(version)

misc/requirements-flatpak.in

@@ -1,9 +1,6 @@
 requests < 3.0
-# PySide6-Essentials  # from flatpak
 QtAwesome
-setuptools
-setuptools-scm
-legendary-gl @ https://github.com/derrod/legendary/archive/3963382b3f33116154399be5dd2d2913336a1f0e.zip
-# orjson  # needs the binary release, use req2flatpak
+legendary-gl
+orjson
 vdf
 pypresence

misc/requirements-packaging.in

@@ -1,5 +1,8 @@
+build
 setuptools
 setuptools-scm
+wheel
+installer
 cx-freeze
 nuitka
 pyinstaller

misc/requirements.in

@@ -1,8 +1,7 @@
+setuptools-scm
 requests < 3.0
 PySide6-Essentials
 QtAwesome
-setuptools
-setuptools-scm
 legendary-gl @ https://github.com/derrod/legendary/archive/3963382b3f33116154399be5dd2d2913336a1f0e.zip
 orjson
 vdf

pyproject.toml

@@ -80,14 +80,17 @@ exclude = [ ".github*", ".tx*", "docs*" ]
 namespaces = true
 
 [tool.setuptools.package-data]
-"rare.resources.images" = [ "Rare.ico", "Rare.icns", "Rare.png", "cover.png", "logo.png" ]
+"rare.resources.images" = [ "Rare.ico", "Rare.icns", "Rare.png", "Rare.svg", "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 = "misc.version:mkversion"
+version_scheme = "misc.mkversion:mknumeric"
 local_scheme = "no-local-version"
 version_file = "rare/_version.py"
 fallback_version = "1.10.11.0"
@@ -131,6 +134,20 @@ force-exclude = '''
 )/
 '''
 
+[tool.poetry]
+name = "Rare"
+version = "1.10.11.0"
+authors = [
+    "Dummerle [email protected]",
+    "loathingKernel [email protected]",
+]
+maintainers = [
+    "loathingKernel [email protected]",
+]
+description = "Open source alternative for Epic Games Launcher, using Legendary"
+readme = "README.md"
+
+
 [tool.poetry.dependencies]
 python = "^3.9"
 requests = "^2.28.1"
@@ -156,3 +173,7 @@ Nuitka = "^2.4.8"
 pylint = "^3.2.7"
 black = "^24.3.0"
 PySide6-stubs = "^6.4.2.0"
+
+[tool.poetry-dynamic-versioning]
+enable = true
+vcs = "git"

rare/__init__.py

@@ -6,4 +6,7 @@
 if __name__ == "__main__":
     import sys
     from rare.main import main
+
     sys.exit(main())
+
+__all__ = ["__version__", "__version_tuple__", "__codename__"]