Marcel Telka
2024-03-01 336a68529ed9cffc96cc64e14f563740cbf49258
python/build: update to 1.1.1

1 files added
6 files modified
68 ■■■■■ changed files
components/python/build/Makefile 10 ●●●● patch | view | raw | blame | history
components/python/build/build-PYVER.p5m 5 ●●●● patch | view | raw | blame | history
components/python/build/manifests/sample-manifest.p5m 7 ●●●● patch | view | raw | blame | history
components/python/build/patches/01-test-skip-flit_core.patch 11 ●●●●● patch | view | raw | blame | history
components/python/build/pkg5 6 ●●●● patch | view | raw | blame | history
components/python/build/python-integrate-project.conf 6 ●●●●● patch | view | raw | blame | history
components/python/build/test/results-all.master 23 ●●●● patch | view | raw | blame | history
components/python/build/Makefile
@@ -19,12 +19,10 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        build
HUMAN_VERSION =            1.0.3
HUMAN_VERSION =            1.1.1
COMPONENT_SUMMARY =        build - A simple, correct Python build frontend
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/98/e3/83a89a9d338317f05a68c86a2bbc9af61235bc55a0c6a749d37598fb2af1/build-1.0.3.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:538aab1b64f9828977f84bc63ae570b060a8ed1be419e7870b8b4fc5e6ea553b
    sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE
@@ -32,10 +30,6 @@
PYTHON_BOOTSTRAP = yes
include $(WS_MAKE_RULES)/common.mk
# This is to make sure we do not run pytest with "-n auto" because it is hard
# to normalize pytest-xdist test results.
COMPONENT_TEST_TARGETS += --
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/flit-core
components/python/build/build-PYVER.p5m
@@ -28,8 +28,11 @@
file path=usr/lib/python$(PYVER)/vendor-packages/build-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/build/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/__main__.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_compat/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_compat/importlib.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_compat/tarfile.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_compat/tomllib.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_exceptions.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_importlib.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_util.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/env.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/py.typed
components/python/build/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)
@@ -28,8 +28,11 @@
file path=usr/lib/python$(PYVER)/vendor-packages/build-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/build/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/__main__.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_compat/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_compat/importlib.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_compat/tarfile.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_compat/tomllib.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_exceptions.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_importlib.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/_util.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/env.py
file path=usr/lib/python$(PYVER)/vendor-packages/build/py.typed
components/python/build/patches/01-test-skip-flit_core.patch
New file
@@ -0,0 +1,11 @@
--- build-1.1.1/tests/test_util.py.orig
+++ build-1.1.1/tests/test_util.py
@@ -22,7 +22,7 @@
 @pytest.mark.pypy3323bug
 def test_wheel_metadata_isolation(package_test_flit):
     if importlib.util.find_spec('flit_core'):
-        pytest.xfail('flit_core is available -- we want it missing!')  # pragma: no cover
+        pytest.skip('flit_core is the build backend so it is always installed')  # pragma: no cover
     metadata = build.util.project_wheel_metadata(package_test_flit)
