Merge branch 'main' into dependabot/pip/niquests-gte-3.14-and-lt-3.19

Author: rjdbcm

ozi_core/pkg_extra.py

@@ -17,7 +17,7 @@
 from pyparsing import ParseResults
 from pyparsing import Suppress
 from pyparsing import White
-from pyparsing import oneOf
+from pyparsing import one_of
 
 from ozi_core.spdx import spdx_license_expression
 
@@ -32,7 +32,7 @@
     + Combine(spdx_license_expression, join_string=' ')
 ).set_parse_action(lambda t: {str(t[0]): str(t[1])})
 license_file = classifier + (
-    Keyword('License-File') + dcolon + oneOf(['LICENSE', 'LICENSE.txt'])
+    Keyword('License-File') + dcolon + one_of(['LICENSE', 'LICENSE.txt'])
 ).set_parse_action(lambda t: {str(t[0]): str(t[1])})
 pep639_headers <<= license_expression + license_file
 pep639_headers_md <<= (

ozi_core/spdx.py

@@ -13,7 +13,7 @@
 from pyparsing import Word
 from pyparsing import ZeroOrMore
 from pyparsing import alphanums
-from pyparsing import oneOf
+from pyparsing import one_of
 from spdx_license_list import LICENSES
 
 user_defined_license = Combine(
@@ -29,7 +29,7 @@
     + [Literal(lic.id) for lic in LICENSES.values() if not lic.deprecated_id],
 ).set_name('License-ID') + ZeroOrMore(
     Keyword('WITH')
-    + oneOf(METADATA.spec.python.pkg.license.exceptions).set_name('License-Exception-ID')
+    + one_of(METADATA.spec.python.pkg.license.exceptions).set_name('License-Exception-ID')
     | Keyword('AND') + spdx_license_expression
     | Keyword('OR') + spdx_license_expression,
 ) | Literal(

subprojects/ozi.wrap

@@ -1,9 +1,9 @@
 [wrap-file]
-directory = OZI-2.0.14
-source_url = https://github.com/OZI-Project/OZI/archive/refs/tags/2.0.14.tar.gz
-source_hash = 64730472eea8743bbd8fc4286d7b69caa038df6c683567b406c7d09a03621293
-source_filename = OZI-2.0.14.tar.gz
+directory = OZI-2.1.29
+source_url = https://github.com/OZI-Project/OZI/archive/refs/tags/2.1.29.tar.gz
+source_hash = 1d464fa3bc50b0593778ff0e483f4c1103b42d5abc78d823733ec9441f45040e
+source_filename = OZI-2.1.29.tar.gz
 
 [provide]
-dependency_names = ozi, ozi-2.0.14
+dependency_names = ozi, ozi-2.1.29