Merge pull request #584 from kpcyrd/github-actions

Add install_requires, use it in tests

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 3e5bb300e5b4b7e7611b029cd6bc19cb50079bef..e798a0d459f57e04e85953fa181a6d51fa4b07fb 100644 (file)
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -11,9 +11,13 @@ 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 libgpgme-dev
+    - name: Install python dependencies
+      run: sudo pip3 install .
     - name: Build torbrowser-launcher
       run: python3 setup.py build
     - name: Install torbrowser-launcher
       run: sudo python3 setup.py install
+    - name: Test torbrowser-launcher install
+      run: torbrowser-launcher -h

diff --git a/setup.py b/setup.py
index 67e126e20a8b3c9e66b700d02f66f396dfffaeec..4e06e60020b982973076cbd3f574dc9cecda38a4 100644 (file)
--- 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',
+    ],
 )