Merge pull request #15 from lowtower/bump_year_2025

Bump year 2025
lowtower · Feb 2, 2025 · 88d7117 · 88d7117
2 parents 6deb783 + f393a39
commit 88d7117
Show file tree

Hide file tree

Showing 42 changed files with 83 additions and 48 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,8 +8,9 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+#        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
     - name: Git config
       run: git config --global core.autocrlf input

diff --git a/README.md b/README.md
@@ -250,6 +250,6 @@ E.g. use [Poedit](https://poedit.net/) or [Localise Online Editor](https://local
 `msgfmt gpxposter.po -o gpxposter.mo`
 
 ## License
-[MIT](https://github.com/flopp/GpxTrackPoster/blob/master/LICENSE) &copy; 2016-2023 Florian Pigorsch
+[MIT](https://github.com/flopp/GpxTrackPoster/blob/master/LICENSE) &copy; 2016-2025 Florian Pigorsch
 
 [strava-activity-type]: https://developers.strava.com/docs/reference/#api-models-ActivityType
diff --git a/gpxtrackposter/calendar_drawer.py b/gpxtrackposter/calendar_drawer.py
@@ -1,5 +1,6 @@
 """Draw a calendar poster."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/circular_drawer.py b/gpxtrackposter/circular_drawer.py
@@ -1,5 +1,6 @@
 """Draw a circular Poster."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.
@@ -236,7 +237,7 @@ def _draw_rings(
         if self._max_distance:
             max_length = self._max_distance
         assert max_length is not None
-        max_length = max_length.to(self._unit)
+        max_length = max_length.to(self._unit)  # type: ignore
         ring_distance = self._determine_ring_distance(max_length)
         if ring_distance is None:
             return
@@ -253,7 +254,7 @@ def _draw_rings(
                     stroke_width=0.3,
                 )
             )
-            distance += ring_distance
+            distance += ring_distance  # type: ignore
 
     def _draw_circle_segment(
         self,
@@ -272,7 +273,7 @@ def _draw_circle_segment(
         color = self.color(self.poster.length_range_by_date, length, has_special)
         max_length = self.poster.length_range_by_date.upper()
         if self._max_distance:
-            max_length = self._max_distance.to_base_units()
+            max_length = self._max_distance.to_base_units()  # type: ignore
         assert max_length is not None
         r1 = rr.lower()
         assert r1 is not None

diff --git a/gpxtrackposter/cli.py b/gpxtrackposter/cli.py
@@ -2,7 +2,7 @@
 """
 Entry point - cli.py
 """
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/exceptions.py b/gpxtrackposter/exceptions.py
@@ -1,5 +1,6 @@
 """Exceptions"""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/github_drawer.py b/gpxtrackposter/github_drawer.py
@@ -1,5 +1,6 @@
 """Draw a GitHub style poster."""
-# Copyright 2020-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2020-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/grid_drawer.py b/gpxtrackposter/grid_drawer.py
@@ -1,5 +1,6 @@
 """Draw a grid poster."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/heatmap_drawer.py b/gpxtrackposter/heatmap_drawer.py
@@ -1,5 +1,6 @@
 """Draw a heatmap poster."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/localization.py b/gpxtrackposter/localization.py
@@ -1,5 +1,6 @@
 """Localization helpers."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/poster.py b/gpxtrackposter/poster.py
@@ -1,5 +1,6 @@
 """Create a poster from track data."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.
@@ -383,7 +384,7 @@ def _compute_track_statistics(
         weeks = {}
         for t in self.tracks:
             total_length += t.length()
-            self.total_length_year_dict[t.start_time().year] += t.length()
+            self.total_length_year_dict[t.start_time().year] += t.length()  # type: ignore
             length_range.extend(t.length())
             # time.isocalendar()[1] -> week number
             weeks[(t.start_time().year, t.start_time().isocalendar()[1])] = 1

diff --git a/gpxtrackposter/quantity_range.py b/gpxtrackposter/quantity_range.py
@@ -1,5 +1,6 @@
 """Represent a range of pint quantities"""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/timezone_adjuster.py b/gpxtrackposter/timezone_adjuster.py
@@ -1,5 +1,6 @@
 """TimezoneAdjuster"""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/track.py b/gpxtrackposter/track.py
@@ -1,5 +1,6 @@
 """Create and maintain info about a given activity track (corresponding to one GPX file)."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/track_loader.py b/gpxtrackposter/track_loader.py
@@ -1,6 +1,6 @@
 """Handle parsing of GPX files and writing/loading of cached data"""
 
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.
@@ -240,7 +240,7 @@ def _merge_tracks(tracks: List[Track]) -> List[Track]:
             if last_end_time is None:
                 merged_tracks.append(t)
             else:
-                dt = (t.start_time() - last_end_time).total_seconds()
+                dt = int((t.start_time() - last_end_time).total_seconds())
                 if 0 < dt < 3600:
                     merged_tracks[-1].append(t)
                 else:

diff --git a/gpxtrackposter/tracks_drawer.py b/gpxtrackposter/tracks_drawer.py
@@ -1,5 +1,6 @@
 """Contains the base class TracksDrawer, which other Drawers inherit from."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/units.py b/gpxtrackposter/units.py
@@ -1,5 +1,6 @@
 """Units"""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/utils.py b/gpxtrackposter/utils.py
@@ -1,5 +1,6 @@
 """Assorted utility methods for use in creating posters."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/value_range.py b/gpxtrackposter/value_range.py
@@ -1,5 +1,6 @@
 """Represent a range of numerical values"""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/xy.py b/gpxtrackposter/xy.py
@@ -1,5 +1,6 @@
 """Represent x,y values with properly overloaded operations."""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/gpxtrackposter/year_range.py b/gpxtrackposter/year_range.py
@@ -1,5 +1,6 @@
 """Represent a range of years, with ability to update based on a track"""
-# Copyright 2016-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/scripts/bump_year.py b/scripts/bump_year.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2018-2023 Florian Pigorsch & Contributors. All rights reserved.
+# Copyright 2018-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/scripts/check_copyright.py b/scripts/check_copyright.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2018-2023 Florian Pigorsch & Contributors. All rights reserved.
+# Copyright 2018-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/scripts/update_readme.py b/scripts/update_readme.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2018-2023 Florian Pigorsch & Contributors. All rights reserved.
+# Copyright 2018-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/setup.cfg b/setup.cfg
@@ -73,8 +73,9 @@ extension-pkg-whitelist=
 
 [pylint.MESSAGES CONTROL]
 disable=
-    invalid-name,
     missing-docstring,
+    too-many-positional-arguments,
+    use-yield-from,
 
 #enable=E,W
 jobs=1

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2016-2021 Florian Pigorsch & Contributors. All rights reserved.
+# Copyright 2016-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,7 +1,8 @@
 """
 ConfTest
 """
-# Copyright 2022-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2022-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_calendar_drawer.py b/tests/test_calendar_drawer.py
@@ -1,7 +1,8 @@
 """
 Several tests for CalendarDrawer
 """
-# Copyright 2022-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2022-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_circular_drawer.py b/tests/test_circular_drawer.py
@@ -1,7 +1,8 @@
 """
 Several tests for CircularDrawer
 """
-# Copyright 2021-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2021-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -1,7 +1,8 @@
 """
 Several tests for entry point cli.py
 """
-# Copyright 2021-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2021-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_github_drawer.py b/tests/test_github_drawer.py
@@ -1,7 +1,8 @@
 """
 Several tests for GithubDrawer
 """
-# Copyright 2022-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2022-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_grid_drawer.py b/tests/test_grid_drawer.py
@@ -1,7 +1,8 @@
 """
 Several tests for GridDrawer
 """
-# Copyright 2022-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2022-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_heatmap_drawer.py b/tests/test_heatmap_drawer.py
@@ -1,7 +1,8 @@
 """
 Several tests for HeatmapDrawer
 """
-# Copyright 2021-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2021-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_localization.py b/tests/test_localization.py
@@ -1,7 +1,8 @@
 """
 Several tests for Localization
 """
-# Copyright 2021-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2021-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_quantity_range.py b/tests/test_quantity_range.py
@@ -1,7 +1,8 @@
 """
 Several tests for QuantityRange
 """
-# Copyright 2021-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2021-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_timezone_adjuster.py b/tests/test_timezone_adjuster.py
@@ -1,7 +1,8 @@
 """
 Several tests for TimezoneAdjuster
 """
-# Copyright 2020-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2020-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_track.py b/tests/test_track.py
@@ -1,7 +1,8 @@
 """
 Several tests for Track
 """
-# Copyright 2022-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2022-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_track_loader.py b/tests/test_track_loader.py
@@ -1,7 +1,8 @@
 """
 Several tests for TrackLoader
 """
-# Copyright 2020-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2020-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -1,7 +1,8 @@
 """
 Several tests for utils
 """
-# Copyright 2018-2023 Florian Pigorsch & Contributors. All rights reserved.
+
+# Copyright 2018-2025 Florian Pigorsch & Contributors. All rights reserved.
 #
 # Use of this source code is governed by a MIT-style
 # license that can be found in the LICENSE file.