| 1 |
commit: 7274dd75f1a690771fc84c7b283360eb45333029 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 2 13:28:06 2022 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 2 13:29:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7274dd75 |
| 7 |
|
| 8 |
dev-python/spyder: unpin dep on qdarkstyle |
| 9 |
|
| 10 |
and update the documentation while at it. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/857564 |
| 13 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-python/spyder/Manifest | 2 +- |
| 16 |
.../files/spyder-5.3.3-unpin-qdarkstyle.patch | 26 ++++++++++++++++++++++ |
| 17 |
...{spyder-5.3.3.ebuild => spyder-5.3.3-r1.ebuild} | 4 ++-- |
| 18 |
3 files changed, 29 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest |
| 21 |
index 3b0cb80ad1a7..b6f3257168e2 100644 |
| 22 |
--- a/dev-python/spyder/Manifest |
| 23 |
+++ b/dev-python/spyder/Manifest |
| 24 |
@@ -1,2 +1,2 @@ |
| 25 |
DIST spyder-5.3.3.gh.tar.gz 24443628 BLAKE2B 767b3e1d59ce650d2df0d229d94eef53bc4c7b52f5d40fd62748efeb3a756a773110aa17442403a1b37777dd39fc367164ad54cd8f767d4311caa8d3e8bf05da SHA512 7d521f8367953849233538cbfd74f1fd98da87e69dbed8076718e81cd09ae66aca84523c4ecdf0e8aeb60644791754df19f09dd244ce11e3f7decc97bb050e02 |
| 26 |
-DIST spyder-docs-9156f446a9225446a2a752ecb669cc3db30094a8.gh.tar.gz 90029977 BLAKE2B 7254da77f6d9dd24d9feb8af684d064bb92400acf1561f8a2b9423c63984c22fb3ab384174f87525c3cdb0612590fb97010e9cd1a21ae1e36ffc6d6f9babe973 SHA512 1a9609baea12059fad1e65b84c1db98e15cb3d65e1c60660a1f1ebeab5723b118d6e995a4e4219391d8aafb640da20e2a4984746e9c66893dd0cef2ea3f082f9 |
| 27 |
+DIST spyder-docs-bb9b308b66cc90e47f43418f079bf098eb4efe6c.gh.tar.gz 89966852 BLAKE2B 7698b0210ccfec9f00cc76893f49398a02878c732eba6bbc89c1da4514734aad8ae8ef85a9c701a1d194976a35a8092755f7c5f09b319f670fac21d0a2e6c542 SHA512 9dd428ca2623c5703076887ab593bd92a2e737d74eb914a7a186d2ab4855519abb02875226463d8c11ff5021e7e84a5ba7c200ad5476f0dc4646831bb0b197a1 |
| 28 |
|
| 29 |
diff --git a/dev-python/spyder/files/spyder-5.3.3-unpin-qdarkstyle.patch b/dev-python/spyder/files/spyder-5.3.3-unpin-qdarkstyle.patch |
| 30 |
new file mode 100644 |
| 31 |
index 000000000000..b9939a95cc53 |
| 32 |
--- /dev/null |
| 33 |
+++ b/dev-python/spyder/files/spyder-5.3.3-unpin-qdarkstyle.patch |
| 34 |
@@ -0,0 +1,26 @@ |
| 35 |
+diff --git a/setup.py b/setup.py |
| 36 |
+index 176c07f..d73d195 100644 |
| 37 |
+--- a/setup.py |
| 38 |
++++ b/setup.py |
| 39 |
+@@ -231,7 +231,7 @@ install_requires = [ |
| 40 |
+ 'python-lsp-server[all]>=1.5.0,<1.6.0', |
| 41 |
+ 'pyxdg>=0.26;platform_system=="Linux"', |
| 42 |
+ 'pyzmq>=22.1.0', |
| 43 |
+- 'qdarkstyle>=3.0.2,<3.1.0', |
| 44 |
++ 'qdarkstyle>=3.0.2', |
| 45 |
+ 'qstylizer>=0.1.10', |
| 46 |
+ 'qtawesome>=1.0.2', |
| 47 |
+ 'qtconsole>=5.3.2,<5.4.0', |
| 48 |
+diff --git a/spyder/dependencies.py b/spyder/dependencies.py |
| 49 |
+index 18fd9d4..50d1a6c 100644 |
| 50 |
+--- a/spyder/dependencies.py |
| 51 |
++++ b/spyder/dependencies.py |
| 52 |
+@@ -57,7 +57,7 @@ PYLSP_BLACK_REQVER = '>=1.2.0' |
| 53 |
+ PYLS_SPYDER_REQVER = '>=0.4.0' |
| 54 |
+ PYXDG_REQVER = '>=0.26' |
| 55 |
+ PYZMQ_REQVER = '>=22.1.0' |
| 56 |
+-QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0' |
| 57 |
++QDARKSTYLE_REQVER = '>=3.0.2' |
| 58 |
+ QSTYLIZER_REQVER = '>=0.1.10' |
| 59 |
+ QTAWESOME_REQVER = '>=1.0.2' |
| 60 |
+ QTCONSOLE_REQVER = '>=5.3.2;<5.4.0' |
| 61 |
|
| 62 |
diff --git a/dev-python/spyder/spyder-5.3.3.ebuild b/dev-python/spyder/spyder-5.3.3-r1.ebuild |
| 63 |
similarity index 98% |
| 64 |
rename from dev-python/spyder/spyder-5.3.3.ebuild |
| 65 |
rename to dev-python/spyder/spyder-5.3.3-r1.ebuild |
| 66 |
index 6ed0d7ebe359..4cc2c5bd76de 100644 |
| 67 |
--- a/dev-python/spyder/spyder-5.3.3.ebuild |
| 68 |
+++ b/dev-python/spyder/spyder-5.3.3-r1.ebuild |
| 69 |
@@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools |
| 70 |
inherit optfeature xdg distutils-r1 |
| 71 |
|
| 72 |
# Commit of documentation to fetch |
| 73 |
-DOCS_PV="9156f446a9225446a2a752ecb669cc3db30094a8" |
| 74 |
+DOCS_PV="bb9b308b66cc90e47f43418f079bf098eb4efe6c" |
| 75 |
|
| 76 |
DESCRIPTION="The Scientific Python Development Environment" |
| 77 |
HOMEPAGE=" |
| 78 |
@@ -51,7 +51,6 @@ RDEPEND=" |
| 79 |
>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}] |
| 80 |
>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}] |
| 81 |
>=dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}] |
| 82 |
- <dev-python/qdarkstyle-3.1[${PYTHON_USEDEP}] |
| 83 |
>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}] |
| 84 |
>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}] |
| 85 |
>=dev-python/qtconsole-5.3.2[${PYTHON_USEDEP}] |
| 86 |
@@ -89,6 +88,7 @@ BDEPEND=" |
| 87 |
PATCHES=( |
| 88 |
"${FILESDIR}/${PN}-5.0.0-build.patch" |
| 89 |
"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch" |
| 90 |
+ "${FILESDIR}/${PN}-5.3.3-unpin-qdarkstyle.patch" |
| 91 |
) |
| 92 |
|
| 93 |
DOCS=( |
Archives