Merge pull request #3478 from citrus-it/py312

Add python 3.12 modules to omnios-build-tools
omniosorg · Feb 14, 2024 · 70f4f91 · 70f4f91
2 parents b377e42 + af95cf9
commit 70f4f91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/build/meta/omnios-build-tools.p5m b/build/meta/omnios-build-tools.p5m
@@ -42,12 +42,24 @@ depend fmri=pkg://$(PKGPUBLISHER)/library/lzlib type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/nspr type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/pcre2 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/coverage-311 type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/coverage-312 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/crossenv-311 type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/crossenv-312 type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/jsonrpclib-312 type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/jsonschema-312 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/meson-311 type=require
+#depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/meson-312 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pip-311 type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pip-312 type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pycurl-312 type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pyopenssl-312 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pyyaml-311 type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pyyaml-312 type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/rapidjson-312 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/setuptools-rust-311 \
     type=require
+depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/setuptools-rust-312 \
+    type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/security/openssl-11 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/security/openssl-3 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/zlib type=require

diff --git a/doc/baseline b/doc/baseline
@@ -315,8 +315,6 @@ omnios library/python-3/orjson-311
 omnios library/python-3/orjson-312
 omnios library/python-3/pip-311
 omnios library/python-3/pip-312
-omnios library/python-3/pip-312
-omnios library/python-3/pip-312
 omnios library/python-3/pycodestyle-311
 omnios library/python-3/pycodestyle-312
 omnios library/python-3/pycparser-311
@@ -335,8 +333,6 @@ omnios library/python-3/semantic-version-311
 omnios library/python-3/semantic-version-312
 omnios library/python-3/setuptools-311
 omnios library/python-3/setuptools-312
-omnios library/python-3/setuptools-312
-omnios library/python-3/setuptools-312
 omnios library/python-3/setuptools-rust-311
 omnios library/python-3/setuptools-rust-312
 omnios library/python-3/six-311