Merge "Update hacking and pyproject.toml"

Author: Zuul

neutron_lib/api/validators/allowedaddresspairs.py

@@ -59,12 +59,12 @@ def _validate_allowed_address_pairs(address_pairs, valid_values=None):
 
         mac = address_pair.get('mac_address')
         ip_address = address_pair['ip_address']
-        if (mac, ip_address) not in unique_check:
-            unique_check[(mac, ip_address)] = None
-        else:
+        if (mac, ip_address) in unique_check:
             raise exceptions.DuplicateAddressPairInRequest(
                 mac_address=mac, ip_address=ip_address)
 
+        unique_check[(mac, ip_address)] = None
+
         invalid_attrs = set(address_pair.keys()) - {'mac_address',
                                                     'ip_address'}
         if invalid_attrs:

pyproject.toml

@@ -9,19 +9,17 @@ authors = [
     {name = "OpenStack", email = "openstack-discuss@lists.openstack.org"},
 ]
 readme = {file = "README.rst", content-type = "text/x-rst"}
-license = {text = "Apache-2.0"}
+license = "Apache-2.0"
 dynamic = ["version", "dependencies"]
 requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: OpenStack",
     "Intended Audience :: Information Technology",
     "Intended Audience :: System Administrators",
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -55,10 +53,8 @@ N536 = "neutron_lib.hacking.checks:assert_equal_none"
 N537 = "neutron_lib.hacking.translation_checks:no_translate_logs"
 N535 = "neutron_lib.hacking.checks:check_no_eventlet_imports"
 
-[tool.setuptools]
-packages = [
-    "neutron_lib"
-]
+[tool.setuptools.packages.find]
+include = ["neutron_lib*"]
 
 [tool.mypy]
 incremental = true
@@ -76,7 +72,8 @@ files = "neutron_lib"
 line-length = 79
 
 [tool.ruff.lint]
-select = ["E4", "E5", "E7", "E9", "F", "G", "S", "UP"]
+select = ["C90", "E", "F", "G", "S", "UP", "W"]
+preview = true
 ignore = [
     "S104",  # Possible binding to all interfaces
     "S311",  # Suspicious non-cryptographic random usage
@@ -85,3 +82,6 @@ ignore = [
 
 [tool.ruff.lint.per-file-ignores]
 "neutron_lib/tests/*" = ["S"]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 16

test-requirements.txt

@@ -1,5 +1,5 @@
 fixtures>=3.0.0 # Apache-2.0/BSD
-hacking>=6.1.0,<=8.0.0 # Apache-2.0
+hacking>=7.0.0,<=8.0.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT