[deps] Add support for Python >=3.12, 3.14 #345

Closes #345

Author: Eeshu-Yadav

.github/workflows/ci.yml

@@ -18,9 +18,11 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
 
     steps:
       - uses: actions/checkout@v4

netjsonconfig/backends/base/backend.py

@@ -7,13 +7,14 @@
 from copy import deepcopy
 from io import BytesIO
 
-from jsonschema import Draft4Validator, draft4_format_checker
+from jsonschema import Draft4Validator
 from jsonschema.exceptions import ValidationError as JsonSchemaError
 
 from ...exceptions import ValidationError
 from ...schema import DEFAULT_FILE_MODE
 from ...utils import evaluate_vars, merge_config
 
+format_checker = Draft4Validator.FORMAT_CHECKER
 _host_name_re = re.compile(r"^[A-Za-z0-9][A-Za-z0-9\.\-]{1,255}$")
 
 
@@ -126,15 +127,15 @@ def _deduplicate_files(self):
             files_dict[file['path']] = file
         self.config['files'] = list(files_dict.values())
 
-    @draft4_format_checker.checks('cidr', AssertionError)
+    @format_checker.checks('cidr', AssertionError)
     def _cidr_notation(value):
         try:
             ipaddress.ip_network(value)
         except ValueError as e:
             assert False, str(e)
         return True
 
-    @draft4_format_checker.checks('hostname', JsonSchemaError)
+    @format_checker.checks('hostname', JsonSchemaError)
     def _is_hostname(value):
         """
         The hostname validation has been taken from jsonschema~=3.2.0
@@ -154,7 +155,7 @@ def _is_hostname(value):
 
     def validate(self):
         try:
-            Draft4Validator(self.schema, format_checker=draft4_format_checker).validate(
+            Draft4Validator(self.schema, format_checker=format_checker).validate(
                 self.config
             )
         except JsonSchemaError as e:

netjsonconfig/backends/openvpn/parser.py

@@ -4,8 +4,8 @@
 from ...utils import sorted_dict
 from ..base.parser import BaseParser
 
-vpn_pattern = re.compile('^# openvpn config:\s', flags=re.MULTILINE)
-config_pattern = re.compile('^([^\s]*) ?(.*)$')
+vpn_pattern = re.compile(r'^# openvpn config:\s', flags=re.MULTILINE)
+config_pattern = re.compile(r'^([^\s]*) ?(.*)$')
 config_suffix = '.conf'
 
 

netjsonconfig/backends/openwrt/parser.py

@@ -5,9 +5,9 @@
 from ...utils import sorted_dict
 from ..base.parser import BaseParser
 
-packages_pattern = re.compile('^package\s', flags=re.MULTILINE)
-block_pattern = re.compile('^config\s', flags=re.MULTILINE)
-config_pattern = re.compile('^(option|list)\s*([^\s]*)\s*(.*)')
+packages_pattern = re.compile(r'^package\s', flags=re.MULTILINE)
+block_pattern = re.compile(r'^config\s', flags=re.MULTILINE)
+config_pattern = re.compile(r'^(option|list)\s*([^\s]*)\s*(.*)')
 config_path = 'etc/config/'
 
 

netjsonconfig/backends/openwrt/schema.py

@@ -7,7 +7,7 @@
 from ..wireguard.schema import base_wireguard_schema
 from .timezones import timezones
 
-QOS_MAPPING_PATTERN = "^[0-9]\d*:[0-9]\d*$"
+QOS_MAPPING_PATTERN = r"^[0-9]\d*:[0-9]\d*$"
 
 default_radio_driver = "mac80211"
 

netjsonconfig/backends/wireguard/parser.py

@@ -2,8 +2,8 @@
 
 from ..base.parser import BaseParser
 
-vpn_pattern = re.compile('^# wireguard config:\s', flags=re.MULTILINE)
-config_pattern = re.compile('^([^\s]*) ?(.*)$')
+vpn_pattern = re.compile(r'^# wireguard config:\s', flags=re.MULTILINE)
+config_pattern = re.compile(r'^([^\s]*) ?(.*)$')
 config_suffix = '.conf'
 
 

netjsonconfig/backends/zerotier/parser.py

@@ -4,8 +4,8 @@
 
 from ..base.parser import BaseParser
 
-vpn_pattern = re.compile('^// zerotier controller config:\s', flags=re.MULTILINE)
-config_pattern = re.compile('^([^\s]*) ?(.*)$')
+vpn_pattern = re.compile(r'^// zerotier controller config:\s', flags=re.MULTILINE)
+config_pattern = re.compile(r'^([^\s]*) ?(.*)$')
 config_suffix = '.json'
 
 

tests/openvpn/test_parser.py

@@ -316,7 +316,8 @@ def test_parse_tar_bytesio(self):
     def test_parse_tar_file(self):
         o = OpenVpn(self._multiple_vpn)
         o.write(name='test', path='/tmp')
-        OpenVpn(native=open('/tmp/test.tar.gz'))
+        with open('/tmp/test.tar.gz', 'rb') as f:
+            OpenVpn(native=f)
         os.remove('/tmp/test.tar.gz')
         self.assertDictEqual(o.config, self._multiple_vpn)
 

tests/openwrt/test_backend.py

@@ -69,7 +69,7 @@ def test_type_error(self):
         with self.assertRaises(TypeError):
             OpenWrt([])
         with self.assertRaises(TypeError):
-            OpenWrt('NOTJSON[]\{\}')
+            OpenWrt(r'NOTJSON[]\{\}')
 
     def test_system_invalid_timezone(self):
         o = OpenWrt({"general": {"hostname": "test_system", "timezone": "WRONG"}})

tests/openwrt/test_network.py

@@ -263,15 +263,15 @@ def test_render_rule_wrong(self):
             o.validate()
         rule['ip_rules'][0]['src'] = '192.168.1.0/24'
         o = OpenWrt(rule)
-        with self.assertRaisesRegexp(ValidationError, "'wrong1' is not a 'cidr'"):
+        with self.assertRaisesRegex(ValidationError, "'wrong1' is not a 'cidr'"):
             o.validate()
         # fix 'dest' and expect no ValidationError raised
         rule['ip_rules'][0]['dest'] = '192.168.1.0/24'
         o = OpenWrt(rule)
         o.validate()
 
     def test_parse_rules_zone(self):
-        with self.assertRaisesRegexp(ValidationError, "'wrong' is not a 'cidr'"):
+        with self.assertRaisesRegex(ValidationError, "'wrong' is not a 'cidr'"):
             OpenWrt(
                 native="""package network