Merge branch '0.10' into 0.11

.github/workflows/main.yml

@@ -44,12 +44,15 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          #python -m pip install --upgrade pip
           if [[ "$F2B_PY" = 3 ]] && ! command -v 2to3x -v 2to3 > /dev/null; then
-            pip install 2to3
+            #pip install 2to3
+            sudo apt-get -y install 2to3
           fi
-          pip install systemd-python || echo 'systemd not available'
-          pip install pyinotify || echo 'inotify not available'
+          #pip install systemd-python || echo 'systemd not available'
+          #pip install pyinotify || echo 'inotify not available'
+          sudo apt-get -y install python${F2B_PY/2/}-systemd || echo 'systemd not available'
+          sudo apt-get -y install python${F2B_PY/2/}-pyinotify || echo 'inotify not available'
 
       - name: Before scripts
         run: |
@@ -62,5 +65,8 @@ jobs:
       - name: Test suite
         run: if [[ "$F2B_PY" = 2 ]]; then python setup.py test; else python bin/fail2ban-testcases --verbosity=2; fi
 
+      - name: Build
+        run: python setup.py build
+
       #- name: Test initd scripts
       #  run: shellcheck -s bash -e SC1090,SC1091 files/debian-initd

setup.py

@@ -39,14 +39,6 @@ from distutils.command.build_scripts import build_scripts
 if setuptools is None:
 	from distutils.command.install import install
 	from distutils.command.install_scripts import install_scripts
-try:
-	# python 3.x
-	from distutils.command.build_py import build_py_2to3
-	from distutils.command.build_scripts import build_scripts_2to3
-	_2to3 = True
-except ImportError:
-	# python 2.x
-	_2to3 = False
 
 import os
 from os.path import isfile, join, isdir, realpath