diff --git a/gtk-doc/PKGBUILD b/gtk-doc/PKGBUILD
index eb1256e1..c9958f34 100644
--- a/gtk-doc/PKGBUILD
+++ b/gtk-doc/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gtk-doc
 pkgver=1.32
-pkgrel=1
+pkgrel=2
 pkgdesc="Documentation tool for public library API"
 arch=('i686' 'x86_64')
 url="https://www.gtk.org/gtk-doc/"
@@ -12,14 +12,13 @@ depends=("docbook-xsl"
          "glib2"
          "gnome-doc-utils"
          "libxml2-python"
-         "python3"
+         "python"
+         "python-pygments"
          "vim"
          "yelp-tools"
-         "python2-six"
         )
 makedepends=("pkg-config"
              "glib2-devel"
-             "python3"
              'itstool'
             )
 source=(https://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz)
@@ -34,7 +33,7 @@ prepare() {
 build() {
   mkdir -p "${srcdir}/build-${CHOST}"
   cd "${srcdir}/build-${CHOST}"
-  export PYTHON=/usr/bin/python3
+  export PYTHON=/usr/bin/python
   ../${pkgname}-${pkgver}/configure \
     --prefix=/usr \
     --build=${CHOST} \
diff --git a/gyp-git/PKGBUILD b/gyp-git/PKGBUILD
index 646c857c..d0f25285 100644
--- a/gyp-git/PKGBUILD
+++ b/gyp-git/PKGBUILD
@@ -3,7 +3,7 @@
 
 _realname=gyp
 pkgname=${_realname}-git
-pkgver=r2162.2eef1129
+pkgver=r2162.28b55023
 pkgrel=1
 pkgdesc="GYP can Generate Your Projects."
 url="https://code.google.com/p/gyp/"
diff --git a/libevent/PKGBUILD b/libevent/PKGBUILD
index 26744a8b..f55bf4e2 100644
--- a/libevent/PKGBUILD
+++ b/libevent/PKGBUILD
@@ -24,7 +24,7 @@ build() {
     --sysconfdir=/etc \
     --disable-libevent-regress
   make
-  make DESTDIR="$srcdir/dest" install
+  make DESTDIR="${srcdir}/dest" install
 }
 
 check() {
@@ -34,11 +34,11 @@ check() {
 
 package_libevent() {
   depends=('openssl')
-  optdepends=('python3: to use event_rpcgen.py')
+  optdepends=('python: to use event_rpcgen.py')
 
-  mkdir -p $pkgdir/usr/bin
-  cp -rf $srcdir/dest/usr/bin $pkgdir/usr/
-  install -Dm644 $srcdir/${pkgname}-${pkgver}-stable/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  mkdir -p ${pkgdir}/usr/bin
+  cp -rf ${srcdir}/dest/usr/bin $pkgdir/usr/
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}-stable/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_libevent-devel() {
@@ -46,7 +46,7 @@ package_libevent-devel() {
   groups=('development')
   depends=("libevent=${pkgver}" "openssl-devel")
 
-  mkdir -p $pkgdir/usr
-  cp -rf $srcdir/dest/usr/include $pkgdir/usr/
-  cp -rf $srcdir/dest/usr/lib $pkgdir/usr/
+  mkdir -p ${pkgdir}/usr
+  cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/
+  cp -rf ${srcdir}/dest/usr/lib ${pkgdir}/usr/
 }
diff --git a/python-appdirs/PKGBUILD b/python-appdirs/PKGBUILD
index 5e606bb6..5c825965 100644
--- a/python-appdirs/PKGBUILD
+++ b/python-appdirs/PKGBUILD
@@ -9,28 +9,26 @@ arch=('any')
 url="https://github.com/ActiveState/appdirs"
 license=('MIT')
 depends=('python')
-makedepends=('python3-setuptools')
+makedepends=('python-setuptools')
 provides=('python3-appdirs')
 replaces=('python3-appdirs')
 conflicts=('python3-appdirs')
-source=("https://pypi.io/packages/source/a/appdirs/appdirs-$pkgver.tar.gz")
+source=("https://pypi.io/packages/source/a/appdirs/appdirs-${pkgver}.tar.gz")
 sha256sums=('9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92')
 
 build() {
   cd "$srcdir"/appdirs-$pkgver
-
-  python3 setup.py build
+  /usr/bin/python setup.py build
 }
 
 check() {
-  cd "$srcdir"/appdirs-$pkgver
-
-  python3 setup.py test
+  cd "${srcdir}"/appdirs-${pkgver}
+  /usr/bin/python setup.py test
 }
 
 package() {
-  cd appdirs-$pkgver
+  cd appdirs-${pkgver}
 
-  python3 setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+  /usr/bin/python setup.py install --root="${pkgdir}/" --optimize=1
+  install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.txt
 }
diff --git a/python-atomicwrites/PKGBUILD b/python-atomicwrites/PKGBUILD
index bb501f18..42a12cf9 100644
--- a/python-atomicwrites/PKGBUILD
+++ b/python-atomicwrites/PKGBUILD
@@ -10,31 +10,30 @@ arch=('any')
 url="https://github.com/untitaker/python-atomicwrites"
 license=('MIT')
 depends=('python')
-makedepends=('python3-setuptools')
-checkdepends=('python3-pytest')
+makedepends=('python-setuptools')
+checkdepends=('python-pytest')
 provides=("python3-${_realname}")
 replaces=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 source=("https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha512sums=('9b619b622f4509c2a41ad340f91bd6e74f238cf9a35f4662fa70f1f957a78069cb89f9bf16f8da70a597bc43a0c6c4fdea6afd0d157364a53a2fa5d8f4272a61')
+sha512sums=('7a257286ba35d6f0db3772ef9666283f29c36719fe35eeb1cb9c36341f0f6a0d7c316d236927ef031f2b8ac6c245320481f51c59e0e1ccf2cbea49065a13d474')
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  python3 setup.py build
+  cd "${srcdir}/python-${_realname}-${pkgver}"
+  /usr/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-${_realname}-${pkgver}"
 
   export PYTHONPATH=build;${PYTHONPATH}
   py.test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/python-${_realname}-${pkgver}"
 
-  python setup.py install --skip-build \
+  /usr/bin/python setup.py install --skip-build \
     --optimize=1 \
     --prefix=/usr \
     --root="${pkgdir}"
diff --git a/python-attrs/PKGBUILD b/python-attrs/PKGBUILD
index 16eb359b..35b9ea45 100644
--- a/python-attrs/PKGBUILD
+++ b/python-attrs/PKGBUILD
@@ -10,7 +10,7 @@ arch=('any')
 license=('MIT')
 url="https://attrs.readthedocs.org/"
 depends=('python')
-makedepends=('python3-setuptools')
+makedepends=('python-setuptools')
 provides=("python3-${_realname}")
 replaces=("python3-${_realname}")
 conflicts=("python3-${_realname}")
@@ -19,13 +19,11 @@ sha512sums=('b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d76
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python3 setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python3 setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  /usr/bin/python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/python-beaker/PKGBUILD b/python-beaker/PKGBUILD
index b5ff79de..620bdf0d 100644
--- a/python-beaker/PKGBUILD
+++ b/python-beaker/PKGBUILD
@@ -4,12 +4,12 @@ _realname=beaker
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
 pkgver=1.11.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
 arch=('i686' 'x86_64')
 license=('PSF')
 url="http://beaker.groovie.org/"
-depends=("python" "python3-setuptools")
+depends=("python" "python-setuptools")
 provides=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 replaces=("python3-${_realname}")
diff --git a/python-colorama/PKGBUILD b/python-colorama/PKGBUILD
index 60c37b9c..70f577a5 100644
--- a/python-colorama/PKGBUILD
+++ b/python-colorama/PKGBUILD
@@ -16,7 +16,7 @@ provides=("python3-${_pyname}")
 conflicts=("python3-${_pyname}")
 replaces=("python3-${_pyname}")
 depends=('python')
-checkdepends=('python3-mock')
+checkdepends=('python-mock')
 source=(colorama-${pkgver}.tar.gz::https://github.com/tartley/colorama/archive/${pkgver}.tar.gz)
 sha256sums=('0d93fc83f70c926cd8437b488ea9c8741f9df2ac2d2d681c40783d5ceef98e2b')
 
@@ -29,7 +29,7 @@ build() {
 check() {
   cd "$srcdir/${_pyname}-${pkgver}"
 
-  /usr/bin/python.exe -m unittest discover -p *_test.py || warning "test failed"
+  /usr/bin/python -m unittest discover -p *_test.py || warning "test failed"
 }
 
 package() {
diff --git a/python-configobj/PKGBUILD b/python-configobj/PKGBUILD
index 87faf07a..256e25b8 100644
--- a/python-configobj/PKGBUILD
+++ b/python-configobj/PKGBUILD
@@ -10,18 +10,16 @@ arch=('any')
 license=('BSD')
 url="https://github.com/DiffSK/configobj"
 depends=('python')
-makedepends=('python3-six')
+makedepends=('python-six')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  /usr/bin/python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/python-dulwich/PKGBUILD b/python-dulwich/PKGBUILD
index 664eb047..f62e3891 100644
--- a/python-dulwich/PKGBUILD
+++ b/python-dulwich/PKGBUILD
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64')
 url='https://www.dulwich.io'
 license=('GPL')
 depends=('python')
-makedepends=('python3-setuptools' 'libcrypt-devel')
+makedepends=('python-setuptools' 'libcrypt-devel')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('805a9b1932dc28b91f359f529c2e46b7623aec3ab719c96d3f2fc63d0d8d8411')
 
@@ -19,14 +19,13 @@ prepare(){
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
-  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  /usr/bin/python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 
   # We are missing runtime deps, so don't bother installing the cli tools.
   # dulwich alone is enough to get breezy working.
diff --git a/python-fastimport/PKGBUILD b/python-fastimport/PKGBUILD
index 1c407461..67909496 100644
--- a/python-fastimport/PKGBUILD
+++ b/python-fastimport/PKGBUILD
@@ -10,18 +10,16 @@ arch=('any')
 license=('GPL')
 url="https://pypi.python.org/pypi/fastimport/"
 depends=('python')
-makedepends=('python3-setuptools')
+makedepends=('python-setuptools')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('b2f2e8eb97000256e1aab83d2a0a053fc7b93c3aa4f7e9b971a5703dfc5963b9')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  /usr/bin/python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/python-mako/PKGBUILD b/python-mako/PKGBUILD
index 4eb27d9c..a6ce9e89 100644
--- a/python-mako/PKGBUILD
+++ b/python-mako/PKGBUILD
@@ -4,15 +4,15 @@ _realname=mako
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A super-fast templating language that borrows the best ideas from the existing templating languages"
 arch=('i686' 'x86_64')
 url="https://pypi.python.org/pypi/Mako"
 license=('MIT')
-depends=("python3-markupsafe"
-         "python3-beaker")
-makedepends=("python3-setuptools")
-checkdepends=("python3-nose")
+depends=("python-markupsafe"
+         "python-beaker")
+makedepends=("python-setuptools")
+checkdepends=("python-nose")
 provides=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 replaces=("python3-${_realname}")
@@ -21,21 +21,17 @@ source=("https://pypi.python.org/packages/source/M/Mako/Mako-${pkgver}.tar.gz")
 sha256sums=('2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4')
 
 build() {
-  cd "$srcdir/Mako-$pkgver"
-
+  cd "${srcdir}/Mako-${pkgver}"
   /usr/bin/python setup.py build
 }
 
 check() {
-  cd "$srcdir/Mako-$pkgver"
-
+  cd "${srcdir}/Mako-${pkgver}"
   /usr/bin/python setup.py test
 }
 
 package() {
-  cd "$srcdir/Mako-$pkgver"
-
-  /usr/bin/python setup.py install --prefix=/usr --root="$pkgdir" -O1
-
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python3-${_realname}/COPYING"
+  cd "${srcdir}/Mako-${pkgver}"
+  /usr/bin/python setup.py install --prefix=/usr --root="${pkgdir}" -O1
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python-${_realname}/COPYING"
 }
diff --git a/python-markupsafe/PKGBUILD b/python-markupsafe/PKGBUILD
index 6a1d8916..766b03ce 100644
--- a/python-markupsafe/PKGBUILD
+++ b/python-markupsafe/PKGBUILD
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64')
 license=('custom')
 url="https://pypi.python.org/pypi/MarkupSafe"
 depends=("python")
-makedepends=("python3-setuptools")
+makedepends=("python-setuptools")
 provides=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 replaces=("python3-${_realname}")
@@ -18,15 +18,12 @@ source=("https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgve
 sha256sums=('29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b')
 
 build() {
-  cd "$srcdir/MarkupSafe-$pkgver"
-
+  cd "${srcdir}/MarkupSafe-${pkgver}"
   /usr/bin/python setup.py build
 }
 
 package() {
-  cd "$srcdir/MarkupSafe-$pkgver"
-
-  /usr/bin/python setup.py install --prefix=/usr --root="$pkgdir" -O1
-
+  cd "${srcdir}/MarkupSafe-${pkgver}"
+  /usr/bin/python setup.py install --prefix=/usr --root="${pkgdir}" -O1
   install -Dm644 LICENSE.rst "${pkgdir}/usr/share/licenses/python-${_realname}/LICENSE"
 }
\ No newline at end of file
diff --git a/python-mock/PKGBUILD b/python-mock/PKGBUILD
index 3a4491e7..985eb831 100644
--- a/python-mock/PKGBUILD
+++ b/python-mock/PKGBUILD
@@ -24,13 +24,13 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/mock-$pkgver"
-  python setup.py build
+  cd "${srcdir}/mock-${pkgver}"
+  /usr/bin/python setup.py build
 }
 
 package() {
-  cd "$srcdir/mock-$pkgver"
+  cd "${srcdir}/mock-${pkgver}"
 
-  python setup.py install --optimize=1 --root="$pkgdir"
+  /usr/bin/python setup.py install --optimize=1 --root="$pkgdir"
   install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/python-more-itertools/PKGBUILD b/python-more-itertools/PKGBUILD
new file mode 100644
index 00000000..03c91b8a
--- /dev/null
+++ b/python-more-itertools/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
+
+_realname=more-itertools
+pkgbase=python-${_realname}
+pkgname=("python-${_realname}")
+provides=("python3-${_realname}")
+replaces=("python3-${_realname}")
+conflicts=("python3-${_realname}")
+pkgver=8.2.0
+pkgrel=1
+pkgdesc='More routines for operating on iterables, beyond itertools'
+arch=('any')
+url='https://github.com/erikrose/more-itertools'
+#url='https://pypi.python.org/pypi/more-itertools'
+license=('MIT')
+makedepends=('python-setuptools')
+depends=('python')
+source=("https://files.pythonhosted.org/packages/source/m/more-itertools/more-itertools-${pkgver}.tar.gz")
+sha512sums=('08b78a5a85a04296fad82857017ec2763250de0bd3159bc7bd8b23b54f90b363023b64e899e79603f2b4c8267d0bb2ed598d7e2910d541921252d66af656cba2')
+
+prepare() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+  # Set version for setuptools_scm
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+}
+
+build() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+  /usr/bin/python setup.py build
+}
+
+package() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+  /usr/bin/python setup.py install --root="${pkgdir}/" --optimize=0 --skip-build
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/python-nose/PKGBUILD b/python-nose/PKGBUILD
index 2b934b9b..cabf5a3d 100644
--- a/python-nose/PKGBUILD
+++ b/python-nose/PKGBUILD
@@ -4,12 +4,12 @@ _realname=nose
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
 pkgver=1.3.7
-pkgrel=5
+pkgrel=6
 pkgdesc="A discovery-based unittest extension"
 arch=('i686' 'x86_64')
 license=('LGPL2.1')
 url="https://nose.readthedocs.io/"
-depends=("python3-setuptools")
+depends=("python-setuptools")
 provides=("python3-${_realname}")
 conflicts=("python3-${_realname}" "python2-${_realname}")
 replaces=("python3-${_realname}")
@@ -17,19 +17,16 @@ source=("https://pypi.python.org/packages/source/n/nose/nose-${pkgver}.tar.gz")
 sha256sums=('f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98')
 
 prepare() {
-  cd "$srcdir/nose-$pkgver"
-
+  cd "${srcdir}/nose-${pkgver}"
   sed -i -e "s:man/man1:share/man/man1:g" setup.py
 }
 
 build() {
   cd "${srcdir}/nose-${pkgver}"
-
   /usr/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/nose-${pkgver}"
-
   /usr/bin/python setup.py install --prefix=/usr --root="${pkgdir}" -O1
 }
\ No newline at end of file
diff --git a/python-packaging/PKGBUILD b/python-packaging/PKGBUILD
index 5ee83bd6..1ae6745b 100644
--- a/python-packaging/PKGBUILD
+++ b/python-packaging/PKGBUILD
@@ -3,29 +3,27 @@
 _realname=packaging
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
-pkgver=19.2
-pkgrel=2
+pkgver=20.1
+pkgrel=1
 pkgdesc="Core utilities for Python packages"
 arch=('any')
 url="https://github.com/pypa/packaging"
 license=('Apache')
-depends=('python3-attrs' 'python3-pyparsing' 'python3-six')
-makedepends=('python3-setuptools' 'git')
+depends=('python-attrs' 'python-pyparsing' 'python-six')
+makedepends=('python-setuptools' 'git')
 provides=("python3-${_realname}")
 replaces=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 source=("https://pypi.io/packages/source/p/packaging/packaging-${pkgver}.tar.gz")
-sha256sums=('28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47')
+sha256sums=('e665345f9eef0c621aa0bf2f8d78cf6d21904eef16a93f020240b704a57f1334')
 
 build() {
   cd "${srcdir}"/packaging-${pkgver}
-
-  python3 setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}"/packaging-${pkgver}
-
-  python3 setup.py install --root "${pkgdir}"
+  /usr/bin/python setup.py install --root "${pkgdir}"
 }
 
diff --git a/python-pbr/PKGBUILD b/python-pbr/PKGBUILD
index b0a73fea..1d801b37 100644
--- a/python-pbr/PKGBUILD
+++ b/python-pbr/PKGBUILD
@@ -3,34 +3,33 @@
 _realname=pbr
 pkgbase=python-${_realname}
 pkgname=(python-${_realname})
-pkgver=5.4.3
-pkgrel=2
+pkgver=5.4.4
+pkgrel=1
 pkgdesc="Python Build Reasonableness"
 arch=('any')
 url='https://pypi.python.org/pypi/pbr'
 license=('Apache')
-depends=('python3-setuptools')
+depends=('python-setuptools')
 provides=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 replaces=("python3-${_realname}")
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack-dev/pbr/archive/$pkgver.tar.gz")
-sha512sums=('83e6357130cba3ed746e2192a87c612af9822212355f105475d98908b52aabd722afcc3932cc38135009023c15b057959411e76b4c5ab9ab6a664b3d26086863')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/openstack-dev/pbr/archive/${pkgver}.tar.gz")
+sha512sums=('0b7d74a16fe2e08f8e39c445c922dbd53fc47c339f6d07993344479aeb2bfae569c02fa819c84bcedcf99a0c098b71f18880ff2434dea8af58ae1b71ffe0ac26')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  export PBR_VERSION=$pkgver
+  export PBR_VERSION=${pkgver}
 }
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
-  python setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
-  python setup.py install -O1 --root="$pkgdir" --skip-build
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
\ No newline at end of file
+  /usr/bin/python setup.py install -O1 --root="${pkgdir}" --skip-build
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/python-pip/PKGBUILD b/python-pip/PKGBUILD
index b8c984cc..15b893c8 100644
--- a/python-pip/PKGBUILD
+++ b/python-pip/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=pip
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
-pkgver=19.3.1
-pkgrel=2
+pkgver=20.0
+pkgrel=1
 pkgdesc="The PyPA recommended tool for installing Python packages"
 url="https://pip.pypa.io/"
 arch=('any')
@@ -15,7 +15,7 @@ provides=("python3-${_realname}")
 replaces=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/pypa/${_realname}/archive/${pkgver}.tar.gz)
-sha256sums=('f12b7a6be2dbbfeefae5f14992c89175ef72ce0fe96452b4f66be855a12841ff')
+sha256sums=('a46819c14ef6726fab4420d3e6caccfd5852c1a5871ec8abe56227fb0af3e812')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -29,4 +29,4 @@ package() {
   python3 setup.py install --prefix=/usr --root="${pkgdir}"
 
   install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
\ No newline at end of file
+}
diff --git a/python-pluggy/PKGBUILD b/python-pluggy/PKGBUILD
index c432c0c0..c266eadd 100644
--- a/python-pluggy/PKGBUILD
+++ b/python-pluggy/PKGBUILD
@@ -3,20 +3,20 @@
 _realname=pluggy
 pkgbase=python-pluggy
 pkgname=(python-${_realname})
-pkgver=0.13.0
-pkgrel=2
+pkgver=0.13.1
+pkgrel=1
 pkgdesc="Plugin and hook calling mechanisms for python"
 arch=('any')
 url="https://www.pluggypayments.com/docs/python"
 license=('MIT')
 depends=('python')
-makedepends=('python3-setuptools' 'python3-setuptools-scm')
-checkdepends=('python3-pytest-runner')
+makedepends=('python-setuptools' 'python-setuptools-scm')
+checkdepends=('python-pytest-runner')
 provides=("python3-${_realname}")
 replaces=("python3-${_realname}")
 conflicts=("python3-${_realname}")
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/pytest-dev/pluggy/archive/$pkgver.tar.gz")
-sha512sums=('cc946bf3e003e0c6fd04d113682560c6e2c84ffa790a6177f43cd5754d25248bae33af6aa77d86c938cea31bc386af9ada88d61499071a6216da1fd94bc11773')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/pytest-dev/pluggy/archive/${pkgver}.tar.gz")
+sha512sums=('3269f7ad7801a70ba8aa3182c568f70e2ee88a90b6f6335be631f9737dd42fac3fb1b27c5b6fe6422de128ddcc58736f0c41ed60b7c0177126dd676b98ece301')
 
 prepare() {
   # Set version for setuptools_scm
@@ -25,20 +25,16 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python3 setup.py build
+  /usr/bin/python setup.py build
 }
 
 check() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python3 setup.py pytest
+  /usr/bin/python setup.py pytest
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python3 setup.py install -O1 --root "$pkgdir" --optimize=1 --skip-build
-
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  /usr/bin/python setup.py install -O1 --root "${pkgdir}" --optimize=1 --skip-build
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/python-py/PKGBUILD b/python-py/PKGBUILD
index c459e7a9..dfd6acc5 100644
--- a/python-py/PKGBUILD
+++ b/python-py/PKGBUILD
@@ -8,20 +8,20 @@
 
 pkgbase=python-py
 pkgname=('python-py')
-pkgver=1.8.0
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
 pkgdesc="library with cross-python path, ini-parsing, io, code, log facilities"
 arch=('any')
 license=('MIT')
 url="https://pylib.readthedocs.io/"
 depends=('python')
-makedepends=('python3-setuptools'
-             'python3-setuptools-scm')
+makedepends=('python-setuptools'
+             'python-setuptools-scm')
 provides=("python3-py")
 replaces=("python3-py")
 conflicts=("python3-py")
-source=("https://pypi.python.org/packages/source/p/py/py-${pkgver}.tar.gz")
-sha512sums=('37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/pytest-dev/py/archive/${pkgver}.tar.gz")
+sha512sums=('6ebe06c50e1279e1a73cf0ef97d75bafc8cd4c7d7990ed5add84aaba52523046f989cf29a11ae86ec56acbb5f0cb43147a0738108902c5eeaddaa8497e5ab32e')
 
 prepare() {
   export LC_CTYPE=en_US.UTF-8
@@ -29,14 +29,12 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/py-${pkgver}"
-
-  /usr/bin/python3 setup.py build
+  cd "${srcdir}/py-${pkgver}"
+  /usr/bin/python setup.py build
 }
 
 package() {
-  cd "$srcdir/py-${pkgver}"
-
-  /usr/bin/python3 setup.py install --root="${pkgdir}" --optimize=1
+  cd "${srcdir}/py-${pkgver}"
+  /usr/bin/python setup.py install --root="${pkgdir}" --optimize=1
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
\ No newline at end of file
+}
diff --git a/python-pygments/PKGBUILD b/python-pygments/PKGBUILD
index acd96a03..c679550a 100644
--- a/python-pygments/PKGBUILD
+++ b/python-pygments/PKGBUILD
@@ -10,7 +10,7 @@ arch=("i686" "x86_64")
 url="http://pygments.org/"
 license=('BSD')
 depends=("python")
-makedepends=("python3-setuptools")
+makedepends=("python-setuptools")
 provides=("python3-pygments")
 conflicts=("python3-pygments")
 replaces=("python3-pygments")
diff --git a/python-pyparsing/PKGBUILD b/python-pyparsing/PKGBUILD
index ba23d4f5..bc9648a3 100644
--- a/python-pyparsing/PKGBUILD
+++ b/python-pyparsing/PKGBUILD
@@ -3,29 +3,27 @@
 _realname=pyparsing
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
-pkgver=2.4.4
-pkgrel=2
+pkgver=2.4.6
+pkgrel=1
 pkgdesc='General parsing module for Python'
 arch=('any')
 url='https://github.com/pyparsing/pyparsing/'
 depends=('python')
-makedepends=('python3-setuptools')
+makedepends=('python-setuptools')
 provides=("python3-${_realname}")
 replaces=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 license=('MIT')
 source=("https://github.com/pyparsing/pyparsing/archive/pyparsing_$pkgver.tar.gz")
-sha256sums=('44cb13c3c953b2cf004637f9ccb0f77cd799174c11539f6b65b3cd76c6de8970')
+sha256sums=('1cfe911bf73d6a03d38c1c7808096ef848d03f4c5df6e4aee69fc7348c89e4f0')
 
 build() {
   cd "${srcdir}"/pyparsing-pyparsing_${pkgver}
-
-  python3 setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd pyparsing-pyparsing_${pkgver}
-
-  python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+  /usr/bin/python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
\ No newline at end of file
+}
diff --git a/python-pytest-runner/PKGBUILD b/python-pytest-runner/PKGBUILD
index a40b1f9d..d8fee4b0 100644
--- a/python-pytest-runner/PKGBUILD
+++ b/python-pytest-runner/PKGBUILD
@@ -3,19 +3,19 @@
 _realname=pytest-runner
 pkgbase=python-${_realname}
 pkgname=("python-${_realname}")
-pkgver=5.1
-pkgrel=2
+pkgver=5.2
+pkgrel=1
 pkgdesc="Invoke py.test as distutils command with dependency resolution"
 arch=('any')
 license=('MIT')
 url="https://github.com/pytest-dev/pytest-runner"
-depends=('python3-pytest')
-makedepends=('python3-setuptools-scm')
+depends=('python-pytest')
+makedepends=('python-setuptools-scm')
 provides=("python3-${_realname}")
 replaces=("python3-${_realname}")
 conflicts=("python3-${_realname}")
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/pytest-dev/pytest-runner/archive/$pkgver.tar.gz")
-sha512sums=('79806b6370e2378b5f230181e265e3046739ebc3ece729d1e3805510b5fb2d34022d60b9071a5a036f3b2604ffedf14b403e9910f0c56a58adc5c51c84866146')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/pytest-dev/pytest-runner/archive/${pkgver}.tar.gz")
+sha512sums=('0ce9c191481ab97795d0f45bdea7669cb61c3ac6aac476954d34c3e09e6fb08fd6bf73f192c014cb7ff2bd90dbfeb0f01d9a9ba7a9c6caeb371e40b42b558d63')
 
 prepare() {
   export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
@@ -23,13 +23,11 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python3 setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
-
-  python3 setup.py install --root="${pkgdir}" --optimize=1
+  /usr/bin/python setup.py install --root="${pkgdir}" --optimize=1
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
\ No newline at end of file
+}
diff --git a/python3-pytest/PKGBUILD b/python-pytest/PKGBUILD
similarity index 52%
rename from python3-pytest/PKGBUILD
rename to python-pytest/PKGBUILD
index 21b41eaa..4d19b5a8 100644
--- a/python3-pytest/PKGBUILD
+++ b/python-pytest/PKGBUILD
@@ -1,24 +1,27 @@
 # Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
 
 pkgbase=python-pytest
-pkgname=('python3-pytest')
-pkgver=5.2.0
+pkgname=('python-pytest')
+pkgver=5.3.5
 pkgrel=1
+provides=("python3-pytest")
+replaces=("python3-pytest")
+conflicts=("python3-pytest")
 pkgdesc="Simple powerful testing with Python"
 arch=('any')
 license=('MIT')
 url="https://pytest.org/"
-depends=('python3' 
-         'python3-atomicwrites'
-         'python3-attrs'
-         'python3-more-itertools'
-         'python3-pluggy'
-         'python3-py'
-         'python3-setuptools'
-         'python3-six')
-makedepends=('python3-setuptools-scm')
+depends=('python'
+         'python-atomicwrites'
+         'python-attrs'
+         'python-more-itertools'
+         'python-pluggy'
+         'python-py'
+         'python-setuptools'
+         'python-six')
+makedepends=('python-setuptools-scm')
 source=("pytest-${pkgver}.tar.gz::https://github.com/pytest-dev/pytest/archive/${pkgver}.tar.gz")
-sha512sums=('37cfd18cea0c92bb4202b03b6afde9896a2517b97a3a20c9d7fc47c3b1ae304de188feb695f805ee5480e887408b419c29659523d73f44dd42aab623505237fc')
+sha512sums=('487bd492522d85184d89c834e606063fc2a1ee3fb374f4a11d851db0dbf6e9d4bea749ee96727600a78dac1dc24f83798d2214b3043bad8fa3da647026b43e04')
 
 prepare() {
   sed -i "s/'_pytest.vendored_packages'//" pytest-${pkgver}/setup.py
@@ -29,11 +32,11 @@ build() {
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
   
   cd "${srcdir}/pytest-${pkgver}"
-  python3 setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd pytest-${pkgver}
-  python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  /usr/bin/python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/python-setuptools-scm/PKGBUILD b/python-setuptools-scm/PKGBUILD
index 4ddc8289..b911e6fa 100644
--- a/python-setuptools-scm/PKGBUILD
+++ b/python-setuptools-scm/PKGBUILD
@@ -3,38 +3,34 @@
 _realname=setuptools-scm
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
-pkgver=3.3.3
-pkgrel=2
+pkgver=3.5.0
+pkgrel=1
 pkgdesc="Handles managing your python package versions in scm metadata"
 arch=('any')
 license=('MIT')
 url='https://github.com/pypa/setuptools_scm'
 depends=('python')
-makedepends=('python3-setuptools')
+makedepends=('python-setuptools')
 provides=("python3-${_realname}")
 replaces=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz"
         0001-python-setuptools-scm-3.1.0-fix-path-error.patch)
-sha256sums=('bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217ab39ea5'
+sha256sums=('5bdf21a05792903cafe7ae0c9501182ab52497614fa6b1750d9dbae7b60c1a87'
             '3a936600ebceccf2315fe76a79e90e4fdcfe2a936b442f6321b2d76a8e9902b1')
 
 prepare() {
   cd "${srcdir}/${_realname/-/_}-${pkgver}"
-
   patch -p1 -i ${srcdir}/0001-python-setuptools-scm-3.1.0-fix-path-error.patch
 }
 
 build() {
   cd "${srcdir}/${_realname/-/_}-${pkgver}"
-
-  python3 setup.py build
+  /usr/bin/python setup.py build
 }
 
 package() {
   cd "${srcdir}/${_realname/-/_}-${pkgver}"
-
-  python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-
+  /usr/bin/python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
   install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/python-setuptools/PKGBUILD b/python-setuptools/PKGBUILD
index 0d78599b..696e1dc7 100644
--- a/python-setuptools/PKGBUILD
+++ b/python-setuptools/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=setuptools
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
-pkgver=41.6.0
-pkgrel=2
+pkgver=45.2.0
+pkgrel=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
 arch=('any')
 license=('PSF')
@@ -14,7 +14,7 @@ provides=("python3-${_realname}" 'python3-distribute')
 replaces=("python3-${_realname}" 'python3-distribute')
 conflicts=("python3-${_realname}")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/pypa/setuptools/archive/v${pkgver}.tar.gz")
-sha512sums=('27dd6762afb7cc5cf302c4086d5142490d90fcba1d4886a6c9d3c7d4bf35cd7670081f103f6f6218b5fdce13a1c461ae7b9d917d0dc60669860e581f1945478a')
+sha512sums=('68a2b600e67dfd1ba25efadd852ed99fff3073ee73959b183ffd8b5c44935628a9eff2f56ac921f4d8d903a389f167ddc2295f031b9b0f7fa9f91970516e4658')
 
 prepare() {
   # Don't download and install deps
@@ -32,10 +32,10 @@ prepare() {
 }
 
 build() {
-  # Build python 3 module
+  # Build python module
   cd "${srcdir}"/setuptools-${pkgver}
-  python3 bootstrap.py
-  python3 setup.py build
+  /usr/bin/python bootstrap.py
+  /usr/bin/python setup.py build
 }
 
 check() { (
@@ -45,13 +45,13 @@ check() { (
   # https://github.com/pypa/setuptools/pull/810
   export PYTHONDONTWRITEBYTECODE=1
 
-  # Check python3 module
+  # Check python module
   # cd "${srcdir}"/setuptools-${pkgver}
-  # python3 setup.py pytest
+  # /usr/bin/python setup.py pytest
 )}
 
 package() {
   cd "${srcdir}"/setuptools-${pkgver}
 
-  python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  /usr/bin/python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
 }
diff --git a/python-six/PKGBUILD b/python-six/PKGBUILD
index 3dc3dbde..9d3ae799 100644
--- a/python-six/PKGBUILD
+++ b/python-six/PKGBUILD
@@ -1,41 +1,33 @@
 # Maintainer: atom2013 <atom.long@hotmail.com>
 
 pkgbase=python-six
-pkgname=('python2-six' 'python3-six')
-pkgver=1.13.0
+pkgname=('python-six')
+pkgver=1.14.0
 pkgrel=1
-pkgdesc="Python 2 and 3 compatibility utilities"
+provides=("python3-six")
+replaces=("python3-six")
+conflicts=("python3-six")
+pkgdesc="Python compatibility utilities"
 arch=('any')
 url="https://pypi.python.org/pypi/six/"
 license=('MIT')
-makedepends=('python3-setuptools' 'python2-setuptools')
+depends=('python')
+makedepends=('python-setuptools')
 source=("https://pypi.io/packages/source/s/six/six-${pkgver}.tar.gz")
-sha256sums=('30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66')
+sha256sums=('236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a')
 
 build() {
-  cp -a six-$pkgver{,-py2}
+  cd "${srcdir}"/six-${pkgver}
+  /usr/bin/python setup.py build
 }
 
 check() {
-  cd "$srcdir"/six-$pkgver
+  cd "${srcdir}"/six-${pkgver}
   py.test
-
-  cd "$srcdir"/six-$pkgver-py2
-  py.test2
 }
 
-package_python3-six() {
-  depends=('python3')
-
+package() {
   cd six-${pkgver}
-  python3 setup.py install --root "${pkgdir}" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python2-six() {
-  depends=('python2')
-
-  cd six-${pkgver}-py2
-  python2 setup.py install --root "${pkgdir}" --optimize=1
+  /usr/bin/python setup.py install --root "${pkgdir}" --optimize=1 --skip-build
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/python3/001-3.4-dbm-cygwin.patch b/python/001-3.4-dbm-cygwin.patch
similarity index 100%
rename from python3/001-3.4-dbm-cygwin.patch
rename to python/001-3.4-dbm-cygwin.patch
diff --git a/python3/00155-avoid-ctypes-thunks.patch b/python/00155-avoid-ctypes-thunks.patch
similarity index 100%
rename from python3/00155-avoid-ctypes-thunks.patch
rename to python/00155-avoid-ctypes-thunks.patch
diff --git a/python3/00170-gc-assertions.patch b/python/00170-gc-assertions.patch
similarity index 100%
rename from python3/00170-gc-assertions.patch
rename to python/00170-gc-assertions.patch
diff --git a/python3/002-3.1-enable-new-dtags.patch b/python/002-3.1-enable-new-dtags.patch
similarity index 100%
rename from python3/002-3.1-enable-new-dtags.patch
rename to python/002-3.1-enable-new-dtags.patch
diff --git a/python3/003-3.4-tkinter-cygwin.patch b/python/003-3.4-tkinter-cygwin.patch
similarity index 100%
rename from python3/003-3.4-tkinter-cygwin.patch
rename to python/003-3.4-tkinter-cygwin.patch
diff --git a/python3/004-3.4-ctypes-cygwin.patch b/python/004-3.4-ctypes-cygwin.patch
similarity index 100%
rename from python3/004-3.4-ctypes-cygwin.patch
rename to python/004-3.4-ctypes-cygwin.patch
diff --git a/python3/005-3.6-PATH_MAX.patch b/python/005-3.6-PATH_MAX.patch
similarity index 100%
rename from python3/005-3.6-PATH_MAX.patch
rename to python/005-3.6-PATH_MAX.patch
diff --git a/python3/006-3.1-ncurses-abi6.patch b/python/006-3.1-ncurses-abi6.patch
similarity index 100%
rename from python3/006-3.1-ncurses-abi6.patch
rename to python/006-3.1-ncurses-abi6.patch
diff --git a/python3/007-3.2-export-PySignal_SetWakeupFd.patch b/python/007-3.2-export-PySignal_SetWakeupFd.patch
similarity index 100%
rename from python3/007-3.2-export-PySignal_SetWakeupFd.patch
rename to python/007-3.2-export-PySignal_SetWakeupFd.patch
diff --git a/python3/009-3.2-distutils-shlibext.patch b/python/009-3.2-distutils-shlibext.patch
similarity index 100%
rename from python3/009-3.2-distutils-shlibext.patch
rename to python/009-3.2-distutils-shlibext.patch
diff --git a/python3/010-3.6-pep3149-cygwin.patch b/python/010-3.6-pep3149-cygwin.patch
similarity index 100%
rename from python3/010-3.6-pep3149-cygwin.patch
rename to python/010-3.6-pep3149-cygwin.patch
diff --git a/python3/011-3.6-thread-cygwin64.patch b/python/011-3.6-thread-cygwin64.patch
similarity index 100%
rename from python3/011-3.6-thread-cygwin64.patch
rename to python/011-3.6-thread-cygwin64.patch
diff --git a/python3/012-3.2-getpath-exe-extension.patch b/python/012-3.2-getpath-exe-extension.patch
similarity index 100%
rename from python3/012-3.2-getpath-exe-extension.patch
rename to python/012-3.2-getpath-exe-extension.patch
diff --git a/python3/013-3.4-select-cygwin.patch b/python/013-3.4-select-cygwin.patch
similarity index 100%
rename from python3/013-3.4-select-cygwin.patch
rename to python/013-3.4-select-cygwin.patch
diff --git a/python3/016-3.6-ftm.patch b/python/016-3.6-ftm.patch
similarity index 100%
rename from python3/016-3.6-ftm.patch
rename to python/016-3.6-ftm.patch
diff --git a/python3/017-3.6-mpdec-cygwin.patch b/python/017-3.6-mpdec-cygwin.patch
similarity index 100%
rename from python3/017-3.6-mpdec-cygwin.patch
rename to python/017-3.6-mpdec-cygwin.patch
diff --git a/python3/025-MINGW-compiler-customize-mingw-cygwin-compilers.patch b/python/025-MINGW-compiler-customize-mingw-cygwin-compilers.patch
similarity index 100%
rename from python3/025-MINGW-compiler-customize-mingw-cygwin-compilers.patch
rename to python/025-MINGW-compiler-customize-mingw-cygwin-compilers.patch
diff --git a/python3/3.6-getrandom.patch b/python/3.6-getrandom.patch
similarity index 100%
rename from python3/3.6-getrandom.patch
rename to python/3.6-getrandom.patch
diff --git a/python3/900-msysize.patch b/python/900-msysize.patch
similarity index 100%
rename from python3/900-msysize.patch
rename to python/900-msysize.patch
diff --git a/python3/920-allow-win-drives-in-os-path-isabs.patch b/python/920-allow-win-drives-in-os-path-isabs.patch
similarity index 100%
rename from python3/920-allow-win-drives-in-os-path-isabs.patch
rename to python/920-allow-win-drives-in-os-path-isabs.patch
diff --git a/python3/PKGBUILD b/python/PKGBUILD
similarity index 100%
rename from python3/PKGBUILD
rename to python/PKGBUILD
diff --git a/python3/dont-make-libpython-readonly.patch b/python/dont-make-libpython-readonly.patch
similarity index 100%
rename from python3/dont-make-libpython-readonly.patch
rename to python/dont-make-libpython-readonly.patch
diff --git a/python2-pip/PKGBUILD b/python2-pip/PKGBUILD
index 365215ff..a58d563b 100644
--- a/python2-pip/PKGBUILD
+++ b/python2-pip/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=pip
 pkgbase="python2-${_realname}"
 pkgname=("python2-${_realname}")
-pkgver=19.3.1
-pkgrel=2
+pkgver=20.0
+pkgrel=1
 pkgdesc="The PyPA recommended tool for installing Python packages"
 url="https://pip.pypa.io/"
 arch=('any')
@@ -13,7 +13,7 @@ depends=('python2' 'python2-setuptools')
 conflicts=('python-pyinstall')
 replaces=('python-pyinstall')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/pypa/${_realname}/archive/${pkgver}.tar.gz)
-sha256sums=('f12b7a6be2dbbfeefae5f14992c89175ef72ce0fe96452b4f66be855a12841ff')
+sha256sums=('a46819c14ef6726fab4420d3e6caccfd5852c1a5871ec8abe56227fb0af3e812')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
diff --git a/python2-setuptools/PKGBUILD b/python2-setuptools/PKGBUILD
index bd5883b5..05eedcad 100644
--- a/python2-setuptools/PKGBUILD
+++ b/python2-setuptools/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=setuptools
 pkgbase="python2-${_realname}"
 pkgname=("python2-${_realname}")
-pkgver=41.6.0
-pkgrel=2
+pkgver=44.0.0
+pkgrel=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
 arch=('any')
 license=('PSF')
@@ -13,7 +13,7 @@ provides=('python2-distribute')
 replaces=('python2-distribute')
 url="https://pypi.python.org/pypi/setuptools"
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/pypa/setuptools/archive/v${pkgver}.tar.gz")
-sha512sums=('27dd6762afb7cc5cf302c4086d5142490d90fcba1d4886a6c9d3c7d4bf35cd7670081f103f6f6218b5fdce13a1c461ae7b9d917d0dc60669860e581f1945478a')
+sha512sums=('48febee840612a56c7f4cb0bc3983bf61a6a08c53dfcb95403f6631061481ba391fc0472d608ea6c0078fda8bcc7bb9f6dd8b73d473f5e4349d6eaeb2ab0050b')
 
 prepare() {
   # Don't download and install deps
@@ -34,8 +34,8 @@ prepare() {
 build() {
   # Build python 2 module
   cd "${srcdir}"/setuptools-${pkgver}
-  python2 bootstrap.py
-  python2 setup.py build
+  /usr/bin/python2 bootstrap.py
+  /usr/bin/python2 setup.py build
 }
 
 check() { (
@@ -47,12 +47,12 @@ check() { (
 
   # Check python2 module
   # cd "${srcdir}"/setuptools-${pkgver}
-  # python2 setup.py pytest
+  # /usr/bin/python2 setup.py pytest
 )}
 
 package() {
   cd "${srcdir}"/setuptools-${pkgver}
 
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  /usr/bin/python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
   rm "${pkgdir}"/usr/bin/easy_install
 }
diff --git a/python3-more-itertools/PKGBUILD b/python3-more-itertools/PKGBUILD
deleted file mode 100644
index 0b371376..00000000
--- a/python3-more-itertools/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
-
-_realname=more-itertools
-pkgbase=python3-${_realname}
-pkgname=("python3-${_realname}")
-pkgver=7.2.0
-pkgrel=1
-pkgdesc='More routines for operating on iterables, beyond itertools'
-arch=('any')
-url='https://github.com/erikrose/more-itertools'
-#url='https://pypi.python.org/pypi/more-itertools'
-license=('MIT')
-makedepends=('python3-setuptools')
-depends=('python3')
-source=("https://files.pythonhosted.org/packages/source/m/more-itertools/more-itertools-$pkgver.tar.gz")
-sha512sums=('840b535bf5f2fc3cf9c4c0106f977f0b178049b95e5ccb6cf51b5e68d0a6afd77a577bb0d0af25ea8cdf4b7dd2ce9691754ba6c773a196f8b10dba5d7683c6b0')
-
-prepare() {
-  cd "${srcdir}"
-  local builddir="python3-build-${CARCH}"
-  rm -rf ${builddir} | true
-  cp -r "${_realname}-${pkgver}" "${builddir}"
-  # Set version for setuptools_scm
-  export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
-}
-
-build() {
-  msg "Python 3 build for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  python${pver} setup.py build
-}
-
-package() {
-  cd "${srcdir}/python3-build-${CARCH}"
-  python3 setup.py install --root="$pkgdir/" --optimize=0 --skip-build
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}