Merge branch 'master' into fix-interface-name-is-too-big

Author: oryaacov

.github/workflows/build.yaml

@@ -6,9 +6,10 @@ on:
     tags:
       - "v*"
   pull_request:
+
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version:
@@ -19,9 +20,9 @@ jobs:
           - "3.11"
     steps:
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Build package
@@ -35,15 +36,15 @@ jobs:
       run: sudo PATH=$PATH coverage run setup.py test
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     needs:
       - build-and-test
     steps:
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: "3.x"
     - name: Build package

doc/conf.py

@@ -196,6 +196,6 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+intersphinx_mapping = {'python': ('http://docs.python.org/', None)}
 
 autoclass_content="both"

iptc/util.py

@@ -3,7 +3,6 @@
 import sys
 import ctypes
 import ctypes.util
-from distutils.sysconfig import get_python_lib
 from itertools import product
 from subprocess import Popen, PIPE
 from sys import version_info
@@ -14,6 +13,12 @@ def get_config_var(name):
         if name == 'SO':
             return '.so'
         raise Exception('Not implemented')
+try:
+    from distutils.sysconfig import get_python_lib
+except ModuleNotFoundError:
+    import sysconfig
+    def get_python_lib():
+        return sysconfig.get_path("purelib")
 
 
 def _insert_ko(modprobe, modname):

iptc/version.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
 __pkgname__ = "python-iptables"
-__version__ = "1.0.2-dev"
+__version__ = "1.1.0"

setup.py

@@ -3,7 +3,6 @@
 """python-iptables setup script"""
 
 from setuptools import setup, Extension
-#from distutils.core import setup, Extension
 
 # make pyflakes happy
 __pkgname__ = None