public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/trash-cli] main: Update trash-cli to 0.26.9.14
@ 2026-09-20 15:08 Jose
0 siblings, 0 replies; only message in thread
From: Jose @ 2026-09-20 15:08 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/trash-cli
Branch : main
Commit : 15ae1dddffe1842b3e1227741b69f85a5e530221
Author : Jose <joxzes@pm.me>
Date : 2026-09-14T22:13:16-05:00
Stats : +5/-352 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/trash-cli/c/15ae1dddffe1842b3e1227741b69f85a5e530221?branch=main
Log:
Update trash-cli to 0.26.9.14
---
diff --git a/trash-cli-0.24.5.26-no-parameterized.patch b/trash-cli-0.24.5.26-no-parameterized.patch
deleted file mode 100644
index de69db8..0000000
--- a/trash-cli-0.24.5.26-no-parameterized.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -Naur trash-cli-0.24.5.26-original/requirements-dev.txt trash-cli-0.24.5.26/requirements-dev.txt
---- trash-cli-0.24.5.26-original/requirements-dev.txt 2024-05-26 10:31:07.000000000 +0100
-+++ trash-cli-0.24.5.26/requirements-dev.txt 2025-11-15 08:59:50.713467488 +0000
-@@ -2,7 +2,6 @@
- pytest
- mock
- flexmock
--parameterized
- tox
- PyYAML <= 5.4.1; python_version ~= '2.7'
- PyYAML <= 5.2; python_version ~= '3.4'
-diff -Naur trash-cli-0.24.5.26-original/tests/test_put/components/test_original_location.py trash-cli-0.24.5.26/tests/test_put/components/test_original_location.py
---- trash-cli-0.24.5.26-original/tests/test_put/components/test_original_location.py 2024-05-26 10:31:07.000000000 +0100
-+++ trash-cli-0.24.5.26/tests/test_put/components/test_original_location.py 2025-11-15 08:59:50.713578031 +0000
-@@ -1,7 +1,6 @@
- import os
--import unittest
-
--from parameterized import parameterized # type: ignore
-+import pytest
-
- from tests.support.put.fake_fs.fake_fs import FakeFs
- from trashcli.put.core.path_maker_type import PathMakerType
-@@ -11,29 +10,34 @@
- RelativePaths = PathMakerType.RelativePaths
-
-
--class TestOriginalLocation(unittest.TestCase):
--
-- def setUp(self):
-- self.original_location = OriginalLocation(FakeFsWithRealpath())
--
-- @parameterized.expand([
-- ('/volume', '/file', AbsolutePaths, '/file',),
-- ('/volume', '/file/././', AbsolutePaths, '/file',),
-- ('/volume', '/dir/../file', AbsolutePaths, '/file'),
-- ('/volume', '/dir/../././file', AbsolutePaths, '/file'),
-- ('/volume', '/outside/file', AbsolutePaths, '/outside/file'),
-- ('/volume', '/volume/file', AbsolutePaths, '/volume/file',),
-- ('/volume', '/volume/dir/file', AbsolutePaths, '/volume/dir/file'),
-- ('/volume', '/file', RelativePaths, '/file'),
-- ('/volume', '/dir/../file', RelativePaths, '/file'),
-- ('/volume', '/outside/file', RelativePaths, '/outside/file'),
-- ('/volume', '/volume/file', RelativePaths, 'file'),
-- ('/volume', '/volume/dir/file', RelativePaths, 'dir/file'),
-- ])
-+@pytest.fixture()
-+def original_location():
-+ yield OriginalLocation(FakeFsWithRealpath())
-+
-+
-+class TestOriginalLocation:
-+
-+ @pytest.mark.parametrize(
-+ "volume,file_to_be_trashed,path_type,expected_result",
-+ [
-+ ('/volume', '/file', AbsolutePaths, '/file',),
-+ ('/volume', '/file/././', AbsolutePaths, '/file',),
-+ ('/volume', '/dir/../file', AbsolutePaths, '/file'),
-+ ('/volume', '/dir/../././file', AbsolutePaths, '/file'),
-+ ('/volume', '/outside/file', AbsolutePaths, '/outside/file'),
-+ ('/volume', '/volume/file', AbsolutePaths, '/volume/file',),
-+ ('/volume', '/volume/dir/file', AbsolutePaths, '/volume/dir/file'),
-+ ('/volume', '/file', RelativePaths, '/file'),
-+ ('/volume', '/dir/../file', RelativePaths, '/file'),
-+ ('/volume', '/outside/file', RelativePaths, '/outside/file'),
-+ ('/volume', '/volume/file', RelativePaths, 'file'),
-+ ('/volume', '/volume/dir/file', RelativePaths, 'dir/file'),
-+ ]
-+ )
- def test_original_location(self, volume, file_to_be_trashed, path_type,
-- expected_result):
-- result = self.original_location.for_file(file_to_be_trashed, path_type,
-- volume)
-+ expected_result, original_location):
-+ result = original_location.for_file(file_to_be_trashed, path_type,
-+ volume)
- assert expected_result == result
-
-
-diff -Naur trash-cli-0.24.5.26-original/tests/test_support/test_help_reformatting/test_split_paragraphs.py trash-cli-0.24.5.26/tests/test_support/test_help_reformatting/test_split_paragraphs.py
---- trash-cli-0.24.5.26-original/tests/test_support/test_help_reformatting/test_split_paragraphs.py 2024-05-26 10:31:07.000000000 +0100
-+++ trash-cli-0.24.5.26/tests/test_support/test_help_reformatting/test_split_paragraphs.py 2025-11-15 08:59:50.713639281 +0000
-@@ -1,9 +1,9 @@
--from parameterized import parameterized # type: ignore
-+import pytest
-
- from tests.support.help.help_reformatting import split_paragraphs
-
-
--@parameterized.expand([
-+@pytest.mark.parametrize("text,expected_result", [
- ('one line', ['one line']),
- ('one line\n', ['one line\n']),
- ('one\ntwo\n', ['one\ntwo\n']),
-diff -Naur trash-cli-0.24.5.26-original/tox.ini trash-cli-0.24.5.26/tox.ini
---- trash-cli-0.24.5.26-original/tox.ini 2024-05-26 10:31:07.000000000 +0100
-+++ trash-cli-0.24.5.26/tox.ini 2025-11-15 08:59:50.713681281 +0000
-@@ -13,7 +13,6 @@
- pytest
- mock
- flexmock
-- parameterized
- # build testing
- setuptools
- commands =
diff --git a/trash-cli-rm-python-mock-usage.diff b/trash-cli-rm-python-mock-usage.diff
deleted file mode 100644
index cf8035c..0000000
--- a/trash-cli-rm-python-mock-usage.diff
+++ /dev/null
@@ -1,236 +0,0 @@
---- a/tests/test_dev_tools/test_make_scripts/test_list_of_created_scripts.py
-+++ b/tests/test_dev_tools/test_make_scripts/test_list_of_created_scripts.py
-@@ -1,4 +1,4 @@
--from mock import Mock
-+from unittest.mock import Mock
-
- from tests.support.make_scripts import Scripts
- from tests.support.make_scripts import script_path_without_base_dir_for
---- a/tests/test_dev_tools/test_make_scripts/test_make_script.py
-+++ b/tests/test_dev_tools/test_make_scripts/test_make_script.py
-@@ -1,7 +1,7 @@
- from textwrap import dedent
-
--import mock
--from mock import Mock
-+from unittest import mock
-+from unittest.mock import Mock
-
- from tests.support.make_scripts import Scripts
- from tests.support.make_scripts import script_path_for
---- a/tests/test_empty/cmd/test_empty_cmd.py
-+++ b/tests/test_empty/cmd/test_empty_cmd.py
-@@ -2,7 +2,7 @@
- import unittest
- from typing import cast
-
--from mock import call
-+from unittest.mock import call
- from six import StringIO
-
- from tests.support.fakes.stub_volume_of import StubVolumeOf
-@@ -14,7 +14,7 @@ from trashcli.fstab.volume_listing impor
- from trashcli.fstab.volume_listing import VolumesListing
- from trashcli.lib.dir_reader import DirReader
- from trashcli.trash_dirs_scanner import TopTrashDirRules
--from mock import Mock
-+from unittest.mock import Mock
-
- class TestTrashEmptyCmdFs(unittest.TestCase):
- def setUp(self):
---- a/tests/test_empty/cmd/test_empty_cmd_fs.py
-+++ b/tests/test_empty/cmd/test_empty_cmd_fs.py
-@@ -2,7 +2,7 @@
- import unittest
-
- import pytest
--from mock import Mock
-+from unittest.mock import Mock
- from six import StringIO
-
- from tests.support.fakes.stub_volume_of import StubVolumeOf
---- a/tests/test_empty/cmd/test_empty_cmd_with_multiple_volumes_fs.py
-+++ b/tests/test_empty/cmd/test_empty_cmd_with_multiple_volumes_fs.py
-@@ -2,7 +2,7 @@
- import os
- import unittest
-
--from mock import Mock
-+from unittest.mock import Mock
- from six import StringIO
-
- from tests.support.fakes.stub_volume_of import StubVolumeOf
---- a/tests/test_empty/components/test_clock.py
-+++ b/tests/test_empty/components/test_clock.py
-@@ -1,7 +1,7 @@
- import datetime
- import unittest
-
--from mock import Mock, call
-+from unittest.mock import Mock, call
- from trashcli.empty.clock import Clock
-
-
---- a/tests/test_empty/components/test_guard.py
-+++ b/tests/test_empty/components/test_guard.py
-@@ -1,6 +1,6 @@
- import unittest
-
--from mock import Mock, call
-+from unittest.mock import Mock, call
- from trashcli.empty.guard import Guard, UserIntention
-
-
---- a/tests/test_empty/components/test_user.py
-+++ b/tests/test_empty/components/test_user.py
-@@ -1,6 +1,6 @@
- import unittest
-
--from mock import Mock, call
-+from unittest.mock import Mock, call
-
- from trashcli.empty.user import User
- from trashcli.lib.my_input import HardCodedInput
---- a/tests/test_put/components/test_trash_directories_finder.py
-+++ b/tests/test_put/components/test_trash_directories_finder.py
-@@ -1,6 +1,6 @@
- import unittest
-
--from mock import Mock
-+from unittest.mock import Mock
-
- from trashcli.put.core.candidate import Candidate
- from trashcli.put.core.check_type import NoCheck, TopTrashDirCheck
---- a/tests/test_put/components/test_trash_put_reporter.py
-+++ b/tests/test_put/components/test_trash_put_reporter.py
-@@ -1,4 +1,4 @@
--from mock import Mock
-+from unittest.mock import Mock
- from six import StringIO
- from trashcli.put.describer import Describer
-
---- a/tests/test_restore/cmd/test_listing_in_restore_cmd.py
-+++ b/tests/test_restore/cmd/test_listing_in_restore_cmd.py
-@@ -1,6 +1,6 @@
- import unittest
-
--from mock import Mock
-+from unittest.mock import Mock
- from six import StringIO
-
- from trashcli.restore.file_system import FakeReadCwd
---- a/tests/test_restore/cmd/test_restore2.py
-+++ b/tests/test_restore/cmd/test_restore2.py
-@@ -1,7 +1,7 @@
- import datetime
- import unittest
-
--from mock import Mock, call
-+from unittest.mock import Mock, call
-
- from tests.support.restore.fake_restore_fs import FakeRestoreFs
- from tests.support.restore.restore_user import RestoreUser
---- a/tests/test_restore/cmd/test_trashed_file_restore_integration.py
-+++ b/tests/test_restore/cmd/test_trashed_file_restore_integration.py
-@@ -1,7 +1,7 @@
- import os
- import unittest
-
--from mock import Mock
-+from unittest.mock import Mock
- from six import StringIO
-
- from tests.support.files import make_empty_file
---- a/tests/test_restore/components/collaborators/test_restore_asking_the_user.py
-+++ b/tests/test_restore/components/collaborators/test_restore_asking_the_user.py
-@@ -1,6 +1,6 @@
- import unittest
-
--from mock import Mock, call
-+from unittest.mock import Mock, call
-
- from trashcli.lib.my_input import HardCodedInput
- from trashcli.restore.output_event import Quit
---- a/tests/test_restore/components/collaborators/test_trash_directories2.py
-+++ b/tests/test_restore/components/collaborators/test_trash_directories2.py
-@@ -1,7 +1,7 @@
- import unittest
-
- import pytest
--from mock import Mock, call
-+from unittest.mock import Mock, call
-
- from tests.support.fakes.stub_volume_of import StubVolumeOf
- from trashcli.restore.trash_directories import TrashDirectories2
---- a/tests/test_restore/components/trashed_files/test_trashed_files_integration.py
-+++ b/tests/test_restore/components/trashed_files/test_trashed_files_integration.py
-@@ -1,7 +1,7 @@
- import datetime
- import unittest
-
--from mock import Mock
-+from unittest.mock import Mock
-
- from tests.support.files import make_file, require_empty_dir
- from tests.support.dirs.remove_dir_if_exists import remove_dir_if_exists
---- a/tests/test_rm/cmd/test_trash_rm.py
-+++ b/tests/test_rm/cmd/test_trash_rm.py
-@@ -2,7 +2,7 @@ import unittest
-
- from six import StringIO
-
--from mock import Mock
-+from unittest.mock import Mock
-
- from tests.support.asserts import assert_starts_with
- from trashcli.rm.rm_cmd import RmCmd
---- a/tests/test_trashcli_lib/test_parsing_trashinfo_contents.py
-+++ b/tests/test_trashcli_lib/test_parsing_trashinfo_contents.py
-@@ -2,7 +2,7 @@
- import unittest
- from datetime import datetime
-
--from mock import MagicMock
-+from unittest.mock import MagicMock
-
- from trashcli.parse_trashinfo.parse_path import parse_path
- from trashcli.parse_trashinfo.parse_trashinfo import ParseTrashInfo
---- a/tests/test_trashcli_lib/trash_dir_scanner/test_top_trash_dir_rules.py
-+++ b/tests/test_trashcli_lib/trash_dir_scanner/test_top_trash_dir_rules.py
-@@ -1,6 +1,6 @@
- import unittest
-
--from mock import Mock, call
-+from unittest.mock import Mock, call
- from trashcli.trash_dirs_scanner import (
- TopTrashDirRules,
- top_trash_dir_does_not_exist,
---- a/tests/test_trashcli_lib/trash_dir_scanner/test_trash_dir_scanner.py
-+++ b/tests/test_trashcli_lib/trash_dir_scanner/test_trash_dir_scanner.py
-@@ -1,6 +1,6 @@
- import unittest
-
--from mock import Mock
-+from unittest.mock import Mock
-
- from trashcli.fstab.volume_listing import VolumesListing
- from trashcli.lib.dir_checker import DirChecker
---- a/requirements-dev.txt
-+++ b/requirements-dev.txt
-@@ -1,6 +1,5 @@
- # testing
- pytest
--mock
- flexmock
- tox
- PyYAML <= 5.4.1; python_version ~= '2.7'
---- a/tox.ini
-+++ b/tox.ini
-@@ -11,7 +11,6 @@ deps =
- enum34; python_version < '3.4'
- # testing
- pytest
-- mock
- flexmock
- # build testing
- setuptools
diff --git a/trash-cli.spec b/trash-cli.spec
index ffa0947..50dadee 100644
--- a/trash-cli.spec
+++ b/trash-cli.spec
@@ -1,18 +1,16 @@
Summary: Command line interface to the freedesktop.org trashcan
Name: trash-cli
-Version: 0.24.5.26
+Version: 0.26.9.14
Release: %autorelease
License: GPL-2.0-or-later
URL : https://github.com/andreafrancia/trash-cli
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-# Replace parameterized with built-in pytest functionality
-# https://github.com/andreafrancia/trash-cli/pull/373
-Patch2: trash-cli-0.24.5.26-no-parameterized.patch
-# remove python-mock usage
-Patch3: trash-cli-rm-python-mock-usage.diff
BuildArch: noarch
BuildRequires: python3-devel
+BuildRequires: python3dist(pytest)
+BuildRequires: python3dist(flexmock)
+BuildRequires: python3dist(pyyaml)
%description
trash-cli provides a command line trash usable with GNOME, KDE, Xfce or any
@@ -21,12 +19,9 @@ compatible with rm and you can use trash-put as an alias to rm.
%prep
%autosetup -n %{name}-%{version} -p1
-# Remove pinned virtualenv version required for tox,
-# which we only run to get the test depndencies anyway.
-sed -i '/requires = virtualenv</d' tox.ini
%generate_buildrequires
-%pyproject_buildrequires -t
+%pyproject_buildrequires
%build
%pyproject_wheel
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-20 15:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-20 15:08 [rpms/trash-cli] main: Update trash-cli to 0.26.9.14 Jose
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox