From 7202407c6f1f3866adce67ee6e78bde34b9cdb24 Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Mon, 21 Jun 2021 02:15:37 +0200 Subject: [PATCH 1/3] Use install_requires for python dependencies --- .github/workflows/python.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 3e5bb30..ed7cdd2 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -11,8 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt-get install gettext python3 python3-packaging python3-gpg python3-pyqt5 python3-requests python3-socks + - name: Install system dependencies + run: sudo apt-get install gettext python3 + - name: Install python dependencies + run: sudo pip3 install . - name: Build torbrowser-launcher run: python3 setup.py build - name: Install torbrowser-launcher From 71142f7999c0ce214d32efa7564b00941b479582 Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Mon, 21 Jun 2021 02:25:35 +0200 Subject: [PATCH 2/3] Add install_requires to setup.py --- .github/workflows/python.yml | 2 +- setup.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index ed7cdd2..9185cec 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install system dependencies - run: sudo apt-get install gettext python3 + run: sudo apt-get install gettext python3 libgpgme-dev - name: Install python dependencies run: sudo pip3 install . - name: Build torbrowser-launcher diff --git a/setup.py b/setup.py index 67e126e..4e06e60 100644 --- a/setup.py +++ b/setup.py @@ -118,4 +118,11 @@ Browser. packages=["torbrowser_launcher"], scripts=["torbrowser-launcher"], data_files=datafiles, + install_requires=[ + 'gpg', + 'packaging', + 'PyQt5', + 'requests', + 'PySocks', + ], ) From 2bb97c7554d9ef6b25db3e2c19ab62f122c94d83 Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Mon, 21 Jun 2021 02:33:06 +0200 Subject: [PATCH 3/3] Test torbrowser-launcher install --- .github/workflows/python.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 9185cec..e798a0d 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -19,3 +19,5 @@ jobs: run: python3 setup.py build - name: Install torbrowser-launcher run: sudo python3 setup.py install + - name: Test torbrowser-launcher install + run: torbrowser-launcher -h