starplot 0.11.2__tar.gz → 0.11.4__tar.gz

{starplot-0.11.2 → starplot-0.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: starplot
-Version: 0.11.2
+Version: 0.11.4
 Summary: Star charts and maps
 Keywords: astronomy,stars,charts,maps,constellations
 Author-email: Steve Berardi <hello@steveberardi.com>

{starplot-0.11.2 → starplot-0.11.4}/docs/changelog.md

@@ -16,6 +16,10 @@
     - Fixes default horizon style to be consistent with grayscale extension
 - [**v0.11.2**]
     - Adds `requests` as a required dependency
+- [**v0.11.3**]
+    - Fixes bug with plotting the celestial equator
+- [**v0.11.4**]
+    - Fixes bug with filtering DSOs by NGC/IC identifier
 
 ## v0.10.x
 [Documentation](https://archives.starplot.dev/0.10.2/)

{starplot-0.11.2 → starplot-0.11.4}/hash_checks/hashio.py

@@ -1,6 +1,7 @@
 import sys
 import inspect
 import time
+import multiprocessing as mp
 
 from pathlib import Path
 
@@ -73,22 +74,26 @@ class Hashio:
     def _phash(self, img) -> str:
         return str(imagehash.phash(img))
 
+    def _call_wrapper(self, c):
+        func_name = c.__name__[6:]
+        console.print(f"{func_name}...")
+        filename = c()
+        img = Image.open(filename)
+        return func_name, {
+            "filename": str(filename),
+            "dhash": self._dhash(img),
+            "phash": self._phash(img),
+        }
+
     def _get_hashes(self) -> dict:
         """Gets hashes for all callables"""
-        hashes = {}
-        with console.status("Getting hashes...", spinner="aesthetic"):
-            for c in self.callables:
-                func_name = c.__name__[6:]
-                console.print(f"{func_name}...")
-                filename = c()
-                img = Image.open(filename)
-                hashes[func_name] = {
-                    "filename": str(filename),
-                    "dhash": self._dhash(img),
-                    "phash": self._phash(img),
-                }
-
-        return hashes
+        mp.set_start_method("spawn")  # required for M1 macs? or macOS issue?
+
+        console.print("Getting hashes...", style="bold")
+        with mp.Pool(5) as p:
+            results = p.map(self._call_wrapper, self.callables)
+
+        return {func_name: hashes for func_name, hashes in results}
 
     def _check(self):
         passed = {}

{starplot-0.11.2 → starplot-0.11.4}/src/starplot/__init__.py

@@ -1,6 +1,6 @@
 """Star charts and maps"""
 
-__version__ = "0.11.2"
+__version__ = "0.11.4"
 
 from .base import BasePlot  # noqa: F401
 from .map import MapPlot, Projection  # noqa: F401

{starplot-0.11.2 → starplot-0.11.4}/src/starplot/base.py

@@ -852,11 +852,8 @@ class BasePlot(ABC):
 
         # TODO : handle wrapping
 
-        ra_start = max(0, int(self.ra_min) - 2) * 100
-        ra_end = min(24, int(self.ra_max) + 2) * 100
-
-        for ra in range(ra_start, ra_end, 2):
-            x0, y0 = self._prepare_coords(ra / 100, 0)
+        for ra in range(25):
+            x0, y0 = self._prepare_coords(ra, 0)
             x.append(x0)
             y.append(y0)
 

{starplot-0.11.2 → starplot-0.11.4}/src/starplot/models/dso.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from starplot.data.dsos import DsoType
+from starplot.data.dsos import DsoType, load_ongc, ONGC_TYPE_MAP
 from starplot.mixins import CreateMapMixin, CreateOpticMixin
 from starplot.models.base import SkyObject, SkyObjectManager
 
@@ -8,27 +8,12 @@ from starplot.models.base import SkyObject, SkyObjectManager
 class DsoManager(SkyObjectManager):
     @classmethod
     def all(cls):
-        from starplot.data.dsos import load_ongc, ONGC_TYPE_MAP
-
         all_dsos = load_ongc()
 
         for d in all_dsos.itertuples():
             magnitude = d.mag_v or d.mag_b or None
             magnitude = float(magnitude) if magnitude else None
-            yield DSO(
-                name=d.name,
-                ra=d.ra_degrees / 15,
-                dec=d.dec_degrees,
-                type=ONGC_TYPE_MAP[d.type],
-                maj_ax=d.maj_ax,
-                min_ax=d.min_ax,
-                angle=d.angle,
-                magnitude=magnitude,
-                size=d.size_deg2,
-                m=d.m,
-                ngc=d.ngc,
-                ic=d.ic,
-            )
+            yield from_tuple(d)
 
 
 class DSO(SkyObject, CreateMapMixin, CreateOpticMixin):
@@ -131,3 +116,22 @@ class DSO(SkyObject, CreateMapMixin, CreateOpticMixin):
 
         """
         pass
+
+
+def from_tuple(d: tuple) -> DSO:
+    magnitude = d.mag_v or d.mag_b or None
+    magnitude = float(magnitude) if magnitude else None
+    return DSO(
+        name=d.name,
+        ra=d.ra_degrees / 15,
+        dec=d.dec_degrees,
+        type=ONGC_TYPE_MAP[d.type],
+        maj_ax=d.maj_ax,
+        min_ax=d.min_ax,
+        angle=d.angle,
+        magnitude=magnitude,
+        size=d.size_deg2,
+        m=d.m,
+        ngc=d.ngc,
+        ic=d.ic,
+    )

{starplot-0.11.2 → starplot-0.11.4}/src/starplot/plotters/dsos.py

@@ -10,7 +10,7 @@ from starplot.data.dsos import (
     DsoLabelMaker,
     load_ongc,
 )
-from starplot.models import DSO
+from starplot.models.dso import DSO, from_tuple
 from starplot.styles import MarkerSymbolEnum
 
 
@@ -22,22 +22,6 @@ class DsoPlotterMixin:
         coords.append(coords[0])
         self._polygon(coords, style.marker.to_polygon_style(), closed=False)
 
-    def _dso_from_df_tuple(self, d):
-        magnitude = d.mag_v or d.mag_b or None
-        magnitude = float(magnitude) if magnitude else None
-        return DSO(
-            name=d.name,
-            ra=d.ra_degrees / 15,
-            dec=d.dec_degrees,
-            type=ONGC_TYPE_MAP[d.type],
-            maj_ax=d.maj_ax,
-            min_ax=d.min_ax,
-            angle=d.angle,
-            magnitude=magnitude,
-            size=d.size_deg2,
-            m=d.m,
-        )
-
     def open_clusters(self, *args, **kwargs):
         """
         Plots open clusters
@@ -155,7 +139,7 @@ class DsoPlotterMixin:
             legend_label = legend_labels.get(dso_type)
             magnitude = d.mag_v or d.mag_b or None
             magnitude = float(magnitude) if magnitude else None
-            _dso = self._dso_from_df_tuple(d)
+            _dso = from_tuple(d)
 
             if any(
                 [