14 files modified
91 ■■■■■ changed files
components/meta-packages/golang/Makefile 4 ●●●● patch | view | raw | blame | history
components/meta-packages/golang/manifests/sample-manifest.p5m 2 ●●● patch | view | raw | blame | history
components/meta-packages/golang/pkg5 2 ●●● patch | view | raw | blame | history
components/python/jaraco.context/Makefile 6 ●●●●● patch | view | raw | blame | history
components/python/jaraco.context/jaraco.context-PYVER.p5m 1 ●●●● patch | view | raw | blame | history
components/python/jaraco.context/manifests/sample-manifest.p5m 1 ●●●● patch | view | raw | blame | history
components/python/jaraco.context/patches/01-no-ruff.patch 10 ●●●● patch | view | raw | blame | history
components/python/jaraco.context/pkg5 1 ●●●● patch | view | raw | blame | history
components/python/jaraco.context/test/results-all.master 26 ●●●● patch | view | raw | blame | history
components/python/xmlschema/Makefile 4 ●●●● patch | view | raw | blame | history
components/python/xmlschema/patches/01-test-verbose.patch 4 ●●●● patch | view | raw | blame | history
components/python/xmlschema/test/results-all.master 5 ●●●● patch | view | raw | blame | history
make-rules/setup.py.mk 22 ●●●●● patch | view | raw | blame | history
make-rules/shared-macros.mk 3 ●●●●● patch | view | raw | blame | history
components/meta-packages/golang/Makefile
@@ -17,7 +17,7 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        golang
COMPONENT_VERSION =        1.21.1
COMPONENT_VERSION =        1.22
COMPONENT_SUMMARY =        The Go Programming Language
COMPONENT_PROJECT_URL =        https://go.dev/
COMPONENT_FMRI =        developer/golang
@@ -25,6 +25,6 @@
include $(WS_MAKE_RULES)/common.mk
PKG_MACROS += GOV=$(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\(\.[^.]*\)\..*/\1/' | tr -d .)
PKG_MACROS += GOV=$(subst .,,$(COMPONENT_VERSION))
# Auto-generated dependencies
components/meta-packages/golang/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/meta-packages/golang/pkg5
@@ -4,4 +4,4 @@
        "developer/golang"
    ],
    "name": "golang"
}
}
components/python/jaraco.context/Makefile
@@ -19,11 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        jaraco.context
HUMAN_VERSION =            5.1.0
HUMAN_VERSION =            5.3.0
COMPONENT_SUMMARY =        jaraco.context - Useful decorators and context managers
COMPONENT_PROJECT_URL =        https://github.com/jaraco/jaraco.context
COMPONENT_ARCHIVE_HASH =    \
    sha256:24ec1f739aec2c5766c68027ccc70d91d7b0cb931699442f5c7ed93515b955e7
    sha256:c2f67165ce1f9be20f32f650f25d8edfc1646a8aeee48ae06fb35f90763576d2
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE
@@ -41,10 +41,12 @@
include $(WS_MAKE_RULES)/common.mk
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/backports-tarfile
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
PYTHON_REQUIRED_PACKAGES += library/python/setuptools-scm
PYTHON_REQUIRED_PACKAGES += library/python/wheel
PYTHON_REQUIRED_PACKAGES += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/portend
TEST_REQUIRED_PACKAGES.python += library/python/pytest
TEST_REQUIRED_PACKAGES.python += library/python/pytest-checkdocs
TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
components/python/jaraco.context/jaraco.context-PYVER.p5m
@@ -34,3 +34,4 @@
    pkg.debug.depend.path=usr/bin
# Automatically generated dependencies based on distribution metadata
depend type=require fmri=pkg:/library/python/backports-tarfile-$(PYV)
components/python/jaraco.context/manifests/sample-manifest.p5m
@@ -34,3 +34,4 @@
    pkg.debug.depend.path=usr/bin
# Automatically generated dependencies based on distribution metadata
depend type=require fmri=pkg:/library/python/backports-tarfile-$(PYV)
components/python/jaraco.context/patches/01-no-ruff.patch
@@ -1,13 +1,13 @@
We have no pytest-ruff support yet.
see https://github.com/tikv/jemallocator/issues/58
--- jaraco.context-5.1.0/setup.cfg.orig
+++ jaraco.context-5.1.0/setup.cfg
@@ -24,7 +24,6 @@
--- jaraco.context-5.3.0/setup.cfg.orig
+++ jaraco.context-5.3.0/setup.cfg
@@ -25,7 +25,6 @@
     pytest-cov
     pytest-mypy
     pytest-enabler >= 2.2
-    pytest-ruff >= 0.2.1
     portend
 docs = 
     sphinx >= 3.5
     jaraco.packaging >= 9.3
components/python/jaraco.context/pkg5
@@ -1,5 +1,6 @@
{
    "dependencies": [
        "library/python/backports-tarfile-39",
        "library/python/setuptools-39",
        "library/python/setuptools-scm-39",
        "library/python/wheel-39",
components/python/jaraco.context/test/results-all.master
@@ -5,12 +5,13 @@
cachedir: .tox/py$(PYV)/.pytest_cache
rootdir: $(@D)
configfile: pytest.ini
collecting ... collected 15 items
collecting ... collected 17 items
.::project PASSED
.::project PASSED
conftest.py::mypy PASSED
conftest.py::mypy-status PASSED
docs/conf.py::mypy PASSED
docs/conf.py::mypy-status PASSED
jaraco/context.py::jaraco.context.ExceptionTrap PASSED
jaraco/context.py::jaraco.context.ExceptionTrap.passes PASSED
jaraco/context.py::jaraco.context.ExceptionTrap.raises PASSED
@@ -20,12 +21,27 @@
jaraco/context.py::jaraco.context.on_interrupt PASSED
jaraco/context.py::jaraco.context.pushd PASSED
jaraco/context.py::jaraco.context.suppress PASSED
jaraco/context.py::jaraco.context.tarball PASSED
jaraco/context.py::jaraco.context.temp_dir PASSED
jaraco/context.py::mypy PASSED
===================================== mypy =====================================
=============================== warnings summary ===============================
jaraco/context.py::jaraco.context.infer_compression
  <doctest jaraco.context.infer_compression[0]>:1: DeprecationWarning: infer_compression is deprecated with no replacement
Success: no issues found in 2 source files
======== 15 passed ========
jaraco/context.py::jaraco.context.infer_compression
  <doctest jaraco.context.infer_compression[1]>:1: DeprecationWarning: infer_compression is deprecated with no replacement
jaraco/context.py::jaraco.context.infer_compression
  <doctest jaraco.context.infer_compression[2]>:1: DeprecationWarning: infer_compression is deprecated with no replacement
jaraco/context.py::jaraco.context.infer_compression
  <doctest jaraco.context.infer_compression[3]>:1: DeprecationWarning: infer_compression is deprecated with no replacement
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
===================================== mypy =====================================
Success: no issues found in 3 source files
======== 17 passed, 4 warnings ========
  py$(PYV): OK
  congratulations :)
components/python/xmlschema/Makefile
@@ -19,11 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        xmlschema
HUMAN_VERSION =            3.2.0
HUMAN_VERSION =            3.2.1
COMPONENT_SUMMARY =        xmlschema - An XML Schema validator and decoder
COMPONENT_PROJECT_URL =        https://github.com/sissaschool/xmlschema
COMPONENT_ARCHIVE_HASH =    \
    sha256:541d96893691aae3cb93ea36a85dde18327012e26e0c51d610f4f79e7fc86f7b
    sha256:c9c3149ccc3f2205a67a71359cd7861729cdb3822b407bb8076f6a7ad9c2ceea
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE
components/python/xmlschema/patches/01-test-verbose.patch
@@ -1,5 +1,5 @@
--- xmlschema-3.2.0/tox.ini.orig
+++ xmlschema-3.2.0/tox.ini
--- xmlschema-3.2.1/tox.ini.orig
+++ xmlschema-3.2.1/tox.ini
@@ -15,7 +15,7 @@
     docs: sphinx_rtd_theme
     coverage: coverage
components/python/xmlschema/test/results-all.master
@@ -819,6 +819,7 @@
test_path_argument (tests.validation.test_validation.TestValidation) ... ok
test_schema_path_argument__issue_326 (tests.validation.test_validation.TestValidation) ... ok
test_validation_hook_argument (tests.validation.test_validation.TestValidation) ... ok
test_all_model_with_emptiable_particles (tests.validation.test_validation.TestValidation11) ... ok
test_attribute_form (tests.validation.test_validation.TestValidation11) ... ok
test_default_attributes (tests.validation.test_validation.TestValidation11) ... ok
test_document_is_valid_api (tests.validation.test_validation.TestValidation11) ... ok
@@ -829,6 +830,7 @@
test_element_form (tests.validation.test_validation.TestValidation11) ... ok
test_extra_validator_argument (tests.validation.test_validation.TestValidation11) ... ok
test_incorrect_validation_errors__issue_372 (tests.validation.test_validation.TestValidation11) ... ok
test_invalid_default_open_content__issue_397 (tests.validation.test_validation.TestValidation11) ... ok
test_issue_064 (tests.validation.test_validation.TestValidation11) ... ok
test_issue_171 (tests.validation.test_validation.TestValidation11) ... ok
test_issue_183 (tests.validation.test_validation.TestValidation11) ... ok
@@ -840,6 +842,7 @@
test_issue_363 (tests.validation.test_validation.TestValidation11) ... ok
test_lxml (tests.validation.test_validation.TestValidation11) ... ok
test_max_depth_argument (tests.validation.test_validation.TestValidation11) ... ok
test_nested_all_groups_and_wildcard (tests.validation.test_validation.TestValidation11) ... ok
test_optional_errors_collector (tests.validation.test_validation.TestValidation11) ... ok
test_path_argument (tests.validation.test_validation.TestValidation11) ... ok
test_schema_path_argument__issue_326 (tests.validation.test_validation.TestValidation11) ... ok
@@ -1379,7 +1382,7 @@
test_valid_schema (tests.validators.test_xsdbase.TestXsdValidator) ... ok
----------------------------------------------------------------------
Ran 1354 tests
Ran 1357 tests
OK (skipped=4)
  py$(PYV): OK
make-rules/setup.py.mk
@@ -493,17 +493,9 @@
# unconditionally.
COMPONENT_TEST_TRANSFORMS += \
    "-e 's/^\(platform sunos5 -- Python \)$(shell echo $(PYTHON_VERSION) | $(GSED) -e 's/\./\\./g')\.[0-9]\{1,\}.*\( -- .*\)/\1\$$(PYTHON_VERSION).X\2/'"
COMPONENT_TEST_TRANSFORMS += "-e '/^Using --randomly-seed=[0-9]\{1,\}$$/d'"    # this is random
COMPONENT_TEST_TRANSFORMS += "-e '/^plugins: /d'"                # order of listed plugins could vary
COMPONENT_TEST_TRANSFORMS += "-e '/^-\{1,\} coverage: /,/^$$/d'"        # remove coverage report
# sort list of pytest unit tests and drop percentage
COMPONENT_TEST_TRANSFORMS += \
    "| ( \
        $(GSED) -u -e '/^=\{1,\} test session starts /q' ; \
        $(GSED) -u -e '/^$$/q' ; \
        $(GSED) -u -e 's/ *\[...%\]$$//' -e '/^$$/Q' | $(SORT) | $(NAWK) '{print}END{if(NR>0)printf(\"\\\\n\")}' ; \
        $(CAT) \
    ) | $(COMPONENT_TEST_TRANSFORMER)"
COMPONENT_TEST_TRANSFORMS += "-e 's/ \{1,\}\[...%\]\$$//'"            # drop percentage
COMPONENT_TEST_TRANSFORMS += \
    "-e 's/^=\{1,\} \(.*\) in [0-9]\{1,\}\.[0-9]\{1,\}s \(([^)]*) \)\?=\{1,\}$$/======== \1 ========/'"    # remove timing
# Remove slowest durations report for projects that run pytest with --durations option
@@ -517,6 +509,18 @@
        $(GSED) -e '/^-\{1,\} benchmark/,/^=/{/^=/!d}' \
    ) | $(COMPONENT_TEST_TRANSFORMER) -e ''")
