From 1414a44b8ee166e63b28c5f4d800b821fa9ea62c Mon Sep 17 00:00:00 2001 From: "Sergey G. Brester" Date: Sun, 19 Sep 2021 18:24:36 +0200 Subject: [PATCH 1/2] Update main.yml CI: try to install dependencies via apt, add build test --- .github/workflows/main.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 231cca1e..c60ab05c 100644 --- a/.github/workflows/main.yml +++ b/.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: | @@ -61,6 +64,9 @@ 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 From 7f22c4873aed3b5ffce0953f079f3c1977297c9a Mon Sep 17 00:00:00 2001 From: "Sergey G. Brester" Date: Sun, 19 Sep 2021 18:36:02 +0200 Subject: [PATCH 2/2] remove 2to3 in setup (should be called outside before setup) --- setup.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/setup.py b/setup.py index 2e2a77fa..f4c2550f 100755 --- a/setup.py +++ b/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