Condense all submodules into a single package and update to 2.0.21

2 files changed, 34 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65b565d6341e..421ca03bc47a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,18 @@
 pkgbase = python-azure-cli
 	pkgdesc = Microsoft Azure Command-Line Tools
-	pkgver = 2.0.4
+	pkgver = 2.0.21
 	pkgrel = 1
 	url = https://github.com/Azure/azure-cli
 	arch = any
 	license = MIT
 	makedepends = python-setuptools
-	depends = python-azure-cli-acr
-	depends = python-azure-cli-acs
-	depends = python-azure-cli-appservice
-	depends = python-azure-cli-batch
-	depends = python-azure-cli-cloud
-	depends = python-azure-cli-component
-	depends = python-azure-cli-configure
-	depends = python-azure-cli-container
-	depends = python-azure-cli-documentdb
-	depends = python-azure-cli-find
-	depends = python-azure-cli-iot
-	depends = python-azure-cli-keyvault
-	depends = python-azure-cli-lab
-	depends = python-azure-cli-monitor
-	depends = python-azure-cli-network
-	depends = python-azure-cli-profile
-	depends = python-azure-cli-redis
-	depends = python-azure-cli-resource
-	depends = python-azure-cli-role
-	depends = python-azure-cli-sql
-	depends = python-azure-cli-storage
-	depends = python-azure-cli-vm
-	source = https://files.pythonhosted.org/packages/source/a/azure-cli/azure-cli-2.0.4.tar.gz
-	md5sums = b0274bbc4f05bfdcfbcbec6bbeb98210
+	depends = python-argcomplete
+	depends = python-azure
+	depends = python-colorama
+	depends = python-humanfriendly
+	depends = python-tabulate
+	source = https://github.com/Azure/azure-cli/archive/azure-cli-2.0.21.tar.gz
+	md5sums = 432bec713c458022ad500fa865434500
 
 pkgname = python-azure-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index 4ab7918c99cd..767b5e86df2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,40 +2,44 @@
 
 _name=azure-cli
 pkgname=python-$_name
-pkgver=2.0.4
+pkgver=2.0.21
 pkgrel=1
 pkgdesc="Microsoft Azure Command-Line Tools"
 arch=('any')
 url="https://github.com/Azure/azure-cli"
 license=('MIT')
-depends=('python-azure-cli-acr' 'python-azure-cli-acs'
-         'python-azure-cli-appservice'
-         'python-azure-cli-batch' 'python-azure-cli-cloud'
-         'python-azure-cli-component' 'python-azure-cli-configure'
-         'python-azure-cli-container' 'python-azure-cli-documentdb'
-         'python-azure-cli-find' 'python-azure-cli-iot'
-         'python-azure-cli-keyvault' 'python-azure-cli-lab'
-         'python-azure-cli-monitor' 'python-azure-cli-network'
-         'python-azure-cli-profile' 'python-azure-cli-redis'
-         'python-azure-cli-resource' 'python-azure-cli-role'
-         'python-azure-cli-sql' 'python-azure-cli-storage'
-         'python-azure-cli-vm')
+depends=( 'python-argcomplete' 'python-azure' 'python-colorama' 'python-humanfriendly' 'python-tabulate')
 makedepends=('python-setuptools')
-source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz")
-md5sums=('b0274bbc4f05bfdcfbcbec6bbeb98210')
+source=("https://github.com/Azure/azure-cli/archive/azure-cli-${pkgver}.tar.gz")
+md5sums=('432bec713c458022ad500fa865434500')
 
 build() {
-  cd "$_name-$pkgver"
-  python setup.py build
+  cd "$_name-$_name-$pkgver/src"
+
+  for d in azure-cli \
+               azure-cli-core \
+               azure-cli-nspkg \
+               azure-cli-command_modules-nspkg \
+               command_modules/azure-cli-*/;
+  do cd $d;
+     python setup.py build;
+     cd -;
+  done;
 }
 
 package() {
-  cd "$_name-$pkgver"
-  python setup.py install --root="$pkgdir" --optimize=1
+  cd "$_name-$_name-$pkgver/src"
+
+  for d in azure-cli \
+               azure-cli-core \
+               azure-cli-nspkg \
+               azure-cli-command_modules-nspkg \
+               command_modules/azure-cli-*/;
+  do cd $d;
+     python setup.py install --root="$pkgdir" --optimize=1
+     cd -;
+  done;
 
   rm "$pkgdir"/usr/lib/python3.?/site-packages/azure/__init__.py
   rm "$pkgdir"/usr/lib/python3.?/site-packages/azure/__pycache__/__init__.*
-  
-  rm "$pkgdir"/usr/lib/python3.?/site-packages/azure/cli/__init__.py
-  rm "$pkgdir"/usr/lib/python3.?/site-packages/azure/cli/__pycache__/__init__.*
 }