Merge branch 'upstream'

* upstream:
  fix: stravaweblib version
  fix: strava version
  Update GitHub Actions and README (yihong0618#611)
  Update ci.yml (yihong0618#610)
  add yer1k's running page (yihong0618#608)
  set default file_suffix = gpx (yihong0618#609)

# Conflicts:
#	README-CN.md
#	README.md
#	requirements.txt

.github/workflows/ci.yml

@@ -10,11 +10,11 @@ jobs:
       matrix:
         python-version: ['3.8', '3.9', '3.10']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
         id: setup_python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'

.github/workflows/gh-pages.yml

@@ -46,14 +46,14 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # if your default branches is not master, please change it here
           ref: master
 
       - name: Cache Data Files
         if: inputs.save_data_in_github_cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             activities
@@ -71,9 +71,9 @@ jobs:
             ${{ inputs.data_cache_prefix }}-
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
 
       - uses: pnpm/action-setup@v2
         name: Install pnpm
@@ -86,7 +86,7 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Setup pnpm cache
         with:
           path: ${{ env.STORE_PATH }}
@@ -100,10 +100,10 @@ jobs:
         run: PATH_PREFIX=/${{ github.event.repository.name }} pnpm build
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
         with:
           # Upload dist repository
           path: './dist'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v3

.github/workflows/run_data_sync.yml

@@ -49,11 +49,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
         id: setup_python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
           cache: pip
@@ -65,7 +65,7 @@ jobs:
 
       - name: Cache Data Files
         if: env.SAVE_DATA_IN_GITHUB_CACHE == 'true'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             activities

requirements.txt

@@ -1,6 +1,6 @@
 httpx>=0.15.0,<=0.15.5
 gpxpy==1.4.2
-stravalib
+stravalib==0.10.4
 appdirs>=1.4.0
 svgwrite>=1.1.9
 colour>=0.1.5
@@ -14,7 +14,7 @@ timezonefinder; platform_system == "Windows"
 pyyaml
 aiofiles
 cloudscraper==1.2.58
-git+https://github.com/alenrajsp/tcxreader.git
+tcxreader
 rich
 lxml==4.9.4
 eviltransform

run_page/gpxtrackposter/track_loader.py

@@ -66,7 +66,7 @@ def __init__(self):
             "fit": load_fit_file,
         }
 
-    def load_tracks(self, data_dir, file_suffix):
+    def load_tracks(self, data_dir, file_suffix="gpx"):
         """Load tracks data_dir and return as a List of tracks"""
         file_names = [x for x in self._list_data_files(data_dir, file_suffix)]
         print(f"{file_suffix.upper()} files: {len(file_names)}")