1.6.1

2 files changed, 31 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92a585a4acad..28240d83c1d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,27 @@
 pkgbase = octoprint
 	pkgdesc = Responsive web interface for controlling a 3D printer (RepRap, Ultimaker, ...)
-	pkgver = 1.5.3
+	pkgver = 1.6.1
 	pkgrel = 1
 	url = http://octoprint.org/
 	install = octoprint.install
 	arch = any
 	license = AGPL3
 	makedepends = python-virtualenv
-	depends = python-feedparser
-	depends = python-filetype
-	depends = python-frozendict
-	depends = python-future
-	depends = python-markdown
-	depends = python-netaddr
+	makedepends = rust
 	depends = python-regex
-	depends = python-rsa
-	depends = python-tornado
-	depends = python-unidecode
+	depends = python-flask-login
+	depends = python-pyserial
+	depends = python-netaddr
+	depends = python-netifaces
+	depends = python-pkginfo
+	depends = python-requests
+	depends = python-psutil
+	depends = python-future
+	depends = python-websocket-client
 	depends = python-wrapt
+	depends = python-filetype
+	depends = python-blinker
+	depends = python-babel
 	optdepends = ffmpeg: timelapse support
 	optdepends = curaengine: fast and robust engine for processing 3D models
 	optdepends = mjpg-streamer: stream images from webcam
@@ -27,7 +31,7 @@ pkgbase = octoprint
 	options = !distcc
 	options = !ccache
 	backup = etc/conf.d/octoprint
-	source = octoprint::git+https://github.com/foosel/OctoPrint.git#tag=1.5.3
+	source = octoprint::git+https://github.com/foosel/OctoPrint.git#tag=1.6.1
 	source = octoprint.sysusers
 	source = octoprint.service
 	source = octoprint-serve
@@ -39,4 +43,3 @@ pkgbase = octoprint
 	sha256sums = 02be5d5a18febe215809882d96f068092c4474abb4e76d82e4450b860a4e9ef5
 
 pkgname = octoprint
-
diff --git a/PKGBUILD b/PKGBUILD
index 3964afda471a..513b92c1c409 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,30 @@
 ## Maintainer: pappy <pappy _AT_ a s c e l i o n _DOT_ com>
 
 pkgname=octoprint
-pkgver=1.5.3
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="Responsive web interface for controlling a 3D printer (RepRap, Ultimaker, ...)"
 arch=(any)
 url="http://octoprint.org/"
 license=('AGPL3')
 depends=(
-		python-feedparser
-		python-filetype
-		python-frozendict
-		python-future
-		python-markdown
-		python-netaddr
 		python-regex
-		python-rsa
-		python-tornado
-		python-unidecode
+		python-flask-login
+		python-pyserial
+		python-netaddr
+		python-netifaces
+		python-pkginfo
+		python-requests
+		python-psutil
+		python-future
+		python-websocket-client
 		python-wrapt
+		python-filetype
+		python-blinker
+
+		python-babel
 		)
-makedepends=('python-virtualenv')
+makedepends=('python-virtualenv' 'rust')
 optdepends=('ffmpeg: timelapse support'
 			'curaengine: fast and robust engine for processing 3D models'
 			'mjpg-streamer: stream images from webcam'
@@ -61,7 +65,7 @@ package() {
 	virtualenv --system-site-packages --no-setuptools --no-wheel $pkgdir/usr/lib/$pkgname
 
 	pushd $srcdir/$pkgname
-	$pkgdir/usr/lib/$pkgname/bin/pip install --install-option '--optimize=1' .
+	$pkgdir/usr/lib/$pkgname/bin/pip --no-cache-dir install --install-option '--optimize=1' .
 	popd
 
 	find $pkgdir/usr/lib/$pkgname/bin -type f -exec grep -q $pkgdir {} \; -exec sed -i "s:$pkgdir::g" {} \;