[arch-commits] Commit in python-jedi/repos/community-staging-any (3 files)
Felix Yan
felixonmars at archlinux.org
Mon Nov 23 14:03:09 UTC 2020
Date: Monday, November 23, 2020 @ 14:03:09
Author: felixonmars
Revision: 759923
archrelease: copy trunk to community-staging-any
Added:
python-jedi/repos/community-staging-any/PKGBUILD
(from rev 759922, python-jedi/trunk/PKGBUILD)
python-jedi/repos/community-staging-any/jedi-0.17.2-py39.patch
(from rev 759922, python-jedi/trunk/jedi-0.17.2-py39.patch)
Deleted:
python-jedi/repos/community-staging-any/PKGBUILD
------------------------+
PKGBUILD | 124 ++++++++++++++++++++++++-----------------------
jedi-0.17.2-py39.patch | 48 ++++++++++++++++++
2 files changed, 113 insertions(+), 59 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-23 14:02:53 UTC (rev 759922)
+++ PKGBUILD 2020-11-23 14:03:09 UTC (rev 759923)
@@ -1,59 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Danilo Bargen <gezuru at gmail.com>
-# Contributor: Simon Conseil <contact+aur at saimon dot org>
-# Contributor: Jesus Alvarez
-
-pkgname=python-jedi
-_gitcommit=3b7106ae71cb7bd3431101d169a0110ee0c179aa
-pkgver=0.17.2
-pkgrel=2
-pkgdesc="Awesome autocompletion for python"
-url="https://github.com/davidhalter/jedi"
-arch=('any')
-license=('MIT')
-depends=('python' 'python-parso')
-makedepends=('git' 'python-setuptools' 'python-sphinx' 'python-sphinx_rtd_theme')
-checkdepends=('python-pytest' 'python-parso')
-source=("git+https://github.com/davidhalter/jedi#commit=${_gitcommit}"
- git+https://github.com/davidhalter/typeshed
- git+https://github.com/typeddjango/django-stubs)
-sha256sums=('SKIP'
- 'SKIP'
- 'SKIP')
-
-pkgver() {
- cd jedi
- git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
- cd jedi
- git submodule init
- git config submodule."jedi/third_party/typeshed".url "${srcdir}/typeshed"
- git config submodule."jedi/third_party/django-stubs".url "${srcdir}/django-stubs"
- git submodule update --recursive
-}
-
-build() {
- cd jedi
- python setup.py build
- sphinx-build -b text docs docs/_build/text
- sphinx-build -b man docs docs/_build/man
-}
-
-check() {
- cd jedi
- # skip pytest 6 test issues https://github.com/davidhalter/jedi/issues/1660
- pytest test -k 'not test_completion[pytest:130] and not test_completion[pytest:163]'
-}
-
-package() {
- cd jedi
- python setup.py install --root="$pkgdir" --optimize=1 --skip-build
- install -Dm 644 LICENSE.txt -t "$pkgdir/usr/share/licenses/$pkgname"
- install -Dm 644 CHANGELOG.rst README.rst docs/_build/text/*.txt -t "$pkgdir/usr/share/doc/$pkgname"
- install -Dm 644 docs/_build/man/jedi.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
-}
-
-# vim: ts=2 sw=2 et:
Copied: python-jedi/repos/community-staging-any/PKGBUILD (from rev 759922, python-jedi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-23 14:03:09 UTC (rev 759923)
@@ -0,0 +1,65 @@
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Danilo Bargen <gezuru at gmail.com>
+# Contributor: Simon Conseil <contact+aur at saimon dot org>
+# Contributor: Jesus Alvarez
+
+pkgname=python-jedi
+_gitcommit=3b7106ae71cb7bd3431101d169a0110ee0c179aa
+pkgver=0.17.2
+pkgrel=3
+pkgdesc="Awesome autocompletion for python"
+url="https://github.com/davidhalter/jedi"
+arch=('any')
+license=('MIT')
+depends=('python' 'python-parso')
+makedepends=('git' 'python-setuptools' 'python-sphinx' 'python-sphinx_rtd_theme')
+checkdepends=('python-pytest' 'python-parso')
+source=("git+https://github.com/davidhalter/jedi#commit=${_gitcommit}"
+ jedi-0.17.2-py39.patch
+ git+https://github.com/davidhalter/typeshed
+ git+https://github.com/typeddjango/django-stubs)
+sha256sums=('SKIP'
+ '9b5c13800f29f4c6954d63c0989210cc173162803e8546bfe084a975e3e25208'
+ 'SKIP'
+ 'SKIP')
+
+pkgver() {
+ cd jedi
+ git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+ cd jedi
+ git submodule init
+ git config submodule."jedi/third_party/typeshed".url "${srcdir}/typeshed"
+ git config submodule."jedi/third_party/django-stubs".url "${srcdir}/django-stubs"
+ git submodule update --recursive
+
+ # two patches for Python 3.9 cherry-picked from upstream's master branch
+ patch -Np1 -i ../jedi-0.17.2-py39.patch
+}
+
+build() {
+ cd jedi
+ python setup.py build
+ sphinx-build -b text docs docs/_build/text
+ sphinx-build -b man docs docs/_build/man
+}
+
+check() {
+ cd jedi
+ # skip pytest 6 test issues https://github.com/davidhalter/jedi/issues/1660
+ # these are also skipped in upstream's Travis CI
+ pytest test -k 'not test_completion[pytest'
+}
+
+package() {
+ cd jedi
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+ install -Dm 644 LICENSE.txt -t "$pkgdir/usr/share/licenses/$pkgname"
+ install -Dm 644 CHANGELOG.rst README.rst docs/_build/text/*.txt -t "$pkgdir/usr/share/doc/$pkgname"
+ install -Dm 644 docs/_build/man/jedi.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
+}
+
+# vim: ts=2 sw=2 et:
Copied: python-jedi/repos/community-staging-any/jedi-0.17.2-py39.patch (from rev 759922, python-jedi/trunk/jedi-0.17.2-py39.patch)
===================================================================
--- jedi-0.17.2-py39.patch (rev 0)
+++ jedi-0.17.2-py39.patch 2020-11-23 14:03:09 UTC (rev 759923)
@@ -0,0 +1,48 @@
+From bd2216ea1acce7b64e94d76a197674e66428d8c1 Mon Sep 17 00:00:00 2001
+From: Dave Halter <davidhalter88 at gmail.com>
+Date: Sun, 12 Jul 2020 01:58:13 +0200
+Subject: [PATCH 1/2] Properly support Python3.9
+
+(cherry picked from commit a49c062b355a44875ae9e43233b94a781c2efcef)
+---
+ jedi/api/environment.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jedi/api/environment.py b/jedi/api/environment.py
+index 89e47163..548dea67 100644
+--- a/jedi/api/environment.py
++++ b/jedi/api/environment.py
+@@ -17,7 +17,7 @@ import parso
+
+ _VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+
+-_SUPPORTED_PYTHONS = ['3.8', '3.7', '3.6', '3.5', '2.7']
++_SUPPORTED_PYTHONS = ['3.9', '3.8', '3.7', '3.6', '3.5', '2.7']
+ _SAFE_PATHS = ['/usr/bin', '/usr/local/bin']
+ _CONDA_VAR = 'CONDA_PREFIX'
+ _CURRENT_VERSION = '%s.%s' % (sys.version_info.major, sys.version_info.minor)
+
+From 2dd31b169370504ee67af04bd6d4ea154b765c04 Mon Sep 17 00:00:00 2001
+From: Dave Halter <davidhalter88 at gmail.com>
+Date: Sat, 19 Sep 2020 21:27:55 +0200
+Subject: [PATCH 2/2] One interpreter test is different for 3.9+
+
+(cherry picked from commit c1f4e7d8748d0f1efe30332e1d41089560e1c319)
+---
+ test/test_api/test_interpreter.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/test_api/test_interpreter.py b/test/test_api/test_interpreter.py
+index 0155d49f..402727b5 100644
+--- a/test/test_api/test_interpreter.py
++++ b/test/test_api/test_interpreter.py
+@@ -656,7 +656,8 @@ def bar():
+
+ # typing is available via globals.
+ ({'return': 'typing.Union[str, int]'}, ['int', 'str'], ''),
+- ({'return': 'typing.Union["str", int]'}, ['int'], ''),
++ ({'return': 'typing.Union["str", int]'},
++ ['int', 'str'] if sys.version_info >= (3, 9) else ['int'], ''),
+ ({'return': 'typing.Union["str", 1]'}, [], ''),
+ ({'return': 'typing.Optional[str]'}, ['NoneType', 'str'], ''),
+ ({'return': 'typing.Optional[str, int]'}, [], ''), # Takes only one arg
More information about the arch-commits
mailing list