From f05531cdec67e0642a47e852773fd714ca71b7a7 Mon Sep 17 00:00:00 2001 From: Aleksey Bilogur Date: Sat, 14 Oct 2017 22:02:02 -0400 Subject: [PATCH] Another correction. --- geoplot/__init__.py | 9 +++++++-- geoplot/{crs => }/crs.py | 0 geoplot/crs/__init__.py | 0 geoplot/{utils => }/utils.py | 0 geoplot/utils/__init__.py | 0 setup.py | 4 ++-- 6 files changed, 9 insertions(+), 4 deletions(-) rename geoplot/{crs => }/crs.py (100%) delete mode 100644 geoplot/crs/__init__.py rename geoplot/{utils => }/utils.py (100%) delete mode 100644 geoplot/utils/__init__.py diff --git a/geoplot/__init__.py b/geoplot/__init__.py index 76ce5451..e0a15473 100644 --- a/geoplot/__init__.py +++ b/geoplot/__init__.py @@ -1,3 +1,8 @@ from .geoplot import (pointplot, polyplot, choropleth, aggplot, cartogram, kdeplot, sankey) -from .crs import crs -from .utils import utils +from .crs import (PlateCarree, LambertCylindrical, Mercator, Miller, Mollweide, Robinson, Sinusoidal, + InterruptedGoodeHomolosine, Geostationary, NorthPolarStereo, SouthPolarStereo, Gnomonic, + AlbersEqualArea, AzimuthalEquidistant, LambertConformal, Orthographic, Stereographic, + TransverseMercator, LambertAzimuthalEqualArea, UTM, OSGB, EuroPP, OSNI) +from .utils import (gaussian_points, gaussian_polygons, gaussian_multi_polygons, uniform_random_global_points, + uniform_random_global_network, classify_clusters) +from .quad import (QuadTree, subpartition, flatten) diff --git a/geoplot/crs/crs.py b/geoplot/crs.py similarity index 100% rename from geoplot/crs/crs.py rename to geoplot/crs.py diff --git a/geoplot/crs/__init__.py b/geoplot/crs/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/geoplot/utils/utils.py b/geoplot/utils.py similarity index 100% rename from geoplot/utils/utils.py rename to geoplot/utils.py diff --git a/geoplot/utils/__init__.py b/geoplot/utils/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/setup.py b/setup.py index 3235160c..c7ab528c 100644 --- a/setup.py +++ b/setup.py @@ -4,12 +4,12 @@ packages = ['geoplot'], # this must be the same as the name above install_requires=['matplotlib', 'seaborn', 'pandas', 'geopandas', 'cartopy'], py_modules=['geoplot', 'crs', 'utils', 'quad'], - version = '0.1.0', + version = '0.1.1', description = 'High-level geospatial plotting for Python.', author = 'Aleksey Bilogur', author_email = 'aleksey.bilogur@gmail.com', url = 'https://github.com/ResidentMario/geoplot', - download_url = 'https://github.com/ResidentMario/geoplot/tarball/0.1.0', + download_url = 'https://github.com/ResidentMario/geoplot/tarball/0.1.1', keywords = ['data', 'data visualization', 'data analysis', 'data science', 'pandas', 'geospatial data', 'geospatial analytics'], classifiers = [],