2 files deleted
3 files added
56 files modified
1091 ■■■■■ changed files
components/archiver/zstd/Makefile 4 ●●●● patch | view | raw | blame | history
components/archiver/zstd/manifests/sample-manifest.p5m 2 ●●● patch | view | raw | blame | history
components/archiver/zstd/pkg5 2 ●●● patch | view | raw | blame | history
components/developer/rust/Makefile 36 ●●●● patch | view | raw | blame | history
components/library/mm-common/Makefile 8 ●●●● patch | view | raw | blame | history
components/python/ansible-core/Makefile 16 ●●●● patch | view | raw | blame | history
components/python/ansible-core/patches/02-selinux.patch 4 ●●●● patch | view | raw | blame | history
components/python/ansible-core/patches/03-test-disable-plugins.patch 18 ●●●●● patch | view | raw | blame | history
components/python/ansible-core/patches/05-wcwidth.patch 4 ●●●● patch | view | raw | blame | history
components/python/ansible-core/patches/06-dev-null.patch 4 ●●●● patch | view | raw | blame | history
components/python/ansible-core/patches/07-test_importlib_resources.patch 4 ●●●● patch | view | raw | blame | history
components/python/ansible-core/python-integrate-project.conf 4 ●●●● patch | view | raw | blame | history
components/python/ansible-core/test/results-all.master 20 ●●●● patch | view | raw | blame | history
components/python/elastic-transport/Makefile 14 ●●●● patch | view | raw | blame | history
components/python/elastic-transport/elastic-transport-PYVER.p5m 2 ●●●●● patch | view | raw | blame | history
components/python/elastic-transport/manifests/sample-manifest.p5m 2 ●●●●● patch | view | raw | blame | history
components/python/elastic-transport/patches/01-remove-unneeded-requirements.patch 8 ●●●● patch | view | raw | blame | history
components/python/elastic-transport/patches/02-test-reqs.patch 15 ●●●●● patch | view | raw | blame | history
components/python/elastic-transport/python-integrate-project.conf 8 ●●●●● patch | view | raw | blame | history
components/python/elastic-transport/test/results-all.master 71 ●●●●● patch | view | raw | blame | history
components/python/elasticsearch/Makefile 9 ●●●● patch | view | raw | blame | history
components/python/elasticsearch/elasticsearch-PYVER.p5m 1 ●●●● patch | view | raw | blame | history
components/python/elasticsearch/manifests/sample-manifest.p5m 1 ●●●● patch | view | raw | blame | history
components/python/elasticsearch/patches/01-test-no-search-engine.patch 8 ●●●● patch | view | raw | blame | history
components/python/elasticsearch/patches/03-test-no-packages.patch 24 ●●●●● patch | view | raw | blame | history
components/python/elasticsearch/python-integrate-project.conf 3 ●●●●● patch | view | raw | blame | history
components/python/elasticsearch/test/results-all.master 39 ●●●● patch | view | raw | blame | history
components/python/httpcore/Makefile 6 ●●●●● patch | view | raw | blame | history
components/python/httpcore/patches/01-no-trio.patch 8 ●●●● patch | view | raw | blame | history
components/python/httpcore/patches/02-no-httpbin.patch 12 ●●●● patch | view | raw | blame | history
components/python/httpcore/patches/03-no-socksio.patch 84 ●●●●● patch | view | raw | blame | history
components/python/httpcore/python-integrate-project.conf 2 ●●● patch | view | raw | blame | history
components/python/httpcore/test/results-all.master 22 ●●●● patch | view | raw | blame | history
components/python/nh3/Makefile 7 ●●●● patch | view | raw | blame | history
components/python/nh3/manifests/sample-manifest.p5m 4 ●●●● patch | view | raw | blame | history
components/python/nh3/nh3-PYVER.p5m 2 ●●● patch | view | raw | blame | history
components/python/nh3/pkg5 6 ●●●● patch | view | raw | blame | history
components/python/nh3/python-integrate-project.conf 2 ●●●●● patch | view | raw | blame | history
components/python/nh3/test/results-all.master 3 ●●●● patch | view | raw | blame | history
components/python/pyasn1/Makefile 6 ●●●●● patch | view | raw | blame | history
components/python/pyasn1/manifests/sample-manifest.p5m 2 ●●● patch | view | raw | blame | history
components/python/pyasn1/pkg5 6 ●●●● patch | view | raw | blame | history
components/python/pyasn1/test/results-all.master 36 ●●●●● patch | view | raw | blame | history
components/python/pyasn1_modules/Makefile 6 ●●●●● patch | view | raw | blame | history
components/python/pyasn1_modules/history 1 ●●●● patch | view | raw | blame | history
components/python/pyasn1_modules/manifests/sample-manifest.p5m 2 ●●● patch | view | raw | blame | history
components/python/pyasn1_modules/pkg5 11 ●●●● patch | view | raw | blame | history
components/python/pyasn1_modules/test/results-all.master 8 ●●●●● patch | view | raw | blame | history
components/python/pybind11/Makefile 6 ●●●●● patch | view | raw | blame | history
components/python/pybind11/manifests/sample-manifest.p5m 4 ●●● patch | view | raw | blame | history
components/python/pybind11/pkg5 6 ●●●● patch | view | raw | blame | history
components/python/pybind11/pybind11-PYVER.p5m 2 ●●●●● patch | view | raw | blame | history
components/python/pymongo/Makefile 4 ●●●● patch | view | raw | blame | history
components/python/pymongo/patches/01-tox-enable-tests.patch 4 ●●●● patch | view | raw | blame | history
components/python/pymongo/patches/02-no-mypy.patch 4 ●●●● patch | view | raw | blame | history
components/python/pymongo/test/results-all.master 420 ●●●●● patch | view | raw | blame | history
components/python/unearth/Makefile 4 ●●●● patch | view | raw | blame | history
components/web/firefox/Makefile 6 ●●●● patch | view | raw | blame | history
components/web/firefox/patches/10-regression-in-Bug1875369.patch 26 ●●●●● patch | view | raw | blame | history
components/web/firefox/patches/Bug1886802.patch 30 ●●●●● patch | view | raw | blame | history
tools/python-integrate-project 8 ●●●● patch | view | raw | blame | history
components/archiver/zstd/Makefile
@@ -19,13 +19,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        zstd
COMPONENT_VERSION=    1.5.5
COMPONENT_VERSION=    1.5.6
COMPONENT_SUMMARY=    Zstandard, or zstd for short, is a fast lossless compression algorithm, targeting real-time compression scenarios
COMPONENT_PROJECT_URL=    https://facebook.github.io/zstd/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_URL=    https://github.com/facebook/zstd/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH=    sha256:9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4
COMPONENT_ARCHIVE_HASH=    sha256:8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1
COMPONENT_FMRI=        compress/zstd
COMPONENT_CLASSIFICATION=    Applications/System Utilities
COMPONENT_LICENSE=    BSD,GPLv2.0
components/archiver/zstd/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
components/archiver/zstd/pkg5
@@ -7,4 +7,4 @@
        "compress/zstd"
    ],
    "name": "zstd"
}
}
components/developer/rust/Makefile
@@ -36,7 +36,7 @@
COMPONENT_NAME=        rustc
COMPONENT_VERSION=    1.76.0
COMPONENT_REVISION=    1
COMPONENT_REVISION=    2
COMPONENT_SUMMARY=    Rust - Safe, concurrent, practical language
COMPONENT_PROJECT_URL=    https://www.rust-lang.org
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)-src
@@ -48,36 +48,36 @@
COMPONENT_LICENSE=    MIT or Apache-2.0
COMPONENT_LICENSE_FILE=    LICENSE-APACHE
RUST_BOOTSTRAP_PATH=    $(BUILD_DIR)/$(MACH64)
RUST_ARCH=        x86_64-unknown-illumos
RUST_BOOTSTRAP_PATH= $(BUILD_DIR)/$(MACH64)
RUST_ARCH= x86_64-unknown-illumos
TEST_TARGET=        $(NO_TESTS)
TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
CLANG_VERSION=        17
CLANG_VERSION= 17
# Need some help to pick the correct ar binary
GNUAR=$(GNUBIN)/ar
GNUAR= $(GNUBIN)/ar
# Put the bits cargo downloads in a private directory.  This could be cached
# somewhere more permanent, but it's important to make sure that a person's
# $HOME/.cargo isn't used.
CARGO_HOME=             $(@D)/.cargo
CARGO_HOME= $(@D)/.cargo
PATH=                   $(PATH.gnu)
PATH= $(PATH.gnu)
RUSTC_BIN_POST=        cargo
RUSTC_BIN_POST+=    clippy-driver
RUSTC_BIN_POST+=    rls
RUSTC_BIN_POST+=    rustc
RUSTC_BIN_POST+=    rustdoc
RUSTC_BIN_POST =  cargo
RUSTC_BIN_POST += clippy-driver
RUSTC_BIN_POST += rls
RUSTC_BIN_POST += rustc
RUSTC_BIN_POST += rustdoc
# Add arch triplet to pkg macros
PKG_MACROS+=        RUST_ARCH="$(RUST_ARCH)"
PKG_MACROS += RUST_ARCH="$(RUST_ARCH)"
# Rust expects the library path to be /usr/lib and is broken otherwise 
RUSTC_LIBDIR=        $(USRLIBDIR)
RUSTC_LIBDIR= $(USRLIBDIR)
COMPONENT_PRE_CONFIGURE_ACTION += ( CLONEY_MODE=hardlink $(CLONEY) $(SOURCE_DIR) $(@D); )
@@ -133,10 +133,10 @@
# Cleanup standard environment
COMPONENT_INSTALL_ENV= 
COMPONENT_INSTALL_ENV+=    $(COMPONENT_BUILD_ENV)
COMPONENT_INSTALL_ENV+=    CARGO_HOME=$(CARGO_HOME)
COMPONENT_INSTALL_ENV += $(COMPONENT_BUILD_ENV)
COMPONENT_INSTALL_ENV += CARGO_HOME=$(CARGO_HOME)
# Set install path
COMPONENT_INSTALL_ENV+=    DESTDIR=$(PROTO_DIR)
COMPONENT_INSTALL_ENV += DESTDIR=$(PROTO_DIR)
# manually added dependencies
REQUIRED_PACKAGES += developer/lang/rustc # previous before build version
components/library/mm-common/Makefile
@@ -20,6 +20,7 @@
COMPONENT_NAME=         mm-common
COMPONENT_VERSION=      1.0.6
COMPONENT_REVISION=        1
COMPONENT_SUMMARY=      GNOME C++ bindings effort https://www.gtkmm.org support tools
COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.xz
@@ -47,7 +48,12 @@
CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
CONFIGURE_OPTIONS += --libexecdir=$(USRLIBEXECDIR)
COMPONENT_POST_INSTALL_ACTION.64= $(GSED) -i -e 's:env python3:python$(PYTHON_VERSION):' $(PROTOUSRBINDIR)/mm-common-get
# Fix scripts
COMPONENT_POST_INSTALL_ACTION= ( \
    $(GSED) -i -e 's:env python3:python$(PYTHON_VERSION):' $(PROTOUSRBINDIR)/mm-common-get; \
    $(GSED) -i -e 's:@datadir_py@:/usr/share:' $(PROTOUSRBINDIR)/mm-common-get; \
    $(GSED) -i -e 's:env python3:python$(PYTHON_VERSION):' $(PROTOUSRSHAREDIR)/mm-common/build/*.py; \
    $(GSED) -i -e 's:env python3:python$(PYTHON_VERSION):' $(PROTOUSRSHAREDIR)/mm-common/doctool/*.py; )
# Configure checks
REQUIRED_PACKAGES += text/gawk
components/python/ansible-core/Makefile
@@ -19,13 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        ansible-core
HUMAN_VERSION =            2.15.9
HUMAN_VERSION =            2.15.10
COMPONENT_SUMMARY =        ansible-core - Radically simple IT automation
COMPONENT_PROJECT_URL =        https://ansible.com/
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/47/0b/5e46aeee6c72adc3507d9909e57fa1e9a66b3f4929c463bdbe102441a062/ansible-core-2.15.9.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:25f9b1b5a5af3c0986bd3928ed086eaddb867527fb5c83afef1a03cfad34f345
    sha256:954dbe8e4e802a4dd5df0366193975b692a05806aa8d7358418a7e617346b20f
COMPONENT_LICENSE =        GPL-3.0-only
COMPONENT_LICENSE_FILE =    COPYING
@@ -53,6 +51,10 @@
COMPONENT_TEST_ARGS += --verbose
COMPONENT_TEST_TARGETS =
# This project does not support tox so we need to provide test requirements
# manually.
TEST_REQUIREMENTS += test/lib/ansible_test/_data/requirements/units.txt
# testing fails without HOME environment variable
COMPONENT_TEST_ENV += HOME=/tmp
@@ -79,3 +81,9 @@
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
PYTHON_REQUIRED_PACKAGES += library/python/wheel
PYTHON_REQUIRED_PACKAGES += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/mock
TEST_REQUIRED_PACKAGES.python += library/python/pytest
TEST_REQUIRED_PACKAGES.python += library/python/pytest-forked
TEST_REQUIRED_PACKAGES.python += library/python/pytest-mock
TEST_REQUIRED_PACKAGES.python += library/python/pytest-xdist
TEST_REQUIRED_PACKAGES.python += library/python/pyyaml
components/python/ansible-core/patches/02-selinux.patch
@@ -1,5 +1,5 @@
--- ansible-core-2.15.9/test/units/module_utils/basic/test_selinux.py.orig
+++ ansible-core-2.15.9/test/units/module_utils/basic/test_selinux.py
--- ansible-core-2.15.10/test/units/module_utils/basic/test_selinux.py.orig
+++ ansible-core-2.15.10/test/units/module_utils/basic/test_selinux.py
@@ -37,6 +37,7 @@
 # test AnsibleModule selinux wrapper methods
 @pytest.mark.usefixtures('no_args_module_exec')
components/python/ansible-core/patches/03-test-disable-plugins.patch
@@ -1,13 +1,19 @@
--- ansible-core-2.15.9/test/lib/ansible_test/_internal/commands/units/__init__.py.orig
+++ ansible-core-2.15.9/test/lib/ansible_test/_internal/commands/units/__init__.py
@@ -258,6 +258,10 @@
--- ansible-core-2.15.10/test/lib/ansible_test/_internal/commands/units/__init__.py.orig
+++ ansible-core-2.15.10/test/lib/ansible_test/_internal/commands/units/__init__.py
@@ -258,6 +258,16 @@
             '-n', str(args.num_workers) if args.num_workers else 'auto',
             '--color', 'yes' if args.color else 'no',
             '-p', 'no:cacheprovider',
+            '-p', 'no:black',
+            '-p', 'no:cov',
+            '-p', 'no:mypy',
+            '-p', 'no:enabler',
+            '-p', 'no:relaxed',
+            '-p', 'no:salt-factories',
+            '-p', 'no:salt-factories-event-listener',
+            '-p', 'no:salt-factories-factories',
+            '-p', 'no:salt-factories-loader-mock',
+            '-p', 'no:salt-factories-log-server',
+            '-p', 'no:salt-factories-markers',
+            '-p', 'no:salt-factories-sysinfo',
+            '-p', 'no:system-statistics',
             '-c', os.path.join(ANSIBLE_TEST_DATA_ROOT, 'pytest', 'config', config_name),
             '--junit-xml', os.path.join(ResultType.JUNIT.path, 'python%s-%s-units.xml' % (python.version, test_context)),
             '--strict-markers',  # added in pytest 4.5.0
components/python/ansible-core/patches/05-wcwidth.patch
@@ -1,7 +1,7 @@
https://www.illumos.org/issues/15543
--- ansible-core-2.15.9/test/units/utils/test_display.py.orig
+++ ansible-core-2.15.9/test/units/utils/test_display.py
--- ansible-core-2.15.10/test/units/utils/test_display.py.orig
+++ ansible-core-2.15.10/test/units/utils/test_display.py
@@ -41,7 +41,6 @@
     assert get_text_width(u'\u001B') == 0
     assert get_text_width(u'ab\u0000') == 2
components/python/ansible-core/patches/06-dev-null.patch
@@ -1,5 +1,5 @@
--- ansible-core-2.15.9/test/units/parsing/vault/test_vault_editor.py.orig
+++ ansible-core-2.15.9/test/units/parsing/vault/test_vault_editor.py
--- ansible-core-2.15.10/test/units/parsing/vault/test_vault_editor.py.orig
+++ ansible-core-2.15.10/test/units/parsing/vault/test_vault_editor.py
@@ -501,6 +501,7 @@
         res = ve._real_path(filename)
         self.assertEqual(res, '-')
components/python/ansible-core/patches/07-test_importlib_resources.patch
@@ -1,5 +1,5 @@
--- ansible-core-2.15.9/test/units/utils/collection_loader/test_collection_loader.py.orig
+++ ansible-core-2.15.9/test/units/utils/collection_loader/test_collection_loader.py
--- ansible-core-2.15.10/test/units/utils/collection_loader/test_collection_loader.py.orig
+++ ansible-core-2.15.10/test/units/utils/collection_loader/test_collection_loader.py
@@ -829,6 +829,7 @@
 
 
components/python/ansible-core/python-integrate-project.conf
@@ -42,6 +42,10 @@
COMPONENT_TEST_ARGS += --verbose
COMPONENT_TEST_TARGETS =
# This project does not support tox so we need to provide test requirements
# manually.
TEST_REQUIREMENTS += test/lib/ansible_test/_data/requirements/units.txt
# testing fails without HOME environment variable
COMPONENT_TEST_ENV += HOME=/tmp
components/python/ansible-core/test/results-all.master
@@ -34,11 +34,11 @@
test/units/ansible_test/test_validate_modules.py::test_type_regex[x = type(foo)-False]  PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[ansible collection location = /tmp/.ansible/collections:/usr/share/ansible/collections]  PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[ansible python module location = $(@D)/lib/ansible]  PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[ansible-cli-test [core 2.15.9]]  PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[ansible-cli-test [core 2.15.10]]  PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[config file = $(@D)/test/lib/ansible_test/_data/ansible.cfg]  PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[configured module search path = ['/dev/null']]  PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[executable location = ]  PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[python version = 3.9.18 (main, Jan 26 2024, 07:32:01) [GCC 13.2.0]]  PASSED
test/units/cli/arguments/test_optparse_helpers.py::test_option_helper_version[python version = 3.9.19 (main, Mar 26 2024, 20:30:24) [GCC 13.2.0]]  PASSED
test/units/cli/galaxy/test_collection_extract_tar.py::test_extract_tar_dir_does_not_exist  PASSED
test/units/cli/galaxy/test_collection_extract_tar.py::test_extract_tar_dir_exists  PASSED
test/units/cli/galaxy/test_collection_extract_tar.py::test_extract_tar_member_trailing_sep  PASSED
@@ -1532,8 +1532,8 @@
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[abcde-ascii-abcde0]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[abcde-ascii-abcde1]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xc3\xa9-utf-8-caf\xc3\xa9]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-latin-1-caf\xe90]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-latin-1-caf\xe91]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-latin-1-caf\xe9_0]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-latin-1-caf\xe9_1]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_bytes[caf\xe9-utf-8-caf\xc3\xa9]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[\u304f\u3089\u3068\u307f-shift-jis-\u304f\u3089\u3068\u307f]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[\u304f\u3089\u3068\u307f-utf-8-\u304f\u3089\u3068\u307f]  PASSED
@@ -1542,8 +1542,8 @@
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[abcde-ascii-abcde0]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[abcde-ascii-abcde1]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xc3\xa9-utf-8-caf\xe9]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-latin-1-caf\xe90]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-latin-1-caf\xe91]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-latin-1-caf\xe9_0]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-latin-1-caf\xe9_1]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_native[caf\xe9-utf-8-caf\xe9]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[\u304f\u3089\u3068\u307f-shift-jis-\u304f\u3089\u3068\u307f]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[\u304f\u3089\u3068\u307f-utf-8-\u304f\u3089\u3068\u307f]  PASSED
@@ -1552,8 +1552,8 @@
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[abcde-ascii-abcde0]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[abcde-ascii-abcde1]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xc3\xa9-utf-8-caf\xe9]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-latin-1-caf\xe90]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-latin-1-caf\xe91]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-latin-1-caf\xe9_0]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-latin-1-caf\xe9_1]  PASSED
test/units/module_utils/common/text/converters/test_to_str.py::test_to_text[caf\xe9-utf-8-caf\xe9]  PASSED
test/units/module_utils/common/text/formatters/test_bytes_to_human.py::test_bytes_to_human[0-0.00 Bytes]  PASSED
test/units/module_utils/common/text/formatters/test_bytes_to_human.py::test_bytes_to_human[0.5-0.50 Bytes]  PASSED
@@ -3634,8 +3634,8 @@
test/units/utils/test_version.py::test_invalid[1.2.3-0123]  PASSED
test/units/utils/test_version.py::test_invalid[1.2.3.DEV]  PASSED
test/units/utils/test_version.py::test_invalid[1.2.31.2.3----RC-SNAPSHOT.12.09.1--..12+788]  PASSED
test/units/utils/test_version.py::test_invalid[1.20]  PASSED
test/units/utils/test_version.py::test_invalid[1.21]  PASSED
test/units/utils/test_version.py::test_invalid[1.2_0]  PASSED
test/units/utils/test_version.py::test_invalid[1.2_1]  PASSED
test/units/utils/test_version.py::test_invalid[1]  PASSED
test/units/utils/test_version.py::test_invalid[9.8.7+meta+meta]  PASSED
test/units/utils/test_version.py::test_invalid[9.8.7-whatever+meta+meta]  PASSED
components/python/elastic-transport/Makefile
@@ -19,13 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        elastic-transport
HUMAN_VERSION =            8.12.0
HUMAN_VERSION =            8.13.0
COMPONENT_SUMMARY =        elastic-transport - Transport classes and utilities shared among Python Elastic client libraries
COMPONENT_PROJECT_URL =        https://github.com/elastic/elastic-transport-python
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/f1/5e/9d697ca2511c2ecb3a239be91d5186a14fdbc97e15369c4ca6524c2929e8/elastic-transport-8.12.0.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:48839b942fcce199eece1558ecea6272e116c58da87ca8d495ef12eb61effaf7
    sha256:2410ec1ff51221e8b3a01c0afa9f0d0498e1386a269283801f5c12f98e42dc45
COMPONENT_LICENSE =        Apache-2.0
COMPONENT_LICENSE_FILE =    LICENSE
@@ -37,11 +35,19 @@
# manually.
TEST_REQUIREMENTS_EXTRAS += develop
# We do not have respx
PYTEST_ADDOPTS += --ignore tests/node/test_http_httpx.py
# We do not have opentelemetry
PYTEST_ADDOPTS += --ignore tests/test_otel.py
# We do not have orjson
PYTEST_ADDOPTS += --ignore tests/test_serializer.py
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/certifi
PYTHON_REQUIRED_PACKAGES += library/python/urllib3
PYTHON_REQUIRED_PACKAGES += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/aiohttp
TEST_REQUIRED_PACKAGES.python += library/python/httpx
TEST_REQUIRED_PACKAGES.python += library/python/mock
TEST_REQUIRED_PACKAGES.python += library/python/pytest
TEST_REQUIRED_PACKAGES.python += library/python/pytest-asyncio
components/python/elastic-transport/elastic-transport-PYVER.p5m
@@ -37,10 +37,12 @@
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_base.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_base_async.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_http_aiohttp.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_http_httpx.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_http_requests.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_http_urllib3.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_urllib3_chain_certs.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node_pool.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_otel.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_response.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_serializer.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_transport.py
components/python/elastic-transport/manifests/sample-manifest.p5m
@@ -37,10 +37,12 @@
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_base.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_base_async.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_http_aiohttp.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_http_httpx.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_http_requests.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_http_urllib3.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node/_urllib3_chain_certs.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_node_pool.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_otel.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_response.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_serializer.py
file path=usr/lib/python$(PYVER)/vendor-packages/elastic_transport/_transport.py
components/python/elastic-transport/patches/01-remove-unneeded-requirements.patch
@@ -1,9 +1,9 @@
We do not have furo packaged and it is not needed to run tests.
--- elastic-transport-8.12.0/setup.py.orig
+++ elastic-transport-8.12.0/setup.py
@@ -69,7 +69,6 @@
             "aiohttp",
--- elastic-transport-8.13.0/setup.py.orig
+++ elastic-transport-8.13.0/setup.py
@@ -73,7 +73,6 @@
             "orjson",
             # Override Read the Docs default (sphinx<2)
             "sphinx>2",
-            "furo",
components/python/elastic-transport/patches/02-test-reqs.patch
New file
@@ -0,0 +1,15 @@
We do not have these projects packaged yet.
--- elastic-transport-8.13.0/setup.py.orig
+++ elastic-transport-8.13.0/setup.py
@@ -67,10 +67,6 @@
             "requests",
             "aiohttp",
             "httpx",
-            "respx",
-            "opentelemetry-api",
-            "opentelemetry-sdk",
-            "orjson",
             # Override Read the Docs default (sphinx<2)
             "sphinx>2",
             "sphinx-autodoc-typehints",
components/python/elastic-transport/python-integrate-project.conf
@@ -14,8 +14,16 @@
#
%patch% 01-remove-unneeded-requirements.patch
%patch% 02-test-reqs.patch
%include-3%
# This project does not support tox so we need to provide test requirements
# manually.
TEST_REQUIREMENTS_EXTRAS += develop
# We do not have respx
PYTEST_ADDOPTS += --ignore tests/node/test_http_httpx.py
# We do not have opentelemetry
PYTEST_ADDOPTS += --ignore tests/test_otel.py
# We do not have orjson
PYTEST_ADDOPTS += --ignore tests/test_serializer.py
components/python/elastic-transport/test/results-all.master
@@ -4,7 +4,7 @@
rootdir: $(@D)
configfile: setup.cfg
asyncio: mode=strict
collecting ... collected 414 items
collecting ... collected 422 items
tests/async_/test_async_transport.py::test_async_transport_httpbin PASSED
tests/async_/test_async_transport.py::test_body_bytes_get_passed_untouched PASSED
@@ -42,9 +42,12 @@
tests/async_/test_async_transport.py::test_transport_and_node_are_async[Urllib3HttpNode] PASSED
tests/async_/test_async_transport.py::test_transport_and_node_are_async[requests] PASSED
tests/async_/test_async_transport.py::test_transport_and_node_are_async[urllib3] PASSED
tests/async_/test_async_transport.py::test_transport_client_meta_node_class[AiohttpHttpNode] PASSED
tests/async_/test_async_transport.py::test_transport_client_meta_node_class[aiohttp] PASSED
tests/async_/test_async_transport.py::test_transport_client_meta_node_class[AiohttpHttpNode-ai] PASSED
tests/async_/test_async_transport.py::test_transport_client_meta_node_class[HttpxAsyncHttpNode-hx] PASSED
tests/async_/test_async_transport.py::test_transport_client_meta_node_class[aiohttp-ai] PASSED
tests/async_/test_async_transport.py::test_transport_client_meta_node_class[httpxasync-hx] PASSED
tests/async_/test_async_transport.py::test_transport_close_node_pool PASSED
tests/async_/test_async_transport.py::test_transport_default_client_meta_node_class PASSED
tests/async_/test_httpbin.py::test_node PASSED
tests/async_/test_httpbin.py::test_simple_request PASSED
tests/async_/test_httpserver.py::test_simple_request PASSED
@@ -52,6 +55,7 @@
tests/node/test_base.py::test_ssl_context_from_node_config[::1-False] PASSED
tests/node/test_base.py::test_ssl_context_from_node_config[localhost-True] PASSED
tests/node/test_base.py::test_unknown_parameter[AiohttpHttpNode] PASSED
tests/node/test_base.py::test_unknown_parameter[HttpxAsyncHttpNode] PASSED
tests/node/test_base.py::test_unknown_parameter[RequestsHttpNode] PASSED
tests/node/test_base.py::test_unknown_parameter[Urllib3HttpNode] PASSED
tests/node/test_http_aiohttp.py::TestAiohttpHttpNode::test_aiohttp_options PASSED
@@ -116,66 +120,87 @@
tests/node/test_http_urllib3.py::TestUrllib3HttpNode::test_uncompressed_body_logged XFAIL
tests/node/test_http_urllib3.py::TestUrllib3HttpNode::test_uses_https_if_verify_certs_is_off PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[0-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[0-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[0-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[0-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[TLSv1-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[TLSv1-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[TLSv1-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[TLSv1-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[ssl_version2-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[ssl_version2-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[ssl_version2-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_ssl_version_value_error[ssl_version2-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_1-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_1-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_1-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_1-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-1.badssl.com:1011-_SSLMethod.PROTOCOL_TLSv1_1-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-1.badssl.com:1011-_SSLMethod.PROTOCOL_TLSv1_1-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-1.badssl.com:1011-_SSLMethod.PROTOCOL_TLSv1_1-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-1.badssl.com:1011-_SSLMethod.PROTOCOL_TLSv1_1-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-None-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-None-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-None-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-None-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-TLSVersion.TLSv1_2-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-TLSVersion.TLSv1_2-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-TLSVersion.TLSv1_2-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-TLSVersion.TLSv1_2-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-_SSLMethod.PROTOCOL_TLSv1_2-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-_SSLMethod.PROTOCOL_TLSv1_2-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-_SSLMethod.PROTOCOL_TLSv1_2-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_supported_tls_versions[https://tls-v1-2.badssl.com:1012-_SSLMethod.PROTOCOL_TLSv1_2-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-None-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-None-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-None-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-None-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_1-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_1-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_1-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_1-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_2-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_2-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_2-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_2-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_3-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_3-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_3-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-TLSVersion.TLSv1_3-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1_1-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1_1-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1_1-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1_1-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1_2-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1_2-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1_2-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-0.badssl.com:1010-_SSLMethod.PROTOCOL_TLSv1_2-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-None-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-None-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-None-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-None-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_2-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_2-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_2-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_2-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_3-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_3-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_3-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-TLSVersion.TLSv1_3-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-_SSLMethod.PROTOCOL_TLSv1_2-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-_SSLMethod.PROTOCOL_TLSv1_2-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-_SSLMethod.PROTOCOL_TLSv1_2-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-1.badssl.com:1011-_SSLMethod.PROTOCOL_TLSv1_2-Urllib3HttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-2.badssl.com:1012-TLSVersion.TLSv1_3-AiohttpHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-2.badssl.com:1012-TLSVersion.TLSv1_3-HttpxAsyncHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-2.badssl.com:1012-TLSVersion.TLSv1_3-RequestsHttpNode] PASSED
tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-2.badssl.com:1012-TLSVersion.TLSv1_3-Urllib3HttpNode] PASSED
tests/node/test_urllib3_chain_certs.py::test_assert_fingerprint_in_cert_chain[8ECDE6884F3D87B1125BA31AC3FCB13D7016DE7F57CC904FE1CB97C6AE98196E-RequestsHttpNode] SKIPPED
@@ -350,23 +375,6 @@
tests/test_response.py::test_response_meta[ObjectApiResponse] PASSED
tests/test_response.py::test_response_meta[TextApiResponse] PASSED
tests/test_response.py::test_text_response PASSED
tests/test_serializer.py::test_date_serialization PASSED
tests/test_serializer.py::test_decimal_serialization PASSED
tests/test_serializer.py::test_deserializes_json_by_default PASSED
tests/test_serializer.py::test_deserializes_text_with_correct_ct PASSED
tests/test_serializer.py::test_ndjson_dumps PASSED
tests/test_serializer.py::test_ndjson_loads[False] PASSED
tests/test_serializer.py::test_ndjson_loads[\n] PASSED
tests/test_serializer.py::test_ndjson_loads[\r\n] PASSED
tests/test_serializer.py::test_raises_improperly_configured_when_default_mimetype_cannot_be_deserialized PASSED
tests/test_serializer.py::test_raises_serialization_error_on_dump_error PASSED
tests/test_serializer.py::test_raises_serialization_error_on_load_error PASSED
tests/test_serializer.py::test_raises_serialization_error_on_unknown_mimetype PASSED
tests/test_serializer.py::test_serializes_nan PASSED
tests/test_serializer.py::test_text_asterisk_works_for_all_text_types PASSED
tests/test_serializer.py::test_unicode_is_handled PASSED
tests/test_serializer.py::test_unicode_surrogates_handled PASSED
tests/test_serializer.py::test_uuid_serialization PASSED
tests/test_transport.py::test_body_bytes_get_passed_untouched PASSED
tests/test_transport.py::test_body_gets_encoded_into_bytes PASSED
tests/test_transport.py::test_client_meta_header PASSED
@@ -406,20 +414,27 @@
tests/test_transport.py::test_transport_client_meta_node_class[requests] PASSED
tests/test_transport.py::test_transport_client_meta_node_class[urllib3] PASSED
tests/test_transport.py::test_transport_close_node_pool PASSED
tests/test_utils.py::test_is_ipaddress[127.0.0.10] PASSED
tests/test_utils.py::test_is_ipaddress[127.0.0.11] PASSED
tests/test_utils.py::test_is_ipaddress[127.0.0.1_0] PASSED
tests/test_utils.py::test_is_ipaddress[127.0.0.1_1] PASSED
tests/test_utils.py::test_is_ipaddress[8.8.8.8] PASSED
tests/test_utils.py::test_is_ipaddress[::1] PASSED
tests/test_utils.py::test_is_ipaddress[::] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%190] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%191] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%2510] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%2511] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%2512] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%19_0] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%19_1] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%251_0] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%251_1] PASSED
tests/test_utils.py::test_is_ipaddress[FE80::8939:7684:D84b:a5A4%251_2] PASSED
tests/test_utils.py::test_is_not_ipaddress[v2.sg.media-imdb.com0] PASSED
tests/test_utils.py::test_is_not_ipaddress[v2.sg.media-imdb.com1] PASSED
tests/test_utils.py::test_is_not_ipaddress[www.python.org0] PASSED
tests/test_utils.py::test_is_not_ipaddress[www.python.org1] PASSED
=============================== warnings summary ===============================
tests/conftest.py:71
  $(@D)/tests/conftest.py:71: PytestRemovedIn9Warning: Marks applied to fixtures have no effect
  See docs: https://docs.pytest.org/en/stable/deprecations.html#applying-a-mark-to-a-fixture-function
    def httpbin_cert_fingerprint(request) -> str:
======== 402 passed, 10 skipped, 2 xfailed ========
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
======== 410 passed, 10 skipped, 2 xfailed, 1 warning ========
components/python/elasticsearch/Makefile
@@ -19,13 +19,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        elasticsearch
HUMAN_VERSION =            8.12.1
HUMAN_VERSION =            8.13.0
COMPONENT_SUMMARY =        elasticsearch - Python client for Elasticsearch
COMPONENT_PROJECT_URL =        https://github.com/elastic/elasticsearch-py
COMPONENT_ARCHIVE_URL =        \
    https://github.com/elastic/elasticsearch-py/archive/refs/tags/v$(HUMAN_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:05c9969be37fb03aa14d166e06b51ee4255080d751ce109beb188507ddc0833d
    sha256:82c0bca576eeaeb62dbaf63bab51119a40e2b77d3b1a8a410cf4959e4f6eb187
COMPONENT_LICENSE =        Apache-2.0
COMPONENT_LICENSE_FILE =    LICENSE
@@ -39,6 +39,9 @@
# manually.
TEST_REQUIREMENTS += dev-requirements.txt
# We do not have orjson
PYTEST_ADDOPTS += --ignore test_elasticsearch/test_serializer.py
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/elastic-transport
PYTHON_REQUIRED_PACKAGES += runtime/python
@@ -50,6 +53,7 @@
TEST_REQUIRED_PACKAGES.python += library/python/isort
TEST_REQUIRED_PACKAGES.python += library/python/jinja2
TEST_REQUIRED_PACKAGES.python += library/python/nox
TEST_REQUIRED_PACKAGES.python += library/python/numpy
TEST_REQUIRED_PACKAGES.python += library/python/pytest
TEST_REQUIRED_PACKAGES.python += library/python/pytest-asyncio
TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
@@ -57,5 +61,6 @@
TEST_REQUIRED_PACKAGES.python += library/python/pyyaml
TEST_REQUIRED_PACKAGES.python += library/python/requests
TEST_REQUIRED_PACKAGES.python += library/python/sphinx
TEST_REQUIRED_PACKAGES.python += library/python/sphinx-autodoc-typehints
TEST_REQUIRED_PACKAGES.python += library/python/sphinx-rtd-theme
TEST_REQUIRED_PACKAGES.python += library/python/twine
components/python/elasticsearch/elasticsearch-PYVER.p5m
@@ -73,6 +73,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/client/watcher.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/client/xpack.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/helpers.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_otel.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/client/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/client/_base.py
components/python/elasticsearch/manifests/sample-manifest.p5m
@@ -73,6 +73,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/client/watcher.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/client/xpack.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_async/helpers.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_otel.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/client/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/elasticsearch/_sync/client/_base.py
components/python/elasticsearch/patches/01-test-no-search-engine.patch
@@ -2,8 +2,8 @@
connect.  Since we do not have the search engine packaged we simply skip all
tests that needs the engine.
--- elasticsearch-py-8.12.1/test_elasticsearch/conftest.py.orig
+++ elasticsearch-py-8.12.1/test_elasticsearch/conftest.py
--- elasticsearch-py-8.13.0/test_elasticsearch/conftest.py.orig
+++ elasticsearch-py-8.13.0/test_elasticsearch/conftest.py
@@ -26,10 +26,7 @@
 
 @pytest.fixture(scope="session")
@@ -16,8 +16,8 @@
 
 
 @pytest.fixture(scope="session")
--- elasticsearch-py-8.12.1/test_elasticsearch/test_server/test_rest_api_spec.py.orig
+++ elasticsearch-py-8.12.1/test_elasticsearch/test_server/test_rest_api_spec.py
--- elasticsearch-py-8.13.0/test_elasticsearch/test_server/test_rest_api_spec.py.orig
+++ elasticsearch-py-8.13.0/test_elasticsearch/test_server/test_rest_api_spec.py
@@ -30,6 +30,7 @@
 from typing import Tuple, Union
 
components/python/elasticsearch/patches/03-test-no-packages.patch
@@ -1,7 +1,7 @@
We have no these projects packaged yet.
We do not have these projects packaged yet.
--- elasticsearch-py-8.12.1/dev-requirements.txt.orig
+++ elasticsearch-py-8.12.1/dev-requirements.txt
--- elasticsearch-py-8.13.0/dev-requirements.txt.orig
+++ elasticsearch-py-8.13.0/dev-requirements.txt
@@ -7,7 +7,6 @@
 coverage
 jinja2
@@ -10,19 +10,15 @@
 pyyaml>=5.4
 isort
 black
@@ -15,15 +14,6 @@
 build
@@ -16,11 +15,7 @@
 nox
 
-numpy
 numpy
-pandas
-
-orjson
-# Testing the 'search_mvt' API response
-mapbox-vector-tile
-# Python 3.7 gets an old version of mapbox-vector-tile, requiring an
-# old version of protobuf
-protobuf<4; python_version<="3.7"
-
 # Docs
 # Override Read the Docs default (sphinx<2 and sphinx-rtd-theme<0.5)
 sphinx>2
 # Python 3.7 gets an old version of mapbox-vector-tile, requiring an
 # old version of protobuf
 protobuf<4; python_version<="3.7"
components/python/elasticsearch/python-integrate-project.conf
@@ -26,3 +26,6 @@
# This project does not support tox so we need to provide test requirements
# manually.
TEST_REQUIREMENTS += dev-requirements.txt
# We do not have orjson
PYTEST_ADDOPTS += --ignore test_elasticsearch/test_serializer.py
components/python/elasticsearch/test/results-all.master
@@ -4,8 +4,9 @@
rootdir: $(@D)
configfile: setup.cfg
asyncio: mode=strict
collecting ... collected 349 items / 2 skipped
collecting ... collected 331 items / 2 skipped
not set)
test_elasticsearch/test_async/test_server/test_clients.py::test_bulk_works_with_bytestring_body SKIPPED
test_elasticsearch/test_async/test_server/test_clients.py::test_bulk_works_with_string_body SKIPPED
test_elasticsearch/test_async/test_server/test_clients.py::test_indices_analyze_unicode[kwargs0] SKIPPED
@@ -238,28 +239,9 @@
test_elasticsearch/test_helpers.py::TestExpandActions::test_string_actions_are_marked_as_simple_inserts[whatever1] PASSED
test_elasticsearch/test_helpers.py::TestParallelBulk::test_all_chunks_sent PASSED
test_elasticsearch/test_helpers.py::TestParallelBulk::test_chunk_sent_from_different_threads PASSED
test_elasticsearch/test_serializer.py::TestDeserializer::test_deserialize_compatibility_header PASSED
test_elasticsearch/test_serializer.py::TestDeserializer::test_deserializes_json_by_default PASSED
test_elasticsearch/test_serializer.py::TestDeserializer::test_deserializes_text_with_correct_ct[{"some":"data"}0] PASSED
test_elasticsearch/test_serializer.py::TestDeserializer::test_deserializes_text_with_correct_ct[{"some":"data"}1] PASSED
test_elasticsearch/test_serializer.py::test_datetime_serialization PASSED
test_elasticsearch/test_serializer.py::test_decimal_serialization PASSED
test_elasticsearch/test_serializer.py::test_json_raises_serialization_error_on_dump_error PASSED
test_elasticsearch/test_serializer.py::test_raises_serialization_error_on_load_error PASSED
test_elasticsearch/test_serializer.py::test_raises_serialization_error_pandas_nat SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_bool SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_datetime SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_floats SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_integers SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_nan_to_nan SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_numpy_ndarray SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_pandas_category SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_pandas_na SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_pandas_series SKIPPED
test_elasticsearch/test_serializer.py::test_serializes_pandas_timestamp SKIPPED
test_elasticsearch/test_serializer.py::test_strings_are_left_untouched PASSED
test_elasticsearch/test_serializer.py::test_text_raises_serialization_error_on_dump_error PASSED
test_elasticsearch/test_serializer.py::test_uuid_serialization PASSED
test_elasticsearch/test_otel.py::test_detailed_span SKIPPED
test_elasticsearch/test_otel.py::test_enabled SKIPPED (TEST_WITH_OTEL is
test_elasticsearch/test_otel.py::test_minimal_span SKIPPED
test_elasticsearch/test_server/test_clients.py::test_bulk_works_with_bytestring_body SKIPPED
test_elasticsearch/test_server/test_clients.py::test_bulk_works_with_string_body SKIPPED
test_elasticsearch/test_server/test_clients.py::test_indices_analyze_unicode[kwargs0] SKIPPED
@@ -312,6 +294,7 @@
test_elasticsearch/test_server/test_mapbox_vector_tile.py::test_mapbox_vector_tile_error[urllib3] SKIPPED
test_elasticsearch/test_server/test_mapbox_vector_tile.py::test_mapbox_vector_tile_response[requests] SKIPPED
test_elasticsearch/test_server/test_mapbox_vector_tile.py::test_mapbox_vector_tile_response[urllib3] SKIPPED
test_elasticsearch/test_server/test_otel.py::test_otel_end_to_end SKIPPED
test_elasticsearch/test_server/test_responses.py::test_exists_response SKIPPED
test_elasticsearch/test_server/test_responses.py::test_object_response SKIPPED
test_elasticsearch/test_server/test_responses.py::test_text_response SKIPPED
@@ -357,8 +340,8 @@
test_elasticsearch/test_transport.py::test_warning_header[headers1] PASSED
=============================== warnings summary ===============================
../../../../../../../..$(PYTHON_DIR)/vendor-packages/_pytest/fixtures.py:1322
  $(PYTHON_DIR)/vendor-packages/_pytest/fixtures.py:1322: PytestRemovedIn9Warning: Marks applied to fixtures have no effect
../../../../../../../..$(PYTHON_DIR)/vendor-packages/_pytest/fixtures.py:1314
  $(PYTHON_DIR)/vendor-packages/_pytest/fixtures.py:1314: PytestRemovedIn9Warning: Marks applied to fixtures have no effect
  See docs: https://docs.pytest.org/en/stable/deprecations.html#applying-a-mark-to-a-fixture-function
    return fixture_marker(fixture_function)
@@ -407,11 +390,11 @@
    AsyncElasticsearch(
test_elasticsearch/test_client/test_options.py::TestOptions::test_user_agent_override
  $(@D)/test_elasticsearch/test_client/test_options.py:344: DeprecationWarning: Passing transport options in the API method is deprecated. Use 'Elasticsearch.options()' instead.
  $(@D)/test_elasticsearch/test_client/test_options.py:351: DeprecationWarning: Passing transport options in the API method is deprecated. Use 'Elasticsearch.options()' instead.
    client.indices.get(index="2", headers={"user-agent": "custom2"})
test_elasticsearch/test_client/test_options.py::TestOptions::test_user_agent_override
  $(@D)/test_elasticsearch/test_client/test_options.py:365: DeprecationWarning: Passing transport options in the API method is deprecated. Use 'Elasticsearch.options()' instead.
  $(@D)/test_elasticsearch/test_client/test_options.py:372: DeprecationWarning: Passing transport options in the API method is deprecated. Use 'Elasticsearch.options()' instead.
    client.indices.get(index="2", headers={"user-agent": "custom4"})
test_elasticsearch/test_client/test_rewrite_parameters.py::TestRewriteParameters::test_default_params_conflict
@@ -456,4 +439,4 @@
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
======== 229 passed, 122 skipped, 27 warnings ========
======== 218 passed, 115 skipped, 27 warnings ========
components/python/httpcore/Makefile
@@ -19,11 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        httpcore
HUMAN_VERSION =            1.0.4
HUMAN_VERSION =            1.0.5
COMPONENT_SUMMARY =        httpcore - A minimal low-level HTTP client.
COMPONENT_PROJECT_URL =        https://www.encode.io/httpcore/
COMPONENT_ARCHIVE_HASH =    \
    sha256:cb2839ccfcba0d2d3c1131d3c3e26dfc327326fbe7a5dc0dbfe9f6c9151bb022
    sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61
COMPONENT_LICENSE =        BSD-3-Clause
COMPONENT_LICENSE_FILE =    LICENSE.md
@@ -34,6 +34,7 @@
# This project does not support tox so we need to provide test requirements
# manually.
TEST_REQUIREMENTS_EXTRAS += http2
TEST_REQUIREMENTS_EXTRAS += socks
TEST_REQUIREMENTS_EXTRAS += asyncio
# Test dependencies we are unable to detect automatically
@@ -48,3 +49,4 @@
PYTHON_REQUIRED_PACKAGES += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/anyio
TEST_REQUIRED_PACKAGES.python += library/python/h2
TEST_REQUIRED_PACKAGES.python += library/python/socksio
components/python/httpcore/patches/01-no-trio.patch
@@ -1,7 +1,7 @@
we have no trio
--- httpcore-1.0.4/tests/test_models.py.orig
+++ httpcore-1.0.4/tests/test_models.py
--- httpcore-1.0.5/tests/test_models.py.orig
+++ httpcore-1.0.5/tests/test_models.py
@@ -150,28 +150,3 @@
     async def __aiter__(self) -> typing.AsyncIterator[bytes]:
         for chunk in self._chunks:
@@ -31,8 +31,8 @@
-    with pytest.raises(RuntimeError):
-        async for chunk in response.aiter_stream():
-            pass  # pragma: nocover
--- httpcore-1.0.4/tests/_async/test_connection_pool.py.orig
+++ httpcore-1.0.4/tests/_async/test_connection_pool.py
--- httpcore-1.0.5/tests/_async/test_connection_pool.py.orig
+++ httpcore-1.0.5/tests/_async/test_connection_pool.py
@@ -4,7 +4,7 @@
 import hpack
 import hyperframe.frame
components/python/httpcore/patches/02-no-httpbin.patch
@@ -1,5 +1,5 @@
--- httpcore-1.0.4/tests/_async/test_integration.py.orig
+++ httpcore-1.0.4/tests/_async/test_integration.py
--- httpcore-1.0.5/tests/_async/test_integration.py.orig
+++ httpcore-1.0.5/tests/_async/test_integration.py
@@ -6,6 +6,7 @@
 
 
@@ -24,8 +24,8 @@
 async def test_extra_info(httpbin_secure):
     ssl_context = ssl.create_default_context()
     ssl_context.check_hostname = False
--- httpcore-1.0.4/tests/_sync/test_integration.py.orig
+++ httpcore-1.0.4/tests/_sync/test_integration.py
--- httpcore-1.0.5/tests/_sync/test_integration.py.orig
+++ httpcore-1.0.5/tests/_sync/test_integration.py
@@ -6,6 +6,7 @@
 
 
@@ -50,8 +50,8 @@
 def test_extra_info(httpbin_secure):
     ssl_context = ssl.create_default_context()
     ssl_context.check_hostname = False
--- httpcore-1.0.4/tests/test_api.py.orig
+++ httpcore-1.0.4/tests/test_api.py
--- httpcore-1.0.5/tests/test_api.py.orig
+++ httpcore-1.0.5/tests/test_api.py
@@ -1,18 +1,23 @@
 import json
 
components/python/httpcore/patches/03-no-socksio.patch
File was deleted
components/python/httpcore/python-integrate-project.conf
@@ -15,12 +15,12 @@
%patch% 01-no-trio.patch
%patch% 02-no-httpbin.patch
%patch% 03-no-socksio.patch
%include-3%
# This project does not support tox so we need to provide test requirements
# manually.
TEST_REQUIREMENTS_EXTRAS += http2
TEST_REQUIREMENTS_EXTRAS += socks
TEST_REQUIREMENTS_EXTRAS += asyncio
# Test dependencies we are unable to detect automatically
components/python/httpcore/test/results-all.master
@@ -45,11 +45,11 @@
tests/_async/test_integration.py::test_extra_info[asyncio] SKIPPED (...)
tests/_async/test_integration.py::test_request[asyncio] SKIPPED (we ...)
tests/_async/test_integration.py::test_ssl_request[asyncio] SKIPPED
tests/_async/test_socks_proxy.py::test_authenticated_socks5_request[asyncio] SKIPPED
tests/_async/test_socks_proxy.py::test_socks5_request[asyncio] SKIPPED
tests/_async/test_socks_proxy.py::test_socks5_request_connect_failed[asyncio] SKIPPED
tests/_async/test_socks_proxy.py::test_socks5_request_failed_to_provide_auth[asyncio] SKIPPED
tests/_async/test_socks_proxy.py::test_socks5_request_incorrect_auth[asyncio] SKIPPED
tests/_async/test_socks_proxy.py::test_authenticated_socks5_request[asyncio] PASSED
tests/_async/test_socks_proxy.py::test_socks5_request[asyncio] PASSED
tests/_async/test_socks_proxy.py::test_socks5_request_connect_failed[asyncio] PASSED
tests/_async/test_socks_proxy.py::test_socks5_request_failed_to_provide_auth[asyncio] PASSED
tests/_async/test_socks_proxy.py::test_socks5_request_incorrect_auth[asyncio] PASSED
tests/_sync/test_connection.py::test_concurrent_requests_not_available_on_http11_connections PASSED
tests/_sync/test_connection.py::test_connection_retries PASSED
tests/_sync/test_connection.py::test_connection_retries_tls PASSED
@@ -108,11 +108,11 @@
tests/_sync/test_integration.py::test_extra_info SKIPPED (we have no...)
tests/_sync/test_integration.py::test_request SKIPPED (we have no ht...)
tests/_sync/test_integration.py::test_ssl_request SKIPPED (we have n...)
tests/_sync/test_socks_proxy.py::test_authenticated_socks5_request SKIPPED
tests/_sync/test_socks_proxy.py::test_socks5_request SKIPPED (we hav...)
tests/_sync/test_socks_proxy.py::test_socks5_request_connect_failed SKIPPED
tests/_sync/test_socks_proxy.py::test_socks5_request_failed_to_provide_auth SKIPPED
tests/_sync/test_socks_proxy.py::test_socks5_request_incorrect_auth SKIPPED
tests/_sync/test_socks_proxy.py::test_authenticated_socks5_request PASSED
tests/_sync/test_socks_proxy.py::test_socks5_request PASSED
tests/_sync/test_socks_proxy.py::test_socks5_request_connect_failed PASSED
tests/_sync/test_socks_proxy.py::test_socks5_request_failed_to_provide_auth PASSED
tests/_sync/test_socks_proxy.py::test_socks5_request_incorrect_auth PASSED
tests/test_api.py::test_request SKIPPED (we have no httpbin)
tests/test_api.py::test_request_with_content SKIPPED (we have no htt...)
tests/test_api.py::test_stream SKIPPED (we have no httpbin)
@@ -138,4 +138,4 @@
=================================== XPASSES ====================================
=========================== short test summary info ============================
======== 108 passed, 20 skipped, 3 xpassed ========
======== 118 passed, 10 skipped, 3 xpassed ========
components/python/nh3/Makefile
@@ -15,17 +15,14 @@
#
BUILD_STYLE = pyproject
PYTHON3_SOABI = abi3
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        nh3
HUMAN_VERSION =            0.2.15
HUMAN_VERSION =            0.2.17
COMPONENT_SUMMARY =        nh3 - Python bindings to the ammonia HTML sanitization library.
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/08/03/506eb477d723da0db7c46d6259ee06bc68243ef40f5626eb66ab72ae4d69/nh3-0.2.15.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:d1e30ff2d8d58fb2a14961f7aac1bbb1c51f9bdd7da727be35c63826060b0bf3
    sha256:40d0741a19c3d645e54efba71cb0d8c475b59135c1e3c580f879ad5514cbf028
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE
components/python/nh3/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,7 +27,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/nh3-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/__init__.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/nh3.so
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/nh3.abi3.so
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/py.typed
# python modules are unusable without python runtime binary
components/python/nh3/nh3-PYVER.p5m
@@ -27,7 +27,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/nh3-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/__init__.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/nh3.so
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/nh3.abi3.so
file path=usr/lib/python$(PYVER)/vendor-packages/nh3/py.typed
# python modules are unusable without python runtime binary
components/python/nh3/pkg5
@@ -6,8 +6,8 @@
        "system/library/gcc-13-runtime"
    ],
    "fmris": [
        "library/python/nh3-39",
        "library/python/nh3"
        "library/python/nh3",
        "library/python/nh3-39"
    ],
    "name": "nh3"
}
}
components/python/nh3/python-integrate-project.conf
@@ -13,8 +13,6 @@
# Copyright 2023 Marcel Telka
#
%include-1%
PYTHON3_SOABI = abi3
%include-3%
# https://www.illumos.org/issues/15767
LD_Z_IGNORE=
components/python/nh3/test/results-all.master
@@ -2,6 +2,7 @@
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(PYTHON)
cachedir: .pytest_cache
rootdir: $(@D)
configfile: pyproject.toml
collecting ... collected 4 items
tests/test_nh3.py::test_clean PASSED
@@ -11,7 +12,7 @@
=============================== warnings summary ===============================
tests/test_nh3.py::test_clean_with_attribute_filter
  $(PYTHON_DIR)/vendor-packages/_pytest/unraisableexception.py:78: PytestUnraisableExceptionWarning: Exception ignored in: ('img', 'src', 'foo')
  $(PYTHON_DIR)/vendor-packages/_pytest/unraisableexception.py:80: PytestUnraisableExceptionWarning: Exception ignored in: ('img', 'src', 'foo')
  
  Traceback (most recent call last):
    File "$(@D)/tests/test_nh3.py", line 71, in test_clean_with_attribute_filter
components/python/pyasn1/Makefile
@@ -19,13 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        pyasn1
HUMAN_VERSION =            0.5.1
HUMAN_VERSION =            0.6.0
COMPONENT_SUMMARY =        pyasn1 - Pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208)
COMPONENT_PROJECT_URL =        https://github.com/pyasn1/pyasn1
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/ce/dc/996e5446a94627fe8192735c20300ca51535397e31e7097a3cc80ccf78b7/pyasn1-0.5.1.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:6d391a96e59b23130a5cfa74d6fd7f388dbbe26cc8f1edf39fdddf08d9d6676c
    sha256:3a35ab2c4b5ef98e17dfdec8ab074046fbda76e281c5a706ccd82328cfc8f64c
COMPONENT_LICENSE =        BSD-2-Clause
COMPONENT_LICENSE_FILE =    LICENSE.rst
components/python/pyasn1/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
components/python/pyasn1/pkg5
@@ -5,8 +5,8 @@
        "runtime/python-39"
    ],
    "fmris": [
        "library/python/pyasn1-39",
        "library/python/pyasn1"
        "library/python/pyasn1",
        "library/python/pyasn1-39"
    ],
    "name": "pyasn1"
}
}
components/python/pyasn1/test/results-all.master
@@ -2,7 +2,8 @@
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(PYTHON)
cachedir: .pytest_cache
rootdir: $(@D)
collecting ... collected 1165 items
configfile: pyproject.toml
collecting ... collected 1196 items
tests/codec/ber/test_decoder.py::AnyDecoderTestCase::testByUntagged PASSED
tests/codec/ber/test_decoder.py::AnyDecoderTestCase::testByUntaggedIndefMode PASSED
@@ -120,6 +121,16 @@
tests/codec/ber/test_decoder.py::RealDecoderTestCase::testPlusInf PASSED
tests/codec/ber/test_decoder.py::RealDecoderTestCase::testShortEncoding PASSED
tests/codec/ber/test_decoder.py::RealDecoderTestCase::testTagFormat PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testIndefiniteLength PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testLarge PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testLeading0x80 PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testNonLeading0x80 PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testOne PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testReservedLength PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testTagFormat PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testThree PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testTwo PASSED
tests/codec/ber/test_decoder.py::RelativeOIDDecoderTestCase::testZeroLength PASSED
tests/codec/ber/test_decoder.py::RestartableDecoderTestCase::testPartialReadingFromNonBlockingStream PASSED
tests/codec/ber/test_decoder.py::SequenceDecoderTestCase::testTagFormat PASSED
tests/codec/ber/test_decoder.py::SequenceDecoderTestCase::testWithOptionalAndDefaultedDefMode PASSED
@@ -320,6 +331,11 @@
tests/codec/ber/test_encoder.py::RealEncoderTestCase::testPlusInf PASSED
tests/codec/ber/test_encoder.py::RealEncoderTestCase::testZero PASSED
tests/codec/ber/test_encoder.py::RealEncoderWithSchemaTestCase::testChar PASSED
tests/codec/ber/test_encoder.py::RelativeOIDEncoderTestCase::testLarge PASSED
tests/codec/ber/test_encoder.py::RelativeOIDEncoderTestCase::testOne PASSED
tests/codec/ber/test_encoder.py::RelativeOIDEncoderTestCase::testThree PASSED
tests/codec/ber/test_encoder.py::RelativeOIDEncoderTestCase::testTwo PASSED
tests/codec/ber/test_encoder.py::RelativeOIDWithSchemaEncoderTestCase::testOne PASSED
tests/codec/ber/test_encoder.py::SequenceEncoderTestCase::testDefMode PASSED
tests/codec/ber/test_encoder.py::SequenceEncoderTestCase::testDefModeChunked PASSED
tests/codec/ber/test_encoder.py::SequenceEncoderTestCase::testIndefMode PASSED
@@ -1062,6 +1078,22 @@
tests/type/test_univ.py::RealTestCase::testSub PASSED
tests/type/test_univ.py::RealTestCase::testTag PASSED
tests/type/test_univ.py::RealTestCase::testTrunc PASSED
tests/type/test_univ.py::RelativeOID::testAdd PASSED
tests/type/test_univ.py::RelativeOID::testContains PASSED
tests/type/test_univ.py::RelativeOID::testEq PASSED
tests/type/test_univ.py::RelativeOID::testInput1 PASSED
tests/type/test_univ.py::RelativeOID::testInput2 PASSED
tests/type/test_univ.py::RelativeOID::testInput3 PASSED
tests/type/test_univ.py::RelativeOID::testLen PASSED
tests/type/test_univ.py::RelativeOID::testPrefix PASSED
tests/type/test_univ.py::RelativeOID::testRadd PASSED
tests/type/test_univ.py::RelativeOID::testRepr PASSED
tests/type/test_univ.py::RelativeOID::testStaticDef PASSED
tests/type/test_univ.py::RelativeOID::testStr PASSED
tests/type/test_univ.py::RelativeOID::testTag PASSED
tests/type/test_univ.py::RelativeOID::testUnicode PASSED
tests/type/test_univ.py::RelativeOIDPicklingTestCase::testSchemaPickling PASSED
tests/type/test_univ.py::RelativeOIDPicklingTestCase::testValuePickling PASSED
tests/type/test_univ.py::Sequence::testById PASSED
tests/type/test_univ.py::Sequence::testByKey PASSED
tests/type/test_univ.py::Sequence::testClone PASSED
@@ -1170,4 +1202,4 @@
tests/type/test_useful.py::UTCTimeTestCase::testToDateTime3 PASSED
tests/type/test_useful.py::UTCTimeTestCase::testToDateTime4 PASSED
======== 1165 passed ========
======== 1196 passed ========
components/python/pyasn1_modules/Makefile
@@ -19,13 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        pyasn1_modules
HUMAN_VERSION =            0.3.0
HUMAN_VERSION =            0.4.0
COMPONENT_SUMMARY =        pyasn1_modules - A collection of ASN.1-based protocols modules
COMPONENT_PROJECT_URL =        https://github.com/pyasn1/pyasn1-modules
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/3b/e4/7dec823b1b5603c5b3c51e942d5d9e65efd6ff946e713a325ed4146d070f/pyasn1_modules-0.3.0.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c
    sha256:831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6
COMPONENT_LICENSE =        BSD-2-Clause
COMPONENT_LICENSE_FILE =    LICENSE.txt
components/python/pyasn1_modules/history
New file
@@ -0,0 +1 @@
library/python/pyasn1-modules-37@0.3.0,5.11-2023.0.0.1
components/python/pyasn1_modules/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
components/python/pyasn1_modules/pkg5
@@ -1,18 +1,13 @@
{
    "dependencies": [
        "library/python/pyasn1-37",
        "library/python/pyasn1-39",
        "library/python/setuptools-37",
        "library/python/setuptools-39",
        "library/python/wheel-37",
        "library/python/wheel-39",
        "runtime/python-37",
        "runtime/python-39"
    ],
    "fmris": [
        "library/python/pyasn1-modules-37",
        "library/python/pyasn1-modules-39",
        "library/python/pyasn1-modules"
        "library/python/pyasn1-modules",
        "library/python/pyasn1-modules-39"
    ],
    "name": "pyasn1_modules"
}
}
components/python/pyasn1_modules/test/results-all.master
@@ -1,12 +1,10 @@
============================= test session starts ==============================
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(PYTHON)
cachedir: .pytest_cache
hypothesis profile 'default' -> database=DirectoryBasedExampleDatabase('$(@D)/.hypothesis/examples')
rootdir: $(@D)
asyncio: mode=strict
collecting ... collected 285 items
configfile: pyproject.toml
collecting ... collected 282 items
::project PASSED
tests/test_pem.py::PemTestCase::testReadBase64fromText PASSED
tests/test_rfc2314.py::CertificationRequestTestCase::testDerCodec PASSED
tests/test_rfc2315.py::Pkcs7TestCase::testDerCodec PASSED
@@ -290,4 +288,4 @@
tests/test_rfc8769.py::CBORContentTestCase::testDerCodec PASSED
tests/test_rfc8769.py::CBORSequenceContentTestCase::testDerCodec PASSED
======== 283 passed ========
======== 282 passed ========
components/python/pybind11/Makefile
@@ -19,13 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        pybind11
HUMAN_VERSION =            2.11.1
HUMAN_VERSION =            2.12.0
COMPONENT_SUMMARY =        pybind11 - Seamless operability between C++11 and Python
COMPONENT_PROJECT_URL =        https://github.com/pybind/pybind11
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/3a/cc/903bb18de90b5d6e15379c97175371ac6414795d94b9c2f6468a9c1303aa/pybind11-2.11.1.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:00cd59116a6e8155aecd9174f37ba299d1d397ed4a6b86ac1dfe01b3e40f2cc4
    sha256:5e3c557a84b06b969247630407fc4d985bed157b4253b13153b8e8e165e0c3dc
COMPONENT_LICENSE =        BSD-3-Clause
COMPONENT_LICENSE_FILE =    LICENSE
components/python/pybind11/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -54,6 +54,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/eval.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/functional.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/gil.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/gil_safe_call_once.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/iostream.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/numpy.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/operators.h
@@ -64,6 +65,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/stl/filesystem.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/stl_bind.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/type_caster_pyobject_ptr.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/typing.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/py.typed
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/setup_helpers.py
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/share/cmake/pybind11/FindPythonLibsNew.cmake
components/python/pybind11/pkg5
@@ -5,8 +5,8 @@
        "runtime/python-39"
    ],
    "fmris": [
        "library/python/pybind11-39",
        "library/python/pybind11"
        "library/python/pybind11",
        "library/python/pybind11-39"
    ],
    "name": "pybind11"
}
}
components/python/pybind11/pybind11-PYVER.p5m
@@ -54,6 +54,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/eval.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/functional.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/gil.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/gil_safe_call_once.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/iostream.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/numpy.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/operators.h
@@ -64,6 +65,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/stl/filesystem.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/stl_bind.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/type_caster_pyobject_ptr.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/include/pybind11/typing.h
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/py.typed
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/setup_helpers.py
file path=usr/lib/python$(PYVER)/vendor-packages/pybind11/share/cmake/pybind11/FindPythonLibsNew.cmake
components/python/pymongo/Makefile
@@ -19,13 +19,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        pymongo
HUMAN_VERSION =            4.6.2
HUMAN_VERSION =            4.6.3
COMPONENT_SUMMARY =        pymongo - Python driver for MongoDB <http://www.mongodb.org>
COMPONENT_PROJECT_URL =        http://github.com/mongodb/mongo-python-driver
COMPONENT_ARCHIVE_URL =        \
    https://github.com/mongodb/mongo-python-driver/archive/refs/tags/$(HUMAN_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:8d520a89dba340c167614ad1f37a902a4904a7194f35a989694d63cac13eae47
    sha256:c3b1be222869a35fee67714b754ebe8c5e83553b34ec60a6e8870ba0ea4f4496
COMPONENT_LICENSE =        Apache-2.0
COMPONENT_LICENSE_FILE =    LICENSE
components/python/pymongo/patches/01-tox-enable-tests.patch
@@ -1,5 +1,5 @@
--- mongo-python-driver-4.6.2/tox.ini.orig
+++ mongo-python-driver-4.6.2/tox.ini
--- mongo-python-driver-4.6.3/tox.ini.orig
+++ mongo-python-driver-4.6.3/tox.ini
@@ -44,7 +44,7 @@
     aws-secrets = aws-secrets
     manifest = manifest
components/python/pymongo/patches/02-no-mypy.patch
@@ -1,5 +1,5 @@
--- mongo-python-driver-4.6.2/test/test_typing.py.orig
+++ mongo-python-driver-4.6.2/test/test_typing.py
--- mongo-python-driver-4.6.3/test/test_typing.py.orig
+++ mongo-python-driver-4.6.3/test/test_typing.py
@@ -93,6 +93,7 @@
         stdout, stderr, exit_status = api.run([filename])
         self.assertTrue(exit_status, msg=stdout)
components/python/pymongo/test/results-all.master
@@ -1,6 +1,6 @@
py$(PYV): remove tox env folder $(@D)/.tox/py$(PYV)
py$(PYV): commands[0]> python --version
Python 3.9.18
Python 3.9.19
py$(PYV): commands[1]> .evergreen/check-c-extensions.sh
running build_ext
copying build/lib.solaris-2.11-i86pc.64bit-cpython-39/bson/_cbson.cpython-39.so -> bson
@@ -4486,402 +4486,28 @@
version must be at least 4.7.-1.0)
================================== XFAILURES ===================================
_ TestUnifiedTestFormatValidFailIgnoreResultAndError.test_operation_errors_are_not_ignored_if_ignoreResultAndError_is_false _
self = <TestCaseFunction test_operation_errors_are_not_ignored_if_ignoreResultAndError_is_false>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailIgnoreResultAndError testMethod=test_operation_errors_are_not_ignored_if_ignoreResultAndError_is_false>
rawexcinfo = (<class 'pymongo.errors.DuplicateKeyError'>, DuplicateKeyError("E11000 duplicate key error collection: database0Name.c...te key error collection: database0Name.coll0 index: _id_ dup key: { _id: 1 }'}"), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailEntityClientStoreEventsAsEntitiesConflictWithinSameArray.test_foo _
self = <TestCaseFunction test_foo>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityClientStoreEventsAsEntitiesConflictWithinSameArray testMethod=test_foo>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Entity named events already in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
___ TestUnifiedTestFormatValidFailOperationFailure.test_Unsupported_command ____
self = <TestCaseFunction test_Unsupported_command>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailOperationFailure testMethod=test_Unsupported_command>
rawexcinfo = (<class 'pymongo.errors.OperationFailure'>, OperationFailure('no such command: \'unsupportedCommand\', full error: {\'...and: \'unsupportedCommand\'", \'code\': 59, \'codeName\': \'CommandNotFound\'}'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailOperationFailure.test_Unsupported_query_operator _
self = <TestCaseFunction test_Unsupported_query_operator>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailOperationFailure testMethod=test_Unsupported_query_operator>
rawexcinfo = (<class 'pymongo.errors.OperationFailure'>, OperationFailure("unknown top level operator: $unsupportedQueryOperator, f...level operator: $unsupportedQueryOperator', 'code': 2, 'codeName': 'BadValue'}"), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailEntityClientStoreEventsAsEntitiesConflictWithinDifferentArray.test_foo _
self = <TestCaseFunction test_foo>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityClientStoreEventsAsEntitiesConflictWithinDifferentArray testMethod=test_foo>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Entity named events already in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailOperationUnsupported.test_Unsupported_operation _
self = <TestCaseFunction test_Unsupported_operation>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailOperationUnsupported testMethod=test_Unsupported_operation>
rawexcinfo = (<class 'TypeError'>, TypeError("'Database' object is not callable"), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailIgnoreResultAndErrorMalformed.test_malformed_operation_fails_if_ignoreResultAndError_is_true _
self = <TestCaseFunction test_malformed_operation_fails_if_ignoreResultAndError_is_true>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailIgnoreResultAndErrorMalformed testMethod=test_malformed_operation_fails_if_ignoreResultAndError_is_true>
rawexcinfo = (<class 'TypeError'>, TypeError("insert_one() got an unexpected keyword argument 'foo'"), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailReturnDocumentEnumInvalid.test_FindOneAndReplace_returnDocument_invalid_enum_value _
self = <TestCaseFunction test_FindOneAndReplace_returnDocument_invalid_enum_value>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailReturnDocumentEnumInvalid testMethod=test_FindOneAndReplace_returnDocument_invalid_enum_value>
rawexcinfo = (<class 'AttributeError'>, AttributeError("type object 'ReturnDocument' has no attribute 'INVALID'"), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailReturnDocumentEnumInvalid.test_FindOneAndUpdate_returnDocument_invalid_enum_value _
self = <TestCaseFunction test_FindOneAndUpdate_returnDocument_invalid_enum_value>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailReturnDocumentEnumInvalid testMethod=test_FindOneAndUpdate_returnDocument_invalid_enum_value>
rawexcinfo = (<class 'AttributeError'>, AttributeError("type object 'ReturnDocument' has no attribute 'INVALID'"), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailEntityFindCursorMalformed.test_createFindCursor_fails_if_filter_is_not_specified _
self = <TestCaseFunction test_createFindCursor_fails_if_filter_is_not_specified>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityFindCursorMalformed testMethod=test_createFindCursor_fails_if_filter_is_not_specified>
rawexcinfo = (<class 'AssertionError'>, AssertionError('createFindCursor requires a "filter" argument'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailEntityClientStoreEventsAsEntitiesConflictWithClientId.test_foo _
self = <TestCaseFunction test_foo>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityClientStoreEventsAsEntitiesConflictWithClientId testMethod=test_foo>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Entity named client0 already in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_____ TestUnifiedTestFormatValidFailEntityBucketDatabaseUndefined.test_foo _____
self = <TestCaseFunction test_foo>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityBucketDatabaseUndefined testMethod=test_foo>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Could not find entity named foo in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
___ TestUnifiedTestFormatValidFailEntityCollectionDatabaseUndefined.test_foo ___
self = <TestCaseFunction test_foo>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityCollectionDatabaseUndefined testMethod=test_foo>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Could not find entity named foo in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_____ TestUnifiedTestFormatValidFailEntityDatabaseClientUndefined.test_foo _____
self = <TestCaseFunction test_foo>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityDatabaseClientUndefined testMethod=test_foo>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Could not find entity named foo in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailAssertNumberConnectionsCheckedOut.test_operation_fails_if_client_entity_does_not_exist _
self = <TestCaseFunction test_operation_fails_if_client_entity_does_not_exist>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailAssertNumberConnectionsCheckedOut testMethod=test_operation_fails_if_client_entity_does_not_exist>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Could not find entity named client1 in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailAssertNumberConnectionsCheckedOut.test_operation_fails_if_client_field_is_not_specified _
self = <TestCaseFunction test_operation_fails_if_client_field_is_not_specified>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailAssertNumberConnectionsCheckedOut testMethod=test_operation_fails_if_client_field_is_not_specified>
rawexcinfo = (<class 'KeyError'>, KeyError('client'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailAssertNumberConnectionsCheckedOut.test_operation_fails_if_connections_field_is_not_specified _
self = <TestCaseFunction test_operation_fails_if_connections_field_is_not_specified>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailAssertNumberConnectionsCheckedOut testMethod=test_operation_fails_if_connections_field_is_not_specified>
rawexcinfo = (<class 'KeyError'>, KeyError('connections'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailAssertNumberConnectionsCheckedOut.test_operation_fails_if_number_of_connections_is_incorrect _
self = <TestCaseFunction test_operation_fails_if_number_of_connections_is_incorrect>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailAssertNumberConnectionsCheckedOut testMethod=test_operation_fails_if_number_of_connections_is_incorrect>
rawexcinfo = (<class 'AssertionError'>, AssertionError('1 != 0'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
___ TestUnifiedTestFormatValidFailEntityClientApiVersionUnsupported.test_foo ___
self = <TestCaseFunction test_foo>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityClientApiVersionUnsupported testMethod=test_foo>
rawexcinfo = (<class 'ValueError'>, ValueError('Unknown ServerApi version: server_will_never_support_this_api_version'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailEntityFindCursor.test_close_fails_if_it_references_a_nonexistent_entity _
self = <TestCaseFunction test_close_fails_if_it_references_a_nonexistent_entity>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityFindCursor testMethod=test_close_fails_if_it_references_a_nonexistent_entity>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Could not find entity named cursor0 in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_ TestUnifiedTestFormatValidFailEntityFindCursor.test_iterateUntilDocumentOrError_fails_if_it_references_a_nonexistent_entity _
self = <TestCaseFunction test_iterateUntilDocumentOrError_fails_if_it_references_a_nonexistent_entity>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntityFindCursor testMethod=test_iterateUntilDocumentOrError_fails_if_it_references_a_nonexistent_entity>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Could not find entity named cursor0 in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
_____ TestUnifiedTestFormatValidFailEntitySessionClientUndefined.test_foo ______
self = <TestCaseFunction test_foo>
testcase = <test.test_unified_format.TestUnifiedTestFormatValidFailEntitySessionClientUndefined testMethod=test_foo>
rawexcinfo = (<class 'AssertionError'>, AssertionError('Could not find entity named foo in map'), <traceback object at $(POINTER)>)
reason = ''
    def addExpectedFailure(
        self,
        testcase: "unittest.TestCase",
        rawexcinfo: "_SysExcInfoType",
        reason: str = "",
    ) -> None:
        try:
>           xfail(str(reason))
E           _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:282: XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
$(PYTHON_DIR)/vendor-packages/_pytest/unittest.py:265: _pytest.outcomes.XFailed
=============================== warnings summary ===============================
test/test_auth_spec.py::TestAuthSpec::test_connection-string_should_throw_an_exception_when_unsupported_auth_property_is_specified_(mongodb-oidc)
  $(@D)/pymongo/uri_parser.py:321: UserWarning: UnsupportedProperty is not a supported auth mechanism property. Must be one of (LIST).
components/python/unearth/Makefile
@@ -19,11 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        unearth
HUMAN_VERSION =            0.15.0
HUMAN_VERSION =            0.15.1
COMPONENT_SUMMARY =        unearth - A utility to fetch and download python packages
COMPONENT_PROJECT_URL =        https://github.com/frostming/unearth
COMPONENT_ARCHIVE_HASH =    \
    sha256:95f4764dab61f6bb637427934fa543b3610a38908760c06014fb861dcca29458
    sha256:863deb3339c0d65a5be0d0ad2c67d46d5f574a798e74ef0552bf11d298a30abb
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE
components/web/firefox/Makefile
@@ -34,7 +34,7 @@
# CANDIDATE_NIGHTLY=1
COMPONENT_NAME =    firefox
COMPONENT_VERSION =    124.0
COMPONENT_VERSION =    124.0.1
COMPONENT_SUMMARY=      Mozilla Firefox Web browser
COMPONENT_PROJECT_URL =    https://www.mozilla.com/firefox
COMPONENT_SRC_NAME =    $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -57,7 +57,7 @@
endif
ifdef CANDIDATE_NIGHTLY
COMPONENT_GIT_HASH=     9dc5b89f7de66165e234e8d244c2796b2dfe9235
COMPONENT_GIT_HASH=     ddac16aea855e057ff6be3c143f7155cc20f452e1f45eb6288ff27e9346ab843
COMPONENT_SRC=          gecko-dev-$(COMPONENT_GIT_HASH)
COMPONENT_ARCHIVE=      $(COMPONENT_GIT_HASH).tar.gz
COMPONENT_ARCHIVE_URL=  https://github.com/mozilla/gecko-dev/archive/$(COMPONENT_ARCHIVE)
@@ -66,7 +66,7 @@
COMPONENT_ARCHIVE_URL =    $(MOZILLA_FTP)/source/$(COMPONENT_ARCHIVE)
endif
COMPONENT_ARCHIVE_HASH= sha256:345a1235123ad808cecdb4a9af09ea48bf52ad09d3d380fc704406e3dd13c9d8
COMPONENT_ARCHIVE_HASH= sha256:ddac16aea855e057ff6be3c143f7155cc20f452e1f45eb6288ff27e9346ab843
COMPONENT_PROJECT_URL = https://www.mozilla.com/en-US/firefox/
COMPONENT_FMRI=        web/browser/firefox
components/web/firefox/patches/10-regression-in-Bug1875369.patch
File was deleted
components/web/firefox/patches/Bug1886802.patch
New file
@@ -0,0 +1,30 @@
Broken GLX rendering with Nvidia on X11
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -9697,12 +9697,23 @@
     mozilla::widget::CompositorWidgetInitData* aInitData) {
   nsCString displayName;
   LOG("nsWindow::GetCompositorWidgetInitData");
+  Window window = GetX11Window();
+#ifdef MOZ_X11
+  // We're bit hackish here. Old GLX backend needs XWindow when GLContext
+  // is created so get XWindow now before map signal.
+  // We may see crashes/errors when nsWindow is unmapped (XWindow is
+  // invalidated) but we can't do anything about it.
+  if (!window && !gfxVars::UseEGL()) {
+    window =
+        gdk_x11_window_get_xid(gtk_widget_get_window(GTK_WIDGET(mContainer)));
+  }
+#endif
   *aInitData = mozilla::widget::GtkCompositorWidgetInitData(
-      GetX11Window(), displayName, GetShapedState(), GdkIsX11Display(),
+      window, displayName, GetShapedState(), GdkIsX11Display(),
       GetClientSize());
 #ifdef MOZ_X11
   if (GdkIsX11Display()) {
     // Make sure the window XID is propagated to X server, we can fail otherwise
tools/python-integrate-project
@@ -387,8 +387,12 @@
    ((TOX_RET == 0)) && ! printf "%s" "$TOX_OUT" | grep -q 'assuming empty tox\.ini' && TEST_STYLE="tox" && break
    # Disable some pytest plugins that almost always collects tests to run
    # even there are no pytest tests available otherwise
    pytest -p no:black -p no:checkdocs -p no:cov -p no:mypy -p no:relaxed --setup-plan
    # even there are no pytest tests available otherwise.
    #
    # The system-statistics plugin is disabled because it often causes the
    # pytest to fail.
    # See also https://github.com/saltstack/pytest-system-statistics/issues/4
    pytest -p no:black -p no:checkdocs -p no:cov -p no:mypy -p no:relaxed -p no:system-statistics --setup-plan
    (($? != 5)) && TEST_STYLE="pytest" && break
    [[ -f setup.py ]] && python setup.py test --help && TEST_STYLE="setup.py" && break