Merge pull request #36 from hugovk/bump-calmap

Require calmap>=0.0.11 to support Pandas 2

Author: marcusvolz

pyproject.toml

@@ -37,11 +37,11 @@ dynamic = [
   "version",
 ]
 dependencies = [
-  "calmap",
+  "calmap>=0.0.11",
   "fit2gpx",
   "gpxpy",
   "matplotlib",
-  "pandas<2", # Pending https://github.com/MarvinT/calmap/pull/14
+  "pandas",
   "plotnine",
   "rich",
   "seaborn",

src/stravavis/__main__.py

@@ -1,4 +1,4 @@
-from stravavis import cli
+from . import cli
 
 if __name__ == "__main__":
     cli.main()

src/stravavis/cli.py

@@ -85,14 +85,14 @@ def main():
 
     # Normally imports go at the top, but scientific libraries can be slow to import
     # so let's validate arguments first
-    from stravavis.plot_calendar import plot_calendar
-    from stravavis.plot_dumbbell import plot_dumbbell
-    from stravavis.plot_elevations import plot_elevations
-    from stravavis.plot_facets import plot_facets
-    from stravavis.plot_landscape import plot_landscape
-    from stravavis.plot_map import plot_map
-    from stravavis.process_activities import process_activities
-    from stravavis.process_data import process_data
+    from .plot_calendar import plot_calendar
+    from .plot_dumbbell import plot_dumbbell
+    from .plot_elevations import plot_elevations
+    from .plot_facets import plot_facets
+    from .plot_landscape import plot_landscape
+    from .plot_map import plot_map
+    from .process_activities import process_activities
+    from .process_data import process_data
 
     print("Processing data...")
     df = process_data(args.path)

src/stravavis/plot_dumbbell.py

@@ -43,7 +43,7 @@ def plot_dumbbell(
         activities["duration"][i] = pd.Timedelta(
             activities["Elapsed Time"][i], unit="s"
         )
-    activities["end"] = activities["start"] + activities["duration"]
+    activities["end"] = pd.to_datetime(activities["start"] + activities["duration"])
 
     # Remove activities outside the year_min -> year_max window
     activities["year"] = activities["Activity Date"].dt.year