[arch-commits] Commit in python-jedi/trunk (PKGBUILD jedi-0.17.2-py39.patch)

[Daniel M. Capella]

    Date: Thursday, March 11, 2021 @ 06:05:13
  Author: polyzen
Revision: 887407

upgpkg: python-jedi 0.18.0-1

Modified:
  python-jedi/trunk/PKGBUILD
Deleted:
  python-jedi/trunk/jedi-0.17.2-py39.patch

------------------------+
 PKGBUILD               |   13 +++---------
 jedi-0.17.2-py39.patch |   48 -----------------------------------------------
 2 files changed, 4 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-11 06:03:01 UTC (rev 887406)
+++ PKGBUILD	2021-03-11 06:05:13 UTC (rev 887407)
@@ -5,9 +5,9 @@
 # Contributor: Jesus Alvarez
 
 pkgname=python-jedi
-_gitcommit=3b7106ae71cb7bd3431101d169a0110ee0c179aa
-pkgver=0.17.2
-pkgrel=3
+_gitcommit=4b5b2e791b66f3a99542bc2a0e1d5730dc1491df
+pkgver=0.18.0
+pkgrel=1
 pkgdesc="Awesome autocompletion for python"
 url="https://github.com/davidhalter/jedi"
 arch=('any')
@@ -16,11 +16,9 @@
 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)
+        git+https://github.com/davidhalter/django-stubs)
 sha256sums=('SKIP'
-            '9b5c13800f29f4c6954d63c0989210cc173162803e8546bfe084a975e3e25208'
             'SKIP'
             'SKIP')
 
@@ -35,9 +33,6 @@
   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() {

Deleted: jedi-0.17.2-py39.patch
===================================================================
--- jedi-0.17.2-py39.patch	2021-03-11 06:03:01 UTC (rev 887406)
+++ jedi-0.17.2-py39.patch	2021-03-11 06:05:13 UTC (rev 887407)
@@ -1,48 +0,0 @@
-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