From 6c4706370f2b6fd7767f6c941234442076dec25f Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:02:04 +0100 Subject: [PATCH 01/17] Try gh-actions. --- .github/workflows/tests.yml | 46 +++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 000000000..e4263d3e1 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,46 @@ +name: Tests + +on: + push: + branches: + - *.* + pull_request: + branches: + - *.* + +jobs: + pospell: + name: 'Orthographe' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + run: | + sudo apt-get update + sudo apt-get install -y hunspell hunspell-fr-comprehensive + sudo pip install pospell + pospell -p dict -l fr_FR *.po */*.po + + powrap: + name: 'Ensure wrapping consistency' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + run: | + sudo pip install powrap + powrap --check --quiet *.po */*.po + + padpo: + name: 'Grammaire' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + run: | + sudo pip install padpo + padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore + + sphinx: + name: 'Build the doc' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + run: make From 5ef67bb3b4215d200cf11ceaa23f802840fec361 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:04:44 +0100 Subject: [PATCH 02/17] meh --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e4263d3e1..178cbd582 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,10 +3,10 @@ name: Tests on: push: branches: - - *.* + - '*.*' pull_request: branches: - - *.* + - '*.*' jobs: pospell: From cf51edc3d14d15edb91e99700ffb03fa0c903a07 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:07:47 +0100 Subject: [PATCH 03/17] =?UTF-8?q?m=C3=AAh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 178cbd582..c8c70112e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,3 +1,5 @@ +--- + name: Tests on: @@ -14,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - run: | + - run: | sudo apt-get update sudo apt-get install -y hunspell hunspell-fr-comprehensive sudo pip install pospell @@ -25,7 +27,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - run: | + - run: | sudo pip install powrap powrap --check --quiet *.po */*.po @@ -34,7 +36,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - run: | + - run: | sudo pip install padpo padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore @@ -43,4 +45,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - run: make + - run: make From 62121d3c73e17d3c098574356d76af5506e46514 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:09:15 +0100 Subject: [PATCH 04/17] D'oh. --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c8c70112e..495949d05 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: - run: | sudo apt-get update sudo apt-get install -y hunspell hunspell-fr-comprehensive - sudo pip install pospell + sudo python3 -m pip install pospell pospell -p dict -l fr_FR *.po */*.po powrap: @@ -28,7 +28,7 @@ jobs: steps: - uses: actions/checkout@v2 - run: | - sudo pip install powrap + sudo python3 -m pip install powrap powrap --check --quiet *.po */*.po padpo: @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@v2 - run: | - sudo pip install padpo + sudo python3 -m pip install padpo padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore sphinx: From 5032a6cdb0ee0b88853bb037d970a8290f8f3398 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:14:39 +0100 Subject: [PATCH 05/17] Split steps for readability --- .github/workflows/tests.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 495949d05..d31617ccd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,29 +16,33 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: | + - name: Install pospell + run: | sudo apt-get update sudo apt-get install -y hunspell hunspell-fr-comprehensive sudo python3 -m pip install pospell - pospell -p dict -l fr_FR *.po */*.po + - name: Run pospell + run: pospell -p dict -l fr_FR *.po */*.po powrap: name: 'Ensure wrapping consistency' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: | - sudo python3 -m pip install powrap - powrap --check --quiet *.po */*.po + - name: Install powrap + run: sudo python3 -m pip install powrap + - name: Run powrap + run: powrap --check --quiet *.po */*.po padpo: name: 'Grammaire' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: | - sudo python3 -m pip install padpo - padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore + - name: Install padpo + run: sudo python3 -m pip install padpo + - name: Run padpo + run: padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore sphinx: name: 'Build the doc' From 0c91fe540d789facb48e76ff89c5317e860b2b72 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:15:54 +0100 Subject: [PATCH 06/17] Missing dependency --- .github/workflows/tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d31617ccd..001520229 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install powrap - run: sudo python3 -m pip install powrap + run: | + sudo apt-get update + sudo apt-get install gettext + sudo python3 -m pip install powrap - name: Run powrap run: powrap --check --quiet *.po */*.po From 477bdaf64da7ac7697b892b05aade60bf9729c6f Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:17:23 +0100 Subject: [PATCH 07/17] I need to know. --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index c797d0a57..2ea5f117b 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,6 @@ BRANCH := 3.9 EXCLUDED := whatsnew/ c-api/ -.SILENT: - # Internal variables UPSTREAM := https://github.com/python/cpython From b510042b151037be57b24ca1936dc1445a709e4d Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:20:11 +0100 Subject: [PATCH 08/17] I need to know more. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 001520229..eeacc6199 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,4 +52,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: make + - run: make --trace From 326e0a1cf0e536759eda53e49a3cdf9bfca4757d Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:26:32 +0100 Subject: [PATCH 09/17] Pre-clone and cache cpython. --- .github/workflows/tests.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index eeacc6199..69b28734b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,4 +52,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: make --trace + - uses: actions/cache@v2 + with: + path: '~/cpython/' + - name: Clone cpython + run: | + if [ ! -d ~/cpython ]; then + git clone https://github.com/python/cpython ~/cpython/ + else + git -C ~/cpython fetch + - name: make + run: make --trace CPYTHON_PATH=$HOME/cpython/ From 6c10f0dcc94790c8398d1b51456b06f717d7fcbd Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:27:55 +0100 Subject: [PATCH 10/17] meh --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 69b28734b..931e3a775 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,6 +55,7 @@ jobs: - uses: actions/cache@v2 with: path: '~/cpython/' + key: '1' - name: Clone cpython run: | if [ ! -d ~/cpython ]; then From bb5a10d5ffea9177926a19a6874e9b0386d85c3b Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:28:42 +0100 Subject: [PATCH 11/17] Need a sleep. --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 931e3a775..22798384b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -62,5 +62,6 @@ jobs: git clone https://github.com/python/cpython ~/cpython/ else git -C ~/cpython fetch + fi - name: make run: make --trace CPYTHON_PATH=$HOME/cpython/ From f535beb160841c0760dae4a2c3a739c676bcc092 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:31:21 +0100 Subject: [PATCH 12/17] Padpo needs python3.6+ --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 22798384b..ca9d2e546 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,6 +42,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: '3.9' - name: Install padpo run: sudo python3 -m pip install padpo - name: Run padpo From 5365753f414350a6ee8272cb3764efb7aa56997d Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:33:32 +0100 Subject: [PATCH 13/17] Stop with padpo 0.3.0. --- .github/workflows/tests.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ca9d2e546..b5abbcd07 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -46,9 +46,12 @@ jobs: with: python-version: '3.9' - name: Install padpo - run: sudo python3 -m pip install padpo + run: + python3.9 -m venv .venv + .venv/bin/python -m pip install --upgrade pip + .venv/bin/python -m pip install padpo - name: Run padpo - run: padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore + run: .venv/bin/padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore sphinx: name: 'Build the doc' From 02834a06989da507b32c467fe2fb9e6963eea2a5 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:36:45 +0100 Subject: [PATCH 14/17] =?UTF-8?q?gn=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b5abbcd07..a61557019 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -46,7 +46,7 @@ jobs: with: python-version: '3.9' - name: Install padpo - run: + run: | python3.9 -m venv .venv .venv/bin/python -m pip install --upgrade pip .venv/bin/python -m pip install padpo @@ -62,6 +62,9 @@ jobs: with: path: '~/cpython/' key: '1' + - uses: actions/setup-python@v2 + with: + python-version: '3.9' - name: Clone cpython run: | if [ ! -d ~/cpython ]; then @@ -69,5 +72,7 @@ jobs: else git -C ~/cpython fetch fi + - name: Create venv + run: python3.9 -m venv .venv - name: make - run: make --trace CPYTHON_PATH=$HOME/cpython/ + run: make --trace CPYTHON_PATH=$HOME/cpython/ VENV=.venv/ From d09e6d2d28329961f9f055e68fcf7dd05a779526 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 22 Nov 2020 23:40:16 +0100 Subject: [PATCH 15/17] May help with grammalecte. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a61557019..fc0002da5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,7 @@ jobs: - name: Install padpo run: | python3.9 -m venv .venv - .venv/bin/python -m pip install --upgrade pip + .venv/bin/python -m pip install --upgrade pip setuptools wheel .venv/bin/python -m pip install padpo - name: Run padpo run: .venv/bin/padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore From c9680010975c812290fbb2c938e0b9a3093542c7 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Mon, 23 Nov 2020 00:02:33 +0100 Subject: [PATCH 16/17] Bypass makefile. --- .github/workflows/tests.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fc0002da5..10fa6b6c3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -72,7 +72,12 @@ jobs: else git -C ~/cpython fetch fi - - name: Create venv - run: python3.9 -m venv .venv - - name: make - run: make --trace CPYTHON_PATH=$HOME/cpython/ VENV=.venv/ + - name: Prepare build hierarchy + run: | + mkdir -p ~/locales/fr/LC_MESSAGES/ + cp -uv --parents *.po */*.po ~/locales/fr/LC_MESSAGES/ + git -C ~/cpython checkout b30934e9afb0af3f8e2e5f0992445be775b3c630 + - name: Prepare venv + run: make -C $HOME/cpython/Doc venv + - name: sphinx-build + run: make -C $HOME/cpython/Doc SPHINXOPTS="-qW -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html From 9d1b11f234655da0e951432a59ed261b71344c82 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Mon, 23 Nov 2020 08:46:02 +0100 Subject: [PATCH 17/17] Try to fix padpo calling its own script. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 10fa6b6c3..a6def2976 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,7 +51,7 @@ jobs: .venv/bin/python -m pip install --upgrade pip setuptools wheel .venv/bin/python -m pip install padpo - name: Run padpo - run: .venv/bin/padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore + run: PATH=$PATH:$PWD/.venv/bin/ padpo -i *.po */*.po 2>&1 | grep -v -Ff padpo.ignore sphinx: name: 'Build the doc'