Support python38 (#7)

* feat: can resume and dump from string Signed-off-by: yihong0618 <[email protected]> * fix: by review and open py3.8 * fix: open package bug Signed-off-by: yihong0618 <[email protected]> * fix: ci Signed-off-by: yihong0618 <[email protected]> * fix: python3.8 in requirement * fix: drop 3.8 support * fix: support python3.8 --------- Signed-off-by: yihong0618 <[email protected]>
matin · Sep 27, 2023 · 556e762 · 556e762
1 parent 482d127
commit 556e762
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
       - uses: actions/checkout@v4
 
@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos, windows]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     env:
       PYTHON: ${{ matrix.python-version }}

diff --git a/garth/stats/_base.py b/garth/stats/_base.py
@@ -48,6 +48,6 @@ def list(
         if not page_dirs:
             return []
         if "values" in page_dirs[0]:
-            page_dirs = [stat | stat.pop("values") for stat in page_dirs]
+            page_dirs = [{**stat, **stat.pop("values")} for stat in page_dirs]
         page_dirs = [camel_to_snake_dict(stat) for stat in page_dirs]
         return [cls(**stat) for stat in page_dirs]
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,12 +10,13 @@ dependencies = [
     "pydantic>=2.0.0",
     "requests-oauthlib>=1.3.1",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.8"
 readme = "README.md"
 license = {text = "MIT"}
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",

diff --git a/tests/stats/test_intensity_minutes.py b/tests/stats/test_intensity_minutes.py
@@ -22,6 +22,8 @@ def test_weekly_intensity_minutes(authed_client: Client):
     weekly_im = WeeklyIntensityMinutes.list(end, weeks, client=authed_client)
     assert len(weekly_im) == weeks
     assert (
-        weekly_im[-1].calendar_date.isocalendar().week
-        == end.isocalendar().week
+        weekly_im[-1].calendar_date.isocalendar()[
+            1
+        ]  # in python3.9+ [1] can be .week
+        == end.isocalendar()[1]
     )