diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 23b9c5d..dc71b38 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -22,14 +22,18 @@ jobs: with: python-version: '3.9' - - name: Legendary dependencies and build tools - run: pip3 install --upgrade + - name: Update packaging tools + run: pip install --upgrade + pip + wheel setuptools - pyinstaller - requests + pipenv + + - name: Install dependencies + run: pipenv install --system --dev - name: Optional dependencies (WebView) - run: pip3 install --upgrade pywebview + run: pipenv install --system --categories="webview" if: runner.os != 'macOS' - name: Set strip option on non-Windows @@ -59,10 +63,12 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Dependencies - run: | - sudo apt install ruby - sudo gem install fpm + - uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.0' + + - name: Install fpm + run: gem install fpm - name: Build run: fpm @@ -75,7 +81,7 @@ jobs: --depends "python3 >= 3.9" setup.py - - name: Os version + - name: OS version id: os_version run: | source /etc/os-release diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..7f4451d --- /dev/null +++ b/Pipfile @@ -0,0 +1,22 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +requests = "~= 2.31" + +[dev-packages] +pyinstaller = "*" +build = "*" + +[requires] +python_version = "3.9" +python_full_version = "3.9.16" + +[webview] +pywebview = "~= 4.1" + +[webview_gtk] +pywebview = "~= 4.1" +pygobject = "~= 3.44" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..8660dc3 --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,271 @@ +{ + "_meta": { + "hash": { + "sha256": "cf1db215953c037012b49f4162de0517d21b76ad5a58c8bd5a88bccb9414da07" + }, + "pipfile-spec": 6, + "requires": { + "python_full_version": "3.9.16", + "python_version": "3.9" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "certifi": { + "hashes": [ + "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7", + "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716" + ], + "markers": "python_version >= '3.6'", + "version": "==2023.5.7" + }, + "charset-normalizer": { + "hashes": [ + "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6", + "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1", + "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e", + "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373", + "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62", + "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230", + "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be", + "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c", + "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0", + "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448", + "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f", + "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649", + "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d", + "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0", + "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706", + "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a", + "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59", + "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23", + "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5", + "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb", + "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e", + "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e", + "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c", + "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28", + "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d", + "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41", + "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974", + "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce", + "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f", + "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1", + "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d", + "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8", + "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017", + "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31", + "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7", + "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8", + "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e", + "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14", + "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd", + "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d", + "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795", + "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b", + "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b", + "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b", + "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203", + "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f", + "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19", + "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1", + "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a", + "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac", + "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9", + "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0", + "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137", + "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f", + "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6", + "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5", + "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909", + "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f", + "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0", + "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324", + "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755", + "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb", + "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854", + "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c", + "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60", + "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84", + "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0", + "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b", + "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1", + "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531", + "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1", + "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11", + "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326", + "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df", + "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab" + ], + "markers": "python_full_version >= '3.7.0'", + "version": "==3.1.0" + }, + "idna": { + "hashes": [ + "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4", + "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2" + ], + "markers": "python_version >= '3.5'", + "version": "==3.4" + }, + "requests": { + "hashes": [ + "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f", + "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1" + ], + "index": "pypi", + "version": "==2.31.0" + }, + "urllib3": { + "hashes": [ + "sha256:61717a1095d7e155cdb737ac7bb2f4324a858a1e2e6466f6d03ff630ca68d3cc", + "sha256:d055c2f9d38dc53c808f6fdc8eab7360b6fdbbde02340ed25cfbcd817c62469e" + ], + "markers": "python_version >= '3.7'", + "version": "==2.0.2" + } + }, + "develop": { + "altgraph": { + "hashes": [ + "sha256:ad33358114df7c9416cdb8fa1eaa5852166c505118717021c6a8c7c7abbd03dd", + "sha256:c8ac1ca6772207179ed8003ce7687757c04b0b71536f81e2ac5755c6226458fe" + ], + "version": "==0.17.3" + }, + "build": { + "hashes": [ + "sha256:af266720050a66c893a6096a2f410989eeac74ff9a68ba194b3f6473e8e26171", + "sha256:d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269" + ], + "index": "pypi", + "version": "==0.10.0" + }, + "packaging": { + "hashes": [ + "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61", + "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f" + ], + "markers": "python_version >= '3.7'", + "version": "==23.1" + }, + "pyinstaller": { + "hashes": [ + "sha256:036a062a228af41f6bb6370a4e87cef34858cc839200a07ace7f8738ef64ad86", + "sha256:049cdc3524aefb5ca015a63d2c81b6bf1567cc818ac066859fbfde702c6165d3", + "sha256:0af9d11a09ce217d32f95c79c984054457b310671387ff32bae1496876308556", + "sha256:2a1fe6d0da22f207cfa4b3221fe365503cba071c77aac19f76a75503f67d9ff9", + "sha256:42fdea67e4c2217cedd54d17d1d402736df3ba718db2b497df65df5a68ae4f93", + "sha256:8454bac8f3cb2219a3ce2227fd039bdaf943dcba60e8c55732958ea3a6d81263", + "sha256:a445a91b85c9a1ea3985268643a674900dd86f244cc4be4ff4ec4c6367ff99a9", + "sha256:b3c6299fd7526c6ca87ea5f9017fb1928d47046df0b9f983d6bbd893801010dc", + "sha256:b4cac0e7b0d63c6a869843113008f59fd5b38b2959ffa6059e7fac4bb05de92b", + "sha256:b8a4f6834e5c85150948e22c74dd3ab8b98aa4ccdf964d880ac14d2f78d9c1a4", + "sha256:cb87cee0b3c81ccd74d4bf3f4faf03b5e1e39bb91f1a894b2ce4cd22363bf779", + "sha256:e359571327bbef434fc61324891399f9117efbb685b5065234eebb01713650a8" + ], + "index": "pypi", + "version": "==5.11.0" + }, + "pyinstaller-hooks-contrib": { + "hashes": [ + "sha256:062ad7a1746e1cfc24d3a8c4be4e606fced3b123bda7d419f14fcf7507804b07", + "sha256:bb39e1038e3e0972420455e0b39cd9dce73f3d80acaf4bf2b3615fea766ff370" + ], + "markers": "python_version >= '3.7'", + "version": "==2023.3" + }, + "pyproject-hooks": { + "hashes": [ + "sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8", + "sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5" + ], + "markers": "python_version >= '3.7'", + "version": "==1.0.0" + }, + "setuptools": { + "hashes": [ + "sha256:5df61bf30bb10c6f756eb19e7c9f3b473051f48db77fddbe06ff2ca307df9a6f", + "sha256:62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102" + ], + "markers": "python_version >= '3.7'", + "version": "==67.8.0" + } + }, + "webview": { + "bottle": { + "hashes": [ + "sha256:d6f15f9d422670b7c073d63bd8d287b135388da187a0f3e3c19293626ce034ea", + "sha256:e1a9c94970ae6d710b3fb4526294dfeb86f2cb4a81eff3a4b98dc40fb0e5e021" + ], + "version": "==0.12.25" + }, + "proxy-tools": { + "hashes": [ + "sha256:ccb3751f529c047e2d8a58440d86b205303cf0fe8146f784d1cbcd94f0a28010" + ], + "version": "==0.1.0" + }, + "pywebview": { + "hashes": [ + "sha256:62efa24fff0b35fb8028556b6d44fc1c698a1deefa8df2c5557909af54679450", + "sha256:d4945c3be285b1046f812032fff882cf640547b63be132016730ad5a11153304" + ], + "index": "pypi", + "version": "==4.1" + } + }, + "webview_gtk": { + "bottle": { + "hashes": [ + "sha256:d6f15f9d422670b7c073d63bd8d287b135388da187a0f3e3c19293626ce034ea", + "sha256:e1a9c94970ae6d710b3fb4526294dfeb86f2cb4a81eff3a4b98dc40fb0e5e021" + ], + "version": "==0.12.25" + }, + "proxy-tools": { + "hashes": [ + "sha256:ccb3751f529c047e2d8a58440d86b205303cf0fe8146f784d1cbcd94f0a28010" + ], + "version": "==0.1.0" + }, + "pycairo": { + "hashes": [ + "sha256:1a6d8e0f353062ad92954784e33dbbaf66c880c9c30e947996c542ed9748aaaf", + "sha256:2dec5378133778961993fb59d66df16070e03f4d491b67eb695ca9ad7a696008", + "sha256:3a71f758e461180d241e62ef52e85499c843bd2660fd6d87cec99c9833792bfa", + "sha256:564601e5f528531c6caec1c0177c3d0709081e1a2a5cccc13561f715080ae535", + "sha256:82e335774a17870bc038e0c2fb106c1e5e7ad0c764662023886dfcfce5bb5a52", + "sha256:87efd62a7b7afad9a0a420f05b6008742a6cfc59077697be65afe8dc73ae15ad", + "sha256:9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c", + "sha256:a4b1f525bbdf637c40f4d91378de36c01ec2b7f8ecc585b700a079b9ff83298e", + "sha256:d6bacff15d688ed135b4567965a4b664d9fb8de7417a7865bb138ad612043c9f", + "sha256:e7cde633986435d87a86b6118b7b6109c384266fd719ef959883e2729f6eafae", + "sha256:ec305fc7f2f0299df78aadec0eaf6eb9accb90eda242b5d3492544d3f2b28027" + ], + "markers": "python_version >= '3.7'", + "version": "==1.23.0" + }, + "pygobject": { + "hashes": [ + "sha256:665fbe980c91e8b31ad78ed3f66879946948200864002d193f67eccc1d7d5d83" + ], + "index": "pypi", + "version": "==3.44.1" + }, + "pywebview": { + "hashes": [ + "sha256:62efa24fff0b35fb8028556b6d44fc1c698a1deefa8df2c5557909af54679450", + "sha256:d4945c3be285b1046f812032fff882cf640547b63be132016730ad5a11153304" + ], + "index": "pypi", + "version": "==4.1" + } + } +} diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..517261a --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,51 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[tool.setuptools] +packages = [ + "legendary", + "legendary.api", + "legendary.downloader", + "legendary.downloader.mp", + "legendary.lfs", + "legendary.models", + "legendary.utils", +] + +[tool.setuptools.dynamic] +version = {attr = "legendary.__version__"} + +[project] +name = "legendary" +description = "Free and open-source replacement for the Epic Games Launcher application" +readme = "README.md" +requires-python = ">=3.9" +license = {file = "LICENSE"} +authors = [ + {name = "Rodney", email = "rodney@rodney.io" } +] +classifiers = [ + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Programming Language :: Python", + "Programming Language :: Python :: 3.9", + "Operating System :: POSIX :: Linux", + "Operating System :: Microsoft", + "Intended Audience :: End Users/Desktop", + "Topic :: Games/Entertainment", + "Development Status :: 4 - Beta", +] +dependencies = [ + "requests ~= 2.31" +] +dynamic = ["version"] + +[project.optional-dependencies] +webview = ["pywebview ~= 4.1"] +webview_gtk = ["pywebview ~= 4.1", "PyGObject ~= 3.44"] + +[project.urls] +"Homepage" = "https://github.com/derrod/legendary" + +[project.scripts] +legendary = "legendary.cli:main" diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 011ac80..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -requests<3.0 diff --git a/setup.py b/setup.py index efa10b9..a4f49f9 100644 --- a/setup.py +++ b/setup.py @@ -1,61 +1,2 @@ -# !/usr/bin/env python -# coding: utf-8 - -import os -import sys - -from setuptools import setup - -from legendary import __version__ as legendary_version - -if sys.version_info < (3, 9): - sys.exit('python 3.9 or higher is required for legendary') - -with open("README.md", "r") as fh: - long_description_l = fh.readlines() - del long_description_l[2:5] # remove discord/twitter link and logo - long_description = ''.join(long_description_l) - -setup( - name='legendary-gl', - version=legendary_version, - license='GPL-3', - author='Rodney', - author_email='rodney@rodney.io', - packages=[ - 'legendary', - 'legendary.api', - 'legendary.downloader', - 'legendary.downloader.mp', - 'legendary.lfs', - 'legendary.models', - 'legendary.utils', - ], - entry_points=dict( - console_scripts=['legendary = legendary.cli:main'] - ), - install_requires=[ - 'requests<3.0', - 'setuptools', - 'wheel' - ], - extras_require=dict( - webview=['pywebview>=3.4'], - webview_gtk=['pywebview>=3.4', 'PyGObject'] - ), - url='https://github.com/derrod/legendary', - description='Free and open-source replacement for the Epic Games Launcher application', - long_description=long_description, - long_description_content_type="text/markdown", - python_requires='>=3.9', - classifiers=[ - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3.9', - 'Operating System :: POSIX :: Linux', - 'Operating System :: Microsoft', - 'Intended Audience :: End Users/Desktop', - 'Topic :: Games/Entertainment', - 'Development Status :: 4 - Beta', - ] -) +import setuptools +setuptools.setup()