* [PATCH 01/15] borgbackup: Update to version 1.2.7
@ 2024-01-29 13:41 Adolf Belka
2024-01-29 13:41 ` [PATCH 02/15] python3-attrs: Update to version 23.2.0 Adolf Belka
` (13 more replies)
0 siblings, 14 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 15220 bytes --]
- Update from version 1.2.3 to 1.2.7
- Update of rootfile
- Patch set put together to also update the dependency packages where they have been
updated.
- Changelog
1.2.7
Fixes:
- docs: CVE-2023-36811 upgrade steps: consider checkpoint archives, #7802
- check/compact: fix spurious reappearance of orphan chunks since borg
1.2, #6687 -
this consists of 2 fixes:
- for existing chunks: check --repair: recreate shadow index, #6687
- for newly created chunks: update shadow index when doing a
double-put, #5661
- LockRoster.modify: no KeyError if element was already gone, #7937
- create --X-from-command: run subcommands with a clean environment, #7916
- list --sort-by: support "archive" as alias of "name", #7873
- fix rc and msg if arg parsing throws an exception, #7885
Other changes:
- support and test on Python 3.12
- include unistd.h in _chunker.c (fix for Python 3.13)
- allow msgpack 1.0.6 and 1.0.7
- TAM issues: show tracebacks, improve borg check logging, #7797
- replace "datetime.utcfromtimestamp" with custom helper to avoid
deprecation warnings when using Python 3.12
- vagrant:
- use generic/debian9 box, fixes #7579
- add VM with debian bookworm / test on OpenSSL 3.0.x.
- docs:
- not only attack/unsafe, can also be a fs issue, #7853
- point to CVE-2023-36811 upgrade steps from borg 1.1 to 1.2 upgrade
steps, #7899
- upgrade steps needed for all kinds of repos (including "none"
encryption mode), #7813
- upgrade steps: talk about consequences of borg check, #7816
- upgrade steps: remove period that could be interpreted as part of
the command
- automated-local.rst: use GPT UUID for consistent udev rule
- create disk/partition sector backup by disk serial number, #7934
- update macOS hint about full disk access
- clarify borg prune -a option description, #7871
- readthedocs: also build offline docs (HTMLzip), #7835
- frontends: add "check.rebuild_refcounts" message
1.2.6
Fixes:
- The upgrade procedure docs as published with borg 1.2.5 did not work,
if the repository had archives resulting from a borg rename or borg
recreate operation.
The updated docs now use BORG_WORKAROUNDS=ignore_invalid_archive_tam
at some places to avoid that issue, #7791.
See: fix pre-1.2.5 archives spoofing vulnerability (CVE-2023-36811),
details and necessary upgrade procedure described above.
Other changes:
- updated 1.2.5 changelog entry: 1.2.5 already has the fix for
rename/recreate.
- remove cython restrictions. recommended is to build with
cython 0.29.latest, because borg 1.2.x uses this since years and it
is very stable. You can also try to build with cython 3.0.x, there is
a good chance that it works. As a 3rd option, we also bundle the
`*.c` files cython outputs in the release pypi package, so you can
also just use these and not need cython at all.
1.2.5
Fixes:
- Security: fix pre-1.2.5 archives spoofing vulnerability (CVE-2023-36811),
see details and necessary upgrade procedure described above.
- rename/recreate: correctly update resulting archive's TAM, see #7791
- create: do not try to read parent dir of recursion root, #7746
- extract: fix false warning about pattern never matching, #4110
- diff: remove surrogates before output, #7535
- compact: clear empty directories at end of compact process, #6823
- create --files-cache=size: fix crash, #7658
- keyfiles: improve key sanity check, #7561
- only warn about "invalid" chunker params, #7590
- ProgressIndicatorPercent: fix space computation for wide chars, #3027
- improve argparse validator error messages
New features:
- mount: make up volname if not given (macOS), #7690.
macFUSE supports a volname mount option to give what finder displays on
the desktop / in the directory view. if the user did not specify it,
we make something up, because otherwise it would be "macFUSE Volume 0
(Python)" and hide the mountpoint directory name.
- BORG_WORKAROUNDS=authenticated_no_key to extract from authenticated repos
without key, #7700
Other changes:
- add `utcnow()` helper function to avoid deprecated `datetime.utcnow()`
- stay on latest Cython 0.29 (0.29.36) for borg 1.2.x (do not use
Cython 3.0 yet)
- docs:
- move upgrade notes to own section, see #7546
- mount -olocal: how to show mount in finder's sidebar, #5321
- list: fix --pattern examples, #7611
- improve patterns help
- incl./excl. options, path-from-stdin exclusiveness
- obfuscation docs: markup fix, note about MAX_DATA_SIZE
- --one-file-system: add macOS apfs notes, #4876
- improve --one-file-system help string, #5618
- rewrite borg check docs
- improve the docs for --keep-within, #7687
- fix borg init command in environment.rst.inc
- 1.1.x upgrade notes: more precise borg upgrade instructions, #3396
-tests:
- fix repo reopen
- avoid long ids in pytest output
- check buzhash chunksize distribution, see #7586
1.2.4
New features:
- import-tar: add --ignore-zeros to process concatenated tars, #7432.
- debug id-hash: computes file/chunk content id-hash, #7406
- diff: --content-only does not show mode/ctime/mtime changes, #7248
- diff: JSON strings in diff output are now sorted alphabetically
Bug fixes:
- xattrs: fix namespace processing on FreeBSD, #6997
- diff: fix path related bug seen when addressing deferred items.
- debug get-obj/put-obj: always give chunkid as cli param, see #7290
(this is an incompatible change, see also borg debug id-hash)
- extract: fix mtime when ResourceFork xattr is set (macOS specific), #7234
- recreate: without --chunker-params, do not re-chunk, #7337
- recreate: when --target is given, do not detect "nothing to do".
use case: borg recreate -a src --target dst can be used to make a copy
of an archive inside the same repository, #7254.
- set .hardlink_master for ALL hardlinkable items, #7175
- locking: fix host, pid, tid order.
tid (thread id) must be parsed as hex from lock file name.
- update development.lock.txt, including a setuptools security fix, #7227
Other changes:
- requirements: allow msgpack 1.0.5 also
- upgrade Cython to 0.29.33
- hashindex minor fixes, refactor, tweaks, tests
- use os.replace not os.rename
- remove BORG_LIBB2_PREFIX (not used any more)
- docs:
- BORG_KEY_FILE: clarify docs, #7444
- update FAQ about locale/unicode issues, #6999
- improve mount options rendering, #7359
- make timestamps in manual pages reproducible
- installation: update Fedora in distribution list, #7357
- tests:
- fix test_size_on_disk_accurate for large st_blksize, #7250
- add same_ts_ns function and use it for relaxed timestamp comparisons
- "auto" compressor tests: don't assume a specific size,
do not assume zlib is better than lz4, #7363
- add test for extracted directory mtime
- vagrant:
- upgrade local freebsd 12.1 box -> generic/freebsd13 box (13.1)
- use pythons > 3.8 which work on freebsd 13.1
- pyenv: also install python 3.11.1 for testing
- pyenv: use python 3.10.1, 3.10.0 build is broken on freebsd
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/borgbackup | 36 ++++++++++++++--------------
lfs/borgbackup | 8 +++----
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup
index feaca4156..897d1d1be 100644
--- a/config/rootfiles/packages/borgbackup
+++ b/config/rootfiles/packages/borgbackup
@@ -6,23 +6,23 @@ usr/lib/python3.10/site-packages/borg/__main__.py
usr/lib/python3.10/site-packages/borg/_version.py
#usr/lib/python3.10/site-packages/borg/algorithms
usr/lib/python3.10/site-packages/borg/algorithms/__init__.py
-usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-x86_64-linux-gnu.so
usr/lib/python3.10/site-packages/borg/archive.py
usr/lib/python3.10/site-packages/borg/archiver.py
usr/lib/python3.10/site-packages/borg/cache.py
-usr/lib/python3.10/site-packages/borg/chunker.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/compress.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/chunker.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/compress.cpython-310-x86_64-linux-gnu.so
usr/lib/python3.10/site-packages/borg/constants.py
#usr/lib/python3.10/site-packages/borg/crypto
usr/lib/python3.10/site-packages/borg/crypto/__init__.py
usr/lib/python3.10/site-packages/borg/crypto/file_integrity.py
usr/lib/python3.10/site-packages/borg/crypto/key.py
usr/lib/python3.10/site-packages/borg/crypto/keymanager.py
-usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-x86_64-linux-gnu.so
usr/lib/python3.10/site-packages/borg/crypto/nonces.py
usr/lib/python3.10/site-packages/borg/fuse.py
usr/lib/python3.10/site-packages/borg/fuse_impl.py
-usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-x86_64-linux-gnu.so
#usr/lib/python3.10/site-packages/borg/helpers
usr/lib/python3.10/site-packages/borg/helpers/__init__.py
usr/lib/python3.10/site-packages/borg/helpers/checks.py
@@ -37,7 +37,7 @@ usr/lib/python3.10/site-packages/borg/helpers/process.py
usr/lib/python3.10/site-packages/borg/helpers/progress.py
usr/lib/python3.10/site-packages/borg/helpers/time.py
usr/lib/python3.10/site-packages/borg/helpers/yes.py
-usr/lib/python3.10/site-packages/borg/item.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/item.cpython-310-x86_64-linux-gnu.so
usr/lib/python3.10/site-packages/borg/locking.py
usr/lib/python3.10/site-packages/borg/logger.py
usr/lib/python3.10/site-packages/borg/lrucache.py
@@ -47,9 +47,9 @@ usr/lib/python3.10/site-packages/borg/patterns.py
#usr/lib/python3.10/site-packages/borg/platform
usr/lib/python3.10/site-packages/borg/platform/__init__.py
usr/lib/python3.10/site-packages/borg/platform/base.py
-usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-xxxMACHINExxx-linux-gnu.so
-usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-x86_64-linux-gnu.so
usr/lib/python3.10/site-packages/borg/platform/xattr.py
usr/lib/python3.10/site-packages/borg/platformflags.py
usr/lib/python3.10/site-packages/borg/remote.py
@@ -72,6 +72,7 @@ usr/lib/python3.10/site-packages/borg/testsuite/crypto.py
usr/lib/python3.10/site-packages/borg/testsuite/efficient_collection_queue.py
usr/lib/python3.10/site-packages/borg/testsuite/file_integrity.py
usr/lib/python3.10/site-packages/borg/testsuite/hashindex.py
+usr/lib/python3.10/site-packages/borg/testsuite/hashindex_stress.py
usr/lib/python3.10/site-packages/borg/testsuite/helpers.py
usr/lib/python3.10/site-packages/borg/testsuite/item.py
usr/lib/python3.10/site-packages/borg/testsuite/key.py
@@ -91,12 +92,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/xattr.py
usr/lib/python3.10/site-packages/borg/upgrader.py
usr/lib/python3.10/site-packages/borg/version.py
usr/lib/python3.10/site-packages/borg/xattr.py
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/PKG-INFO
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/SOURCES.txt
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/dependency_links.txt
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/entry_points.txt
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/not-zip-safe
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/requires.txt
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/top_level.txt
-
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/PKG-INFO
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/SOURCES.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/dependency_links.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/entry_points.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/not-zip-safe
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/requires.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/top_level.txt
diff --git a/lfs/borgbackup b/lfs/borgbackup
index 79d6446ee..7b77fd4bb 100644
--- a/lfs/borgbackup
+++ b/lfs/borgbackup
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.2.3
+VER = 1.2.7
SUMMARY = Deduplicating backup program with compression and authenticated encryption
THISAPP = borgbackup-$(VER)
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = borgbackup
-PAK_VER = 15
+PAK_VER = 16
DEPS = python3-msgpack python3-packaging python3-pyfuse3
# borgbackup only works with specific versions of python3-msgpack
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 970fad62428b44eb22df761020a4c25f4aa8d3e8f5cc2c81aa96b1afb051dc24b3d124b4fc84e81cf8eaa6a9b19a200f6f9bda1f7f4c2794a7e8d33e8d5020f1
+$(DL_FILE)_BLAKE2 = 8d69f3e7890ee117e1fe2cdf6b92c548bc40b337de09850948150034fc4724bf05c51c852a268df2294e3657676920a1c663a421331fd6dba5fffa558429f11e
install : $(TARGET)
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 02/15] python3-attrs: Update to version 23.2.0
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 03/15] python3-hatchling: New build dependency for python3-attrs Adolf Belka
` (12 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 10483 bytes --]
- Update from version 22.1.0 to 23.2.0
- Update of rootfile
- setup.py is no longer available so build to use pyproject.toml was used.
- A new series of build dependencies are also now required for python3-attrs
- Changelog
23.2.0
Changes
The type annotation for attrs.resolve_types() is now correct. #1141
Type stubs now use typing.dataclass_transform to decorate dataclass-like
decorators, instead of the non-standard __dataclass_transform__ special
form, which is only supported by Pyright. #1158
Fixed serialization of namedtuple fields using attrs.asdict/astuple() with
retain_collection_types=True. #1165
attrs.AttrsInstance is now a typing.Protocol in both type hints and code.
This allows you to subclass it along with another Protocol. #1172
If attrs detects that __attrs_pre_init__ accepts more than just self, it
will call it with the same arguments as __init__ was called. This allows
you to, for example, pass arguments to super().__init__(). #1187
Slotted classes now transform functools.cached_property decorated methods to
support equivalent semantics. #1200
Added class_body argument to attrs.make_class() to provide additional
attributes for newly created classes. It is, for example, now possible to
attach methods. #1203
23.1.0
Backwards-incompatible Changes
Python 3.6 has been dropped and packaging switched to static package data
using Hatch. #993
Deprecations
The support for zope-interface via the attrs.validators.provides validator
is now deprecated and will be removed in, or after, April 2024.
The presence of a C-based package in our developement dependencies has
caused headaches and we’re not under the impression it’s used a lot.
Let us know if you’re using it and we might publish it as a separate
package. #1120
Changes
attrs.filters.exclude() and attrs.filters.include() now support the passing
of attribute names as strings. #1068
attrs.has() and attrs.fields() now handle generic classes correctly. #1079
Fix frozen exception classes when raised within e.g.
contextlib.contextmanager, which mutates their __traceback__ attributes. #1081
@frozen now works with type checkers that implement PEP-681 (ex. pyright).
#1084
Restored ability to unpickle instances pickled before 22.2.0. #1085
attrs.asdict()’s and attrs.astuple()’s type stubs now accept the
attrs.AttrsInstance protocol. #1090
Fix slots class cellvar updating closure in CPython 3.8+ even when
__code__ introspection is unavailable. #1092
attrs.resolve_types() can now pass include_extras to typing.get_type_hints()
on Python 3.9+, and does so by default. #1099
Added instructions for pull request workflow to CONTRIBUTING.md. #1105
Added type parameter to attrs.field() function for use with attrs.make_class().
Please note that type checkers ignore type metadata passed into
make_class(), but it can be useful if you’re wrapping attrs. #1107
It is now possible for attrs.evolve() (and attr.evolve()) to change fields
named inst if the instance is passed as a positional argument.
Passing the instance using the inst keyword argument is now deprecated and
will be removed in, or after, April 2024. #1117
attrs.validators.optional() now also accepts a tuple of validators
(in addition to lists of validators). #1122
22.2.0
Backwards-incompatible Changes
Python 3.5 is not supported anymore. #988
Deprecations
Python 3.6 is now deprecated and support will be removed in the next
release. #1017
Changes
attrs.field() now supports an alias option for explicit __init__ argument
names.
Get __init__ signatures matching any taste, peculiar or plain! The PEP 681
compatible alias option can be use to override private attribute name
mangling, or add other arbitrary field argument name overrides. #950
attrs.NOTHING is now an enum value, making it possible to use with e.g.
typing.Literal. #983
Added missing re-import of attr.AttrsInstance to the attrs namespace. #987
Fix slight performance regression in classes with custom __setattr__ and
speedup even more. #991
Class-creation performance improvements by switching performance-sensitive
templating operations to f-strings.
You can expect an improvement of about 5% – even for very simple classes. #995
attrs.has() is now a TypeGuard for AttrsInstance. That means that type
checkers know a class is an instance of an attrs class if you check it
using attrs.has() (or attr.has()) first. #997
Made attrs.AttrsInstance stub available at runtime and fixed type errors
related to the usage of attrs.AttrsInstance in Pyright. #999
On Python 3.10 and later, call abc.update_abstractmethods() on dict classes
after creation. This improves the detection of abstractness. #1001
attrs’s pickling methods now use dicts instead of tuples. That is safer and
more robust across different versions of a class. #1009
Added attrs.validators.not_(wrapped_validator) to logically invert
wrapped_validator by accepting only values where wrapped_validator rejects
the value with a ValueError or TypeError (by default, exception types
configurable). #1010
The type stubs for attrs.cmp_using() now have default values. #1027
To conform with PEP 681, attr.s() and attrs.define() now accept unsafe_hash
in addition to hash. #1065
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/python3-attrs | 17 ++++++++++-------
lfs/python3-attrs | 21 +++++++++++++++------
2 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/packages/python3-attrs b/config/rootfiles/packages/python3-attrs
index b84c91ba4..f65c80b40 100644
--- a/config/rootfiles/packages/python3-attrs
+++ b/config/rootfiles/packages/python3-attrs
@@ -8,6 +8,7 @@ usr/lib/python3.10/site-packages/attr/_config.py
usr/lib/python3.10/site-packages/attr/_funcs.py
usr/lib/python3.10/site-packages/attr/_make.py
usr/lib/python3.10/site-packages/attr/_next_gen.py
+usr/lib/python3.10/site-packages/attr/_typing_compat.pyi
usr/lib/python3.10/site-packages/attr/_version_info.py
usr/lib/python3.10/site-packages/attr/_version_info.pyi
usr/lib/python3.10/site-packages/attr/converters.py
@@ -22,13 +23,15 @@ usr/lib/python3.10/site-packages/attr/setters.pyi
usr/lib/python3.10/site-packages/attr/validators.py
usr/lib/python3.10/site-packages/attr/validators.pyi
#usr/lib/python3.10/site-packages/attrs
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/not-zip-safe
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/METADATA
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/RECORD
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/licenses
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/licenses/LICENSE
usr/lib/python3.10/site-packages/attrs/__init__.py
usr/lib/python3.10/site-packages/attrs/__init__.pyi
usr/lib/python3.10/site-packages/attrs/converters.py
diff --git a/lfs/python3-attrs b/lfs/python3-attrs
index 9ac72e14a..03a809a27 100644
--- a/lfs/python3-attrs
+++ b/lfs/python3-attrs
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 22.1.0
+VER = 23.2.0
SUMMARY = Classes Without Boilerplate
THISAPP = attrs-$(VER)
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-attrs
-PAK_VER = 2
+PAK_VER = 3
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5da48b3cbcd99cdcc531a0859be264a4d209778caa53bd95480a103549b816c8a805079e1555fce38eb33f8bd3d5b7bfa6f814ef2b60dc405bda6686c7746f0b
+$(DL_FILE)_BLAKE2 = a06f4f17a81fc173c37661bcf518367a1cdc9a333d2783bd2cd1ac5f0a72bd20ec1afdd964e10255624bcfa027e3a152375cd21472c177428d29bd06b29984a1
install : $(TARGET)
@@ -80,7 +80,16 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && python3 setup.py build
- cd $(DIR_APP) && python3 setup.py install --root=/
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 03/15] python3-hatchling: New build dependency for python3-attrs
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
2024-01-29 13:41 ` [PATCH 02/15] python3-attrs: Update to version 23.2.0 Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 04/15] python3-hatch-vcs: " Adolf Belka
` (11 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 11434 bytes --]
- lfs and rootfile created.
- rootfile put into common as it is only used as a build dependency.
- Used pyproject.toml build approach
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/python3-hatchling | 99 +++++++++++++++++++++++
lfs/python3-hatchling | 85 +++++++++++++++++++
make.sh | 1 +
3 files changed, 185 insertions(+)
create mode 100644 config/rootfiles/common/python3-hatchling
create mode 100644 lfs/python3-hatchling
diff --git a/config/rootfiles/common/python3-hatchling b/config/rootfiles/common/python3-hatchling
new file mode 100644
index 000000000..28e8a3708
--- /dev/null
+++ b/config/rootfiles/common/python3-hatchling
@@ -0,0 +1,99 @@
+#usr/bin/hatchling
+#usr/lib/python3.10/site-packages/hatchling
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/entry_points.txt
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/licenses
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/licenses/LICENSE.txt
+#usr/lib/python3.10/site-packages/hatchling/__about__.py
+#usr/lib/python3.10/site-packages/hatchling/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/__main__.py
+#usr/lib/python3.10/site-packages/hatchling/bridge
+#usr/lib/python3.10/site-packages/hatchling/bridge/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/bridge/app.py
+#usr/lib/python3.10/site-packages/hatchling/build.py
+#usr/lib/python3.10/site-packages/hatchling/builders
+#usr/lib/python3.10/site-packages/hatchling/builders/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/builders/app.py
+#usr/lib/python3.10/site-packages/hatchling/builders/config.py
+#usr/lib/python3.10/site-packages/hatchling/builders/constants.py
+#usr/lib/python3.10/site-packages/hatchling/builders/custom.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/custom.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/plugin
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/version.py
+#usr/lib/python3.10/site-packages/hatchling/builders/plugin
+#usr/lib/python3.10/site-packages/hatchling/builders/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/builders/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/builders/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/builders/sdist.py
+#usr/lib/python3.10/site-packages/hatchling/builders/utils.py
+#usr/lib/python3.10/site-packages/hatchling/builders/wheel.py
+#usr/lib/python3.10/site-packages/hatchling/cli
+#usr/lib/python3.10/site-packages/hatchling/cli/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/cli/build
+#usr/lib/python3.10/site-packages/hatchling/cli/build/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/cli/dep
+#usr/lib/python3.10/site-packages/hatchling/cli/dep/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/cli/metadata
+#usr/lib/python3.10/site-packages/hatchling/cli/metadata/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/cli/version
+#usr/lib/python3.10/site-packages/hatchling/cli/version/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/dep
+#usr/lib/python3.10/site-packages/hatchling/dep/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/dep/core.py
+#usr/lib/python3.10/site-packages/hatchling/licenses
+#usr/lib/python3.10/site-packages/hatchling/licenses/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/licenses/parse.py
+#usr/lib/python3.10/site-packages/hatchling/licenses/supported.py
+#usr/lib/python3.10/site-packages/hatchling/metadata
+#usr/lib/python3.10/site-packages/hatchling/metadata/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/core.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/custom.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/plugin
+#usr/lib/python3.10/site-packages/hatchling/metadata/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/spec.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/utils.py
+#usr/lib/python3.10/site-packages/hatchling/ouroboros.py
+#usr/lib/python3.10/site-packages/hatchling/plugin
+#usr/lib/python3.10/site-packages/hatchling/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/plugin/exceptions.py
+#usr/lib/python3.10/site-packages/hatchling/plugin/manager.py
+#usr/lib/python3.10/site-packages/hatchling/plugin/specs.py
+#usr/lib/python3.10/site-packages/hatchling/plugin/utils.py
+#usr/lib/python3.10/site-packages/hatchling/py.typed
+#usr/lib/python3.10/site-packages/hatchling/utils
+#usr/lib/python3.10/site-packages/hatchling/utils/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/utils/constants.py
+#usr/lib/python3.10/site-packages/hatchling/utils/context.py
+#usr/lib/python3.10/site-packages/hatchling/utils/fs.py
+#usr/lib/python3.10/site-packages/hatchling/version
+#usr/lib/python3.10/site-packages/hatchling/version/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/core.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/plugin
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/standard.py
+#usr/lib/python3.10/site-packages/hatchling/version/source
+#usr/lib/python3.10/site-packages/hatchling/version/source/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/code.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/env.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/plugin
+#usr/lib/python3.10/site-packages/hatchling/version/source/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/regex.py
diff --git a/lfs/python3-hatchling b/lfs/python3-hatchling
new file mode 100644
index 000000000..fb0fe7798
--- /dev/null
+++ b/lfs/python3-hatchling
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.21.1
+
+THISAPP = hatchling-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 58d0ff8bd3d0717df0c51af903cda18c731d05422e71ebb091ccae695542257330c4ff7b97c60331996060c9a819b1c050813de5ab3f16203c7b81f9e93dc15a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 3b67eb196..d77ad1099 100755
--- a/make.sh
+++ b/make.sh
@@ -1595,6 +1595,7 @@ buildipfire() {
lfsmake2 python3-terminaltables
lfsmake2 python3-pkgconfig
lfsmake2 python3-msgpack
+ lfsmake2 python3-hatchling
lfsmake2 python3-attrs
lfsmake2 python3-sniffio
lfsmake2 python3-sortedcontainers
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 04/15] python3-hatch-vcs: New build dependency for python3-attrs
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
2024-01-29 13:41 ` [PATCH 02/15] python3-attrs: Update to version 23.2.0 Adolf Belka
2024-01-29 13:41 ` [PATCH 03/15] python3-hatchling: New build dependency for python3-attrs Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 05/15] python3-hatch-fancy-pypi-readme: " Adolf Belka
` (10 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6126 bytes --]
- lfs and rootfile created.
- rootfile put into common as it is only used as a build dependency.
- Used pyproject.toml build approach
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/python3-hatch-vcs | 18 +++++
lfs/python3-hatch-vcs | 85 +++++++++++++++++++++++
make.sh | 1 +
3 files changed, 104 insertions(+)
create mode 100644 config/rootfiles/common/python3-hatch-vcs
create mode 100644 lfs/python3-hatch-vcs
diff --git a/config/rootfiles/common/python3-hatch-vcs b/config/rootfiles/common/python3-hatch-vcs
new file mode 100644
index 000000000..5a3434c84
--- /dev/null
+++ b/config/rootfiles/common/python3-hatch-vcs
@@ -0,0 +1,18 @@
+#usr/lib/python3.10/site-packages/hatch_vcs
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/METADATA
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/RECORD
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/entry_points.txt
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/licenses
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/licenses/LICENSE.txt
+#usr/lib/python3.10/site-packages/hatch_vcs/__about__.py
+#usr/lib/python3.10/site-packages/hatch_vcs/__init__.py
+#usr/lib/python3.10/site-packages/hatch_vcs/build_hook.py
+#usr/lib/python3.10/site-packages/hatch_vcs/hooks.py
+#usr/lib/python3.10/site-packages/hatch_vcs/metadata_hook.py
+#usr/lib/python3.10/site-packages/hatch_vcs/vcs_utils.py
+#usr/lib/python3.10/site-packages/hatch_vcs/version_source.py
diff --git a/lfs/python3-hatch-vcs b/lfs/python3-hatch-vcs
new file mode 100644
index 000000000..8e9c3c5d1
--- /dev/null
+++ b/lfs/python3-hatch-vcs
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.4.0
+
+THISAPP = hatch_vcs-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = cc0e02cbedf968a630803791b455f22f2ce60966327a531aac87196d48f6cf192f74eab6e995a169659983b6049cb2e656ca3d7f3670445ef06eca65318c5c6a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index d77ad1099..571903442 100755
--- a/make.sh
+++ b/make.sh
@@ -1596,6 +1596,7 @@ buildipfire() {
lfsmake2 python3-pkgconfig
lfsmake2 python3-msgpack
lfsmake2 python3-hatchling
+ lfsmake2 python3-hatch-vcs
lfsmake2 python3-attrs
lfsmake2 python3-sniffio
lfsmake2 python3-sortedcontainers
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 05/15] python3-hatch-fancy-pypi-readme: New build dependency for python3-attrs
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (2 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 04/15] python3-hatch-vcs: " Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 06/15] python3-editables: New build dependency for python3-hatchling Adolf Belka
` (9 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6872 bytes --]
- lfs and rootfile created.
- rootfile put into common as it is only used as a build dependency.
- Used pyproject.toml build approach
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
.../common/python3-hatch-fancy-pypi-readme | 23 +++++
lfs/python3-hatch-fancy-pypi-readme | 85 +++++++++++++++++++
make.sh | 1 +
3 files changed, 109 insertions(+)
create mode 100644 config/rootfiles/common/python3-hatch-fancy-pypi-readme
create mode 100644 lfs/python3-hatch-fancy-pypi-readme
diff --git a/config/rootfiles/common/python3-hatch-fancy-pypi-readme b/config/rootfiles/common/python3-hatch-fancy-pypi-readme
new file mode 100644
index 000000000..44f4beee4
--- /dev/null
+++ b/config/rootfiles/common/python3-hatch-fancy-pypi-readme
@@ -0,0 +1,23 @@
+#usr/bin/hatch-fancy-pypi-readme
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/METADATA
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/RECORD
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/entry_points.txt
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/licenses
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/licenses/AUTHORS.md
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/licenses/LICENSE.txt
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/__init__.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/__main__.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_builder.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_cli.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_config.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_fragments.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_substitutions.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/exceptions.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/hooks.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/py.typed
diff --git a/lfs/python3-hatch-fancy-pypi-readme b/lfs/python3-hatch-fancy-pypi-readme
new file mode 100644
index 000000000..ff0626be1
--- /dev/null
+++ b/lfs/python3-hatch-fancy-pypi-readme
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 24.1.0
+
+THISAPP = hatch_fancy_pypi_readme-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 9baa6dd61c02f7bbc610b815db8476c10ace7623ac7cdfebbf2317d1f4f5713e898624fde1c915f9f8b5f92fea22dbff41963a0685ccf6f112180a8cf9cca59b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 571903442..d914a76e0 100755
--- a/make.sh
+++ b/make.sh
@@ -1597,6 +1597,7 @@ buildipfire() {
lfsmake2 python3-msgpack
lfsmake2 python3-hatchling
lfsmake2 python3-hatch-vcs
+ lfsmake2 python3-hatch-fancy-pypi-readme
lfsmake2 python3-attrs
lfsmake2 python3-sniffio
lfsmake2 python3-sortedcontainers
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 06/15] python3-editables: New build dependency for python3-hatchling
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (3 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 05/15] python3-hatch-fancy-pypi-readme: " Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-30 14:11 ` Arne Fitzenreiter
2024-01-29 13:41 ` [PATCH 07/15] python3-pathspec: " Adolf Belka
` (8 subsequent siblings)
13 siblings, 1 reply; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5966 bytes --]
- lfs and rootfile created.
- rootfile put into common as it is only used as a build dependency.
- Used pyproject.toml build approach
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/python3-editables | 12 ++++
lfs/python3-editables | 85 +++++++++++++++++++++++
make.sh | 4 +-
3 files changed, 98 insertions(+), 3 deletions(-)
create mode 100644 config/rootfiles/common/python3-editables
create mode 100644 lfs/python3-editables
diff --git a/config/rootfiles/common/python3-editables b/config/rootfiles/common/python3-editables
new file mode 100644
index 000000000..6b5b36e52
--- /dev/null
+++ b/config/rootfiles/common/python3-editables
@@ -0,0 +1,12 @@
+#usr/lib/python3.10/site-packages/editables
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/editables/__init__.py
+#usr/lib/python3.10/site-packages/editables/py.typed
+#usr/lib/python3.10/site-packages/editables/redirector.py
diff --git a/lfs/python3-editables b/lfs/python3-editables
new file mode 100644
index 000000000..cb5b33d45
--- /dev/null
+++ b/lfs/python3-editables
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.5
+
+THISAPP = editables-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index d914a76e0..1466574d0 100755
--- a/make.sh
+++ b/make.sh
@@ -1595,6 +1595,7 @@ buildipfire() {
lfsmake2 python3-terminaltables
lfsmake2 python3-pkgconfig
lfsmake2 python3-msgpack
+ lfsmake2 python3-editables
lfsmake2 python3-hatchling
lfsmake2 python3-hatch-vcs
lfsmake2 python3-hatch-fancy-pypi-readme
@@ -1651,9 +1652,6 @@ buildipfire() {
lfsmake2 dnsdist
lfsmake2 bird
lfsmake2 libyang
- lfsmake2 abseil-cpp
- lfsmake2 protobuf
- lfsmake2 protobuf-c
lfsmake2 frr
lfsmake2 dmidecode
lfsmake2 mcelog
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 07/15] python3-pathspec: New build dependency for python3-hatchling
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (4 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 06/15] python3-editables: New build dependency for python3-hatchling Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 08/15] python3-pluggy: " Adolf Belka
` (7 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6126 bytes --]
- lfs and rootfile created.
- rootfile put into common as it is only used as a build dependency.
- Used pyproject.toml build approach
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/python3-pathspec | 19 ++++++
lfs/python3-pathspec | 85 ++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 105 insertions(+)
create mode 100644 config/rootfiles/common/python3-pathspec
create mode 100644 lfs/python3-pathspec
diff --git a/config/rootfiles/common/python3-pathspec b/config/rootfiles/common/python3-pathspec
new file mode 100644
index 000000000..ff2684f93
--- /dev/null
+++ b/config/rootfiles/common/python3-pathspec
@@ -0,0 +1,19 @@
+#usr/lib/python3.10/site-packages/pathspec
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/LICENSE
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/pathspec/__init__.py
+#usr/lib/python3.10/site-packages/pathspec/_meta.py
+#usr/lib/python3.10/site-packages/pathspec/gitignore.py
+#usr/lib/python3.10/site-packages/pathspec/pathspec.py
+#usr/lib/python3.10/site-packages/pathspec/pattern.py
+#usr/lib/python3.10/site-packages/pathspec/patterns
+#usr/lib/python3.10/site-packages/pathspec/patterns/__init__.py
+#usr/lib/python3.10/site-packages/pathspec/patterns/gitwildmatch.py
+#usr/lib/python3.10/site-packages/pathspec/py.typed
+#usr/lib/python3.10/site-packages/pathspec/util.py
diff --git a/lfs/python3-pathspec b/lfs/python3-pathspec
new file mode 100644
index 000000000..960737a9c
--- /dev/null
+++ b/lfs/python3-pathspec
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.12.1
+
+THISAPP = pathspec-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = e5cf93dc0a24a51bdcbcec807514344ed4e39029a8f1abe8db7cf8fa4883ac2e74f8b1a3ad6cd44bcff538b5eecc5b091b145c6c8d170de574ce9217d58855cb
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 1466574d0..9b46c4f42 100755
--- a/make.sh
+++ b/make.sh
@@ -1596,6 +1596,7 @@ buildipfire() {
lfsmake2 python3-pkgconfig
lfsmake2 python3-msgpack
lfsmake2 python3-editables
+ lfsmake2 python3-pathspec
lfsmake2 python3-hatchling
lfsmake2 python3-hatch-vcs
lfsmake2 python3-hatch-fancy-pypi-readme
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 08/15] python3-pluggy: New build dependency for python3-hatchling
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (5 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 07/15] python3-pathspec: " Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 09/15] python3-trove-classifiers: " Adolf Belka
` (6 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5726 bytes --]
- lfs and rootfile created.
- rootfile put into common as it is only used as a build dependency.
- Used setup.py build approach as pyproject.toml approach kept failing to build
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/python3-pluggy | 16 ++++++
lfs/python3-pluggy | 76 ++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 93 insertions(+)
create mode 100644 config/rootfiles/common/python3-pluggy
create mode 100644 lfs/python3-pluggy
diff --git a/config/rootfiles/common/python3-pluggy b/config/rootfiles/common/python3-pluggy
new file mode 100644
index 000000000..9df9610de
--- /dev/null
+++ b/config/rootfiles/common/python3-pluggy
@@ -0,0 +1,16 @@
+#usr/lib/python3.10/site-packages/pluggy
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/pluggy/__init__.py
+#usr/lib/python3.10/site-packages/pluggy/_callers.py
+#usr/lib/python3.10/site-packages/pluggy/_hooks.py
+#usr/lib/python3.10/site-packages/pluggy/_manager.py
+#usr/lib/python3.10/site-packages/pluggy/_result.py
+#usr/lib/python3.10/site-packages/pluggy/_tracing.py
+#usr/lib/python3.10/site-packages/pluggy/_version.py
+#usr/lib/python3.10/site-packages/pluggy/_warnings.py
+#usr/lib/python3.10/site-packages/pluggy/py.typed
diff --git a/lfs/python3-pluggy b/lfs/python3-pluggy
new file mode 100644
index 000000000..deb018ee4
--- /dev/null
+++ b/lfs/python3-pluggy
@@ -0,0 +1,76 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.4.0
+
+THISAPP = pluggy-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 0a8bff68f1871f0e571105012b0e3961771c6ee34a64711520084d0a951308d192187d01b14136c389b5bc09f127ead1a1f96ebffa7b345d2d5023157c049c43
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 setup.py build
+ cd $(DIR_APP) && python3 setup.py install --root=/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 9b46c4f42..32234d844 100755
--- a/make.sh
+++ b/make.sh
@@ -1597,6 +1597,7 @@ buildipfire() {
lfsmake2 python3-msgpack
lfsmake2 python3-editables
lfsmake2 python3-pathspec
+ lfsmake2 python3-pluggy
lfsmake2 python3-hatchling
lfsmake2 python3-hatch-vcs
lfsmake2 python3-hatch-fancy-pypi-readme
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 09/15] python3-trove-classifiers: New build dependency for python3-hatchling
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (6 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 08/15] python3-pluggy: " Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 10/15] python3-calver: New build dependency for python3-trove-classifiers Adolf Belka
` (5 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5567 bytes --]
- lfs and rootfile created.
- rootfile put into common as it is only used as a build dependency.
- Used setup.py build approach as the pyproject.toml approach failed to build successfully.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
.../common/python3-trove-classifiers | 9 +++
lfs/python3-trove-classifiers | 76 +++++++++++++++++++
make.sh | 1 +
3 files changed, 86 insertions(+)
create mode 100644 config/rootfiles/common/python3-trove-classifiers
create mode 100644 lfs/python3-trove-classifiers
diff --git a/config/rootfiles/common/python3-trove-classifiers b/config/rootfiles/common/python3-trove-classifiers
new file mode 100644
index 000000000..a1142b9f4
--- /dev/null
+++ b/config/rootfiles/common/python3-trove-classifiers
@@ -0,0 +1,9 @@
+#usr/lib/python3.10/site-packages/trove_classifiers
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/trove_classifiers/__init__.py
+#usr/lib/python3.10/site-packages/trove_classifiers/__main__.py
+#usr/lib/python3.10/site-packages/trove_classifiers/py.typed
diff --git a/lfs/python3-trove-classifiers b/lfs/python3-trove-classifiers
new file mode 100644
index 000000000..9a88316d9
--- /dev/null
+++ b/lfs/python3-trove-classifiers
@@ -0,0 +1,76 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2024.1.8
+
+THISAPP = trove-classifiers-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = f0a4ec5439415d53d81297001aac2b4ffc3da0e2c5492acb9a3ed23fba9e7c7ea1407cfa2f8291ab0b8ea7f1dd985cdd86a1b82e71b0223c88ae73bcc7ce63cd
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 setup.py build
+ cd $(DIR_APP) && python3 setup.py install --root=/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 32234d844..d2d2ea499 100755
--- a/make.sh
+++ b/make.sh
@@ -1598,6 +1598,7 @@ buildipfire() {
lfsmake2 python3-editables
lfsmake2 python3-pathspec
lfsmake2 python3-pluggy
+ lfsmake2 python3-trove-classifiers
lfsmake2 python3-hatchling
lfsmake2 python3-hatch-vcs
lfsmake2 python3-hatch-fancy-pypi-readme
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 10/15] python3-calver: New build dependency for python3-trove-classifiers
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (7 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 09/15] python3-trove-classifiers: " Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 11/15] python3-exceptiongroup: Update to version 1.2.0 Adolf Belka
` (4 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5380 bytes --]
- lfs and rootfile created.
- rootfile put into common as it is only used as a build dependency.
- Used setup.py build approach as the pyproject.toml approach failed to build successfully
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/python3-calver | 9 +++
lfs/python3-calver | 76 ++++++++++++++++++++++++++
make.sh | 1 +
3 files changed, 86 insertions(+)
create mode 100644 config/rootfiles/common/python3-calver
create mode 100644 lfs/python3-calver
diff --git a/config/rootfiles/common/python3-calver b/config/rootfiles/common/python3-calver
new file mode 100644
index 000000000..02796ab2d
--- /dev/null
+++ b/config/rootfiles/common/python3-calver
@@ -0,0 +1,9 @@
+#usr/lib/python3.10/site-packages/calver
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/calver/__init__.py
+#usr/lib/python3.10/site-packages/calver/integration.py
diff --git a/lfs/python3-calver b/lfs/python3-calver
new file mode 100644
index 000000000..565b3b63b
--- /dev/null
+++ b/lfs/python3-calver
@@ -0,0 +1,76 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2022.6.26
+
+THISAPP = calver-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = bd75214d1107d5c58c07221b014fcca9c19df8b01ffc110a43a83ce7cd4e4c9746fc7c5a2f6be9eed5ffcfce0f8d38a70901deeba4d21727e53aed2383cbedef
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 setup.py build
+ cd $(DIR_APP) && python3 setup.py install --root=/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index d2d2ea499..f38d9f758 100755
--- a/make.sh
+++ b/make.sh
@@ -1598,6 +1598,7 @@ buildipfire() {
lfsmake2 python3-editables
lfsmake2 python3-pathspec
lfsmake2 python3-pluggy
+ lfsmake2 python3-calver
lfsmake2 python3-trove-classifiers
lfsmake2 python3-hatchling
lfsmake2 python3-hatch-vcs
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 11/15] python3-exceptiongroup: Update to version 1.2.0
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (8 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 10/15] python3-calver: New build dependency for python3-trove-classifiers Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 12/15] python3-msgpack: Update to version 1.0.7 Adolf Belka
` (3 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5528 bytes --]
- Updated from version 1.1.0 to 1.2.0
- Update of rootfile
- Changelog
1.2.0
Added special monkeypatching if Apport has overridden sys.excepthook so it
will format exception groups correctly (PR by John Litborn)
Added a backport of contextlib.suppress() from Python 3.12.1 which also
handles suppressing exceptions inside exception groups
Fixed bare raise in a handler reraising the original naked exception rather
than an exception group which is what is raised when you do a raise in an
except* handler
1.1.3
catch() now raises a TypeError if passed an async exception handler instead
of just giving a RuntimeWarning about the coroutine never being awaited.
(#66, PR by John Litborn)
Fixed plain raise statement in an exception handler callback to work like a
raise in an except* block
Fixed new exception group not being chained to the original exception when
raising an exception group from exceptions raised in handler callbacks
Fixed type annotations of the derive(), subgroup() and split() methods to
match the ones in typeshed
1.1.2
Changed handling of exceptions in exception group handler callbacks to not
wrap a single exception in an exception group, as per CPython issue 103590
1.1.1
Worked around CPython issue #98778, urllib.error.HTTPError(..., fp=None)
raises KeyError on unknown attribute access, on affected Python versions.
(PR by Zac Hatfield-Dodds)
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
.../rootfiles/packages/python3-exceptiongroup | 17 +++++++++--------
lfs/python3-exceptiongroup | 8 ++++----
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/packages/python3-exceptiongroup b/config/rootfiles/packages/python3-exceptiongroup
index 0ed2ae1f5..08e10c3b9 100644
--- a/config/rootfiles/packages/python3-exceptiongroup
+++ b/config/rootfiles/packages/python3-exceptiongroup
@@ -1,15 +1,16 @@
usr/lib/python3.10/site-packages/exceptiongroup
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/INSTALLER
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/LICENSE
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/METADATA
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/RECORD
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/REQUESTED
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/WHEEL
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/LICENSE
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/METADATA
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/RECORD
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/direct_url.json
usr/lib/python3.10/site-packages/exceptiongroup/__init__.py
usr/lib/python3.10/site-packages/exceptiongroup/_catch.py
usr/lib/python3.10/site-packages/exceptiongroup/_exceptions.py
usr/lib/python3.10/site-packages/exceptiongroup/_formatting.py
+usr/lib/python3.10/site-packages/exceptiongroup/_suppress.py
usr/lib/python3.10/site-packages/exceptiongroup/_version.py
usr/lib/python3.10/site-packages/exceptiongroup/py.typed
diff --git a/lfs/python3-exceptiongroup b/lfs/python3-exceptiongroup
index f1de6bb6f..067b42f14 100644
--- a/lfs/python3-exceptiongroup
+++ b/lfs/python3-exceptiongroup
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.1.1
+VER = 1.2.0
SUMMARY = This is a backport of the BaseExceptionGroup and ExceptionGroup classes from Python 3.11.
THISAPP = exceptiongroup-$(VER)
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-exceptiongroup
-PAK_VER = 1
+PAK_VER = 2
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = c396d1e1ab15265e06d76d11e6cbbff5c4e52284f890d727aab65d0ab40fcd17e3db8827ba4bba6b34d13f66606ca34ac8bcc361dd4aecf9afe624d5001de327
+$(DL_FILE)_BLAKE2 = 4f3b5505c9c6e229eae52fda1e2dc957ada9e44eb8da8f2a8c62315ee93a1e2129005d0b4a1a7f3bbc2a1448e89929fdaf6ee59a40c8aefb44104c5e330d5ac9
install : $(TARGET)
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 12/15] python3-msgpack: Update to version 1.0.7
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (9 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 11/15] python3-exceptiongroup: Update to version 1.2.0 Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 13/15] python3-packaging: Update to version 23.2 Adolf Belka
` (2 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4612 bytes --]
- Update from version 1.0.4 to 1.0.7
- Update of rootfile
- Changelog
1.0.7
Fix build error of extension module on Windows. (#567)
setup.py doesn't skip build error of extension module. (#568)
1.0.6
Add Python 3.12 wheels (#517)
Remove Python 2.7, 3.6, and 3.7 support
1.0.5
Use __BYTE_ORDER__ instead of __BYTE_ORDER for portability. (#513, #514)
Add Python 3.11 wheels (#517)
fallback: Fix packing multidimensional memoryview (#527)
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/python3-msgpack | 23 +++++++++++++++++------
lfs/python3-msgpack | 8 ++++----
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/config/rootfiles/packages/python3-msgpack b/config/rootfiles/packages/python3-msgpack
index abe34fd9c..2347b0834 100644
--- a/config/rootfiles/packages/python3-msgpack
+++ b/config/rootfiles/packages/python3-msgpack
@@ -1,11 +1,22 @@
usr/lib/python3.10/site-packages/msgpack
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info/top_level.txt
usr/lib/python3.10/site-packages/msgpack/__init__.py
-usr/lib/python3.10/site-packages/msgpack/_cmsgpack.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/msgpack/_cmsgpack.cpp
+usr/lib/python3.10/site-packages/msgpack/_cmsgpack.cpython-310-x86_64-linux-gnu.so
+usr/lib/python3.10/site-packages/msgpack/_cmsgpack.pyx
+usr/lib/python3.10/site-packages/msgpack/_packer.pyx
+usr/lib/python3.10/site-packages/msgpack/_unpacker.pyx
+#usr/lib/python3.10/site-packages/msgpack/buff_converter.h
usr/lib/python3.10/site-packages/msgpack/exceptions.py
usr/lib/python3.10/site-packages/msgpack/ext.py
usr/lib/python3.10/site-packages/msgpack/fallback.py
+#usr/lib/python3.10/site-packages/msgpack/pack.h
+#usr/lib/python3.10/site-packages/msgpack/pack_template.h
+#usr/lib/python3.10/site-packages/msgpack/sysdep.h
+#usr/lib/python3.10/site-packages/msgpack/unpack.h
+#usr/lib/python3.10/site-packages/msgpack/unpack_define.h
+#usr/lib/python3.10/site-packages/msgpack/unpack_template.h
diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack
index 5bb333a53..f09edd3e8 100644
--- a/lfs/python3-msgpack
+++ b/lfs/python3-msgpack
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.4
+VER = 1.0.7
SUMMARY = Python module for reading and writing MessagePack data
THISAPP = msgpack-$(VER)
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-msgpack
-PAK_VER = 3
+PAK_VER = 4
DEPS =
# borgbackup only works with specific versions of python3-msgpack - check when updating
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = fcbaafbea57f87c949a43a6bd6f6507eb3a07ac5e4a9c44fabfbb7c07849f1edabb8dadcd99a547fed32bce0f900f965368c4ee744acd4e850cad5c27022f463
+$(DL_FILE)_BLAKE2 = 8ddf2acf6bf81498d981c3ec83cbdffde1b1611f8ac23d3377f3f1541e679eda288b40b949bd586ca24a7059da3a0f73fa797a661375135ec092f408521c8527
install : $(TARGET)
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 13/15] python3-packaging: Update to version 23.2
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (10 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 12/15] python3-msgpack: Update to version 1.0.7 Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 14/15] python3-pyfuse3: Update to version 3.3.0 Adolf Belka
2024-01-29 13:41 ` [PATCH 15/15] python3-trio: Update to version 0.23.1 Adolf Belka
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4901 bytes --]
- Update from version 23.0 to 23.2
- Update of rootfile
- Changelog
23.2
Document calendar-based versioning scheme (#716)
Enforce that the entire marker string is parsed (#687)
Requirement parsing no longer automatically validates the URL (#120)
Canonicalize names for requirements comparison (#644)
Introduce metadata.Metadata (along with metadata.ExceptionGroup and
metadata.InvalidMetadata; #570)
Introduce the validate keyword parameter to utils.normalize_name() (#570)
Introduce utils.is_normalized_name() (#570)
Make utils.parse_sdist_filename() and utils.parse_wheel_filename() raise
InvalidSdistFilename and InvalidWheelFilename, respectively, when the
version component of the name is invalid
23.1
Parse raw metadata (#671)
Import underlying parser functions as an underscored variable (#663)
Improve error for local version label with unsupported operators (#675)
Add dedicated error for specifiers with incorrect .* suffix
Replace spaces in platform names with underscores (#620)
Relax typing of _key on _BaseVersion (#669)
Handle prefix match with zeros at end of prefix correctly (#674)
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/python3-packaging | 11 ++++++-----
lfs/python3-packaging | 8 ++++----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/config/rootfiles/packages/python3-packaging b/config/rootfiles/packages/python3-packaging
index 0c1765041..6c1ee4773 100644
--- a/config/rootfiles/packages/python3-packaging
+++ b/config/rootfiles/packages/python3-packaging
@@ -1,9 +1,9 @@
usr/lib/python3.10/site-packages/packaging
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info/top_level.txt
usr/lib/python3.10/site-packages/packaging/__init__.py
usr/lib/python3.10/site-packages/packaging/_elffile.py
usr/lib/python3.10/site-packages/packaging/_manylinux.py
@@ -12,6 +12,7 @@ usr/lib/python3.10/site-packages/packaging/_parser.py
usr/lib/python3.10/site-packages/packaging/_structures.py
usr/lib/python3.10/site-packages/packaging/_tokenizer.py
usr/lib/python3.10/site-packages/packaging/markers.py
+usr/lib/python3.10/site-packages/packaging/metadata.py
usr/lib/python3.10/site-packages/packaging/py.typed
usr/lib/python3.10/site-packages/packaging/requirements.py
usr/lib/python3.10/site-packages/packaging/specifiers.py
diff --git a/lfs/python3-packaging b/lfs/python3-packaging
index 4bf2d6be0..e98c9e283 100644
--- a/lfs/python3-packaging
+++ b/lfs/python3-packaging
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 23.0
+VER = 23.2
THISAPP = packaging-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-packaging
-PAK_VER = 3
+PAK_VER = 4
###############################################################################
# Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 601806498c414aaf3a68206a008e4032b0925bb1a06b170a6da64786d15456b5a3082cfde7620cd39f3f0ec204f42337df4b6c663c76697b6dc9577d38cc45c3
+$(DL_FILE)_BLAKE2 = cf7986a07312fd82a2a0ee738088993b9570d95cd0b573afa7a1f911bf335de7084e3d40d961adea7f5a8369738688f9d0a4265ef26a393f2d30769bc13f752a
install : $(TARGET)
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 14/15] python3-pyfuse3: Update to version 3.3.0
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (11 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 13/15] python3-packaging: Update to version 23.2 Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
2024-01-29 13:41 ` [PATCH 15/15] python3-trio: Update to version 0.23.1 Adolf Belka
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4593 bytes --]
- Update from version 3.2.2 to 3.3.0
- Update of rootfile
- Changelog
3.3.0
Note: This is the first pyfuse3 release compatible with Cython 3.0.0 release.
Cython 0.29.x is also still supported.
Cythonized with latest Cython 3.0.0.
Drop Python 3.6 and 3.7 support and testing, #71.
CI: also test python 3.12. test on cython 0.29 and cython 3.0.
Tell Cython that callbacks may raise exceptions, #80.
Fix lookup in examples/hello.py, similar to #16.
Misc. CI, testing, build and sphinx related fixes.
3.2.3
cythonize with latest Cython 0.29.34 (brings Python 3.12 support)
add a minimal pyproject.toml, require setuptools
tests: fix integer overflow on 32-bit arches, fixes #47
test: Use shutil.which() instead of external which(1) program
setup.py: catch more generic OSError when searching Cython, fixes #63
setup.py: require Cython >= 0.29
fix basedir computation in setup.py (fix pip install -e .)
use sphinx < 6.0 due to compatibility issues with more recent versions
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/python3-pyfuse3 | 16 ++++++++--------
lfs/python3-pyfuse3 | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/packages/python3-pyfuse3 b/config/rootfiles/packages/python3-pyfuse3
index c96c15889..32f863c8e 100644
--- a/config/rootfiles/packages/python3-pyfuse3
+++ b/config/rootfiles/packages/python3-pyfuse3
@@ -1,10 +1,10 @@
usr/lib/python3.10/site-packages/_pyfuse3.py
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/zip-safe
-usr/lib/python3.10/site-packages/pyfuse3.cpython-310-xxxMACHINExxx-linux-gnu.so
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/zip-safe
+usr/lib/python3.10/site-packages/pyfuse3.cpython-310-x86_64-linux-gnu.so
usr/lib/python3.10/site-packages/pyfuse3_asyncio.py
diff --git a/lfs/python3-pyfuse3 b/lfs/python3-pyfuse3
index 60d78df90..1db132488 100644
--- a/lfs/python3-pyfuse3
+++ b/lfs/python3-pyfuse3
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 3.2.2
+VER = 3.3.0
SUMMARY = Python3 bindings for libfuse3
THISAPP = pyfuse3-$(VER)
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-pyfuse3
-PAK_VER = 2
+PAK_VER = 3
DEPS = python3-trio
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a6f11083a3ddec031fdfe5cb810be526cba26d7bc9599a64d28e9a45281aeb04fca8728ff3788e44f1736475c89e64c3c1fd7cb964ff81fc30ce441a5dda7fae
+$(DL_FILE)_BLAKE2 = 29a871bbd4c82298231eac0c8d4b668a75a9ea748c3dd15f093a369770fbfe080620b6209c79ce934880757764c946c3216b558dcc63cd1d1a7ef03e124174c2
install : $(TARGET)
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 15/15] python3-trio: Update to version 0.23.1
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
` (12 preceding siblings ...)
2024-01-29 13:41 ` [PATCH 14/15] python3-pyfuse3: Update to version 3.3.0 Adolf Belka
@ 2024-01-29 13:41 ` Adolf Belka
13 siblings, 0 replies; 19+ messages in thread
From: Adolf Belka @ 2024-01-29 13:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 18288 bytes --]
- Update from version 0.22.0 to 0.23.1
- Update of rootfile
- Changelog
0.23.0
Headline features
Add type hints. (#543)
Features
When exiting a nursery block, the parent task always waits for child tasks
to exit. This wait cannot be cancelled. However, previously, if you tried
to cancel it, it would inject a Cancelled exception, even though it wasn’t
cancelled. Most users probably never noticed either way, but injecting a
Cancelled here is not really useful, and in some rare cases caused
confusion or problems, so Trio no longer does that. (#1457)
If called from a thread spawned by trio.to_thread.run_sync,
trio.from_thread.run and trio.from_thread.run_sync now reuse the task and
cancellation status of the host task; this means that context variables and
cancel scopes naturally propagate ‘through’ threads spawned by Trio. You
can also use trio.from_thread.check_cancelled to efficiently check for
cancellation without reentering the Trio thread. (#2392)
trio.lowlevel.start_guest_run() now does a bit more setup of the guest run
before it returns to its caller, so that the caller can immediately make
calls to trio.current_time(), trio.lowlevel.spawn_system_task(),
trio.lowlevel.current_trio_token(), etc. (#2696)
Bugfixes
When a starting function raises before calling trio.TaskStatus.started(),
trio.Nursery.start() will no longer wrap the exception in an undocumented
ExceptionGroup. Previously, trio.Nursery.start() would incorrectly raise an
ExceptionGroup containing it when using trio.run(...,
strict_exception_groups=True). (#2611)
Deprecations and removals
To better reflect the underlying thread handling semantics, the keyword
argument for trio.to_thread.run_sync that was previously called cancellable
is now named abandon_on_cancel. It still does the same thing – allow the
thread to be abandoned if the call to trio.to_thread.run_sync is
cancelled – but since we now have other ways to propagate a cancellation
without abandoning the thread, “cancellable” has become somewhat of a
misnomer. The old cancellable name is now deprecated. (#2841)
Deprecated support for math.inf for the backlog argument in
open_tcp_listeners, making its docstring correct in the fact that only
TypeError is raised if invalid arguments are passed. (#2842)
Removals without deprecations
Drop support for Python3.7 and PyPy3.7/3.8. (#2668)
Removed special MultiError traceback handling for IPython. As of version
8.15 ExceptionGroup is handled natively. (#2702)
Miscellaneous internal changes
Trio now indicates its presence to sniffio using the sniffio.thread_local
interface that is preferred since sniffio v1.3.0. This should be less
likely than the previous approach to cause sniffio.current_async_library()
to return incorrect results due to unintended inheritance of contextvars.
(#2700)
On windows, if SIO_BASE_HANDLE failed and SIO_BSP_HANDLE_POLL didn’t return
a different socket, runtime error will now raise from the OSError that
indicated the issue so that in the event it does happen it might help with
debugging. (#2807)
0.22.2
Bugfixes
Fix PermissionError when importing trio due to trying to access pthread.
(#2688)
0.22.1
Breaking changes
Timeout functions now raise ValueError if passed math.nan. This includes
trio.sleep, trio.sleep_until, trio.move_on_at, trio.move_on_after,
trio.fail_at and trio.fail_after. (#2493)
Features
Added support for naming threads created with trio.to_thread.run_sync,
requires pthreads so is only available on POSIX platforms with glibc
installed. (#1148)
trio.socket.socket now prints the address it tried to connect to upon
failure. (#1810)
Bugfixes
Fixed a crash that can occur when running Trio within an embedded Python
interpreter, by handling the TypeError that is raised when trying to
(re-)install a C signal handler. (#2333)
Fix sniffio.current_async_library() when Trio tasks are spawned from a
non-Trio context (such as when using trio-asyncio). Previously, a regular
Trio task would inherit the non-Trio library name, and spawning a system
task would cause the non-Trio caller to start thinking it was Trio. (#2462)
Issued a new release as in the git tag for 0.22.0, trio.__version__ is
incorrectly set to 0.21.0+dev. (#2485)
Improved documentation
Documented that Nursery.start_soon does not guarantee task ordering. (#970)
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/python3-trio | 138 +++++++++++++------------
lfs/python3-trio | 6 +-
2 files changed, 73 insertions(+), 71 deletions(-)
diff --git a/config/rootfiles/packages/python3-trio b/config/rootfiles/packages/python3-trio
index 6b19eeba3..4a807b767 100644
--- a/config/rootfiles/packages/python3-trio
+++ b/config/rootfiles/packages/python3-trio
@@ -1,10 +1,10 @@
#usr/lib/python3.10/site-packages/trio
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/top_level.txt
usr/lib/python3.10/site-packages/trio/__init__.py
usr/lib/python3.10/site-packages/trio/_abc.py
usr/lib/python3.10/site-packages/trio/_channel.py
@@ -29,37 +29,33 @@ usr/lib/python3.10/site-packages/trio/_core/_mock_clock.py
usr/lib/python3.10/site-packages/trio/_core/_multierror.py
usr/lib/python3.10/site-packages/trio/_core/_parking_lot.py
usr/lib/python3.10/site-packages/trio/_core/_run.py
+#usr/lib/python3.10/site-packages/trio/_core/_tests
+usr/lib/python3.10/site-packages/trio/_core/_tests/__init__.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_asyncgen.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_guest_mode.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_instrumentation.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_io.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_ki.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_local.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_mock_clock.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts/__init__.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts/_common.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts/apport_excepthook.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts/simple_excepthook.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_parking_lot.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_run.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_thread_cache.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_tutil.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_unbounded_queue.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_windows.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/tutil.py
usr/lib/python3.10/site-packages/trio/_core/_thread_cache.py
usr/lib/python3.10/site-packages/trio/_core/_traps.py
usr/lib/python3.10/site-packages/trio/_core/_unbounded_queue.py
usr/lib/python3.10/site-packages/trio/_core/_wakeup_socketpair.py
usr/lib/python3.10/site-packages/trio/_core/_windows_cffi.py
-#usr/lib/python3.10/site-packages/trio/_core/tests
-usr/lib/python3.10/site-packages/trio/_core/tests/__init__.py
-usr/lib/python3.10/site-packages/trio/_core/tests/conftest.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_asyncgen.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_guest_mode.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_instrumentation.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_io.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_ki.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_local.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_mock_clock.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror.py
-#usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/__init__.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/_common.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/apport_excepthook.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/ipython_custom_exc.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/simple_excepthook.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/simple_excepthook_IPython.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_parking_lot.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_run.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_thread_cache.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_tutil.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_unbounded_queue.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_util.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_windows.py
-usr/lib/python3.10/site-packages/trio/_core/tests/tutil.py
usr/lib/python3.10/site-packages/trio/_deprecate.py
usr/lib/python3.10/site-packages/trio/_dtls.py
usr/lib/python3.10/site-packages/trio/_file_io.py
@@ -81,11 +77,51 @@ usr/lib/python3.10/site-packages/trio/_subprocess_platform/kqueue.py
usr/lib/python3.10/site-packages/trio/_subprocess_platform/waitid.py
usr/lib/python3.10/site-packages/trio/_subprocess_platform/windows.py
usr/lib/python3.10/site-packages/trio/_sync.py
+#usr/lib/python3.10/site-packages/trio/_tests
+usr/lib/python3.10/site-packages/trio/_tests/__init__.py
+usr/lib/python3.10/site-packages/trio/_tests/check_type_completeness.py
+usr/lib/python3.10/site-packages/trio/_tests/module_with_deprecations.py
+usr/lib/python3.10/site-packages/trio/_tests/pytest_plugin.py
+usr/lib/python3.10/site-packages/trio/_tests/test_abc.py
+usr/lib/python3.10/site-packages/trio/_tests/test_channel.py
+usr/lib/python3.10/site-packages/trio/_tests/test_contextvars.py
+usr/lib/python3.10/site-packages/trio/_tests/test_deprecate.py
+usr/lib/python3.10/site-packages/trio/_tests/test_dtls.py
+usr/lib/python3.10/site-packages/trio/_tests/test_exports.py
+usr/lib/python3.10/site-packages/trio/_tests/test_fakenet.py
+usr/lib/python3.10/site-packages/trio/_tests/test_file_io.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_generic.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_open_tcp_listeners.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_open_tcp_stream.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_open_unix_stream.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_serve_listeners.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_socket.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_ssl_helpers.py
+usr/lib/python3.10/site-packages/trio/_tests/test_path.py
+usr/lib/python3.10/site-packages/trio/_tests/test_scheduler_determinism.py
+usr/lib/python3.10/site-packages/trio/_tests/test_signals.py
+usr/lib/python3.10/site-packages/trio/_tests/test_socket.py
+usr/lib/python3.10/site-packages/trio/_tests/test_ssl.py
+usr/lib/python3.10/site-packages/trio/_tests/test_subprocess.py
+usr/lib/python3.10/site-packages/trio/_tests/test_sync.py
+usr/lib/python3.10/site-packages/trio/_tests/test_testing.py
+usr/lib/python3.10/site-packages/trio/_tests/test_threads.py
+usr/lib/python3.10/site-packages/trio/_tests/test_timeouts.py
+usr/lib/python3.10/site-packages/trio/_tests/test_tracing.py
+usr/lib/python3.10/site-packages/trio/_tests/test_unix_pipes.py
+usr/lib/python3.10/site-packages/trio/_tests/test_util.py
+usr/lib/python3.10/site-packages/trio/_tests/test_wait_for_object.py
+usr/lib/python3.10/site-packages/trio/_tests/test_windows_pipes.py
+#usr/lib/python3.10/site-packages/trio/_tests/tools
+usr/lib/python3.10/site-packages/trio/_tests/tools/__init__.py
+usr/lib/python3.10/site-packages/trio/_tests/tools/test_gen_exports.py
+usr/lib/python3.10/site-packages/trio/_tests/tools/test_mypy_annotate.py
usr/lib/python3.10/site-packages/trio/_threads.py
usr/lib/python3.10/site-packages/trio/_timeouts.py
#usr/lib/python3.10/site-packages/trio/_tools
usr/lib/python3.10/site-packages/trio/_tools/__init__.py
usr/lib/python3.10/site-packages/trio/_tools/gen_exports.py
+usr/lib/python3.10/site-packages/trio/_tools/mypy_annotate.py
usr/lib/python3.10/site-packages/trio/_unix_pipes.py
usr/lib/python3.10/site-packages/trio/_util.py
usr/lib/python3.10/site-packages/trio/_version.py
@@ -94,6 +130,7 @@ usr/lib/python3.10/site-packages/trio/_windows_pipes.py
usr/lib/python3.10/site-packages/trio/abc.py
usr/lib/python3.10/site-packages/trio/from_thread.py
usr/lib/python3.10/site-packages/trio/lowlevel.py
+usr/lib/python3.10/site-packages/trio/py.typed
usr/lib/python3.10/site-packages/trio/socket.py
#usr/lib/python3.10/site-packages/trio/testing
usr/lib/python3.10/site-packages/trio/testing/__init__.py
@@ -104,40 +141,5 @@ usr/lib/python3.10/site-packages/trio/testing/_memory_streams.py
usr/lib/python3.10/site-packages/trio/testing/_network.py
usr/lib/python3.10/site-packages/trio/testing/_sequencer.py
usr/lib/python3.10/site-packages/trio/testing/_trio_test.py
-#usr/lib/python3.10/site-packages/trio/tests
-usr/lib/python3.10/site-packages/trio/tests/__init__.py
-usr/lib/python3.10/site-packages/trio/tests/conftest.py
-usr/lib/python3.10/site-packages/trio/tests/module_with_deprecations.py
-usr/lib/python3.10/site-packages/trio/tests/test_abc.py
-usr/lib/python3.10/site-packages/trio/tests/test_channel.py
-usr/lib/python3.10/site-packages/trio/tests/test_contextvars.py
-usr/lib/python3.10/site-packages/trio/tests/test_deprecate.py
-usr/lib/python3.10/site-packages/trio/tests/test_dtls.py
-usr/lib/python3.10/site-packages/trio/tests/test_exports.py
-usr/lib/python3.10/site-packages/trio/tests/test_fakenet.py
-usr/lib/python3.10/site-packages/trio/tests/test_file_io.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_generic.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_open_tcp_listeners.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_open_tcp_stream.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_open_unix_stream.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_serve_listeners.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_socket.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_ssl_helpers.py
-usr/lib/python3.10/site-packages/trio/tests/test_path.py
-usr/lib/python3.10/site-packages/trio/tests/test_scheduler_determinism.py
-usr/lib/python3.10/site-packages/trio/tests/test_signals.py
-usr/lib/python3.10/site-packages/trio/tests/test_socket.py
-usr/lib/python3.10/site-packages/trio/tests/test_ssl.py
-usr/lib/python3.10/site-packages/trio/tests/test_subprocess.py
-usr/lib/python3.10/site-packages/trio/tests/test_sync.py
-usr/lib/python3.10/site-packages/trio/tests/test_testing.py
-usr/lib/python3.10/site-packages/trio/tests/test_threads.py
-usr/lib/python3.10/site-packages/trio/tests/test_timeouts.py
-usr/lib/python3.10/site-packages/trio/tests/test_unix_pipes.py
-usr/lib/python3.10/site-packages/trio/tests/test_util.py
-usr/lib/python3.10/site-packages/trio/tests/test_wait_for_object.py
-usr/lib/python3.10/site-packages/trio/tests/test_windows_pipes.py
-#usr/lib/python3.10/site-packages/trio/tests/tools
-usr/lib/python3.10/site-packages/trio/tests/tools/__init__.py
-usr/lib/python3.10/site-packages/trio/tests/tools/test_gen_exports.py
+usr/lib/python3.10/site-packages/trio/tests.py
usr/lib/python3.10/site-packages/trio/to_thread.py
diff --git a/lfs/python3-trio b/lfs/python3-trio
index 49f1207ab..9a4f833af 100644
--- a/lfs/python3-trio
+++ b/lfs/python3-trio
@@ -24,7 +24,7 @@
include Config
-VER = 0.22.0
+VER = 0.23.1
SUMMARY = async/await-native I/O library for Python
THISAPP = trio-$(VER)
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-trio
-PAK_VER = 3
+PAK_VER = 4
DEPS = python3-async_generator python3-attrs python3-sniffio python3-sortedcontainers python3-outcome python3-idna python3-exceptiongroup
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b76f49c45788d41cbeded573e54d88e525cb2ad80b05da4c61f6c5100bdc85271f26a0c3aee07ca858214092106d217a2176d60744892c768bbc8ecad9383190
+$(DL_FILE)_BLAKE2 = e7c1aa2ec7ef7fa8c5940e66d6322df1abf3def9b1026509dcd1783f968cdb42332c293905887f2892619efed5abbc353c7d552d0ba34153e3a4715fbe4e403c
install : $(TARGET)
--
2.43.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 06/15] python3-editables: New build dependency for python3-hatchling
2024-01-29 13:41 ` [PATCH 06/15] python3-editables: New build dependency for python3-hatchling Adolf Belka
@ 2024-01-30 14:11 ` Arne Fitzenreiter
2024-01-30 14:57 ` Michael Tremer
0 siblings, 1 reply; 19+ messages in thread
From: Arne Fitzenreiter @ 2024-01-30 14:11 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6434 bytes --]
Hi,
this reverts changes for frr deps (protobuf) on make.sh
Arne
Am 2024-01-29 14:41, schrieb Adolf Belka:
> - lfs and rootfile created.
> - rootfile put into common as it is only used as a build dependency.
> - Used pyproject.toml build approach
>
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/common/python3-editables | 12 ++++
> lfs/python3-editables | 85 +++++++++++++++++++++++
> make.sh | 4 +-
> 3 files changed, 98 insertions(+), 3 deletions(-)
> create mode 100644 config/rootfiles/common/python3-editables
> create mode 100644 lfs/python3-editables
>
> diff --git a/config/rootfiles/common/python3-editables
> b/config/rootfiles/common/python3-editables
> new file mode 100644
> index 000000000..6b5b36e52
> --- /dev/null
> +++ b/config/rootfiles/common/python3-editables
> @@ -0,0 +1,12 @@
> +#usr/lib/python3.10/site-packages/editables
> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info
> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER
> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt
> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA
> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD
> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED
> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL
> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json
> +#usr/lib/python3.10/site-packages/editables/__init__.py
> +#usr/lib/python3.10/site-packages/editables/py.typed
> +#usr/lib/python3.10/site-packages/editables/redirector.py
> diff --git a/lfs/python3-editables b/lfs/python3-editables
> new file mode 100644
> index 000000000..cb5b33d45
> --- /dev/null
> +++ b/lfs/python3-editables
> @@ -0,0 +1,85 @@
> +###############################################################################
> +#
> #
> +# IPFire.org - A linux based firewall
> #
> +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org>
> #
> +#
> #
> +# This program is free software: you can redistribute it and/or modify
> #
> +# it under the terms of the GNU General Public License as published by
> #
> +# the Free Software Foundation, either version 3 of the License, or
> #
> +# (at your option) any later version.
> #
> +#
> #
> +# This program is distributed in the hope that it will be useful,
> #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> #
> +# GNU General Public License for more details.
> #
> +#
> #
> +# You should have received a copy of the GNU General Public License
> #
> +# along with this program. If not, see
> <http://www.gnu.org/licenses/>. #
> +#
> #
> +###############################################################################
> +
> +###############################################################################
> +# Definitions
> +###############################################################################
> +
> +include Config
> +
> +VER = 0.5
> +
> +THISAPP = editables-$(VER)
> +DL_FILE = $(THISAPP).tar.gz
> +DL_FROM = $(URL_IPFIRE)
> +DIR_APP = $(DIR_SRC)/$(THISAPP)
> +TARGET = $(DIR_INFO)/$(THISAPP)
> +
> +###############################################################################
> +# Top-level Rules
> +###############################################################################
> +
> +objects = $(DL_FILE)
> +
> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_BLAKE2 =
> 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1
> +
> +install : $(TARGET)
> +
> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> +
> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> +
> +b2 : $(subst %,%_BLAKE2,$(objects))
> +
> +###############################################################################
> +# Downloading, checking, b2sum
> +###############################################################################
> +
> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> + @$(CHECK)
> +
> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> + @$(LOAD)
> +
> +$(subst %,%_BLAKE2,$(objects)) :
> + @$(B2SUM)
> +
> +###############################################################################
> +# Installation Details
> +###############################################################################
> +
> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> + @$(PREBUILD)
> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> + cd $(DIR_APP) && python3 -m build \
> + --no-isolation \
> + --wheel
> + cd $(DIR_APP) && pip3 install \
> + --no-build-isolation \
> + --root="/" \
> + --no-deps \
> + --ignore-installed \
> + dist/*.whl
> + # remove temp build files in /root/.cache from rootfile
> + cd $(DIR_APP) && rm -R /root/.cache/
> + @rm -rf $(DIR_APP)
> + @$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index d914a76e0..1466574d0 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1595,6 +1595,7 @@ buildipfire() {
> lfsmake2 python3-terminaltables
> lfsmake2 python3-pkgconfig
> lfsmake2 python3-msgpack
> + lfsmake2 python3-editables
> lfsmake2 python3-hatchling
> lfsmake2 python3-hatch-vcs
> lfsmake2 python3-hatch-fancy-pypi-readme
> @@ -1651,9 +1652,6 @@ buildipfire() {
> lfsmake2 dnsdist
> lfsmake2 bird
> lfsmake2 libyang
> - lfsmake2 abseil-cpp
> - lfsmake2 protobuf
> - lfsmake2 protobuf-c
> lfsmake2 frr
> lfsmake2 dmidecode
> lfsmake2 mcelog
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 06/15] python3-editables: New build dependency for python3-hatchling
2024-01-30 14:11 ` Arne Fitzenreiter
@ 2024-01-30 14:57 ` Michael Tremer
2024-01-30 16:20 ` Adolf Belka
0 siblings, 1 reply; 19+ messages in thread
From: Michael Tremer @ 2024-01-30 14:57 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6594 bytes --]
Oops. I just corrected this.
-Michael
> On 30 Jan 2024, at 14:11, Arne Fitzenreiter <arne_f(a)ipfire.org> wrote:
>
> Hi,
>
> this reverts changes for frr deps (protobuf) on make.sh
>
> Arne
>
> Am 2024-01-29 14:41, schrieb Adolf Belka:
>> - lfs and rootfile created.
>> - rootfile put into common as it is only used as a build dependency.
>> - Used pyproject.toml build approach
>> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> ---
>> config/rootfiles/common/python3-editables | 12 ++++
>> lfs/python3-editables | 85 +++++++++++++++++++++++
>> make.sh | 4 +-
>> 3 files changed, 98 insertions(+), 3 deletions(-)
>> create mode 100644 config/rootfiles/common/python3-editables
>> create mode 100644 lfs/python3-editables
>> diff --git a/config/rootfiles/common/python3-editables b/config/rootfiles/common/python3-editables
>> new file mode 100644
>> index 000000000..6b5b36e52
>> --- /dev/null
>> +++ b/config/rootfiles/common/python3-editables
>> @@ -0,0 +1,12 @@
>> +#usr/lib/python3.10/site-packages/editables
>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info
>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER
>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt
>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA
>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD
>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED
>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL
>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json
>> +#usr/lib/python3.10/site-packages/editables/__init__.py
>> +#usr/lib/python3.10/site-packages/editables/py.typed
>> +#usr/lib/python3.10/site-packages/editables/redirector.py
>> diff --git a/lfs/python3-editables b/lfs/python3-editables
>> new file mode 100644
>> index 000000000..cb5b33d45
>> --- /dev/null
>> +++ b/lfs/python3-editables
>> @@ -0,0 +1,85 @@
>> +###############################################################################
>> +# #
>> +# IPFire.org - A linux based firewall #
>> +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
>> +# #
>> +# This program is free software: you can redistribute it and/or modify #
>> +# it under the terms of the GNU General Public License as published by #
>> +# the Free Software Foundation, either version 3 of the License, or #
>> +# (at your option) any later version. #
>> +# #
>> +# This program is distributed in the hope that it will be useful, #
>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
>> +# GNU General Public License for more details. #
>> +# #
>> +# You should have received a copy of the GNU General Public License #
>> +# along with this program. If not, see <http://www.gnu.org/licenses/>. #
>> +# #
>> +###############################################################################
>> +
>> +###############################################################################
>> +# Definitions
>> +###############################################################################
>> +
>> +include Config
>> +
>> +VER = 0.5
>> +
>> +THISAPP = editables-$(VER)
>> +DL_FILE = $(THISAPP).tar.gz
>> +DL_FROM = $(URL_IPFIRE)
>> +DIR_APP = $(DIR_SRC)/$(THISAPP)
>> +TARGET = $(DIR_INFO)/$(THISAPP)
>> +
>> +###############################################################################
>> +# Top-level Rules
>> +###############################################################################
>> +
>> +objects = $(DL_FILE)
>> +
>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>> +
>> +$(DL_FILE)_BLAKE2 = 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1
>> +
>> +install : $(TARGET)
>> +
>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
>> +
>> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
>> +
>> +b2 : $(subst %,%_BLAKE2,$(objects))
>> +
>> +###############################################################################
>> +# Downloading, checking, b2sum
>> +###############################################################################
>> +
>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
>> + @$(CHECK)
>> +
>> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
>> + @$(LOAD)
>> +
>> +$(subst %,%_BLAKE2,$(objects)) :
>> + @$(B2SUM)
>> +
>> +###############################################################################
>> +# Installation Details
>> +###############################################################################
>> +
>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>> + @$(PREBUILD)
>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
>> + cd $(DIR_APP) && python3 -m build \
>> + --no-isolation \
>> + --wheel
>> + cd $(DIR_APP) && pip3 install \
>> + --no-build-isolation \
>> + --root="/" \
>> + --no-deps \
>> + --ignore-installed \
>> + dist/*.whl
>> + # remove temp build files in /root/.cache from rootfile
>> + cd $(DIR_APP) && rm -R /root/.cache/
>> + @rm -rf $(DIR_APP)
>> + @$(POSTBUILD)
>> diff --git a/make.sh b/make.sh
>> index d914a76e0..1466574d0 100755
>> --- a/make.sh
>> +++ b/make.sh
>> @@ -1595,6 +1595,7 @@ buildipfire() {
>> lfsmake2 python3-terminaltables
>> lfsmake2 python3-pkgconfig
>> lfsmake2 python3-msgpack
>> + lfsmake2 python3-editables
>> lfsmake2 python3-hatchling
>> lfsmake2 python3-hatch-vcs
>> lfsmake2 python3-hatch-fancy-pypi-readme
>> @@ -1651,9 +1652,6 @@ buildipfire() {
>> lfsmake2 dnsdist
>> lfsmake2 bird
>> lfsmake2 libyang
>> - lfsmake2 abseil-cpp
>> - lfsmake2 protobuf
>> - lfsmake2 protobuf-c
>> lfsmake2 frr
>> lfsmake2 dmidecode
>> lfsmake2 mcelog
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 06/15] python3-editables: New build dependency for python3-hatchling
2024-01-30 14:57 ` Michael Tremer
@ 2024-01-30 16:20 ` Adolf Belka
2024-01-30 17:38 ` Michael Tremer
0 siblings, 1 reply; 19+ messages in thread
From: Adolf Belka @ 2024-01-30 16:20 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7490 bytes --]
Hi All,
Yes that was me. I know what happened now.
The borgbackup update set was becoming so large that at a certain point I stashed it and worked on something else. Then I came back to it and continued working on it.
However I also did a git pull on my ipfire local repo so I got the newer make.sh file.
I did actually spot it when I was doing the commits for the borgbackup set and I thought I had done the correction on all the make.sh versions for the new files but I obviously missed the python3-editables set.
Thanks for catching it for me.
Moral of the story, don't do a git pull when you have a partially done patch set update :-)
Regards,
Adolf.
On 30/01/2024 15:57, Michael Tremer wrote:
> Oops. I just corrected this.
>
> -Michael
>
>> On 30 Jan 2024, at 14:11, Arne Fitzenreiter <arne_f(a)ipfire.org> wrote:
>>
>> Hi,
>>
>> this reverts changes for frr deps (protobuf) on make.sh
>>
>> Arne
>>
>> Am 2024-01-29 14:41, schrieb Adolf Belka:
>>> - lfs and rootfile created.
>>> - rootfile put into common as it is only used as a build dependency.
>>> - Used pyproject.toml build approach
>>> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> ---
>>> config/rootfiles/common/python3-editables | 12 ++++
>>> lfs/python3-editables | 85 +++++++++++++++++++++++
>>> make.sh | 4 +-
>>> 3 files changed, 98 insertions(+), 3 deletions(-)
>>> create mode 100644 config/rootfiles/common/python3-editables
>>> create mode 100644 lfs/python3-editables
>>> diff --git a/config/rootfiles/common/python3-editables b/config/rootfiles/common/python3-editables
>>> new file mode 100644
>>> index 000000000..6b5b36e52
>>> --- /dev/null
>>> +++ b/config/rootfiles/common/python3-editables
>>> @@ -0,0 +1,12 @@
>>> +#usr/lib/python3.10/site-packages/editables
>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info
>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER
>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt
>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA
>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD
>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED
>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL
>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json
>>> +#usr/lib/python3.10/site-packages/editables/__init__.py
>>> +#usr/lib/python3.10/site-packages/editables/py.typed
>>> +#usr/lib/python3.10/site-packages/editables/redirector.py
>>> diff --git a/lfs/python3-editables b/lfs/python3-editables
>>> new file mode 100644
>>> index 000000000..cb5b33d45
>>> --- /dev/null
>>> +++ b/lfs/python3-editables
>>> @@ -0,0 +1,85 @@
>>> +###############################################################################
>>> +# #
>>> +# IPFire.org - A linux based firewall #
>>> +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
>>> +# #
>>> +# This program is free software: you can redistribute it and/or modify #
>>> +# it under the terms of the GNU General Public License as published by #
>>> +# the Free Software Foundation, either version 3 of the License, or #
>>> +# (at your option) any later version. #
>>> +# #
>>> +# This program is distributed in the hope that it will be useful, #
>>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
>>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
>>> +# GNU General Public License for more details. #
>>> +# #
>>> +# You should have received a copy of the GNU General Public License #
>>> +# along with this program. If not, see <http://www.gnu.org/licenses/>. #
>>> +# #
>>> +###############################################################################
>>> +
>>> +###############################################################################
>>> +# Definitions
>>> +###############################################################################
>>> +
>>> +include Config
>>> +
>>> +VER = 0.5
>>> +
>>> +THISAPP = editables-$(VER)
>>> +DL_FILE = $(THISAPP).tar.gz
>>> +DL_FROM = $(URL_IPFIRE)
>>> +DIR_APP = $(DIR_SRC)/$(THISAPP)
>>> +TARGET = $(DIR_INFO)/$(THISAPP)
>>> +
>>> +###############################################################################
>>> +# Top-level Rules
>>> +###############################################################################
>>> +
>>> +objects = $(DL_FILE)
>>> +
>>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>> +
>>> +$(DL_FILE)_BLAKE2 = 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1
>>> +
>>> +install : $(TARGET)
>>> +
>>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
>>> +
>>> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
>>> +
>>> +b2 : $(subst %,%_BLAKE2,$(objects))
>>> +
>>> +###############################################################################
>>> +# Downloading, checking, b2sum
>>> +###############################################################################
>>> +
>>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
>>> + @$(CHECK)
>>> +
>>> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
>>> + @$(LOAD)
>>> +
>>> +$(subst %,%_BLAKE2,$(objects)) :
>>> + @$(B2SUM)
>>> +
>>> +###############################################################################
>>> +# Installation Details
>>> +###############################################################################
>>> +
>>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>> + @$(PREBUILD)
>>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
>>> + cd $(DIR_APP) && python3 -m build \
>>> + --no-isolation \
>>> + --wheel
>>> + cd $(DIR_APP) && pip3 install \
>>> + --no-build-isolation \
>>> + --root="/" \
>>> + --no-deps \
>>> + --ignore-installed \
>>> + dist/*.whl
>>> + # remove temp build files in /root/.cache from rootfile
>>> + cd $(DIR_APP) && rm -R /root/.cache/
>>> + @rm -rf $(DIR_APP)
>>> + @$(POSTBUILD)
>>> diff --git a/make.sh b/make.sh
>>> index d914a76e0..1466574d0 100755
>>> --- a/make.sh
>>> +++ b/make.sh
>>> @@ -1595,6 +1595,7 @@ buildipfire() {
>>> lfsmake2 python3-terminaltables
>>> lfsmake2 python3-pkgconfig
>>> lfsmake2 python3-msgpack
>>> + lfsmake2 python3-editables
>>> lfsmake2 python3-hatchling
>>> lfsmake2 python3-hatch-vcs
>>> lfsmake2 python3-hatch-fancy-pypi-readme
>>> @@ -1651,9 +1652,6 @@ buildipfire() {
>>> lfsmake2 dnsdist
>>> lfsmake2 bird
>>> lfsmake2 libyang
>>> - lfsmake2 abseil-cpp
>>> - lfsmake2 protobuf
>>> - lfsmake2 protobuf-c
>>> lfsmake2 frr
>>> lfsmake2 dmidecode
>>> lfsmake2 mcelog
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 06/15] python3-editables: New build dependency for python3-hatchling
2024-01-30 16:20 ` Adolf Belka
@ 2024-01-30 17:38 ` Michael Tremer
0 siblings, 0 replies; 19+ messages in thread
From: Michael Tremer @ 2024-01-30 17:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7813 bytes --]
Happens :) It was just three lines that confused me quite a bit :)
> On 30 Jan 2024, at 16:20, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>
> Hi All,
>
> Yes that was me. I know what happened now.
>
> The borgbackup update set was becoming so large that at a certain point I stashed it and worked on something else. Then I came back to it and continued working on it.
>
> However I also did a git pull on my ipfire local repo so I got the newer make.sh file.
>
> I did actually spot it when I was doing the commits for the borgbackup set and I thought I had done the correction on all the make.sh versions for the new files but I obviously missed the python3-editables set.
>
> Thanks for catching it for me.
>
> Moral of the story, don't do a git pull when you have a partially done patch set update :-)
>
> Regards,
> Adolf.
>
>
> On 30/01/2024 15:57, Michael Tremer wrote:
>> Oops. I just corrected this.
>> -Michael
>>> On 30 Jan 2024, at 14:11, Arne Fitzenreiter <arne_f(a)ipfire.org> wrote:
>>>
>>> Hi,
>>>
>>> this reverts changes for frr deps (protobuf) on make.sh
>>>
>>> Arne
>>>
>>> Am 2024-01-29 14:41, schrieb Adolf Belka:
>>>> - lfs and rootfile created.
>>>> - rootfile put into common as it is only used as a build dependency.
>>>> - Used pyproject.toml build approach
>>>> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>>> ---
>>>> config/rootfiles/common/python3-editables | 12 ++++
>>>> lfs/python3-editables | 85 +++++++++++++++++++++++
>>>> make.sh | 4 +-
>>>> 3 files changed, 98 insertions(+), 3 deletions(-)
>>>> create mode 100644 config/rootfiles/common/python3-editables
>>>> create mode 100644 lfs/python3-editables
>>>> diff --git a/config/rootfiles/common/python3-editables b/config/rootfiles/common/python3-editables
>>>> new file mode 100644
>>>> index 000000000..6b5b36e52
>>>> --- /dev/null
>>>> +++ b/config/rootfiles/common/python3-editables
>>>> @@ -0,0 +1,12 @@
>>>> +#usr/lib/python3.10/site-packages/editables
>>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info
>>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER
>>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt
>>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA
>>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD
>>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED
>>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL
>>>> +#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json
>>>> +#usr/lib/python3.10/site-packages/editables/__init__.py
>>>> +#usr/lib/python3.10/site-packages/editables/py.typed
>>>> +#usr/lib/python3.10/site-packages/editables/redirector.py
>>>> diff --git a/lfs/python3-editables b/lfs/python3-editables
>>>> new file mode 100644
>>>> index 000000000..cb5b33d45
>>>> --- /dev/null
>>>> +++ b/lfs/python3-editables
>>>> @@ -0,0 +1,85 @@
>>>> +###############################################################################
>>>> +# #
>>>> +# IPFire.org - A linux based firewall #
>>>> +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> #
>>>> +# #
>>>> +# This program is free software: you can redistribute it and/or modify #
>>>> +# it under the terms of the GNU General Public License as published by #
>>>> +# the Free Software Foundation, either version 3 of the License, or #
>>>> +# (at your option) any later version. #
>>>> +# #
>>>> +# This program is distributed in the hope that it will be useful, #
>>>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
>>>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
>>>> +# GNU General Public License for more details. #
>>>> +# #
>>>> +# You should have received a copy of the GNU General Public License #
>>>> +# along with this program. If not, see <http://www.gnu.org/licenses/>. #
>>>> +# #
>>>> +###############################################################################
>>>> +
>>>> +###############################################################################
>>>> +# Definitions
>>>> +###############################################################################
>>>> +
>>>> +include Config
>>>> +
>>>> +VER = 0.5
>>>> +
>>>> +THISAPP = editables-$(VER)
>>>> +DL_FILE = $(THISAPP).tar.gz
>>>> +DL_FROM = $(URL_IPFIRE)
>>>> +DIR_APP = $(DIR_SRC)/$(THISAPP)
>>>> +TARGET = $(DIR_INFO)/$(THISAPP)
>>>> +
>>>> +###############################################################################
>>>> +# Top-level Rules
>>>> +###############################################################################
>>>> +
>>>> +objects = $(DL_FILE)
>>>> +
>>>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>>> +
>>>> +$(DL_FILE)_BLAKE2 = 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1
>>>> +
>>>> +install : $(TARGET)
>>>> +
>>>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
>>>> +
>>>> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
>>>> +
>>>> +b2 : $(subst %,%_BLAKE2,$(objects))
>>>> +
>>>> +###############################################################################
>>>> +# Downloading, checking, b2sum
>>>> +###############################################################################
>>>> +
>>>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
>>>> + @$(CHECK)
>>>> +
>>>> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
>>>> + @$(LOAD)
>>>> +
>>>> +$(subst %,%_BLAKE2,$(objects)) :
>>>> + @$(B2SUM)
>>>> +
>>>> +###############################################################################
>>>> +# Installation Details
>>>> +###############################################################################
>>>> +
>>>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>>> + @$(PREBUILD)
>>>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
>>>> + cd $(DIR_APP) && python3 -m build \
>>>> + --no-isolation \
>>>> + --wheel
>>>> + cd $(DIR_APP) && pip3 install \
>>>> + --no-build-isolation \
>>>> + --root="/" \
>>>> + --no-deps \
>>>> + --ignore-installed \
>>>> + dist/*.whl
>>>> + # remove temp build files in /root/.cache from rootfile
>>>> + cd $(DIR_APP) && rm -R /root/.cache/
>>>> + @rm -rf $(DIR_APP)
>>>> + @$(POSTBUILD)
>>>> diff --git a/make.sh b/make.sh
>>>> index d914a76e0..1466574d0 100755
>>>> --- a/make.sh
>>>> +++ b/make.sh
>>>> @@ -1595,6 +1595,7 @@ buildipfire() {
>>>> lfsmake2 python3-terminaltables
>>>> lfsmake2 python3-pkgconfig
>>>> lfsmake2 python3-msgpack
>>>> + lfsmake2 python3-editables
>>>> lfsmake2 python3-hatchling
>>>> lfsmake2 python3-hatch-vcs
>>>> lfsmake2 python3-hatch-fancy-pypi-readme
>>>> @@ -1651,9 +1652,6 @@ buildipfire() {
>>>> lfsmake2 dnsdist
>>>> lfsmake2 bird
>>>> lfsmake2 libyang
>>>> - lfsmake2 abseil-cpp
>>>> - lfsmake2 protobuf
>>>> - lfsmake2 protobuf-c
>>>> lfsmake2 frr
>>>> lfsmake2 dmidecode
>>>> lfsmake2 mcelog
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-01-30 17:38 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-29 13:41 [PATCH 01/15] borgbackup: Update to version 1.2.7 Adolf Belka
2024-01-29 13:41 ` [PATCH 02/15] python3-attrs: Update to version 23.2.0 Adolf Belka
2024-01-29 13:41 ` [PATCH 03/15] python3-hatchling: New build dependency for python3-attrs Adolf Belka
2024-01-29 13:41 ` [PATCH 04/15] python3-hatch-vcs: " Adolf Belka
2024-01-29 13:41 ` [PATCH 05/15] python3-hatch-fancy-pypi-readme: " Adolf Belka
2024-01-29 13:41 ` [PATCH 06/15] python3-editables: New build dependency for python3-hatchling Adolf Belka
2024-01-30 14:11 ` Arne Fitzenreiter
2024-01-30 14:57 ` Michael Tremer
2024-01-30 16:20 ` Adolf Belka
2024-01-30 17:38 ` Michael Tremer
2024-01-29 13:41 ` [PATCH 07/15] python3-pathspec: " Adolf Belka
2024-01-29 13:41 ` [PATCH 08/15] python3-pluggy: " Adolf Belka
2024-01-29 13:41 ` [PATCH 09/15] python3-trove-classifiers: " Adolf Belka
2024-01-29 13:41 ` [PATCH 10/15] python3-calver: New build dependency for python3-trove-classifiers Adolf Belka
2024-01-29 13:41 ` [PATCH 11/15] python3-exceptiongroup: Update to version 1.2.0 Adolf Belka
2024-01-29 13:41 ` [PATCH 12/15] python3-msgpack: Update to version 1.0.7 Adolf Belka
2024-01-29 13:41 ` [PATCH 13/15] python3-packaging: Update to version 23.2 Adolf Belka
2024-01-29 13:41 ` [PATCH 14/15] python3-pyfuse3: Update to version 3.3.0 Adolf Belka
2024-01-29 13:41 ` [PATCH 15/15] python3-trio: Update to version 0.23.1 Adolf Belka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox