Merge branch 'master' into feature-981

.github/pyinstaller/pyinstaller.spec

@@ -95,7 +95,7 @@ exe = EXE(pyz,
           a.datas,
           exclude_binaries=False,
           name='capa',
-          # TODO not working anymore for unknown reason icon='logo.ico',
+          icon='logo.ico',
           debug=False,
           strip=None,
           upx=True,
@@ -109,4 +109,4 @@ exe = EXE(pyz,
 #               a.datas,
 #               strip=None,
 #               upx=True,
-#               name='capa-dat')
+#               name='capa-dat')

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
       - if: matrix.os == 'ubuntu-18.04'
         run: sudo apt-get install -y libyaml-dev
       - name: Upgrade pip, setuptools
-        run: pip install --upgrade pip setuptools
+        run: python -m pip install --upgrade pip setuptools
       - name: Install capa with build requirements
         run: pip install -e .[build]
       - name: Build standalone executable