Skip to content

Commit a941cdb

Browse files
author
Mathieu Dupuy
committed
Merge branch '3.10' into lib-decimal
2 parents a090886 + 1e8e99b commit a941cdb

File tree

384 files changed

+57248
-87186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

384 files changed

+57248
-87186
lines changed

.github/workflows/tests.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ jobs:
2020
apt_dependencies: hunspell hunspell-fr-comprehensive
2121
command: 'pospell -p dict -l fr_FR $CHANGED_PO_FILES'
2222
- name: Longueur des lignes
23-
package: powrap
24-
apt_dependencies: gettext
25-
command: 'powrap --check --quiet --diff $CHANGED_PO_FILES'
23+
command: 'awk ''{if (length($0) > 80 && length(gensub(/[^ ]/, "", "g")) > 1) {print FILENAME ":" FNR, "line too long:", $0; ERRORS+=1}} END {if (ERRORS>0) {exit 1}}'' $CHANGED_PO_FILES'
2624
- name: Grammaire
2725
package: padpo
2826
command: 'padpo -i $CHANGED_PO_FILES 2>&1 | grep -v -Ff padpo.ignore'
@@ -42,9 +40,13 @@ jobs:
4240
python-version: '3.9'
4341
- name: Install ${{ matrix.tool.package }}
4442
run: |
45-
[ -n "${{ matrix.tool.apt_dependencies }}" ] && sudo apt-get update && sudo apt-get install -y ${{ matrix.tool.apt_dependencies }}
46-
python -m pip install --upgrade pip setuptools wheel
47-
python -m pip install ${{ matrix.tool.package }}
43+
if [ -n "${{ matrix.tool.apt_dependencies }}" ]; then
44+
sudo apt-get update && sudo apt-get install -y ${{ matrix.tool.apt_dependencies }}
45+
fi
46+
if [ -n "${{ matrix.tool.package }}" ]; then
47+
python -m pip install --upgrade pip setuptools wheel
48+
python -m pip install ${{ matrix.tool.package }}
49+
fi
4850
- name: Run ${{ matrix.tool.package }}
4951
env:
5052
ADDED_FILES: ${{ join(fromJSON(steps.changed_files.outputs.added), ' ') }}
@@ -83,12 +85,12 @@ jobs:
8385
run: |
8486
mkdir -p ~/locales/fr/LC_MESSAGES/
8587
cp -uv --parents *.po */*.po ~/locales/fr/LC_MESSAGES/
86-
git -C ~/cpython checkout 895591c1f0bdec5ad357fe6a5fd0875990061357
88+
git -C ~/cpython checkout $(grep ^CPYTHON_CURRENT_COMMIT Makefile| cut -d= -f2)
8789
- name: Prepare venv
8890
run: |
8991
# If the venv exists but is broken, drop it (happens on Python upgrades):
9092
# see https://github.com/actions/setup-python/issues/170
9193
[ -d $HOME/cpython/Doc/venv/bin/ -a ! -e $HOME/cpython/Doc/venv/bin/python ] && rm -fr $HOME/cpython/Doc/venv
9294
make -C $HOME/cpython/Doc venv
9395
- name: sphinx-build
94-
run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html
96+
run: make -C $HOME/cpython/Doc SPHINXOPTS="-q -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html

0 commit comments

Comments
 (0)