Merge pull request #17 from raphaelquast/dev

merge for v0.1.5

eomaps/__init__.py

@@ -1,6 +1,9 @@
-from pathlib import Path
+from pkg_resources import get_distribution, DistributionNotFound
 
-__version__ = (Path(__file__).parents[1] / "VERSION").read_text().strip()
+try:
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:
+    pass
 
 __author__ = "Raphael Quast"
 

eomaps/eomaps.py

@@ -634,20 +634,21 @@ def picker(artist, event):
         )
 
     def _set_cpos(self, x, y, radiusx, radiusy, cpos):
+        # use x = x + ...   instead of x +=  to allow casting from int to float
         if cpos == "c":
             pass
         elif cpos == "ll":
-            x += radiusx
-            y += radiusy
+            x = x + radiusx
+            y = y + radiusy
         elif cpos == "ul":
-            x += radiusx
-            y -= radiusy
+            x = x + radiusx
+            y = y - radiusy
         elif cpos == "lr":
-            x -= radiusx
-            y += radiusy
+            x = x - radiusx
+            y = y + radiusy
         elif cpos == "ur":
-            x -= radiusx
-            y -= radiusx
+            x = x - radiusx
+            y = y - radiusx
 
         return x, y
 
@@ -1611,7 +1612,7 @@ def onpick(event):
                             ind=ind,
                         )
 
-                    callback(**clickdict, **kwargs)
+                        callback(**clickdict, **kwargs)
 
                 else:
                     if "annotate" in [i.split("__")[0] for i in self._attached_cbs]:

setup.py

@@ -7,15 +7,15 @@
 from pathlib import Path
 from setuptools import setup, find_packages
 
-version = (Path(__file__).parent / "VERSION").read_text().strip()
+version = "0.1.5"
 
 setup(
     name="EOmaps",
     version=version,
     description="A general-purpose library to generate interactive plots of geographical datasets.",
     packages=find_packages(),
     package_dir={"eomaps": "eomaps"},
-    include_package_data=False,
+    # include_package_data=True,
     author="Raphael Quast",
     author_email="[email protected]",
     maintainer="Raphael Quast",