Clean up CI workflow

Author: Arusekk

.github/workflows/ci.yml

@@ -38,9 +38,11 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y \
           python2.7 python2.7-dev python2-pip-whl
-        export PYTHONPATH=`echo /usr/share/python-wheels/pip-*py2*.whl`
-        sudo --preserve-env=PYTHONPATH python2.7 -m pip install --upgrade pip setuptools wheel
         sudo ln -sf python2.7 /usr/bin/python
+        export PYTHONPATH=`echo /usr/share/python-wheels/pip-*py2*.whl`
+        sudo --preserve-env=PYTHONPATH python -m pip install --upgrade pip setuptools wheel
+        sudo chown -R $USER /usr/local/lib/python2.7
+
 
     - name: Verify tag against version
       if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
@@ -60,7 +62,8 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y --no-install-recommends -o Acquire::Retries=3 \
           ash bash-static dash ksh mksh zsh \
-          pandoc gdb gdbserver socat \
+          python3-rpyc \
+          gdb gdbserver socat \
           binutils-multiarch qemu-user-static \
           binutils-aarch64-linux-gnu \
           binutils-arm-linux-gnueabihf \
@@ -73,11 +76,6 @@ jobs:
           libc6-dbg \
           elfutils
       
-    - name: Install RPyC for GDB
-      run: |
-        sudo apt-get install -y python3-pip
-        /usr/bin/python3 -m pip install rpyc
-
     - name: Testing Corefiles
       run: |
         ulimit -a
@@ -104,6 +102,7 @@ jobs:
       run: pip install -r docs/requirements.txt
 
     - name: Manually install non-broken Unicorn
+      if:   matrix.python_version == '2.7'
       run:  pip install unicorn==2.0.0rc7
 
     - name: Disable yama ptrace_scope

setup.py

@@ -50,6 +50,9 @@
     project = toml.load('pyproject.toml')['project']
     compat['install_requires'] = project['dependencies']
     compat['name'] = project['name']
+    if '--user' in sys.argv:
+        sys.argv.remove('--user')
+
 
 # Check that the user has installed the Python development headers
 PythonH = os.path.join(get_python_inc(), 'Python.h')