Update merge.py and Update Doc action

Author: egeakman

.github/workflows/update_doc.yml

@@ -25,9 +25,8 @@ jobs:
     - name: Run merge.py
       run: python merge.py ${GITHUB_REF##*/}
 
-    - name: Commit changes and powrap
+    - name: Commit changes
       run: |
-        powrap *.po */*.po
         git config --local user.email "github-actions[bot]@users.noreply.github.com"
         git config --local user.name "github-actions[bot]"
         git commit -m "Get changes from CPython Doc for ${{ github.ref_name }}"

merge.py

@@ -127,6 +127,7 @@ def main():
     remove_old_files(downstream - upstream)
     clean_paths((upstream - downstream) | (upstream & downstream))
     shutil.rmtree(pot_path)
+    run("powrap", "-m")
     update_makefile(args.cpython_repo)
     git_add_relevant_files()