-
Notifications
You must be signed in to change notification settings - Fork 3.9k
pipx,pillow: bump versions #30248
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
pipx,pillow: bump versions #30248
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| From d1724588f0eacf71513e111ece880265231e6bb4 Mon Sep 17 00:00:00 2001 | ||
| From: Alexandru Ardelean <alex@shruggie.ro> | ||
| Date: Tue, 11 Aug 2026 12:00:00 +0300 | ||
| Subject: [PATCH] Drop the docutils man-page build hook | ||
|
|
||
| pipx's custom hatch build hook (hatch_build.py) unconditionally imports | ||
| docutils to render docs/man/pipx.1.rst into a man page during the wheel | ||
| build, pulling docutils>=0.21 into build-system.requires. OpenWrt does not | ||
| ship the man page and has no docutils host tool, so disable the custom hook | ||
| and drop the requirement; the CLI wheel then builds without docutils. | ||
|
|
||
| Signed-off-by: Alexandru Ardelean <alex@shruggie.ro> | ||
| --- | ||
| pyproject.toml | 3 --- | ||
| 1 file changed, 3 deletions(-) | ||
|
|
||
| --- a/pyproject.toml | ||
| +++ b/pyproject.toml | ||
| @@ -1,7 +1,6 @@ | ||
| [build-system] | ||
| build-backend = "hatchling.build" | ||
| requires = [ | ||
| - "docutils>=0.21", | ||
| "hatch-vcs>=0.4", | ||
| "hatchling>=1.27", | ||
| ] | ||
| @@ -113,9 +112,7 @@ zipapp = [ | ||
|
|
||
| [tool.hatch] | ||
| version.source = "vcs" | ||
| -build.hooks.custom = {} | ||
| build.hooks.vcs.version-file = "src/pipx/version.py" | ||
| -build.targets.wheel.shared-data = { "build/man" = "share/man/man1" } | ||
| build.targets.sdist.include = [ | ||
| "/*.md", | ||
| "/docs/man", |
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,8 @@ | ||||||||||
| #!/bin/sh | ||||||||||
|
|
||||||||||
| [ "$1" = pipx ] || exit 0 | ||||||||||
|
|
||||||||||
| # 'pipx environment' resolves and prints pipx's path configuration with no | ||||||||||
| # network access, proving the CLI entry point runs end-to-end. | ||||||||||
| pipx environment >/dev/null 2>&1 || { echo "FAIL: 'pipx environment' errored"; exit 1; } | ||||||||||
| pipx environment --value PIPX_HOME >/dev/null 2>&1 || { echo "FAIL: 'pipx environment --value' errored"; exit 1; } | ||||||||||
|
Comment on lines
+7
to
+8
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
It's also a deviation from the rest of
Suggested change
Generated by Claude Code |
||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| # | ||
| # This is free software, licensed under the GNU General Public License v2. | ||
| # See /LICENSE for more information. | ||
| # | ||
|
|
||
| include $(TOPDIR)/rules.mk | ||
|
|
||
| PKG_NAME:=python-filelock | ||
| PKG_VERSION:=3.32.2 | ||
| PKG_RELEASE:=1 | ||
|
|
||
| PYPI_NAME:=filelock | ||
| PKG_HASH:=c33351e1f49cae33414acbc6d56784e6ecee82514ec90795da1161fc4836b5b8 | ||
|
|
||
| PKG_LICENSE:=MIT | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I could not fetch the upstream Generated by Claude Code |
||
| PKG_LICENSE_FILES:=LICENSE | ||
| PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> | ||
|
|
||
| PKG_BUILD_DEPENDS:=python-hatchling/host python-hatch-vcs/host | ||
|
|
||
| include ../pypi.mk | ||
| include $(INCLUDE_DIR)/package.mk | ||
| include ../python3-package.mk | ||
|
|
||
| define Package/python3-filelock | ||
| SECTION:=lang | ||
| CATEGORY:=Languages | ||
| SUBMENU:=Python | ||
| TITLE:=A platform independent file lock | ||
| URL:=https://github.com/tox-dev/filelock | ||
| DEPENDS:=+python3-light +python3-asyncio +python3-logging +python3-uuid | ||
| endef | ||
|
|
||
| define Package/python3-filelock/description | ||
| A platform independent file lock that supports the with-statement and | ||
| provides a simple way to synchronise access to a resource across | ||
| processes and threads. | ||
| endef | ||
|
|
||
| $(eval $(call Py3Package,python3-filelock)) | ||
| $(eval $(call BuildPackage,python3-filelock)) | ||
| $(eval $(call BuildPackage,python3-filelock-src)) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #!/bin/sh | ||
|
|
||
| [ "$1" = python3-filelock ] || exit 0 | ||
|
|
||
| python3 - "$2" << 'EOF' | ||
| import os | ||
| import sys | ||
| import tempfile | ||
|
|
||
| import filelock | ||
|
|
||
| # Assert the packaged version and exercise a real lock acquire/release cycle | ||
| # through the fcntl backend, which is the code path used on the target. | ||
| assert filelock.__version__ == sys.argv[1], (filelock.__version__, sys.argv[1]) | ||
|
|
||
| lockpath = os.path.join(tempfile.gettempdir(), "test-python3-filelock.lock") | ||
| lock = filelock.FileLock(lockpath) | ||
| with lock: | ||
| assert lock.is_locked | ||
| assert not lock.is_locked | ||
| EOF |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: series ordering β this
+python3-filelockdependency is introduced byf89a445"pipx: bump to 1.16.6", but the package it points at is only created two commits later inaa24335"python-filelock: add package". Atf89a445andddaa718the tree references apython3-filelockthat does not exist in the feed, which breaks bisect.Reordering so
python-filelock: add packagelands first (before the pipx bump) makes every commit in the series self-consistent. Nothing else in the series depends on the current order.Generated by Claude Code