From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Fix broken python-jedi
Date: Wed, 09 Sep 2020 14:00:52 +0200 [thread overview]
Message-ID: <20200909120052.4mLjg1otOPf-oFZ7FQAYJzmIJ--tvvC5hBOo3igBLTE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24773@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/CameronNemo/void-packages jedi
https://github.com/void-linux/void-packages/pull/24773
Fix broken python-jedi
None
A patch file from https://github.com/void-linux/void-packages/pull/24773.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jedi-24773.patch --]
[-- Type: text/x-diff, Size: 6935 bytes --]
From 31f77a7818bbeb50a8a7c1911622a2f1aed3928a Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Tue, 8 Sep 2020 21:53:41 -0700
Subject: [PATCH 1/4] python3-parso: downgrade to 0.7.1.
https://github.com/davidhalter/jedi/issues/1666
---
srcpkgs/python3-parso/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template
index 5fed4bfb7ee..cb2c8e20105 100644
--- a/srcpkgs/python3-parso/template
+++ b/srcpkgs/python3-parso/template
@@ -1,8 +1,8 @@
# Template file for 'python3-parso'
pkgname=python3-parso
-version=0.8.0
-revision=1
-archs=noarch
+reverts="0.8.0_1"
+version=0.7.1
+revision=2
wrksrc="parso-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/davidhalter/parso"
distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz"
-checksum=2b6db14759c528d857eeb9eac559c2166b2554548af39f5198bdfb976f72aa64
+checksum=caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9
post_install() {
vlicense LICENSE.txt
From 9bac8bd778452a603702e6535dee641ca5f238c5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Tue, 8 Sep 2020 21:54:10 -0700
Subject: [PATCH 2/4] python-jedi: remove erroneous patch
This version of jedi is NOT compatible with parso 0.8.0.
https: //github.com/davidhalter/jedi/issues/1666
sgn: while we're at it, drop noarch.
Close: #24773
---
srcpkgs/python-jedi/patches/py3-parso-requirement.patch | 6 ------
srcpkgs/python-jedi/template | 4 +---
2 files changed, 1 insertion(+), 9 deletions(-)
delete mode 100644 srcpkgs/python-jedi/patches/py3-parso-requirement.patch
diff --git a/srcpkgs/python-jedi/patches/py3-parso-requirement.patch b/srcpkgs/python-jedi/patches/py3-parso-requirement.patch
deleted file mode 100644
index b6daa80444b..00000000000
--- a/srcpkgs/python-jedi/patches/py3-parso-requirement.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- requirements.txt.orig 2020-08-04 22:18:10.590850660 -0400
-+++ requirements.txt 2020-08-04 22:18:48.906184653 -0400
-@@ -1 +1,2 @@
--parso>=0.7.0,<0.8.0
-+parso>=0.7.0,<0.8.0; python_version<"3"
-+parso>=0.7.0; python_version>="3"
diff --git a/srcpkgs/python-jedi/template b/srcpkgs/python-jedi/template
index 0799a69c69f..530133496b6 100644
--- a/srcpkgs/python-jedi/template
+++ b/srcpkgs/python-jedi/template
@@ -1,8 +1,7 @@
# Template file for 'python-jedi'
pkgname=python-jedi
version=0.17.2
-revision=2
-archs=noarch
+revision=3
wrksrc="jedi-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
@@ -20,7 +19,6 @@ post_install() {
}
python3-jedi_package() {
- archs=noarch
depends="python3-parso"
short_desc="${short_desc/2/3}"
pkg_install() {
From b069b2805df6e4a95b952af35899f4adfdaa801b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 9 Sep 2020 18:50:28 +0700
Subject: [PATCH 3/4] python-parso: drop package
---
srcpkgs/python-parso/template | 19 -------------------
srcpkgs/python-parso/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-parso/template
delete mode 100644 srcpkgs/python-parso/update
diff --git a/srcpkgs/python-parso/template b/srcpkgs/python-parso/template
deleted file mode 100644
index 49ed2fbdf20..00000000000
--- a/srcpkgs/python-parso/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-parso'
-pkgname=python-parso
-version=0.7.1
-revision=1
-archs=noarch
-wrksrc="parso-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python parser (Python 2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/davidhalter/parso"
-distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz"
-checksum=caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9
-
-post_install() {
- vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python-parso/update b/srcpkgs/python-parso/update
deleted file mode 100644
index 6c7527aa483..00000000000
--- a/srcpkgs/python-parso/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="parso-\K0.7[0-9.]+(?=.tar.gz)"
From 33099a19aa5cb3204d3661dc3ec62ccfd6068e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 9 Sep 2020 18:55:34 +0700
Subject: [PATCH 4/4] python-jedi: drop package
---
srcpkgs/python-jedi/template | 28 ----------------------------
srcpkgs/python3-jedi | 1 -
srcpkgs/python3-jedi/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-jedi/template
delete mode 120000 srcpkgs/python3-jedi
create mode 100644 srcpkgs/python3-jedi/template
diff --git a/srcpkgs/python-jedi/template b/srcpkgs/python-jedi/template
deleted file mode 100644
index 530133496b6..00000000000
--- a/srcpkgs/python-jedi/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-jedi'
-pkgname=python-jedi
-version=0.17.2
-revision=3
-wrksrc="jedi-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-parso"
-checkdepends="python-parso python3-parso python-pytest python3-pytest"
-short_desc="Autocompletion/static analysis library for Python 2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://jedi.readthedocs.io/"
-distfiles="${PYPI_SITE}/j/jedi/jedi-${version}.tar.gz"
-checksum=86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-jedi_package() {
- depends="python3-parso"
- short_desc="${short_desc/2/3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-jedi b/srcpkgs/python3-jedi
deleted file mode 120000
index d378953d1bd..00000000000
--- a/srcpkgs/python3-jedi
+++ /dev/null
@@ -1 +0,0 @@
-python-jedi
\ No newline at end of file
diff --git a/srcpkgs/python3-jedi/template b/srcpkgs/python3-jedi/template
new file mode 100644
index 00000000000..1c1f12397d3
--- /dev/null
+++ b/srcpkgs/python3-jedi/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-jedi'
+pkgname=python3-jedi
+version=0.17.2
+revision=3
+wrksrc="jedi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-parso"
+checkdepends="python3-parso python3-pytest"
+short_desc="Autocompletion/static analysis library for Python 3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://jedi.readthedocs.io/"
+distfiles="${PYPI_SITE}/j/jedi/jedi-${version}.tar.gz"
+checksum=86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20
+
+post_install() {
+ vlicense LICENSE.txt
+}
next prev parent reply other threads:[~2020-09-09 12:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 4:59 [PR PATCH] " CameronNemo
2020-09-09 11:52 ` [PR REVIEW] " sgn
2020-09-09 12:00 ` sgn [this message]
2020-09-09 12:02 ` sgn
2020-09-09 13:07 ` ahesford
2020-09-09 14:11 ` [PR PATCH] [Closed]: " sgn
2020-09-09 14:13 ` [PR REVIEW] " sgn
2020-09-09 16:35 ` CameronNemo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200909120052.4mLjg1otOPf-oFZ7FQAYJzmIJ--tvvC5hBOo3igBLTE@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).