!7 remove python2

From: @renxichen 
Reviewed-by: @overweight 
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2022-06-20 08:10:05 +00:00 committed by Gitee
commit 510e46c11e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 75 additions and 1 deletions

View File

@ -0,0 +1,70 @@
From f13d6bc1c1675eddf148db3d0b942872aef398ec Mon Sep 17 00:00:00 2001
From: renhongxun <renhongxun@h-partners.com>
Date: Mon, 20 Jun 2022 10:54:26 +0800
Subject: [PATCH] bash-completion remove python2
---
completions/Makefile.am | 4 +---
completions/Makefile.in | 4 +---
completions/python | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 723b42f..2d0c0f2 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -666,8 +666,6 @@ CLEANFILES = \
pypy3 \
pytest-2 \
pytest-3 \
- python2 \
- python2.7 \
python3 \
python3.3 \
python3.4 \
@@ -890,7 +888,7 @@ symlinks: $(DATA)
$(ss) pylint \
pylint-2 pylint-3
$(ss) python \
- micropython pypy pypy3 python2 python2.7 python3 python3.3 python3.4 python3.5 python3.6 python3.7 python3.8
+ micropython pypy pypy3 python3 python3.3 python3.4 python3.5 python3.6 python3.7 python3.8
$(ss) pyvenv \
pyvenv-3.4 pyvenv-3.5 pyvenv-3.6 pyvenv-3.7 pyvenv-3.8
$(ss) qdbus \
diff --git a/completions/Makefile.in b/completions/Makefile.in
index b8a439f..fe2ad1c 100644
--- a/completions/Makefile.in
+++ b/completions/Makefile.in
@@ -890,8 +890,6 @@ CLEANFILES = \
pypy3 \
pytest-2 \
pytest-3 \
- python2 \
- python2.7 \
python3 \
python3.3 \
python3.4 \
@@ -1332,7 +1330,7 @@ symlinks: $(DATA)
$(ss) pylint \
pylint-2 pylint-3
$(ss) python \
- micropython pypy pypy3 python2 python2.7 python3 python3.3 python3.4 python3.5 python3.6 python3.7 python3.8
+ micropython pypy pypy3 python3 python3.3 python3.4 python3.5 python3.6 python3.7 python3.8
$(ss) pyvenv \
pyvenv-3.4 pyvenv-3.5 pyvenv-3.6 pyvenv-3.7 pyvenv-3.8
$(ss) qdbus \
diff --git a/completions/python b/completions/python
index d50c18f..a8c17db 100644
--- a/completions/python
+++ b/completions/python
@@ -62,6 +62,6 @@ _python()
COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
fi
} &&
- complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
+ complete -F _python python python3 python3.{3..8} pypy pypy3 micropython
# ex: filetype=sh
--
1.8.3.1

View File

@ -3,7 +3,7 @@
Name: bash-completion Name: bash-completion
Version: 2.11 Version: 2.11
Release: 1 Release: 2
Epoch: 1 Epoch: 1
Summary: Completion for bash command Summary: Completion for bash command
License: GPLv2+ License: GPLv2+
@ -11,6 +11,7 @@ URL: https://github.com/scop/bash-completion
Source0: https://github.com/scop/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source0: https://github.com/scop/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Patch0: %{name}-1.99-noblacklist.patch Patch0: %{name}-1.99-noblacklist.patch
Patch1: bash-completion-remove-python2.patch
BuildArch: noarch BuildArch: noarch
@ -64,6 +65,9 @@ make -C completions check
%doc CHANGES README.md doc/bash_completion.txt CONTRIBUTING.md %doc CHANGES README.md doc/bash_completion.txt CONTRIBUTING.md
%changelog %changelog
* Mon Jun 20 2022 renhongxun <renhongxun@h-partners.com> - 1:2.11-2
- remove python2
* Tue Jan 26 2021 fuanan <fuanan3@huawei.com> - 1:2.11-1 * Tue Jan 26 2021 fuanan <fuanan3@huawei.com> - 1:2.11-1
- Update to version 2.11 - Update to version 2.11