From 7640973d6bc82fec17e981829058bd8d736d3e40 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 4 Jul 2023 20:11:26 +0200 Subject: [PATCH 1/6] docs: CI only on github actions now --- docs/development.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/development.rst b/docs/development.rst index 41eef2675..6a27e78c8 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -131,12 +131,9 @@ you run the tests. Continuous Integration ---------------------- -All pull requests go through `GitHub Actions`_, which runs the tests on Linux -and Mac OS X as well as the flake8 style checker. Windows builds run on AppVeyor_, -while additional Unix-like platforms are tested on Golem_. +All pull requests go through `GitHub Actions`_, which runs the tests on misc. +Python versions and on misc. platforms as well as some additional checks. -.. _AppVeyor: https://ci.appveyor.com/project/borgbackup/borg/ -.. _Golem: https://golem.enkore.de/view/Borg/ .. _GitHub Actions: https://github.com/borgbackup/borg/actions Output and Logging From e0f80812a5ddc247f4bd814dbc31f8d59bd024e1 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 4 Jul 2023 20:20:35 +0200 Subject: [PATCH 2/6] docs: no signature upload on pypi any more but we upload it on github releases, so people can check it. --- docs/development.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/development.rst b/docs/development.rst index 6a27e78c8..801b86292 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -333,6 +333,9 @@ Checklist: scripts/sdist-sign X.Y.Z scripts/upload-pypi X.Y.Z test scripts/upload-pypi X.Y.Z + + Note: the signature is not uploaded to PyPi any more, but we upload it to + github releases. - Put binaries into dist/borg-OSNAME and sign them: :: @@ -350,6 +353,7 @@ Checklist: - Create a GitHub release, include: + * pypi dist package and signature * Standalone binaries (see above for how to create them). + For OS X, document the OS X Fuse version in the README of the binaries. From d13b5d5557488792b42bba03ce56bfc4af8cf9c7 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 4 Jul 2023 23:32:36 +0200 Subject: [PATCH 3/6] docs: remove info about borg 1.0 files per dir --- docs/usage/general/file-systems.rst.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/usage/general/file-systems.rst.inc b/docs/usage/general/file-systems.rst.inc index 60b7f46f9..6651d54a7 100644 --- a/docs/usage/general/file-systems.rst.inc +++ b/docs/usage/general/file-systems.rst.inc @@ -21,7 +21,7 @@ and readable after one of the failures mentioned above occurred, run - At least three directory levels with short names - Typically, file sizes up to a few hundred MB. Large repositories may require large files (>2 GB). -- Up to 1000 files per directory (10000 for repositories initialized with Borg 1.0) +- Up to 1000 files per directory. - rename(2) / MoveFile(Ex) should work as specified, i.e. on the same file system it should be a move (not a copy) operation, and in case of a directory it should fail if the destination exists and is not an empty directory, From 661e5cccd328d01259224b7adde4f9095da8ae3f Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 27 Oct 2023 20:27:51 +0200 Subject: [PATCH 4/6] docs: minor fixes/update to notes --- docs/usage/notes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/usage/notes.rst b/docs/usage/notes.rst index 546b6bf9c..8805f2765 100644 --- a/docs/usage/notes.rst +++ b/docs/usage/notes.rst @@ -276,7 +276,7 @@ with file 6:: That's all to do in the repository. -If you want to access this rollbacked repository from a client that already has +If you want to access this rolled back repository from a client that already has a cache for this repository, the cache will reflect a newer repository state than what you actually have in the repository now, after the rollback. From 7a4d53c2f521fc27a0aab004fb1be54bf6f5e2b7 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 4 Jul 2023 23:55:06 +0200 Subject: [PATCH 5/6] docs: update macOS hint about full disk access --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index a6e4824f8..89704cfdb 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -266,7 +266,7 @@ the installed ``openssl`` formula, point pkg-config to the correct path:: PKG_CONFIG_PATH="/usr/local/opt/openssl@1.1/lib/pkgconfig" pip install borgbackup[llfuse] -For OS X Catalina and later, be aware that you must authorize full disk access. +Be aware that for all recent macOS releases you must authorize full disk access. It is no longer sufficient to run borg backups as root. If you have not yet granted full disk access, and you run Borg backup from cron, you will see messages such as:: From 05cec8b3b02020513fc9933feafca31e91f8d32e Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 4 Jul 2023 23:56:29 +0200 Subject: [PATCH 6/6] docs: OS X -> macOS --- docs/development.rst | 4 ++-- docs/usage/general/file-metadata.rst.inc | 2 +- src/borg/testsuite/platform.py | 2 +- src/borg/xattr.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/development.rst b/docs/development.rst index 801b86292..5aa726d29 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -356,7 +356,7 @@ Checklist: * pypi dist package and signature * Standalone binaries (see above for how to create them). - + For OS X, document the OS X Fuse version in the README of the binaries. - OS X FUSE uses a kernel extension that needs to be compatible with the + + For macOS, document the macFUSE version in the README of the binaries. + macFUSE uses a kernel extension that needs to be compatible with the code contained in the binary. * A link to ``CHANGES.rst``. diff --git a/docs/usage/general/file-metadata.rst.inc b/docs/usage/general/file-metadata.rst.inc index 8f4c67cbf..5fd0d4d8f 100644 --- a/docs/usage/general/file-metadata.rst.inc +++ b/docs/usage/general/file-metadata.rst.inc @@ -29,7 +29,7 @@ On some platforms additional features are supported: +=========================+==========+===========+============+ | Linux | Yes | Yes | Yes [1]_ | +-------------------------+----------+-----------+------------+ -| Mac OS X | Yes | Yes | Yes (all) | +| macOS | Yes | Yes | Yes (all) | +-------------------------+----------+-----------+------------+ | FreeBSD | Yes | Yes | Yes (all) | +-------------------------+----------+-----------+------------+ diff --git a/src/borg/testsuite/platform.py b/src/borg/testsuite/platform.py index 659e4376e..92fda6c04 100644 --- a/src/borg/testsuite/platform.py +++ b/src/borg/testsuite/platform.py @@ -149,7 +149,7 @@ class PlatformLinuxTestCase(BaseTestCase): self.assert_equal(acl_use_local_uid_gid(b'group:root:rw-:0'), b'group:0:rw-') -@unittest.skipUnless(sys.platform.startswith('darwin'), 'OS X only test') +@unittest.skipUnless(sys.platform.startswith('darwin'), 'macOS only test') @unittest.skipIf(fakeroot_detected(), 'not compatible with fakeroot') class PlatformDarwinTestCase(BaseTestCase): diff --git a/src/borg/xattr.py b/src/borg/xattr.py index 7bc63a75d..76e3b8d41 100644 --- a/src/borg/xattr.py +++ b/src/borg/xattr.py @@ -1,4 +1,4 @@ -"""A basic extended attributes (xattr) implementation for Linux, FreeBSD and MacOS X.""" +"""A basic extended attributes (xattr) implementation for Linux, FreeBSD and macOS.""" import errno import os