Fix ci/cd

Author: kazanzhy

.github/scripts/manage_translation.py

@@ -15,9 +15,11 @@
 
 RESOURCE_NAME_MAP = {'glossary_': 'glossary'}
 
+LANG = 'uk'
+
 ORGANISATION_ID = 'o:python-doc'
 PROJECT_ID = 'o:python-doc:p:python-newest'
-LANGUAGE_ID = 'l:uk'
+LANGUAGE_ID = f'l:{LANG}'
 ORGANISATION = transifex_api.Organization.get(id=ORGANISATION_ID)
 PROJECT = transifex_api.Project.get(id=PROJECT_ID)
 LANGUAGE = transifex_api.Language.get(id=LANGUAGE_ID)
@@ -46,6 +48,10 @@ def recreate_config() -> None:
                 f'file_filter = {path}\n',
                 'type = PO\n',
                 'source_lang = en\n',
+                'minimum_perc = 0\n',
+                f'trans.{LANG} = {path}\n',
+                f'source_file = {path}\n',
+                f'resource_name = {resource.name}\n'
             ))
 
 
@@ -90,13 +96,16 @@ def recreate_team_stats() -> None:
 
 def fetch_translations():
     """Fetch translations from Transifex, remove source lines."""
-    pull_return_code = os.system(f'tx pull -l uk --force --skip')
-    if pull_return_code != 0:
-        exit(pull_return_code)
+    return_code = os.system(f'./tx pull -l {LANG} --force --skip')
+    exit(return_code)
 
+def format_translations():
+    """Format translations using 'msgcat' from 'gettext'"""
+    return_code = os.system('find -name "*.po" -exec msgcat --no-location -o {} {} \;')
+    exit(return_code)
 
 if __name__ == "__main__":
-    RUNNABLE_SCRIPTS = ('recreate_config', 'recreate_resource_stats', 'recreate_team_stats',  'fetch_translations')
+    RUNNABLE_SCRIPTS = ('recreate_config', 'recreate_resource_stats', 'recreate_team_stats',  'fetch_translations', 'format_translations')
 
     parser = ArgumentParser()
     parser.add_argument('cmd', nargs=1, choices=RUNNABLE_SCRIPTS)

.github/workflows/update-and-build.yml

@@ -5,13 +5,15 @@ on:
     - cron: '0 6 * * *'
   push:
     branches: ['main']
+  pull_request:
+    branches: ['main']
   workflow_dispatch:
 
 jobs:
+
   update-translation:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
         version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
@@ -22,9 +24,9 @@ jobs:
         with:
           python-version: 3
       - run: sudo apt-get install -y gettext
+      - run: pip install transifex-python six
       - run: curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
         working-directory: /usr/local/bin
-      - run: pip install requests cogapp polib transifex-python sphinx-lint sphinx-intl blurb six
       - uses: actions/checkout@master
         with:
           ref: ${{ matrix.version }}
@@ -34,6 +36,7 @@ jobs:
       - run: .github/scripts/manage_translation.py fetch_translations
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
+      - run: find -name "*.po" -exec msgcat --no-location -o {} {} \;
       - run: git config --local user.email github-actions@github.com
       - run: git config --local user.name "GitHub Action's update-translation job"
       - run: git add .
@@ -42,18 +45,28 @@ jobs:
         with:
           branch: ${{ matrix.version }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: peter-evans/repository-dispatch@main
+
+  lint-translation:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+    needs: ['update-translation']
+    continue-on-error: true
+    steps:
+      - uses: actions/setup-python@master
         with:
           python-version: 3
+      - run: pip install sphinx-lint
       - uses: actions/checkout@master
         with:
           ref: ${{ matrix.version }}
       - uses: rffontenelle/sphinx-lint-problem-matcher@v1.0.0
       - run: sphinx-lint
+
   build-translation:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
         version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
         format: [html, latex]
@@ -77,14 +90,15 @@ jobs:
       - uses: sphinx-doc/github-problem-matcher@v1.1
       - run: make -e SPHINXOPTS=" -D language='uk' -W --keep-going" ${{ matrix.format }}
         working-directory: ./Doc
+      - run: make sphinx-lint
       - uses: actions/upload-artifact@master
         with:
           name: build-${{ matrix.version }}-${{ matrix.format }}
           path: Doc/build/${{ matrix.format }}
+
   output-pdf:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
         version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
     needs: ['build-translation']

Makefile

@@ -102,6 +102,11 @@ ensure_prerequisites:
 	    exit 1; \
 	fi
 
+.PHONY: sphinx-lint
+sphinx-lint:
+	@echo "Checking all files using sphinx-lint..."
+	@sphinx-lint --enable all --disable line-too-long **/*.po
+
 .PHONY: serve
 serve:
 	$(MAKE) -C $(CPYTHON_PATH)/Doc/ serve