Merge lp:~allenap/maas/work-with-setuptools-in-zesty into lp:~maas-committers/maas/trunk

[Gavin Panella]

Fix MANIFEST.in to work with Zesty's apparently broken setuptools.

MANIFEST.in's mini-language has "graft" and "prune" commands. Previously these were interpreted as glob patterns but newer setuptools treat them as directory names.

[Gavin Panella (allenap)]

https://github.com/pypa/setuptools/pull/764 is implicated in the apparent regression.

[Andres Rodriguez (andreserl)]

lgtm! Seems to be working on xenial and zesty. I've compared debian packages and no differences (other than not installing some tests).

Please backport this to lp:maas/2.1

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2015-12-21 15:33:59 +0000
+++ MANIFEST.in	2016-11-23 14:49:19 +0000
@@ -1,11 +1,6 @@
-graft src/*/static
-graft src/*/templates
-graft src/*/fixtures
-graft src/*/specs
-graft src/provisioningserver/*
-graft src/metadataserver/commissioning
+graft src/maasserver/static
+graft src/maasserver/templates
+graft src/metadataserver/fixtures
+graft src/provisioningserver/templates
 include src/maasserver/migrations/south/django16_south_maas19.tar.gz
-prune src/*/testing
-prune src/*/tests
-prune src/maastesting
-prune src/provisioningserver/*/tests
+include src/provisioningserver/drivers/power/*.xml
 
=== modified file 'setup.py'
--- setup.py	2016-10-17 16:42:02 +0000
+++ setup.py	2016-11-23 14:49:19 +0000
@@ -89,6 +89,7 @@
             "*.testing",
             "*.tests",
             "maastesting",
+            "maastesting.*",
         ],
     ),
     package_dir={'': 'src'},