Change source and build

2 files changed, 44 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe56cdf7dd4a..e6139c7c848d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,24 @@
 pkgbase = mssql-cli
 	pkgdesc = Interactive command line query tool for SQL Server
-	pkgver = 1.0.0
-	pkgrel = 1
+	pkgver = 1.0
+	pkgrel = 2
 	url = https://github.com/dbcli/mssql-cli
 	arch = any
 	license = BSD
-	makedepends = python-pip
+	makedepends = python-setuptools
 	depends = python
-	depends = python-click
+	depends = python-applicationinsights
 	depends = python-argparse
-	depends = python-pygments
-	depends = python-prompt_toolkit
-	depends = python-sqlparse
-	depends = python-configobj
-	depends = python-humanize
+	depends = python-click
 	depends = python-cli_helpers
-	depends = python-applicationinsights
+	depends = python-configobj
 	depends = python-future
-	source = https://files.pythonhosted.org/packages/py2.py3/m/mssql_cli/mssql_cli-1.0.0-py2.py3-none-manylinux1_x86_64.whl
-	sha256sums = edb3850ab8ffa077c64270f27263f6377fdb5bd5bb5c5b4990c5fb08f49627b6
+	depends = python-humanize
+	depends = python-polib
+	depends = python-prompt_toolkit
+	depends = python-pygments
+	depends = python-sqlparse
+	source = https://github.com/dbcli/mssql-cli/archive/refs/tags/1.0.tar.gz
+	sha256sums = 331f2cedc3c2f5ed0e3bd8c1ec41eec4d5f07a3ece0c2a08d6b1f0e811c44f9f
 
 pkgname = mssql-cli
-
diff --git a/PKGBUILD b/PKGBUILD
index f023e5cdf001..fc2d097770ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,39 @@
-# Maintainer: Carter Green <crtrgreen at gmail dot com>
+# Maintainer: Iyán Méndez Veiga <me (at) iyanmv (dot) com>
+# Contributor: Carter Green <crtrgreen at gmail dot com>
 pkgname=mssql-cli
-pkgver=1.0.0
-pkgrel=1
+pkgver=1.0
+pkgrel=2
 pkgdesc="Interactive command line query tool for SQL Server"
 arch=(any)
 url="https://github.com/dbcli/mssql-cli"
 license=('BSD')
-depends=('python' 'python-click' 'python-argparse' 'python-pygments'
-         'python-prompt_toolkit' 'python-sqlparse' 'python-configobj'
-         'python-humanize' 'python-cli_helpers' 'python-applicationinsights'
-         'python-future')
-makedepends=('python-pip')
-source=("https://files.pythonhosted.org/packages/py2.py3/${pkgname::1}/${pkgname//-/_}/${pkgname//-/_}-${pkgver}-py2.py3-none-manylinux1_x86_64.whl")
-sha256sums=('edb3850ab8ffa077c64270f27263f6377fdb5bd5bb5c5b4990c5fb08f49627b6')
+depends=(
+    'python'
+    'python-applicationinsights'
+    'python-argparse'
+    'python-click'
+    'python-cli_helpers'
+    'python-configobj'
+    'python-future'
+    'python-humanize'
+    'python-polib'
+    'python-prompt_toolkit'
+    'python-pygments'
+    'python-sqlparse'
+)
+makedepends=(
+    'python-setuptools'
+)
+source=("https://github.com/dbcli/$pkgname/archive/refs/tags/$pkgver.tar.gz")
+sha256sums=('331f2cedc3c2f5ed0e3bd8c1ec41eec4d5f07a3ece0c2a08d6b1f0e811c44f9f')
 
-package() {
-  cd "$srcdir"
-  PIP_CONFIG_FILE=/dev/null pip install --isolated --root="$pkgdir" --ignore-installed --no-deps *.whl
-  msg2 "Removing non-existant required static libraries..."
-  local deps_path="${pkgdir}$(python --version | \
-    awk -F'[ .]' '{ printf "/usr/lib/python%s.%s/site-packages/mssqlcli/mssqltoolsservice/bin/MicrosoftSqlToolsServiceLayer.deps.json",
-      $2, $3 }')"
-  sed -i '/\.a": {/,+2d' "$deps_path"
-  msg2 "Generating .pyo files..."
-  python -O -m compileall "$pkgdir"
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    python setup.py build
 }
 
-# vim:set ts=2 sw=2 et:
-
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    python setup.py install --root="$pkgdir" --optimize=1
+    rm "$pkgdir/usr/bin/mssql-cli.bat"
+}