Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/python/filelock/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/filelock-3.20.1/
/filelock-3.20.2/
6 changes: 2 additions & 4 deletions components/python/filelock/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ BUILD_STYLE = pyproject
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME = filelock
HUMAN_VERSION = 3.20.1
HUMAN_VERSION = 3.20.2
COMPONENT_SUMMARY = A platform independent file lock.
COMPONENT_PROJECT_URL = https://github.com/tox-dev/py-filelock
COMPONENT_ARCHIVE_HASH = \
sha256:b8360948b351b80f420878d8516519a2204b07aefcdcfd24912a5d33127f188c
sha256:a2241ff4ddde2a7cebddf78e39832509cb045d18ec1a09d7248d6bfc6bfbbe64
COMPONENT_LICENSE = Unlicense
COMPONENT_LICENSE_FILE = LICENSE

Expand All @@ -48,10 +48,8 @@ COMPONENT_TEST_TRANSFORMS += "-e 's|/tmp/.*/garbage[^/]*|\$$(TMPDIR)|'"
REQUIRED_PACKAGES.python += library/python/hatch-vcs
REQUIRED_PACKAGES.python += library/python/hatchling
REQUIRED_PACKAGES.python += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/covdefaults
TEST_REQUIRED_PACKAGES.python += library/python/pytest
TEST_REQUIRED_PACKAGES.python += library/python/pytest-asyncio
TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
TEST_REQUIRED_PACKAGES.python += library/python/pytest-mock
TEST_REQUIRED_PACKAGES.python += library/python/pytest-timeout
TEST_REQUIRED_PACKAGES.python += library/python/virtualenv
2 changes: 1 addition & 1 deletion components/python/filelock/manifests/sample-manifest.p5m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#

#
# Copyright 2025 <contributor>
# Copyright 2026 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
Expand Down
8 changes: 4 additions & 4 deletions components/python/filelock/patches/01-tox-no-diff-cover.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
We cannot compare against origin/main branch because we build from sdist, not git.

--- filelock-3.20.1/tox.toml.orig
+++ filelock-3.20.1/tox.toml
--- filelock-3.20.2/tox.toml.orig
+++ filelock-3.20.2/tox.toml
@@ -36,14 +36,6 @@

"tests",
Expand All @@ -17,8 +17,8 @@ We cannot compare against origin/main branch because we build from sdist, not gi
]

[env.coverage]
--- filelock-3.20.1/pyproject.toml.orig
+++ filelock-3.20.1/pyproject.toml
--- filelock-3.20.2/pyproject.toml.orig
+++ filelock-3.20.2/pyproject.toml
@@ -57,7 +57,6 @@

test = [
Expand Down
39 changes: 39 additions & 0 deletions components/python/filelock/patches/02-no-coverage.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
We do not need to check coverage for this project.

--- filelock-3.20.2/pyproject.toml.orig
+++ filelock-3.20.2/pyproject.toml
@@ -56,10 +56,8 @@
]

test = [
- "covdefaults>=2.3",
"pytest>=8.4.2",
"pytest-asyncio>=1.2",
- "pytest-cov>=7",
"pytest-mock>=3.15.1",
"pytest-timeout>=2.4",
"virtualenv>=20.34",
--- filelock-3.20.2/tox.toml.orig
+++ filelock-3.20.2/tox.toml
@@ -17,21 +17,6 @@
"--junitxml",
"{env_tmp_dir}{/}junit.xml",
{ replace = "posargs", extend = true, default = [
- "--no-cov-on-fail",
- "--cov",
- "{env_site_packages_dir}{/}filelock",
- "--cov",
- "{tox_root}{/}tests",
- "--cov-config",
- "{tox_root}{/}pyproject.toml",
- "--cov-context",
- "test",
- "--cov-report",
- "term-missing:skip-covered",
- "--cov-report",
- "html:{env_tmp_dir}{/}htmlcov",
- "--cov-report",
- "xml:{env_tmp_dir}{/}coverage.xml",
] },

"tests",
13 changes: 0 additions & 13 deletions components/python/filelock/patches/02-tox-cov-proto.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- filelock-3.20.1/tox.toml.orig
+++ filelock-3.20.1/tox.toml
--- filelock-3.20.2/tox.toml.orig
+++ filelock-3.20.2/tox.toml
@@ -11,6 +11,8 @@
set_env.COVERAGE_FILE = { replace = "env", name = "COVERAGE_FILE", default = "{work_dir}{/}.coverage.{env_name}" }
commands = [
Expand Down
2 changes: 1 addition & 1 deletion components/python/filelock/python-integrate-project.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#

%patch% 01-tox-no-diff-cover.patch
%patch% 02-tox-cov-proto.patch
%patch% 02-no-coverage.patch
%patch% 03-tox-pytest-indirectly.patch

%include-2%
Expand Down