1.4.2 - python3

2 files changed, 28 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5c85582b6d7..e80c935b2ddf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,46 +1,33 @@
 pkgbase = octoprint
 	pkgdesc = Responsive web interface for controlling a 3D printer (RepRap, Ultimaker, ...)
-	pkgver = 1.4.1
+	pkgver = 1.4.2
 	pkgrel = 1
 	url = http://octoprint.org/
 	install = octoprint.install
 	arch = any
 	license = AGPL3
-	makedepends = python2-virtualenv
-	depends = python2-argh
-	depends = python2-babel
-	depends = python2-backports.ssl_match_hostname
-	depends = python2-blinker
-	depends = python2-chardet
-	depends = python2-feedparser
-	depends = python2-idna
-	depends = python2-itsdangerous
-	depends = python2-markdown
-	depends = python2-markupsafe
-	depends = python2-netifaces>=0.10.6
-	depends = python2-netifaces<0.11
-	depends = python2-pathtools
-	depends = python2-psutil
-	depends = python2-pyasn1
-	depends = python2-pyserial
-	depends = python2-pytz
-	depends = python2-regex
-	depends = python2-requests
-	depends = python2-sarge
-	depends = python2-six
-	depends = python2-tornado
-	depends = python2-urllib3
+	makedepends = python-virtualenv
+	depends = python-feedparser
+	depends = python-filetype
+	depends = python-frozendict
+	depends = python-future
+	depends = python-markdown
+	depends = python-netaddr
+	depends = python-regex
+	depends = python-rsa
+	depends = python-tornado
+	depends = python-unidecode
+	depends = python-wrapt
 	optdepends = ffmpeg: timelapse support
 	optdepends = curaengine: fast and robust engine for processing 3D models
 	optdepends = mjpg-streamer: stream images from webcam
 	optdepends = motion: motion detector which grabs images from video4linux devices and/or from webcams
-	optdepends = python2-pybonjour: interface to Apple Bonjour and compatible DNS-SD libraries
 	provides = octoprint
 	conflicts = octoprint-venv
 	options = !distcc
 	options = !ccache
 	backup = etc/conf.d/octoprint
-	source = octoprint::git+https://github.com/foosel/OctoPrint.git#tag=1.4.1
+	source = octoprint::git+https://github.com/foosel/OctoPrint.git#tag=1.4.2
 	source = octoprint.sysusers
 	source = octoprint.service
 	source = octoprint-serve
diff --git a/PKGBUILD b/PKGBUILD
index aa1eee6ba196..8a78310ef72e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,30 @@
 ## Maintainer: pappy <pappy _AT_ a s c e l i o n _DOT_ com>
 
 pkgname=octoprint
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="Responsive web interface for controlling a 3D printer (RepRap, Ultimaker, ...)"
 arch=(any)
 url="http://octoprint.org/"
 license=('AGPL3')
 depends=(
-		python2-argh
-		python2-babel
-		python2-backports.ssl_match_hostname
-		python2-blinker
-		python2-chardet
-		python2-feedparser
-		python2-idna
-		python2-itsdangerous
-		python2-markdown
-		python2-markupsafe
-		'python2-netifaces>=0.10.6'
-		'python2-netifaces<0.11'
-		python2-pathtools
-		python2-psutil
-		python2-pyasn1
-		python2-pyserial
-		python2-pytz
-		python2-regex
-		python2-requests
-		python2-sarge
-		python2-six
-		python2-tornado
-		python2-urllib3
+		python-feedparser
+		python-filetype
+		python-frozendict
+		python-future
+		python-markdown
+		python-netaddr
+		python-regex
+		python-rsa
+		python-tornado
+		python-unidecode
+		python-wrapt
 		)
-makedepends=('python2-virtualenv')
+makedepends=('python-virtualenv')
 optdepends=('ffmpeg: timelapse support'
 			'curaengine: fast and robust engine for processing 3D models'
 			'mjpg-streamer: stream images from webcam'
 			'motion: motion detector which grabs images from video4linux devices and/or from webcams'
-			'python2-pybonjour: interface to Apple Bonjour and compatible DNS-SD libraries'
 			)
 provides=(octoprint)
 conflicts=('octoprint-venv')
@@ -71,7 +58,7 @@ prepare()
 }
 
 package() {
-	virtualenv2 --system-site-packages --no-setuptools --no-wheel $pkgdir/usr/lib/$pkgname
+	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' .