Merge pull request #576 from ksunden/namespace_package

New style namespace packages

Author: molinav

packages/basemap/setup.py

@@ -10,7 +10,7 @@
 import glob
 import warnings
 from setuptools import setup
-from setuptools import find_packages
+from setuptools import find_namespace_packages
 from setuptools.command.sdist import sdist
 from setuptools.extension import Extension
 
@@ -223,13 +223,10 @@ def run(self):
         "maps",
         "plots",
     ],
-    "namespace_packages": [
-        "mpl_toolkits",
-    ],
     "package_dir":
         {"": "src"},
     "packages":
-        find_packages(where="src"),
+        find_namespace_packages(where="src"),
     "ext_modules":
         ext_modules,
     "data_files":

packages/basemap/src/mpl_toolkits/__init__.py

@@ -7,7 +7,7 @@
 import os
 import itertools
 from setuptools import setup
-from setuptools import find_packages
+from setuptools import find_namespace_packages
 
 
 def get_content(name, splitlines=False):
@@ -108,13 +108,10 @@ def get_content(name, splitlines=False):
         "maps",
         "plots",
     ],
-    "namespace_packages": [
-        "mpl_toolkits.basemap_data",
-    ],
     "package_dir":
         {"": "src"},
     "packages":
-        find_packages(where="src"),
+        find_namespace_packages(where="src"),
     "package_data": {
         "mpl_toolkits.basemap_data":
             data_files,

packages/basemap_data/setup.py

@@ -7,7 +7,7 @@
 import os
 import itertools
 from setuptools import setup
-from setuptools import find_packages
+from setuptools import find_namespace_packages
 
 
 def get_content(name, splitlines=False):
@@ -86,13 +86,10 @@ def get_content(name, splitlines=False):
         "maps",
         "plots",
     ],
-    "namespace_packages": [
-        "mpl_toolkits.basemap_data",
-    ],
     "package_dir":
         {"": "src"},
     "packages":
-        find_packages(where="src"),
+        find_namespace_packages(where="src"),
     "package_data": {
         "mpl_toolkits.basemap_data":
             data_files,