Remove python-poetry

2 files changed, 14 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b920357c6cc..ba0a9be603bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = cmake-language-server-git
 	pkgdesc = Python based cmake language server
-	pkgver = v0.1.1.r3.g40d9352
-	pkgrel = 2
+	pkgver = v0.1.6.r5.g60c376a
+	pkgrel = 1
 	url = https://github.com/regen100/cmake-language-server
 	arch = any
 	license = MIT
-	makedepends = python-setuptools
-	makedepends = python-poetry
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = git
 	depends = python-pygls
 	depends = python-pyparsing
 	depends = cmake
+	depends = cmake-format
 	provides = cmake-language-server
 	conflicts = cmake-language-server
-	conflicts = cmake-format
 	source = cmake-language-server-git::git+https://github.com/regen100/cmake-language-server.git
 	sha256sums = SKIP
 
 pkgname = cmake-language-server-git
-
diff --git a/PKGBUILD b/PKGBUILD
index c41a041a5d3c..9d755ac6bfac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Otreblan <otreblain@gmail.com>
 
 pkgname=cmake-language-server-git
-pkgver=v0.1.1.r3.g40d9352
-pkgrel=2
+pkgver=v0.1.6.r5.g60c376a
+pkgrel=1
 pkgdesc="Python based cmake language server"
 arch=('any')
 url="https://github.com/regen100/cmake-language-server"
 license=('MIT')
 groups=()
-depends=("python-pygls" "python-pyparsing" "cmake")
-makedepends=("python-setuptools" "python-poetry" "git")
+depends=("python-pygls" "python-pyparsing" "cmake" "cmake-format")
+makedepends=("python-build" "python-installer" "git")
 optdepends=()
 provides=(${pkgname%-git})
-conflicts=(${pkgname%-git} "cmake-format")
+conflicts=(${pkgname%-git})
 replaces=()
 backup=()
 options=()
@@ -22,21 +22,6 @@ source=("${pkgname}::git+${url}.git")
 noextract=()
 sha256sums=("SKIP")
 
-prepare() {
-	cd "$srcdir/$pkgname"
-	poetry build --format=sdist
-
-	# Quick hack to use the tarball from poetry
-	mkdir -p untar
-	tar -xvf dist/*.tar.gz -C untar
-	mv untar/* $pkgname
-
-	cd $pkgname
-
-	sed -i "s/from distutils.core import setup/from setuptools import setup/" setup.py
-	sed -i "s/pygls>=0.8.1,<0.9.0/pygls>=0.8.1/" setup.py
-}
-
 pkgver() {
 	cd "$srcdir/$pkgname"
 	( set -o pipefail
@@ -47,14 +32,14 @@ pkgver() {
 
 
 build() {
-	cd "$srcdir/$pkgname/$pkgname"
+	cd "$srcdir/$pkgname"
 
-	python setup.py build
+	python -m build --wheel --no-isolation
 }
 
 package() {
-	cd "$srcdir/$pkgname/$pkgname"
+	cd "$srcdir/$pkgname"
 
-	python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	python -m installer --destdir="$pkgdir" dist/*.whl
 	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }