diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 23b9c5d..d6ca1d4 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 @@ -37,7 +41,7 @@ jobs: run: echo ::set-output name=option::--strip if: runner.os != 'Windows' - - name: Build + - name: Build pyinstaller working-directory: legendary run: pyinstaller --onefile @@ -61,10 +65,10 @@ jobs: - name: Dependencies run: | - sudo apt install ruby - sudo gem install fpm + apt install ruby + gem install fpm - - name: Build + - name: Build fpm run: fpm --input-type python --output-type deb @@ -73,7 +77,6 @@ jobs: --maintainer "Rodney " --category python --depends "python3 >= 3.9" - setup.py - name: Os version id: os_version diff --git a/Pipfile b/Pipfile index ec2a1a7..7f4451d 100644 --- a/Pipfile +++ b/Pipfile @@ -7,6 +7,8 @@ name = "pypi" requests = "~= 2.31" [dev-packages] +pyinstaller = "*" +build = "*" [requires] python_version = "3.9" diff --git a/Pipfile.lock b/Pipfile.lock index 4cedc99..8660dc3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "950437a7d89b5e215d40d7a78b0a8e9d1970e6fededd4e7f96520e46874a2b8b" + "sha256": "cf1db215953c037012b49f4162de0517d21b76ad5a58c8bd5a88bccb9414da07" }, "pipfile-spec": 6, "requires": { @@ -131,7 +131,73 @@ "version": "==2.0.2" } }, - "develop": {}, + "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": [ diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 30412e9..0000000 --- a/requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ --i https://pypi.org/simple -certifi==2023.5.7 ; python_version >= '3.6' -charset-normalizer==3.1.0 ; python_full_version >= '3.7.0' -idna==3.4 ; python_version >= '3.5' -requests==2.31.0 -urllib3==2.0.2 ; python_version >= '3.7' -bottle==0.12.25 -proxy-tools==0.1.0 -pywebview==4.1 -pycairo==1.23.0 ; python_version >= '3.7' -pygobject==3.44.1