Drop python2 support

4 files changed, 21 insertions, 103 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d327eae4250..b9a49c1c06a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,12 @@
 pkgbase = python-codeintel
-	pkgdesc = Komodo Edit CodeIntel
-	pkgver = 2.0.0b33
+	pkgdesc = Full-featured code intelligence and smart autocomplete engine
+	pkgver = 2.0.0
 	pkgrel = 1
-	url = https://github.com/Kronuz/CodeIntel
+	url = https://github.com/SublimeCodeIntel/CodeIntel
 	arch = any
-	license = MPL 1.1
+	license = custom
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://pypi.python.org/packages/cc/7c/ace9843f71374185b62b2910410a5777e4e0de5d6651a705339c877091c2/CodeIntel-2.0.0b33.tar.gz
-	md5sums = 347d80fd0f859fe58f8d49391a60e530
+	source = https://github.com/SublimeCodeIntel/CodeIntel/archive/v2.0.0.tar.gz
+	sha512sums = 109b56b1dd5abd965813a4f3ae5951333a822c76af7f7650ff8b621b52500473df3c846f14d278e4cf263186e0e71b158030a7f87456978bdf3069a6929547d3
 
 pkgname = python-codeintel
-
-pkgname = python2-codeintel
-
diff --git a/PKGBUILD b/PKGBUILD
index 8e4148dd7499..95b222adc1d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,23 @@
-_name=CodeIntel
-_pkg=$(tr '[:upper:]' '[:lower:]' <<< $_name)
-
-pkgname=("python-${_pkg}" "python2-${_pkg}")
-pkgver=2.0.0b33
+# Contributor: minj4ever <minj4ever@inbox.lt>
+_base=CodeIntel
+pkgname=python-${_base,,}
+pkgver=2.0.0
 pkgrel=1
-pkgdesc="Komodo Edit CodeIntel"
-url="https://github.com/Kronuz/CodeIntel"
-#url="https://github.com/Komodo/KomodoEdit/wiki/290-CodeIntel-OOP-Protocol#set-environment"
-makedepends=('python-setuptools' 'python2-setuptools')
-license=('MPL 1.1')
+pkgdesc="Full-featured code intelligence and smart autocomplete engine"
+url="https://github.com/SublimeCodeIntel/${_base}"
+makedepends=(python-setuptools)
+license=('custom')
 arch=('any')
-source=('https://pypi.python.org/packages/cc/7c/ace9843f71374185b62b2910410a5777e4e0de5d6651a705339c877091c2/CodeIntel-2.0.0b33.tar.gz')
-md5sums=('347d80fd0f859fe58f8d49391a60e530')
-
-prepare() {
-#   mv "${srcdir}/${_name}-${pkgver}/"{SilverCity,silvercity}
-    cp -a "${srcdir}/${_name}-${pkgver}"{,-python2}
-}
+source=(${url}/archive/v${pkgver}.tar.gz)
+sha512sums=('109b56b1dd5abd965813a4f3ae5951333a822c76af7f7650ff8b621b52500473df3c846f14d278e4cf263186e0e71b158030a7f87456978bdf3069a6929547d3')
 
 build() {
-    cd "${srcdir}/${_name}-${pkgver}"
-    python setup.py build
-    cd "${srcdir}/${_name}-${pkgver}-python2"
-    python2 setup.py build
+  cd "${_base}-${pkgver}"
+  python setup.py build
 }
 
 package_python-codeintel() {
-    cd "${srcdir}/${_name}-${pkgver}"
-    python setup.py install --root="$pkgdir" --optimize=1
-}
-
-package_python2-codeintel() {
-    cd "${srcdir}/${_name}-${pkgver}-python2"
-    python2 setup.py install --root="$pkgdir" --optimize=1
+  cd "${_base}-${pkgver}"
+  export PYTHONHASHSEED=0
+  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/pip2arch-fix-tmpl.patch b/pip2arch-fix-tmpl.patch
deleted file mode 100644
index 4c11ea4cb83b..000000000000
--- a/pip2arch-fix-tmpl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/PKGBUILD b/PKGBUILD
-index bb1e5c6..8e4148d 100644
---- a/PKGBUILD
-+++ b/PKGBUILD
-@@ -1,22 +1,36 @@
-+_name=CodeIntel
-+_pkg=$(tr '[:upper:]' '[:lower:]' <<< $_name)
- 
--pkgname=codeintel
-+pkgname=("python-${_pkg}" "python2-${_pkg}")
- pkgver=<pkgver>
- pkgrel=1
- pkgdesc="Komodo Edit CodeIntel"
- url="https://github.com/Kronuz/CodeIntel"
--depends=('python' )
--makedepends=('python3' )
-+#url="https://github.com/Komodo/KomodoEdit/wiki/290-CodeIntel-OOP-Protocol#set-environment"
-+makedepends=('python-setuptools' 'python2-setuptools')
- license=('MPL 1.1')
- arch=('any')
- source=('<source>')
- md5sums=('<hash>')
- 
-+prepare() {
-+#   mv "${srcdir}/${_name}-${pkgver}/"{SilverCity,silvercity}
-+    cp -a "${srcdir}/${_name}-${pkgver}"{,-python2}
-+}
-+
- build() {
--    cd $srcdir/CodeIntel-<pkgver>
-+    cd "${srcdir}/${_name}-${pkgver}"
-     python setup.py build
-+    cd "${srcdir}/${_name}-${pkgver}-python2"
-+    python2 setup.py build
- }
- 
--package() {
--    cd $srcdir/CodeIntel-<pkgver>
--    python setup.py install --root="$pkgdir" --optimize=1 
-+package_python-codeintel() {
-+    cd "${srcdir}/${_name}-${pkgver}"
-+    python setup.py install --root="$pkgdir" --optimize=1
-+}
-+
-+package_python2-codeintel() {
-+    cd "${srcdir}/${_name}-${pkgver}-python2"
-+    python2 setup.py install --root="$pkgdir" --optimize=1
- }
diff --git a/update.sh b/update.sh
deleted file mode 100755
index 8adc821d4bb0..000000000000
--- a/update.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-pip2arch CodeIntel #-v2.0.0b10
-sed -e '/Automatically generated by pip2arch/d' -i PKGBUILD
-
-pkgver=$(grep -oPm1 '(?<=pkgver=).*' PKGBUILD)
-url=$(grep -oPm1 "(?<=source=\(').*(?=')" PKGBUILD)
-digest=$(grep -oPm1 "(?<=sums=\(').*(?=')" PKGBUILD)
-
-cp pip2arch-fix-tmpl.patch pip2arch-fix.patch
-sed -e "s@<pkgver>@${pkgver}@g" -e "s@<source>@${url}@g" \
-    -e "s@<hash>@${digest}@g" -i pip2arch-fix.patch
-
-patch -p1 < pip2arch-fix.patch
-if [ $? -eq 0 ]; then
-    rm pip2arch-fix.patch
-    makepkg --printsrcinfo > .SRCINFO
-fi