diff --git a/files/0001-Set-XDG-variables-in-tests.patch b/files/0001-Set-XDG-variables-in-tests.patch new file mode 100644 --- /dev/null +++ b/files/0001-Set-XDG-variables-in-tests.patch @@ -0,0 +1,24 @@ +From e4df66126490c5b0793991db64f4ce47df9377de Mon Sep 17 00:00:00 2001 +From: Fabio Forni +Date: Thu, 14 Apr 2022 23:37:52 +0200 +Subject: [PATCH] Set XDG variables in tests + +--- + tests/conftest.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/conftest.py b/tests/conftest.py +index 964458b..82218de 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -69,5 +69,7 @@ def set_shell(monkeypatch): + @pytest.fixture(autouse=True) + def os_environ(monkeypatch): + env = {'PATH': os.environ['PATH']} ++ env['XDG_CONFIG_HOME'] = str(Path('.').resolve()) ++ env['XDG_CACHE_HOME'] = str(Path('.').resolve()) + monkeypatch.setattr('os.environ', env) + return env +-- +2.35.1 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,21 +1,33 @@ name : thefuck -version : '3.30' -release : 16 +version : '3.32' +release : 17 source : - - https://github.com/nvbn/thefuck/archive/3.30.tar.gz : dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3 + - https://github.com/nvbn/thefuck/archive/3.32.tar.gz : 76cbb014473672d1c384922857f8fbc1f6f7774f74f784149ad88751854ecfdf license : MIT component : system.utils summary : Magnificent app which corrects your previous console command description: | Magnificent app which corrects your previous console command +builddeps : + - python-colorama # Check. + - python-decorator # Check. + - python-psutil # Check. + - python-pyte # Check. + - python-pytest-mock # Check. rundeps : - python-colorama - python-decorator - python-psutil - python-pyte - - python-six build : | %python3_setup install : | %python3_install install -Dm00755 $pkgfiles/thefuck.sh $installdir/usr/share/defaults/etc/profile.d/thefuck.sh +check : | + cd thefuck-%version% + + # Set environment variables to avoid writing into /root. + # Also, disable tests that don't honor such env variables. + %patch -p1 < $pkgfiles/0001-Set-XDG-variables-in-tests.patch + python3 -m pytest --capture=sys -k 'not test_get_all_executables_exclude_paths' tests diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ thefuck - Joey Riches - josephriches@gmail.com + Fabio Forni + livingsilver94.solus@redaril.me MIT system.utils @@ -21,13 +21,13 @@ /usr/bin/fuck /usr/bin/thefuck - /usr/lib/python3.9/site-packages/thefuck-3.30-py3.9.egg-info/PKG-INFO - /usr/lib/python3.9/site-packages/thefuck-3.30-py3.9.egg-info/SOURCES.txt - /usr/lib/python3.9/site-packages/thefuck-3.30-py3.9.egg-info/dependency_links.txt - /usr/lib/python3.9/site-packages/thefuck-3.30-py3.9.egg-info/entry_points.txt - /usr/lib/python3.9/site-packages/thefuck-3.30-py3.9.egg-info/not-zip-safe - /usr/lib/python3.9/site-packages/thefuck-3.30-py3.9.egg-info/requires.txt - /usr/lib/python3.9/site-packages/thefuck-3.30-py3.9.egg-info/top_level.txt + /usr/lib/python3.9/site-packages/thefuck-3.32-py3.9.egg-info/PKG-INFO + /usr/lib/python3.9/site-packages/thefuck-3.32-py3.9.egg-info/SOURCES.txt + /usr/lib/python3.9/site-packages/thefuck-3.32-py3.9.egg-info/dependency_links.txt + /usr/lib/python3.9/site-packages/thefuck-3.32-py3.9.egg-info/entry_points.txt + /usr/lib/python3.9/site-packages/thefuck-3.32-py3.9.egg-info/not-zip-safe + /usr/lib/python3.9/site-packages/thefuck-3.32-py3.9.egg-info/requires.txt + /usr/lib/python3.9/site-packages/thefuck-3.32-py3.9.egg-info/top_level.txt /usr/lib/python3.9/site-packages/thefuck/__init__.py /usr/lib/python3.9/site-packages/thefuck/__pycache__/__init__.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/__pycache__/argument_parser.cpython-39.pyc @@ -87,11 +87,13 @@ /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/cargo_no_command.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/cat_dir.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/cd_correction.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/cd_cs.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/cd_mkdir.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/cd_parent.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/chmod_x.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/choco_install.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/composer_not_command.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/conda_mistype.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/cp_create_destination.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/cp_omitting_directory.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/cpp11.cpython-39.pyc @@ -111,11 +113,14 @@ /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_add.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_add_force.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_bisect_usage.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_branch_0flag.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_branch_delete.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_branch_delete_checked_out.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_branch_exists.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_branch_list.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_checkout.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_clone_git_clone.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_commit_add.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_commit_amend.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_commit_reset.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_diff_no_index.cpython-39.pyc @@ -123,6 +128,9 @@ /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_fix_stash.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_flag_after_filename.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_help_aliased.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_hook_bypass.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_lfs_mistype.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_main_master.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_merge.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_merge_unrelated.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/git_not_command.cpython-39.pyc @@ -180,8 +188,10 @@ /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/npm_missing_script.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/npm_run_script.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/npm_wrong_command.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/omnienv_no_such_command.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/open.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/pacman.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/pacman_invalid_option.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/pacman_not_found.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/path_from_history.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/php_s.cpython-39.pyc @@ -189,10 +199,11 @@ /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/pip_unknown_command.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/port_already_in_use.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/prove_recursively.cpython-39.pyc - /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/pyenv_no_such_command.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/python_command.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/python_execute.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/python_module_error.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/quotation_marks.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/rails_migrations_pending.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/react_native_command_unrecognized.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/remove_shell_prompt_literal.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/remove_trailing_cedilla.cpython-39.pyc @@ -217,6 +228,7 @@ /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/vagrant_up.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/whois.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/workon_doesnt_exists.cpython-39.pyc + /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/wrong_hyphen_before_subcommand.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/yarn_alias.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/yarn_command_not_found.cpython-39.pyc /usr/lib/python3.9/site-packages/thefuck/rules/__pycache__/yarn_command_replaced.cpython-39.pyc @@ -242,11 +254,13 @@ /usr/lib/python3.9/site-packages/thefuck/rules/cargo_no_command.py /usr/lib/python3.9/site-packages/thefuck/rules/cat_dir.py /usr/lib/python3.9/site-packages/thefuck/rules/cd_correction.py + /usr/lib/python3.9/site-packages/thefuck/rules/cd_cs.py /usr/lib/python3.9/site-packages/thefuck/rules/cd_mkdir.py /usr/lib/python3.9/site-packages/thefuck/rules/cd_parent.py /usr/lib/python3.9/site-packages/thefuck/rules/chmod_x.py /usr/lib/python3.9/site-packages/thefuck/rules/choco_install.py /usr/lib/python3.9/site-packages/thefuck/rules/composer_not_command.py + /usr/lib/python3.9/site-packages/thefuck/rules/conda_mistype.py /usr/lib/python3.9/site-packages/thefuck/rules/cp_create_destination.py /usr/lib/python3.9/site-packages/thefuck/rules/cp_omitting_directory.py /usr/lib/python3.9/site-packages/thefuck/rules/cpp11.py @@ -266,11 +280,14 @@ /usr/lib/python3.9/site-packages/thefuck/rules/git_add.py /usr/lib/python3.9/site-packages/thefuck/rules/git_add_force.py /usr/lib/python3.9/site-packages/thefuck/rules/git_bisect_usage.py + /usr/lib/python3.9/site-packages/thefuck/rules/git_branch_0flag.py /usr/lib/python3.9/site-packages/thefuck/rules/git_branch_delete.py /usr/lib/python3.9/site-packages/thefuck/rules/git_branch_delete_checked_out.py /usr/lib/python3.9/site-packages/thefuck/rules/git_branch_exists.py /usr/lib/python3.9/site-packages/thefuck/rules/git_branch_list.py /usr/lib/python3.9/site-packages/thefuck/rules/git_checkout.py + /usr/lib/python3.9/site-packages/thefuck/rules/git_clone_git_clone.py + /usr/lib/python3.9/site-packages/thefuck/rules/git_commit_add.py /usr/lib/python3.9/site-packages/thefuck/rules/git_commit_amend.py /usr/lib/python3.9/site-packages/thefuck/rules/git_commit_reset.py /usr/lib/python3.9/site-packages/thefuck/rules/git_diff_no_index.py @@ -278,6 +295,9 @@ /usr/lib/python3.9/site-packages/thefuck/rules/git_fix_stash.py /usr/lib/python3.9/site-packages/thefuck/rules/git_flag_after_filename.py /usr/lib/python3.9/site-packages/thefuck/rules/git_help_aliased.py + /usr/lib/python3.9/site-packages/thefuck/rules/git_hook_bypass.py + /usr/lib/python3.9/site-packages/thefuck/rules/git_lfs_mistype.py + /usr/lib/python3.9/site-packages/thefuck/rules/git_main_master.py /usr/lib/python3.9/site-packages/thefuck/rules/git_merge.py /usr/lib/python3.9/site-packages/thefuck/rules/git_merge_unrelated.py /usr/lib/python3.9/site-packages/thefuck/rules/git_not_command.py @@ -335,8 +355,10 @@ /usr/lib/python3.9/site-packages/thefuck/rules/npm_missing_script.py /usr/lib/python3.9/site-packages/thefuck/rules/npm_run_script.py /usr/lib/python3.9/site-packages/thefuck/rules/npm_wrong_command.py + /usr/lib/python3.9/site-packages/thefuck/rules/omnienv_no_such_command.py /usr/lib/python3.9/site-packages/thefuck/rules/open.py /usr/lib/python3.9/site-packages/thefuck/rules/pacman.py + /usr/lib/python3.9/site-packages/thefuck/rules/pacman_invalid_option.py /usr/lib/python3.9/site-packages/thefuck/rules/pacman_not_found.py /usr/lib/python3.9/site-packages/thefuck/rules/path_from_history.py /usr/lib/python3.9/site-packages/thefuck/rules/php_s.py @@ -344,10 +366,11 @@ /usr/lib/python3.9/site-packages/thefuck/rules/pip_unknown_command.py /usr/lib/python3.9/site-packages/thefuck/rules/port_already_in_use.py /usr/lib/python3.9/site-packages/thefuck/rules/prove_recursively.py - /usr/lib/python3.9/site-packages/thefuck/rules/pyenv_no_such_command.py /usr/lib/python3.9/site-packages/thefuck/rules/python_command.py /usr/lib/python3.9/site-packages/thefuck/rules/python_execute.py + /usr/lib/python3.9/site-packages/thefuck/rules/python_module_error.py /usr/lib/python3.9/site-packages/thefuck/rules/quotation_marks.py + /usr/lib/python3.9/site-packages/thefuck/rules/rails_migrations_pending.py /usr/lib/python3.9/site-packages/thefuck/rules/react_native_command_unrecognized.py /usr/lib/python3.9/site-packages/thefuck/rules/remove_shell_prompt_literal.py /usr/lib/python3.9/site-packages/thefuck/rules/remove_trailing_cedilla.py @@ -372,6 +395,7 @@ /usr/lib/python3.9/site-packages/thefuck/rules/vagrant_up.py /usr/lib/python3.9/site-packages/thefuck/rules/whois.py /usr/lib/python3.9/site-packages/thefuck/rules/workon_doesnt_exists.py + /usr/lib/python3.9/site-packages/thefuck/rules/wrong_hyphen_before_subcommand.py /usr/lib/python3.9/site-packages/thefuck/rules/yarn_alias.py /usr/lib/python3.9/site-packages/thefuck/rules/yarn_command_not_found.py /usr/lib/python3.9/site-packages/thefuck/rules/yarn_command_replaced.py @@ -424,12 +448,12 @@ - - 2021-07-29 - 3.30 + + 2022-04-14 + 3.32 Packaging update - Joey Riches - josephriches@gmail.com + Fabio Forni + livingsilver94.solus@redaril.me \ No newline at end of file