components/python/build/pkg5
@@ -8,8 +8,8 @@
        "runtime/python-39"
    ],
    "fmris": [
        "library/python/build-39",
        "library/python/build"
        "library/python/build",
        "library/python/build-39"
    ],
    "name": "build"
}
}
components/python/build/python-integrate-project.conf
@@ -13,10 +13,8 @@
# Copyright 2022 Marcel Telka
#
%patch% 01-test-skip-flit_core.patch
%include-2%
# Since we cannot use the 'build' package to build itself we need to bootstrap.
PYTHON_BOOTSTRAP = yes
%include-3%
# This is to make sure we do not run pytest with "-n auto" because it is hard
# to normalize pytest-xdist test results.
COMPONENT_TEST_TARGETS += --
components/python/build/test/results-all.master
@@ -1,14 +1,15 @@
ROOT: tox-gh-actions won't override envlist because tox is not running in GitHub Actions
py$(PYV): remove tox env folder $(@D)/.tox/py$(PYV)
py$(PYV): commands[0]> python -m pytest -ra --cov --cov-config pyproject.toml --cov-report=html:$(@D)/.tox/py$(PYV)/htmlcov --cov-context=test --cov-report=xml:$(@D)/.tox/coverage.py$(PYV).xml
py$(PYV): commands[0]> python -m pytest -ra --cov --cov-config pyproject.toml --cov-report=html:$(@D)/.tox/py$(PYV)/htmlcov --cov-context=test --cov-report=xml:$(@D)/.tox/coverage.py$(PYV).xml -n auto
============================= test session starts ==============================
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(@D)/.tox/py$(PYV)/bin/python
cachedir: .tox/py$(PYV)/.pytest_cache
installed packages of interest: build==1.0.3 colorama==0.4.6 filelock==3.12.3 packaging==23.1 pip==23.2.1 pyproject_hooks==1.0.0 setuptools==68.1.2 tomli==2.0.1 virtualenv==20.24.4 wheel==0.41.2
installed packages of interest: build==1.1.1 colorama==0.4.6 filelock==3.13.1 packaging==23.2 pip==24.0 pyproject_hooks==1.0.0 setuptools==69.1.0 tomli==2.0.1 virtualenv==20.25.1 wheel==0.42.0
rootdir: $(@D)
configfile: pyproject.toml
testpaths: tests
collecting ... collected 158 items
X workers [158 items]
scheduling tests via LoadScheduling
tests/test_env.py::test_can_get_venv_paths_with_conflicting_default_scheme SKIPPED
tests/test_env.py::test_can_get_venv_paths_with_posix_local_default_scheme SKIPPED
@@ -35,7 +36,7 @@
tests/test_integration.py::test_build[Solaar-no_isolation-code] SKIPPED
tests/test_integration.py::test_build[Solaar-no_isolation-entrypoint] SKIPPED
tests/test_integration.py::test_build[Solaar-no_isolation-module] SKIPPED
tests/test_integration.py::test_build[build-isolated-code] SKIPPED (...)
tests/test_integration.py::test_build[build-isolated-code] SKIPPED
tests/test_integration.py::test_build[build-isolated-entrypoint] SKIPPED
tests/test_integration.py::test_build[build-isolated-module] SKIPPED
tests/test_integration.py::test_build[build-no_isolation-code] SKIPPED
@@ -47,19 +48,19 @@
tests/test_integration.py::test_build[dateutil-no_isolation-code] SKIPPED
tests/test_integration.py::test_build[dateutil-no_isolation-entrypoint] SKIPPED
tests/test_integration.py::test_build[dateutil-no_isolation-module] SKIPPED
tests/test_integration.py::test_build[flit-isolated-code] SKIPPED (i...)
tests/test_integration.py::test_build[flit-isolated-code] SKIPPED
tests/test_integration.py::test_build[flit-isolated-entrypoint] SKIPPED
tests/test_integration.py::test_build[flit-isolated-module] SKIPPED
tests/test_integration.py::test_build[flit-no_isolation-code] SKIPPED
tests/test_integration.py::test_build[flit-no_isolation-entrypoint] SKIPPED
tests/test_integration.py::test_build[flit-no_isolation-module] SKIPPED
tests/test_integration.py::test_build[pip-isolated-code] SKIPPED (in...)
tests/test_integration.py::test_build[pip-isolated-code] SKIPPED
tests/test_integration.py::test_build[pip-isolated-entrypoint] SKIPPED
tests/test_integration.py::test_build[pip-isolated-module] SKIPPED (...)
tests/test_integration.py::test_build[pip-isolated-module] SKIPPED
tests/test_integration.py::test_build[pip-no_isolation-code] SKIPPED
tests/test_integration.py::test_build[pip-no_isolation-entrypoint] SKIPPED
tests/test_integration.py::test_build[pip-no_isolation-module] SKIPPED
tests/test_integration.py::test_isolation SKIPPED (integration tests...)
tests/test_integration.py::test_isolation SKIPPED
tests/test_main.py::test_build_isolated PASSED
tests/test_main.py::test_build_no_isolation_check_deps_empty PASSED
tests/test_main.py::test_build_no_isolation_with_check_deps[missing_deps0-\n\tfoo] PASSED
@@ -166,11 +167,11 @@
tests/test_self_packaging.py::test_build_wheel[from_sdist] PASSED
tests/test_util.py::test_wheel_metadata[False] PASSED
tests/test_util.py::test_wheel_metadata[True] PASSED
tests/test_util.py::test_wheel_metadata_isolation XFAIL (flit_core i...)
tests/test_util.py::test_wheel_metadata_isolation SKIPPED
tests/test_util.py::test_with_get_requires PASSED
=========================== short test summary info ============================
======== 124 passed, 33 skipped, 1 xfailed ========
======== 124 passed, 34 skipped ========
  py$(PYV): OK
  congratulations :)