[arch-commits] Commit in python-antlr4/trunk (PKGBUILD fix-tests.patch)

[Konstantin Gizdov]

    Date: Monday, April 18, 2022 @ 16:18:39
  Author: kgizdov
Revision: 1187002

upgpkg: python-antlr4 4.10.1-1

Modified:
  python-antlr4/trunk/PKGBUILD
Deleted:
  python-antlr4/trunk/fix-tests.patch

-----------------+
 PKGBUILD        |   25 ++++++++++---------------
 fix-tests.patch |   52 ----------------------------------------------------
 2 files changed, 10 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-18 16:04:48 UTC (rev 1187001)
+++ PKGBUILD	2022-04-18 16:18:39 UTC (rev 1187002)
@@ -2,37 +2,32 @@
 # Contributor: Baptiste Jonglez <archlinux at bitsofnetworks dot org>
 
 _pkgname=antlr4
-pkgname=python-${_pkgname}
-pkgver=4.9.3
-pkgrel=2
+pkgname="python-${_pkgname}"
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="ANTLR4 runtime for Python"
 arch=('any')
 url="https://www.antlr.org/"
 license=('BSD')
 depends=('python')
-makedepends=('python-setuptools')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/antlr/${_pkgname}/archive/${pkgver}.tar.gz"
-        'fix-tests.patch')
-sha256sums=('efe4057d75ab48145d4683100fec7f77d7f87fa258707330cadd1f8e6f7eecae'
-            '4e33e19f83a09997914e5650c5c19aa11ce2c79ad00b41c0759770cdfafd9a80')
+makedepends=('python-build' 'python-installer' 'python-wheel' 'python-setuptools-scm')
+checkdepends=('python-tests')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/antlr/${_pkgname}/archive/${pkgver}.tar.gz")
+sha256sums=('a320568b738e42735946bebc5d9d333170e14a251c5734e8b852ad1502efa8a2')
 
-prepare() {
-  patch -Np1 -i "${srcdir}"/fix-tests.patch -d "${srcdir}/${_pkgname}-${pkgver}"
-}
-
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}/runtime/Python3"
-  python setup.py build
+  python -m build --wheel --no-isolation
 }
 
 check() {
   cd "${srcdir}/${_pkgname}-${pkgver}/runtime/Python3"
-  python setup.py test
+  python -m test
 }
 
 package() {
   cd "${srcdir}/${_pkgname}-${pkgver}/runtime/Python3"
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
   install -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -Dm644 "${srcdir}/${_pkgname}-${pkgver}"/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}"/LICENSE
 }

Deleted: fix-tests.patch
===================================================================
--- fix-tests.patch	2022-04-18 16:04:48 UTC (rev 1187001)
+++ fix-tests.patch	2022-04-18 16:18:39 UTC (rev 1187002)
@@ -1,52 +0,0 @@
-diff -aur antlr4-4.8-old/runtime/Python3/tests/ctest.py antlr4-4.8-new/runtime/Python3/tests/ctest.py
---- antlr4-4.8-old/runtime/Python3/tests/ctest.py	2020-01-19 18:18:55.000000000 +0200
-+++ antlr4-4.8-new/runtime/Python3/tests/ctest.py	2020-06-30 16:32:13.862026103 +0300
-@@ -7,8 +7,8 @@
- import sys
- sys.setrecursionlimit(4000)
- import antlr4
--from parser.cparser import CParser
--from parser.clexer import CLexer
-+from .parser.cparser import CParser
-+from .parser.clexer import CLexer
- from datetime import datetime
- import cProfile
- 
-diff --color -aur --color antlr4-4.9.1-old/runtime/Python3/tests/run.py antlr4-4.9.1-new/runtime/Python3/tests/run.py
---- antlr4-4.9.1-old/runtime/Python3/tests/run.py	2021-01-05 21:22:02.000000000 +0200
-+++ antlr4-4.9.1-new/runtime/Python3/tests/run.py	2021-01-18 12:43:13.915624039 +0200
-@@ -3,7 +3,7 @@
- src_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'src')
- sys.path.insert(0,src_path)
- from TestTokenStreamRewriter import TestTokenStreamRewriter
--from xpathtest import XPathTest
-+from .xpathtest import XPathTest
- from TestFileStream import TestFileStream
- from TestInputStream import TestInputStream
- from TestIntervalSet import TestIntervalSet
-diff -aur antlr4-4.8-old/runtime/Python3/tests/TestTokenStreamRewriter.py antlr4-4.8-new/runtime/Python3/tests/TestTokenStreamRewriter.py
---- antlr4-4.8-old/runtime/Python3/tests/TestTokenStreamRewriter.py	2020-01-19 18:18:55.000000000 +0200
-+++ antlr4-4.8-new/runtime/Python3/tests/TestTokenStreamRewriter.py	2020-06-30 16:32:36.462025917 +0300
-@@ -5,7 +5,7 @@
- import unittest
- 
- 
--from mocks.TestLexer import TestLexer, TestLexer2
-+from .mocks.TestLexer import TestLexer, TestLexer2
- from antlr4.TokenStreamRewriter import TokenStreamRewriter
- from antlr4.InputStream import InputStream
- from antlr4.CommonTokenStream import CommonTokenStream
-diff -aur antlr4-4.8-old/runtime/Python3/tests/xpathtest.py antlr4-4.8-new/runtime/Python3/tests/xpathtest.py
---- antlr4-4.8-old/runtime/Python3/tests/xpathtest.py	2020-01-19 18:18:55.000000000 +0200
-+++ antlr4-4.8-new/runtime/Python3/tests/xpathtest.py	2020-06-30 16:32:44.398692519 +0300
-@@ -2,8 +2,8 @@
- from antlr4 import InputStream, CommonTokenStream, TerminalNode
- from antlr4.xpath.XPath import XPath
- import unittest
--from expr.ExprParser import ExprParser
--from expr.ExprLexer  import ExprLexer
-+from .expr.ExprParser import ExprParser
-+from .expr.ExprLexer  import ExprLexer
- 
- def tokenToString(token, ruleNames):
-     if isinstance(token, TerminalNode):