[gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/ - gentoo-commits

From:	Andrew Ammerlaan <andrewammerlaan@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/
Date:	Sat, 06 Nov 2021 16:20:30
Message-Id:	`1636215619.d2b7cdd9d107ba6b170d933fd89d7823e284b6bd.andrewammerlaan@gentoo`

1

commit:     d2b7cdd9d107ba6b170d933fd89d7823e284b6bd

2

Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>

3

AuthorDate: Sat Nov  6 16:20:02 2021 +0000

4

Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>

5

CommitDate: Sat Nov  6 16:20:19 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b7cdd9

7

8

dev-python/spyder: bring back Code Analysis

9

10

It was accidentally hit by our sed's

11

12

Closes: https://bugs.gentoo.org/821409

13

Package-Manager: Portage-3.0.28, Repoman-3.0.3

14

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

15

16

 .../{spyder-4.2.5-r2.ebuild => spyder-4.2.5-r3.ebuild}       | 12 ++++++++++--

17

 .../{spyder-5.0.5-r1.ebuild => spyder-5.0.5-r2.ebuild}       | 12 ++++++++++--

18

 .../{spyder-5.1.5-r1.ebuild => spyder-5.1.5-r2.ebuild}       | 10 +++++++++-

19

 3 files changed, 29 insertions(+), 5 deletions(-)

20

21

diff --git a/dev-python/spyder/spyder-4.2.5-r2.ebuild b/dev-python/spyder/spyder-4.2.5-r3.ebuild

22

similarity index 96%

23

rename from dev-python/spyder/spyder-4.2.5-r2.ebuild

24

rename to dev-python/spyder/spyder-4.2.5-r3.ebuild

25

index 0656eb1aa38..9d806017200 100644

26

--- a/dev-python/spyder/spyder-4.2.5-r2.ebuild

27

+++ b/dev-python/spyder/spyder-4.2.5-r3.ebuild

28

@@ -141,11 +141,19 @@ python_prepare_all() {

29

 	sed -i \

30

 		-e '/pyqt5/d' \

31

 		-e '/pyqtwebengine/d' \

32

-		-e '/python-language-server/d' \

33

 		-e '/python-lsp-server/d' \

34

 		-e '/parso/d' \

35

 		-e '/jedi/d' \

36

-			{setup.py,requirements/conda.txt} || die

37

+		-e '/pylint/d' \

38

+			requirements/conda.txt || die

39

+	sed -i \

40

+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \

41

+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \

42

+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \

43

+		-e "/'parso[ 0-9<=>.,]*',/d" \

44

+		-e "/'jedi[ 0-9<=>.,]*',/d" \

45

+		-e "/'pylint[ 0-9<=>.,]*',/d" \

46

+			setup.py || die

47

 	sed -i \

48

 		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \

49

 		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \

50

51

diff --git a/dev-python/spyder/spyder-5.0.5-r1.ebuild b/dev-python/spyder/spyder-5.0.5-r2.ebuild

52

similarity index 96%

53

rename from dev-python/spyder/spyder-5.0.5-r1.ebuild

54

rename to dev-python/spyder/spyder-5.0.5-r2.ebuild

55

index 15c28e9147d..60b669345ea 100644

56

--- a/dev-python/spyder/spyder-5.0.5-r1.ebuild

57

+++ b/dev-python/spyder/spyder-5.0.5-r2.ebuild

58

@@ -148,11 +148,19 @@ python_prepare_all() {

59

 	sed -i \

60

 		-e '/pyqt5/d' \

61

 		-e '/pyqtwebengine/d' \

62

-		-e '/python-language-server/d' \

63

 		-e '/python-lsp-server/d' \

64

 		-e '/parso/d' \

65

 		-e '/jedi/d' \

66

-			{setup.py,requirements/conda.txt} || die

67

+		-e '/pylint/d' \

68

+			requirements/conda.txt || die

69

+	sed -i \

70

+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \

71

+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \

72

+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \

73

+		-e "/'parso[ 0-9<=>.,]*',/d" \

74

+		-e "/'jedi[ 0-9<=>.,]*',/d" \

75

+		-e "/'pylint[ 0-9<=>.,]*',/d" \

76

+			setup.py || die

77

 	sed -i \

78

 		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \

79

 		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \

80

81

diff --git a/dev-python/spyder/spyder-5.1.5-r1.ebuild b/dev-python/spyder/spyder-5.1.5-r2.ebuild

82

similarity index 96%

83

rename from dev-python/spyder/spyder-5.1.5-r1.ebuild

84

rename to dev-python/spyder/spyder-5.1.5-r2.ebuild

85

index b2318fa8c7e..41c79713327 100644

86

--- a/dev-python/spyder/spyder-5.1.5-r1.ebuild

87

+++ b/dev-python/spyder/spyder-5.1.5-r2.ebuild

88

@@ -136,7 +136,15 @@ python_prepare_all() {

89

 		-e '/parso/d' \

90

 		-e '/jedi/d' \

91

 		-e '/pylint/d' \

92

-			{setup.py,requirements/conda.txt} || die

93

+			requirements/conda.txt || die

94

+	sed -i \

95

+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \

96

+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \

97

+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \

98

+		-e "/'parso[ 0-9<=>.,]*',/d" \

99

+		-e "/'jedi[ 0-9<=>.,]*',/d" \

100

+		-e "/'pylint[ 0-9<=>.,]*',/d" \

101

+			setup.py || die

102

 	sed -i \

103

 		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \

104

 		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \

1	commit: d2b7cdd9d107ba6b170d933fd89d7823e284b6bd
2	Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3	AuthorDate: Sat Nov 6 16:20:02 2021 +0000
4	Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5	CommitDate: Sat Nov 6 16:20:19 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b7cdd9
7
8	dev-python/spyder: bring back Code Analysis
9
10	It was accidentally hit by our sed's
11
12	Closes: https://bugs.gentoo.org/821409
13	Package-Manager: Portage-3.0.28, Repoman-3.0.3
14	Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
15
16	.../{spyder-4.2.5-r2.ebuild => spyder-4.2.5-r3.ebuild} \| 12 ++++++++++--
17	.../{spyder-5.0.5-r1.ebuild => spyder-5.0.5-r2.ebuild} \| 12 ++++++++++--
18	.../{spyder-5.1.5-r1.ebuild => spyder-5.1.5-r2.ebuild} \| 10 +++++++++-
19	3 files changed, 29 insertions(+), 5 deletions(-)
20
21	diff --git a/dev-python/spyder/spyder-4.2.5-r2.ebuild b/dev-python/spyder/spyder-4.2.5-r3.ebuild
22	similarity index 96%
23	rename from dev-python/spyder/spyder-4.2.5-r2.ebuild
24	rename to dev-python/spyder/spyder-4.2.5-r3.ebuild
25	index 0656eb1aa38..9d806017200 100644
26	--- a/dev-python/spyder/spyder-4.2.5-r2.ebuild
27	+++ b/dev-python/spyder/spyder-4.2.5-r3.ebuild
28	@@ -141,11 +141,19 @@ python_prepare_all() {
29	sed -i \
30	-e '/pyqt5/d' \
31	-e '/pyqtwebengine/d' \
32	- -e '/python-language-server/d' \
33	-e '/python-lsp-server/d' \
34	-e '/parso/d' \
35	-e '/jedi/d' \
36	- {setup.py,requirements/conda.txt} \|\| die
37	+ -e '/pylint/d' \
38	+ requirements/conda.txt \|\| die
39	+ sed -i \
40	+ -e "/'pyqt5[ 0-9<=>.,]*',/d" \
41	+ -e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
42	+ -e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
43	+ -e "/'parso[ 0-9<=>.,]*',/d" \
44	+ -e "/'jedi[ 0-9<=>.,]*',/d" \
45	+ -e "/'pylint[ 0-9<=>.,]*',/d" \
46	+ setup.py \|\| die
47	sed -i \
48	-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
49	-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
50
51	diff --git a/dev-python/spyder/spyder-5.0.5-r1.ebuild b/dev-python/spyder/spyder-5.0.5-r2.ebuild
52	similarity index 96%
53	rename from dev-python/spyder/spyder-5.0.5-r1.ebuild
54	rename to dev-python/spyder/spyder-5.0.5-r2.ebuild
55	index 15c28e9147d..60b669345ea 100644
56	--- a/dev-python/spyder/spyder-5.0.5-r1.ebuild
57	+++ b/dev-python/spyder/spyder-5.0.5-r2.ebuild
58	@@ -148,11 +148,19 @@ python_prepare_all() {
59	sed -i \
60	-e '/pyqt5/d' \
61	-e '/pyqtwebengine/d' \
62	- -e '/python-language-server/d' \
63	-e '/python-lsp-server/d' \
64	-e '/parso/d' \
65	-e '/jedi/d' \
66	- {setup.py,requirements/conda.txt} \|\| die
67	+ -e '/pylint/d' \
68	+ requirements/conda.txt \|\| die
69	+ sed -i \
70	+ -e "/'pyqt5[ 0-9<=>.,]*',/d" \
71	+ -e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
72	+ -e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
73	+ -e "/'parso[ 0-9<=>.,]*',/d" \
74	+ -e "/'jedi[ 0-9<=>.,]*',/d" \
75	+ -e "/'pylint[ 0-9<=>.,]*',/d" \
76	+ setup.py \|\| die
77	sed -i \
78	-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
79	-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
80
81	diff --git a/dev-python/spyder/spyder-5.1.5-r1.ebuild b/dev-python/spyder/spyder-5.1.5-r2.ebuild
82	similarity index 96%
83	rename from dev-python/spyder/spyder-5.1.5-r1.ebuild
84	rename to dev-python/spyder/spyder-5.1.5-r2.ebuild
85	index b2318fa8c7e..41c79713327 100644
86	--- a/dev-python/spyder/spyder-5.1.5-r1.ebuild
87	+++ b/dev-python/spyder/spyder-5.1.5-r2.ebuild
88	@@ -136,7 +136,15 @@ python_prepare_all() {
89	-e '/parso/d' \
90	-e '/jedi/d' \
91	-e '/pylint/d' \
92	- {setup.py,requirements/conda.txt} \|\| die
93	+ requirements/conda.txt \|\| die
94	+ sed -i \
95	+ -e "/'pyqt5[ 0-9<=>.,]*',/d" \
96	+ -e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
97	+ -e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
98	+ -e "/'parso[ 0-9<=>.,]*',/d" \
99	+ -e "/'jedi[ 0-9<=>.,]*',/d" \
100	+ -e "/'pylint[ 0-9<=>.,]*',/d" \
101	+ setup.py \|\| die
102	sed -i \
103	-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
104	-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \

Gentoo Archives: gentoo-commits