switch to make/poetry

2 files changed, 9 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb52a352559c..c3c3e4258fed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = jrnl-git
 	pkgdesc = Collect your thoughts and notes without leaving the command line
 	pkgver = v2.8.1.r12.g5e87ff1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://jrnl.sh/
 	arch = any
 	license = GPL3
 	checkdepends = python-behave
 	checkdepends = python-pytest
 	checkdepends = python-black
+	checkdepends = python-poetry
 	makedepends = git
-	makedepends = python-dephell
-	makedepends = python-setuptools
+	makedepends = make
 	depends = python
 	depends = python-ansiwrap
 	depends = python-asteval
diff --git a/PKGBUILD b/PKGBUILD
index 166daf9e7216..415ebcbdcd54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgname=jrnl-git
 _gitname=jrnl
 pkgver=v2.8.1.r12.g5e87ff1
-pkgrel=2
+pkgrel=3
 pkgdesc="Collect your thoughts and notes without leaving the command line"
 arch=('any')
 url="https://jrnl.sh/"
 license=('GPL3')
 depends=('python' 'python-ansiwrap' 'python-asteval' 'python-colorama' 'python-cryptography' 'python-keyring' 'python-parsedatetime' 'python-dateutil' 'python-pyxdg' 'python-pyaml')
-checkdepends=('python-behave' 'python-pytest' 'python-black')
-makedepends=('git' 'python-dephell' 'python-setuptools')
+checkdepends=('python-behave' 'python-pytest' 'python-black' 'python-poetry')
+makedepends=('git' 'make')
 conflicts=("jrnl")
 source=("git+https://github.com/jrnl-org/jrnl.git")
 md5sums=('SKIP')
@@ -22,25 +22,12 @@ pkgver() {
 
 check() {
   cd "$_gitname"
-  pytest .
-  behave --no-skipped --format progress
-
-  black setup.py --diff | patch
-  black --check --diff .
-}
-
-prepare() {
-  cd "$_gitname"
-  dephell deps convert --from pyproject.toml --to setup.py --envs main
-}
-
-build() {
-  cd "$_gitname"
-  python setup.py build
+  #black setup.py --diff | patch
+  make test
 }
 
 package() {
   cd "$_gitname"
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  make install
 }