Created attachment 239383 [details] Patch After updating to py-rdiff-backup-2.2.0 on the quarterly branch, I began running into failures using rdiff-backup due to a missing run dependency on devel/py-yaml. I've attached a patch that corrects this issue along with an update to support version 2.2.2 that was released two weeks ago. Traceback (most recent call last): File "/usr/local/bin/rdiff-backup", line 33, in <module> sys.exit(load_entry_point('rdiff-backup==2.2.0', 'console_scripts', 'rdiff-backup')()) File "/usr/local/bin/rdiff-backup", line 25, in importlib_load_entry_point return next(matches).load() File "/usr/local/lib/python3.9/importlib/metadata.py", line 86, in load module = import_module(match.group('module')) File "/usr/local/lib/python3.9/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "<frozen importlib._bootstrap>", line 1030, in _gcd_import File "<frozen importlib._bootstrap>", line 1007, in _find_and_load File "<frozen importlib._bootstrap>", line 986, in _find_and_load_unlocked File "<frozen importlib._bootstrap>", line 680, in _load_unlocked File "<frozen importlib._bootstrap_external>", line 850, in exec_module File "<frozen importlib._bootstrap>", line 228, in _call_with_frames_removed File "/usr/local/lib/python3.9/site-packages/rdiffbackup/run.py", line 24, in <module> from rdiffbackup import arguments, actions_mgr, actions File "/usr/local/lib/python3.9/site-packages/rdiffbackup/actions_mgr.py", line 27, in <module> import rdiffbackup.actions File "/usr/local/lib/python3.9/site-packages/rdiffbackup/actions/__init__.py", line 31, in <module> import yaml ModuleNotFoundError: No module named 'yaml'
Thanks for report and patch. I think it's okay.
My pleasure. Thanks!
From requirements: --- #--- mandatory --- setuptools # also listed in setup.py! setuptools-scm importlib-metadata ; python_version < "3.8" PyYAML # for rdiff-backup >= 2.1 --- Shouldn't py-yaml be in BUILD_DEPENDS instead of RUN_DEPENDS?
That's a good point - oddly enough, rdiff-backup builds fine without PyYAML installed, but I agree. If it's listed in requirements.txt it should be in BUILD_DEPENDS. I'll upload a new patch.
Created attachment 239390 [details] Patch #2
Created attachment 239392 [details] Patch #3
Comment on attachment 239392 [details] Patch #3 I think shouldn't introduce a new variable (PY_DEPENDS). The py-yaml goes into RUN_DEPENDS and add RUN_DEPENDS to the BUILD_DEPENDS: RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} BUILD_DEPENDS+= ${RUN_DEPENDS}
Created attachment 239404 [details] Patch #4 SGTM. Updated patch attached!
(In reply to Steven Stallion from comment #8) That's fine too, same as BUILD_DEPENDS+= and portfmt sugests it. I've noticed that testunit fails in both 2.2.0 and 2.2.2, do you need do some testing before I commit it? Cheers
(In reply to Nuno Teixeira from comment #9) I can't speak for Zsolt, but I've been using these changes running nightly backups for the last couple of nights without any issues.
(In reply to Nuno Teixeira from comment #9) Do you mean do-test? Can I run it with poudriere? Or how should I run it?
(In reply to Zsolt Udvari from comment #11) You can run it in a poudriere interactive jail: e.g., jail==131amd64 and ports==main: --- $ poudriere testport -i -j 131amd64 -p main -o sysutils/py-rdiff-backup Inside jail you will need super user rights: $ su $ make test $ exit (to exit from su command) $ exit (to leave jail) If jail==140amd64, then inside it, cd to /usr/ports/sysutils/py-rdiff-backup and do the same commands. If testunit is broken due to upstream problems then we can add a "special" do-test-fail target until is fixed. Need to search on Mk/* scripts whats the target to use.
Thanks. Should add git and py-sqlite3 to test-dependencies and run tools/setup-testfiles.sh script. But it fails: Test files not found, installing them... Cloning into 'rdiff-backup-filesrepo'... remote: Enumerating objects: 6, done. remote: Total 6 (delta 0), reused 0 (delta 0), pack-reused 6 Receiving objects: 100% (6/6), 3.36 MiB | 4.81 MiB/s, done. rdiff-backup_testfiles/root/ttyS0: Can't create 'rdiff-backup_testfiles/root/ttyS0': Operation not permitted rdiff-backup_testfiles/root/sonycd: Can't create 'rdiff-backup_testfiles/root/sonycd': Operation not permitted rdiff-backup_testfiles/select/filetypes/ttyS1: Can't create 'rdiff-backup_testfiles/select/filetypes/ttyS1': Operation not permitted I test it manually. The reason of error is the user is not root (I don't know why).
(In reply to Zsolt Udvari from comment #13) I've looked at other examples about test failures like: do-test: # 2 tests fail, see https://github.com/MolSSI/QCElemental/issues/293 (...) I think we can apply the same to this port so users know about it. I know that tests don't work on 2.2.0 and 2.2.2 and if it ever worked on past versions. Any ideia of failure comment?
(In reply to Nuno Teixeira from comment #14) See https://github.com/rdiff-backup/rdiff-backup/blob/master/Makefile#L22 The tools/setup-testfiles.sh run. It (git-)clones https://github.com/rdiff-backup/rdiff-backup-filesrepo.git - runs without any error. After it untar https://github.com/rdiff-backup/rdiff-backup-filesrepo/blob/master/rdiff-backup_testfiles.tar file. It contains some files that cause error, they're: # file root/ttyS0 root/sonycd select/filetypes/ttyS1 root/ttyS0: character special (3/48) root/sonycd: block special (15/0) select/filetypes/ttyS1: character special (4/65) (https://github.com/rdiff-backup/rdiff-backup/blob/v2.1.4rc0/docs/DEVELOP.adoc#testing) I think simply should add TEST_TARGET=test (and delete do-test: target) but I don't know what should write instead of RUN_COMMAND (https://github.com/rdiff-backup/rdiff-backup/blob/master/Makefile#L5). I'm working on it...
Hey All, Just checking in - has there been any progress?
I'm working on it but I have only a little time.
Created attachment 240093 [details] update to 2.2.3 Update to 2.2.3. Remove test-releated things.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268863
Comment on attachment 240093 [details] update to 2.2.3 Obsoleted by bug #270692.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=8678ecc56992a10b50d0d444e3b77fd9e93208fa commit 8678ecc56992a10b50d0d444e3b77fd9e93208fa Author: Zsolt Udvari <uzsolt@uzsolt.hu> AuthorDate: 2023-04-08 11:34:45 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-04-09 16:28:49 +0000 sysutils/py-rdiff-backup: update to 2.2.4 Changelog: https://github.com/rdiff-backup/rdiff-backup/blob/v2.2.4/CHANGELOG.adoc#new-in-v2-2-4-2023-02-27 Reported by: Steven Stallion <sstallion@gmail.com> PR: 270692, 268863 MFH: 2023Q2 sysutils/py-rdiff-backup/Makefile | 10 ++++------ sysutils/py-rdiff-backup/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-)
A commit in branch 2023Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a483bfec6a8b76bb8ce1faf4e3217ea8a19704b commit 9a483bfec6a8b76bb8ce1faf4e3217ea8a19704b Author: Zsolt Udvari <uzsolt@uzsolt.hu> AuthorDate: 2023-04-08 11:34:45 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-04-09 16:31:48 +0000 sysutils/py-rdiff-backup: update to 2.2.4 Changelog: https://github.com/rdiff-backup/rdiff-backup/blob/v2.2.4/CHANGELOG.adoc#new-in-v2-2-4-2023-02-27 Reported by: Steven Stallion <sstallion@gmail.com> PR: 270692, 268863 MFH: 2023Q2 (cherry picked from commit 8678ecc56992a10b50d0d444e3b77fd9e93208fa) sysutils/py-rdiff-backup/Makefile | 10 ++++------ sysutils/py-rdiff-backup/distinfo | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-)