Skip to content

Commit 84500e7

Browse files
authored
Merge pull request #509 from molinav/feature-data
Move basemap data into separate package
2 parents 020295e + fbe5028 commit 84500e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+25
-14
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ include doc/make.py
105105
include doc/conf.py
106106
include doc/index.rst
107107
recursive-include geos-3.3.3 *
108-
recursive-include lib/mpl_toolkits/basemap/data *
108+
recursive-include lib/mpl_toolkits/basemap_data *

lib/mpl_toolkits/basemap/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
if not os.path.isdir(basemap_datadir):
6262
raise RuntimeError('Path in environment BASEMAPDATA not a directory')
6363
else:
64-
basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
64+
from mpl_toolkits import basemap_data
65+
basemap_datadir = os.path.dirname(basemap_data.__file__)
6566

6667
__version__ = '1.2.2+dev'
6768

0 commit comments

Comments
 (0)