# Normalize test results produced by pytest-randomly
USE_PYTEST_RANDOMLY = $(filter library/python/pytest-randomly-$(subst .,,$(PYTHON_VERSION)), $(REQUIRED_PACKAGES) $(TEST_REQUIRED_PACKAGES))
PYTEST_SORT_TESTS = $(USE_PYTEST_RANDOMLY)
COMPONENT_TEST_TRANSFORMS += $(if $(strip $(USE_PYTEST_RANDOMLY)),"-e '/^Using --randomly-seed=[0-9]\{1$(comma)\}\$$/d'")
COMPONENT_TEST_TRANSFORMS += \
    $(if $(strip $(PYTEST_SORT_TESTS)),"| ( \
        $(GSED) -u -e '/^=\{1$(comma)\} test session starts /q' ; \
        $(GSED) -u -e '/^\$$/q' ; \
        $(GSED) -u -e '/^\$$/Q' | $(SORT) | $(GSED) -e '\$$a\'\$$'\\\n\\\n' ; \
        $(CAT) \
    ) | $(COMPONENT_TEST_TRANSFORMER) -e ''")
# Normalize test results produced by pytest-xdist
COMPONENT_TEST_TRANSFORMS += \
    $(if $(filter library/python/pytest-xdist-$(subst .,,$(PYTHON_VERSION)), $(REQUIRED_PACKAGES) $(TEST_REQUIRED_PACKAGES)),"| ( \
make-rules/shared-macros.mk
@@ -98,6 +98,9 @@
empty :=
space := $(empty) $(empty)
# Define $(comma) as single comma so we can use it in text transforming functions
comma = ,
ROOT =            /
# Distribution name and version