From 6bb1d797480772bf27fa5f846a6a230eba53976d Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sat, 4 Apr 2020 23:43:49 +0200 Subject: [PATCH 01/57] Try some github actions --- .github/workflows/tests.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 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..983d49c11 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,34 @@ +name: WeasyPrint's tests +on: [push] + +jobs: + tests: + runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + python-version: [3.5, 3.6, 3.7, 3.8, pypy3] + shell: bash + steps: + - run: | + if [ matrix.os == 'ubuntu-latest' ]; then + apt-get update -y && apt-get install ttf-dejavu -y + mkdir -p ~/.fonts + wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf + elif [ matrix.os == 'macos-latest' ]; then + brew tap homebrew/cask-fonts + brew cask install font-dejavu-sans + brew install cairo pango gdk-pixbuf libffi + elif [ matrix.os == 'windows-latest' ]; then + export "PATH=$PATH;C:\msys64\mingw64\bin" + choco install -y python dejavufonts + wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" + 7z e msys2-base-x86_64-20180531.tar.xz + 7z x -y msys2-base-x86_64-20180531.tar -oc:\\ + powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" + fi + python -m pip install --upgrade pip setuptools + if [ matrix.os == 'windows-latest' ]; then + python m pip install --upgrade cffi + fi + python setup.py test From 87b0a4c492bc48024a783a51a9fcafd2a5544d3b Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sat, 4 Apr 2020 23:46:01 +0200 Subject: [PATCH 02/57] Remove shell --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 983d49c11..ab9e50acd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,6 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] python-version: [3.5, 3.6, 3.7, 3.8, pypy3] - shell: bash steps: - run: | if [ matrix.os == 'ubuntu-latest' ]; then From 7011685969a67802d6b3ad25101839be21ecf2c4 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sat, 4 Apr 2020 23:49:40 +0200 Subject: [PATCH 03/57] Move shell --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ab9e50acd..880f750ed 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,6 +9,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: [3.5, 3.6, 3.7, 3.8, pypy3] steps: + - shell: bash - run: | if [ matrix.os == 'ubuntu-latest' ]; then apt-get update -y && apt-get install ttf-dejavu -y From ff25217421cfc54faf9d3058ff2ef2855dd88443 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sat, 4 Apr 2020 23:53:48 +0200 Subject: [PATCH 04/57] Fix if --- .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 880f750ed..bb4d57a39 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,15 +11,15 @@ jobs: steps: - shell: bash - run: | - if [ matrix.os == 'ubuntu-latest' ]; then + if [ runner.os == 'Linux' ]; then apt-get update -y && apt-get install ttf-dejavu -y mkdir -p ~/.fonts wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - elif [ matrix.os == 'macos-latest' ]; then + elif [ runner.os == 'macOS' ]; then brew tap homebrew/cask-fonts brew cask install font-dejavu-sans brew install cairo pango gdk-pixbuf libffi - elif [ matrix.os == 'windows-latest' ]; then + elif [ runner.os == 'Windows' ]; then export "PATH=$PATH;C:\msys64\mingw64\bin" choco install -y python dejavufonts wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" From a6a9622022bf96dd7835c200bb7f927d65a848de Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sat, 4 Apr 2020 23:56:08 +0200 Subject: [PATCH 05/57] Move shell again --- .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 bb4d57a39..70590f34e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,6 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: [3.5, 3.6, 3.7, 3.8, pypy3] steps: - - shell: bash - run: | if [ runner.os == 'Linux' ]; then apt-get update -y && apt-get install ttf-dejavu -y @@ -32,3 +31,4 @@ jobs: python m pip install --upgrade cffi fi python setup.py test + shell: bash From 39626ffe826d3c95a0c0828d3a71b04a51064db9 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 00:00:16 +0200 Subject: [PATCH 06/57] Try some if --- .github/workflows/tests.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 70590f34e..9d26e73d4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,25 +10,23 @@ jobs: python-version: [3.5, 3.6, 3.7, 3.8, pypy3] steps: - run: | - if [ runner.os == 'Linux' ]; then + if: runner.os == 'Linux' apt-get update -y && apt-get install ttf-dejavu -y mkdir -p ~/.fonts wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - elif [ runner.os == 'macOS' ]; then + if: runner.os == 'macOS' ] brew tap homebrew/cask-fonts brew cask install font-dejavu-sans brew install cairo pango gdk-pixbuf libffi - elif [ runner.os == 'Windows' ]; then + if: runner.os == 'Windows' export "PATH=$PATH;C:\msys64\mingw64\bin" choco install -y python dejavufonts wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" 7z e msys2-base-x86_64-20180531.tar.xz 7z x -y msys2-base-x86_64-20180531.tar -oc:\\ powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - fi python -m pip install --upgrade pip setuptools - if [ matrix.os == 'windows-latest' ]; then + if: matrix.os == 'windows-latest' python m pip install --upgrade cffi - fi python setup.py test shell: bash From 403ef61d61583d496c7df3c1c4fcac6d75402a3a Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 00:07:49 +0200 Subject: [PATCH 07/57] Invert run and ifs --- .github/workflows/tests.yml | 44 +++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9d26e73d4..54c00b222 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,24 +9,26 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: [3.5, 3.6, 3.7, 3.8, pypy3] steps: - - run: | - if: runner.os == 'Linux' - apt-get update -y && apt-get install ttf-dejavu -y - mkdir -p ~/.fonts - wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - if: runner.os == 'macOS' ] - brew tap homebrew/cask-fonts - brew cask install font-dejavu-sans - brew install cairo pango gdk-pixbuf libffi - if: runner.os == 'Windows' - export "PATH=$PATH;C:\msys64\mingw64\bin" - choco install -y python dejavufonts - wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" - 7z e msys2-base-x86_64-20180531.tar.xz - 7z x -y msys2-base-x86_64-20180531.tar -oc:\\ - powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' - python m pip install --upgrade cffi - python setup.py test - shell: bash + if: runner.os == 'Linux' + run: | + apt-get update -y && apt-get install ttf-dejavu -y + mkdir -p ~/.fonts + wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf + if: runner.os == 'macOS' ] + run: | + brew tap homebrew/cask-fonts + brew cask install font-dejavu-sans + brew install cairo pango gdk-pixbuf libffi + if: runner.os == 'Windows' + run: | + export "PATH=$PATH;C:\msys64\mingw64\bin" + choco install -y python dejavufonts + wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" + 7z e msys2-base-x86_64-20180531.tar.xz + 7z x -y msys2-base-x86_64-20180531.tar -oc:\\ + powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" + python -m pip install --upgrade pip setuptools + if: matrix.os == 'windows-latest' + run: python m pip install --upgrade cffi + run: python setup.py test + shell: bash From f12c92ca6d1cd401533878ba4e8fc81aabad72a2 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 00:11:12 +0200 Subject: [PATCH 08/57] run at the same level as if --- .github/workflows/tests.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 54c00b222..8d89f6ce4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,25 +10,25 @@ jobs: python-version: [3.5, 3.6, 3.7, 3.8, pypy3] steps: if: runner.os == 'Linux' - run: | - apt-get update -y && apt-get install ttf-dejavu -y - mkdir -p ~/.fonts - wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf + run: | + apt-get update -y && apt-get install ttf-dejavu -y + mkdir -p ~/.fonts + wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf if: runner.os == 'macOS' ] - run: | - brew tap homebrew/cask-fonts - brew cask install font-dejavu-sans - brew install cairo pango gdk-pixbuf libffi + run: | + brew tap homebrew/cask-fonts + brew cask install font-dejavu-sans + brew install cairo pango gdk-pixbuf libffi if: runner.os == 'Windows' - run: | - export "PATH=$PATH;C:\msys64\mingw64\bin" - choco install -y python dejavufonts - wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" - 7z e msys2-base-x86_64-20180531.tar.xz - 7z x -y msys2-base-x86_64-20180531.tar -oc:\\ - powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - python -m pip install --upgrade pip setuptools + run: | + export "PATH=$PATH;C:\msys64\mingw64\bin" + choco install -y python dejavufonts + wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" + 7z e msys2-base-x86_64-20180531.tar.xz + 7z x -y msys2-base-x86_64-20180531.tar -oc:\\ + powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" + run: python -m pip install --upgrade pip setuptools if: matrix.os == 'windows-latest' - run: python m pip install --upgrade cffi + run: python m pip install --upgrade cffi run: python setup.py test shell: bash From ca15957297f0cf239e30085f4bf0aa3a688bb7fe Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 13:53:38 +0200 Subject: [PATCH 09/57] Use checkout and setup-python actions --- .github/workflows/tests.yml | 49 ++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8d89f6ce4..09b09bac1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,26 +9,29 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: [3.5, 3.6, 3.7, 3.8, pypy3] steps: - if: runner.os == 'Linux' - run: | - apt-get update -y && apt-get install ttf-dejavu -y - mkdir -p ~/.fonts - wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - if: runner.os == 'macOS' ] - run: | - brew tap homebrew/cask-fonts - brew cask install font-dejavu-sans - brew install cairo pango gdk-pixbuf libffi - if: runner.os == 'Windows' - run: | - export "PATH=$PATH;C:\msys64\mingw64\bin" - choco install -y python dejavufonts - wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" - 7z e msys2-base-x86_64-20180531.tar.xz - 7z x -y msys2-base-x86_64-20180531.tar -oc:\\ - powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' - run: python m pip install --upgrade cffi - run: python setup.py test - shell: bash + - uses: actions/checkout@v2 + - uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - if: runner.os == 'Linux' + run: | + apt-get update -y && apt-get install ttf-dejavu -y + mkdir -p ~/.fonts + wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf + - if: runner.os == 'macOS' ] + run: | + brew tap homebrew/cask-fonts + brew cask install font-dejavu-sans + brew install cairo pango gdk-pixbuf libffi + - if: runner.os == 'Windows' + run: | + export "PATH=$PATH;C:\msys64\mingw64\bin" + choco install -y python dejavufonts + wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" + 7z e msys2-base-x86_64-20180531.tar.xz + 7z x -y msys2-base-x86_64-20180531.tar -oc:\\ + powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" + - run: python -m pip install --upgrade pip setuptools + - if: matrix.os == 'windows-latest' + run: python m pip install --upgrade cffi + - run: python setup.py test From 67c21c8edf9681a975ec4af0bf5903964795cd97 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 13:54:50 +0200 Subject: [PATCH 10/57] Remove bracket --- .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 09b09bac1..579020347 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: apt-get update -y && apt-get install ttf-dejavu -y mkdir -p ~/.fonts wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - - if: runner.os == 'macOS' ] + - if: runner.os == 'macOS' run: | brew tap homebrew/cask-fonts brew cask install font-dejavu-sans From 371b2b9b2fc997d3a48a364f591a08ad1473344f Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 13:56:24 +0200 Subject: [PATCH 11/57] Fix python instruction --- .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 579020347..9e2c69c51 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,5 +33,5 @@ jobs: powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' - run: python m pip install --upgrade cffi + run: python -m pip install --upgrade cffi - run: python setup.py test From f336c7daf30f1c7d15fe92adbb911b52e2ef7828 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 14:30:12 +0200 Subject: [PATCH 12/57] Use matrix instead of runner --- .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 9e2c69c51..641cc4787 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,17 +13,17 @@ jobs: - uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - - if: runner.os == 'Linux' + - if: matrix.os == 'ubuntu' run: | apt-get update -y && apt-get install ttf-dejavu -y mkdir -p ~/.fonts wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - - if: runner.os == 'macOS' + - if: matrix.os == 'macos-latest' run: | brew tap homebrew/cask-fonts brew cask install font-dejavu-sans brew install cairo pango gdk-pixbuf libffi - - if: runner.os == 'Windows' + - if: matrix.os == 'windows-latest' run: | export "PATH=$PATH;C:\msys64\mingw64\bin" choco install -y python dejavufonts From 9ed728e89263daf3f1e056e15f1fc4d71e428f61 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 14:33:03 +0200 Subject: [PATCH 13/57] sudo for linux and macos --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 641cc4787..874d1367e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,14 +15,14 @@ jobs: python-version: ${{ matrix.python-version }} - if: matrix.os == 'ubuntu' run: | - apt-get update -y && apt-get install ttf-dejavu -y + sudo apt-get update -y && apt-get install ttf-dejavu -y mkdir -p ~/.fonts wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - if: matrix.os == 'macos-latest' run: | - brew tap homebrew/cask-fonts - brew cask install font-dejavu-sans - brew install cairo pango gdk-pixbuf libffi + sudo brew tap homebrew/cask-fonts + sudo brew cask install font-dejavu-sans + sudo brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | export "PATH=$PATH;C:\msys64\mingw64\bin" From 642fb2e5065d52b33e11f6127b5a30fe54b74359 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 14:37:28 +0200 Subject: [PATCH 14/57] Fix if ubuntu --- .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 874d1367e..a92d97502 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - - if: matrix.os == 'ubuntu' + - if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update -y && apt-get install ttf-dejavu -y mkdir -p ~/.fonts From c22848ed3e6ebfb2b8e0bfb99172aa1935bbcc61 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 14:39:48 +0200 Subject: [PATCH 15/57] Remove sudo on macos --- .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 a92d97502..b8e538235 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,9 +20,9 @@ jobs: wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - if: matrix.os == 'macos-latest' run: | - sudo brew tap homebrew/cask-fonts - sudo brew cask install font-dejavu-sans - sudo brew install cairo pango gdk-pixbuf libffi + brew tap homebrew/cask-fonts + brew cask install font-dejavu-sans + brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | export "PATH=$PATH;C:\msys64\mingw64\bin" From e067bed01c430d9039b74e44da2626165fb7b1aa Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 14:47:59 +0200 Subject: [PATCH 16/57] More sudo --- .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 b8e538235..c11e2dbf5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: python-version: ${{ matrix.python-version }} - if: matrix.os == 'ubuntu-latest' run: | - sudo apt-get update -y && apt-get install ttf-dejavu -y + sudo apt-get update -y && sudo apt-get install ttf-dejavu -y mkdir -p ~/.fonts wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - if: matrix.os == 'macos-latest' From bf895ac82dc92a221f2d6da9b0053d87b16b500f Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 14:53:33 +0200 Subject: [PATCH 17/57] fail-fast --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c11e2dbf5..5f648b64c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,6 +5,7 @@ jobs: tests: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] python-version: [3.5, 3.6, 3.7, 3.8, pypy3] From 5ca87f3185e0c418d5b9bb1eb24f556a9e6fd5ef Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 15:05:04 +0200 Subject: [PATCH 18/57] Remove export PATH for windows --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5f648b64c..061a66cd2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,6 @@ jobs: brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | - export "PATH=$PATH;C:\msys64\mingw64\bin" choco install -y python dejavufonts wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" 7z e msys2-base-x86_64-20180531.tar.xz From 2a6dfc357dabfc3158f2e9bc4fdd93de5e91492f Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 15:07:03 +0200 Subject: [PATCH 19/57] Revert "Remove export PATH for windows" This reverts commit 5ca87f3185e0c418d5b9bb1eb24f556a9e6fd5ef. --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 061a66cd2..5f648b64c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,6 +26,7 @@ jobs: brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | + export "PATH=$PATH;C:\msys64\mingw64\bin" choco install -y python dejavufonts wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" 7z e msys2-base-x86_64-20180531.tar.xz From 79b2c6c5e657a6b375ec6fbc1c5f90fa3477749a Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 15:23:26 +0200 Subject: [PATCH 20/57] Runs-on depends on matrix.os --- .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 5f648b64c..779b65ae7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,7 @@ on: [push] jobs: tests: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: From bf4f846aa05c8ae1a9c2d493da08191ff7ebfa6f Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 15:33:07 +0200 Subject: [PATCH 21/57] Try to install msys2 with choco --- .github/workflows/tests.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 779b65ae7..e11b3a6f5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,11 +26,7 @@ jobs: brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | - export "PATH=$PATH;C:\msys64\mingw64\bin" - choco install -y python dejavufonts - wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz" - 7z e msys2-base-x86_64-20180531.tar.xz - 7z x -y msys2-base-x86_64-20180531.tar -oc:\\ + choco install -y msys2 python dejavufonts powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' From a66836465d5b004b8a6a98b59afbeede4e8a7e98 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 15:41:58 +0200 Subject: [PATCH 22/57] Remove progress bar on choco installs --- .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 e11b3a6f5..eab14a170 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | - choco install -y msys2 python dejavufonts + choco install -y --no-progress msys2 python dejavufonts powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' From c235fae9c0fa6848e48f464d6954ba35d13fd195 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 15:55:31 +0200 Subject: [PATCH 23/57] Change msys path --- .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 eab14a170..ac2ca98ae 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: - if: matrix.os == 'windows-latest' run: | choco install -y --no-progress msys2 python dejavufonts - powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" + powershell "C:\tool\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi From 8a251183d8cbc735f31c0c4d42b339f57c06d8cf Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 16:18:50 +0200 Subject: [PATCH 24/57] No more Ahem --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ac2ca98ae..584678add 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,8 +17,6 @@ jobs: - if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update -y && sudo apt-get install ttf-dejavu -y - mkdir -p ~/.fonts - wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf - if: matrix.os == 'macos-latest' run: | brew tap homebrew/cask-fonts From 4e70083883e38df0ab8d35a6d30bf71839fbcaea Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 16:23:56 +0200 Subject: [PATCH 25/57] Fix path --- .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 584678add..06434dfbe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: - if: matrix.os == 'windows-latest' run: | choco install -y --no-progress msys2 python dejavufonts - powershell "C:\tool\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" + powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi From dcbcaa57c1d88889fb3c7a61b61f1662f1654a98 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 16:40:18 +0200 Subject: [PATCH 26/57] Not sure installing python with choco is usefull as actions/setup-python is used --- .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 06434dfbe..9b9174919 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,7 @@ jobs: brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | - choco install -y --no-progress msys2 python dejavufonts + choco install -y --no-progress msys2 dejavufonts powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' From ac3b23496dd4c7b19978f3b68b492afc050ee8a9 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 16:48:17 +0200 Subject: [PATCH 27/57] export is back --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9b9174919..e504ebdf5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,6 +26,7 @@ jobs: run: | choco install -y --no-progress msys2 dejavufonts powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" + export "PATH=$PATH;C:\msys64\mingw64\bin" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi From ee54d488fe3add6c1e2cb6f2d2f58aff4e39379e Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 17:07:17 +0200 Subject: [PATCH 28/57] add-path instead of export --- .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 e504ebdf5..3059b1942 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: run: | choco install -y --no-progress msys2 dejavufonts powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - export "PATH=$PATH;C:\msys64\mingw64\bin" + echo "::add-path::C:\msys64\mingw64\bin" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi From 70bf0dabda9af7518cfb5a6432aac6edb05b070f Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 17:36:07 +0200 Subject: [PATCH 29/57] fix path --- .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 3059b1942..914aed83a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: run: | choco install -y --no-progress msys2 dejavufonts powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - echo "::add-path::C:\msys64\mingw64\bin" + echo "::add-path::C:\tools\msys64\mingw64\bin" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi From ca489138cbf5ab67a7c79ab60426bc47c87bf0de Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 18:16:13 +0200 Subject: [PATCH 30/57] Force shell to be bash when exporting path --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 914aed83a..5f7189b58 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,10 +23,11 @@ jobs: brew cask install font-dejavu-sans brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' + shell: bash run: | choco install -y --no-progress msys2 dejavufonts powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - echo "::add-path::C:\tools\msys64\mingw64\bin" + export "PATH=$PATH;C:\msys64\mingw64\bin" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi From f341a8a8f5e596b8312302ccac2d08e0db1e1b74 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Sun, 5 Apr 2020 18:25:08 +0200 Subject: [PATCH 31/57] Revert "Force shell to be bash when exporting path" This reverts commit ca489138cbf5ab67a7c79ab60426bc47c87bf0de. --- .github/workflows/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5f7189b58..914aed83a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,11 +23,10 @@ jobs: brew cask install font-dejavu-sans brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' - shell: bash run: | choco install -y --no-progress msys2 dejavufonts powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - export "PATH=$PATH;C:\msys64\mingw64\bin" + echo "::add-path::C:\tools\msys64\mingw64\bin" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi From 037b5bdaaf3755b941d236e99a175fe3ad562f11 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Sun, 5 Apr 2020 22:10:22 +0200 Subject: [PATCH 32/57] Try to use set-env --- .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 5f7189b58..b1ef1ff7f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: run: | choco install -y --no-progress msys2 dejavufonts powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - export "PATH=$PATH;C:\msys64\mingw64\bin" + echo "::set-env name=PATH::PATH:C:\tools\msys64\mingw64\bin" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi From bea95d4294de29f696e32dbdef8d514013baa3be Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Sun, 5 Apr 2020 22:23:14 +0200 Subject: [PATCH 33/57] Try to use $env:PATH --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b1ef1ff7f..9eee7a437 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,8 @@ jobs: run: | choco install -y --no-progress msys2 dejavufonts powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - echo "::set-env name=PATH::PATH:C:\tools\msys64\mingw64\bin" + $env:PATH += ";C:\tools\msys64\mingw64\bin" + echo "::set-env name=PATH::$env:PATH" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi From 93b2a5d412d8e348f76b2a75e204aebbbe311e47 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Sun, 5 Apr 2020 22:30:16 +0200 Subject: [PATCH 34/57] =?UTF-8?q?Don=E2=80=99t=20use=20bash=20for=20Window?= =?UTF-8?q?s=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9eee7a437..71ea04469 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,7 +23,6 @@ jobs: brew cask install font-dejavu-sans brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' - shell: bash run: | choco install -y --no-progress msys2 dejavufonts powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" From 95cea078de81d0287b20a9be9c8d8c72044141c4 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Sun, 5 Apr 2020 23:16:37 +0200 Subject: [PATCH 35/57] Install DejaVu fonts before msys for Windows tests Looks like fonts are not installed with the reverse order --- .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 71ea04469..bdb7ec685 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,7 @@ jobs: brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | - choco install -y --no-progress msys2 dejavufonts + choco install -y --no-progress dejavufonts msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" From 58fc1904bb3a0b89ffa3a27a91d2d6ce069e8867 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Sun, 5 Apr 2020 23:26:17 +0200 Subject: [PATCH 36/57] Install choco packages one by one --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bdb7ec685..3b9176a39 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,8 @@ jobs: brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | - choco install -y --no-progress dejavufonts msys2 + choco install -y --no-progress dejavufonts + choco install -y --no-progress msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" From e344ffb34259eb94756ac90b83111ba5fbd37c1f Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Sun, 5 Apr 2020 23:49:01 +0200 Subject: [PATCH 37/57] Force DejaVu fonts to be scanned by FontConfig --- .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 3b9176a39..6c08cfea4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,9 +24,9 @@ jobs: brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | - choco install -y --no-progress dejavufonts - choco install -y --no-progress msys2 + choco install -y --no-progress dejavufonts msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" + C:\tools\msys64\mingw64\bin\fc-cache --verbose -f -y C:\ProgramData\chocolatey\lib\dejavufonts $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - run: python -m pip install --upgrade pip setuptools From 2c286a1a83c39420dbc1024f5bf2f755abd4df88 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 00:00:15 +0200 Subject: [PATCH 38/57] Fix FontConfig font scanning --- .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 6c08cfea4..0403ff4bf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: run: | choco install -y --no-progress dejavufonts msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - C:\tools\msys64\mingw64\bin\fc-cache --verbose -f -y C:\ProgramData\chocolatey\lib\dejavufonts + C:\tools\msys64\mingw64\bin\fc-cache --verbose -f C:\ProgramData\chocolatey\lib\dejavufonts $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - run: python -m pip install --upgrade pip setuptools From b63a3ac73d853420f895246ea9a1670ba432d3d4 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 00:25:11 +0200 Subject: [PATCH 39/57] Exclude some testing configurations --- .github/workflows/tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0403ff4bf..fe86707cc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,6 +9,16 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] python-version: [3.5, 3.6, 3.7, 3.8, pypy3] + exclude: + # Pillow wheel missing for this configuration + - os: macos-latest + python-version: pypy3 + # Strange bug during PDF generation + - os: windows-latest + python-version: 3.5 + # Cannot find installed libraries + - os: windows-latest + python-version: pypy3 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 From 85c67587ae461084ae94feb7478189d76c27b0f0 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 00:25:30 +0200 Subject: [PATCH 40/57] Drop manual fc-cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It doesn’t work :/ --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fe86707cc..0ab920854 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,7 +36,6 @@ jobs: run: | choco install -y --no-progress dejavufonts msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" - C:\tools\msys64\mingw64\bin\fc-cache --verbose -f C:\ProgramData\chocolatey\lib\dejavufonts $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - run: python -m pip install --upgrade pip setuptools From 467cb48941e1f950daa6115a8a9efeea1799bca9 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 00:53:28 +0200 Subject: [PATCH 41/57] Install DejaVu with pacman --- .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 0ab920854..7527bcfe2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,8 +34,8 @@ jobs: brew install cairo pango gdk-pixbuf libffi - if: matrix.os == 'windows-latest' run: | - choco install -y --no-progress dejavufonts msys2 - powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'" + choco install -y --no-progress msys2 + powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-ttf-dejavu mingw-w64-x86_64-gtk3 --noconfirm'" $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - run: python -m pip install --upgrade pip setuptools From c6e9f4fedd6a4243fa59141e65358f04ad5b7c55 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 00:59:36 +0200 Subject: [PATCH 42/57] Fix DejaVu package name --- .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 7527bcfe2..63671405d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,7 +35,7 @@ jobs: - if: matrix.os == 'windows-latest' run: | choco install -y --no-progress msys2 - powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-ttf-dejavu mingw-w64-x86_64-gtk3 --noconfirm'" + powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-ttf-dejavu mingw-w64-x86_64-gtk3 --noconfirm'" $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - run: python -m pip install --upgrade pip setuptools From 9463e3fa86a4c381e00845ff83a782c1a6e83aee Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 14:17:00 +0200 Subject: [PATCH 43/57] Display DejaVu matching fonts --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 63671405d..2c3552f6e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,5 +40,7 @@ jobs: echo "::set-env name=PATH::$env:PATH" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' - run: python -m pip install --upgrade cffi + run: | + python -m pip install --upgrade cffi + fc-match -s "DejaVu" - run: python setup.py test From f327c8aa7e3a593e23d9adbfff3e9821d29a6c32 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 15:19:24 +0200 Subject: [PATCH 44/57] Copy DejaVu fonts into a fontconfig-friendly folder --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2c3552f6e..90fba0fdd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,5 +42,8 @@ jobs: - if: matrix.os == 'windows-latest' run: | python -m pip install --upgrade cffi + xcopy "C:\ProgramData\chocolatey\lib\dejavufonts" "%userprofile%\.fonts" /e /i + fc-cache --verbose -f "%userprofile%\.fonts" fc-match -s "DejaVu" + fc-conflist - run: python setup.py test From 4d2ff1e9205c560dfa5f1d96b0bc53002fa1d36c Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 15:33:10 +0200 Subject: [PATCH 45/57] Fix font folder --- .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 90fba0fdd..d574f6a38 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,7 +42,7 @@ jobs: - if: matrix.os == 'windows-latest' run: | python -m pip install --upgrade cffi - xcopy "C:\ProgramData\chocolatey\lib\dejavufonts" "%userprofile%\.fonts" /e /i + xcopy "C:\tools\msys64\mingw64\share\fonts\TTF" "%userprofile%\.fonts" /e /i fc-cache --verbose -f "%userprofile%\.fonts" fc-match -s "DejaVu" fc-conflist From b7f2d72c19073e6ace7e452f55babc8852a286d1 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 15:42:59 +0200 Subject: [PATCH 46/57] Use explicit destination for fonts destination --- .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 d574f6a38..9abe67c68 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,8 +42,8 @@ jobs: - if: matrix.os == 'windows-latest' run: | python -m pip install --upgrade cffi - xcopy "C:\tools\msys64\mingw64\share\fonts\TTF" "%userprofile%\.fonts" /e /i - fc-cache --verbose -f "%userprofile%\.fonts" + xcopy "C:\tools\msys64\mingw64\share\fonts\TTF" "C:\Users\runneradmin\.fonts" /e /i + fc-cache --verbose -f "C:\Users\runneradmin\.fonts" fc-match -s "DejaVu" fc-conflist - run: python setup.py test From 5a79ad745122d43ce1f89d7b4c5ab24010ad9eee Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 15:53:31 +0200 Subject: [PATCH 47/57] Remove useless lines --- .github/workflows/tests.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9abe67c68..914529e18 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,8 +25,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - if: matrix.os == 'ubuntu-latest' - run: | - sudo apt-get update -y && sudo apt-get install ttf-dejavu -y + run: sudo apt-get update -y && sudo apt-get install ttf-dejavu -y - if: matrix.os == 'macos-latest' run: | brew tap homebrew/cask-fonts @@ -36,14 +35,11 @@ jobs: run: | choco install -y --no-progress msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-ttf-dejavu mingw-w64-x86_64-gtk3 --noconfirm'" + xcopy "C:\tools\msys64\mingw64\share\fonts\TTF" "C:\Users\runneradmin\.fonts" /e /i + fc-cache "C:\Users\runneradmin\.fonts" $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' - run: | - python -m pip install --upgrade cffi - xcopy "C:\tools\msys64\mingw64\share\fonts\TTF" "C:\Users\runneradmin\.fonts" /e /i - fc-cache --verbose -f "C:\Users\runneradmin\.fonts" - fc-match -s "DejaVu" - fc-conflist + run: python -m pip install --upgrade cffi - run: python setup.py test From 39a69298711df1566ac826d73aaaf9b95f8b7e6b Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 16:03:23 +0200 Subject: [PATCH 48/57] Remove fc-cache --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 914529e18..ecda4e417 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,7 +36,6 @@ jobs: choco install -y --no-progress msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-ttf-dejavu mingw-w64-x86_64-gtk3 --noconfirm'" xcopy "C:\tools\msys64\mingw64\share\fonts\TTF" "C:\Users\runneradmin\.fonts" /e /i - fc-cache "C:\Users\runneradmin\.fonts" $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - run: python -m pip install --upgrade pip setuptools From dc21f1c65ef9848eda318066c6e98433816babff Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Mon, 6 Apr 2020 16:14:37 +0200 Subject: [PATCH 49/57] Use verbose tests to find crash --- .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 ecda4e417..a2dc1d46d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -41,4 +41,4 @@ jobs: - run: python -m pip install --upgrade pip setuptools - if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi - - run: python setup.py test + - run: python setup.py test --addopts="-v" From ada69675c4252ff4737873a05d1920d6b04be245 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Mon, 6 Apr 2020 16:16:24 +0200 Subject: [PATCH 50/57] Add names --- .github/workflows/tests.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ecda4e417..048cdfd74 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,6 +3,7 @@ on: [push] jobs: tests: + name: ${{ matrix.os }} - ${{ matrix.python-version }} runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -24,21 +25,27 @@ jobs: - uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - - if: matrix.os == 'ubuntu-latest' + - name: Install DejaVu + if: matrix.os == 'ubuntu-latest' run: sudo apt-get update -y && sudo apt-get install ttf-dejavu -y - - if: matrix.os == 'macos-latest' + - name: Install DejaVu, cairo, pango, gdk-pixbuf and libffi + if: matrix.os == 'macos-latest' run: | brew tap homebrew/cask-fonts brew cask install font-dejavu-sans brew install cairo pango gdk-pixbuf libffi - - if: matrix.os == 'windows-latest' + - name: Install msys2 and DejaVu + if: matrix.os == 'windows-latest' run: | choco install -y --no-progress msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-ttf-dejavu mingw-w64-x86_64-gtk3 --noconfirm'" xcopy "C:\tools\msys64\mingw64\share\fonts\TTF" "C:\Users\runneradmin\.fonts" /e /i $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - - run: python -m pip install --upgrade pip setuptools - - if: matrix.os == 'windows-latest' + - name: Upgrade pip and setuptools + run: python -m pip install --upgrade pip setuptools + - name: Upgrade cffi + if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi - - run: python setup.py test + - name: Launch tests + run: python setup.py test From 98c4e4fb7f9cb73dd04424f80382fdc940214f3f Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Mon, 6 Apr 2020 16:20:42 +0200 Subject: [PATCH 51/57] Specify os on names --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4547459c8..c95fe33a9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,16 +25,16 @@ jobs: - uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - - name: Install DejaVu + - name: Install DejaVu (Ubuntu) if: matrix.os == 'ubuntu-latest' run: sudo apt-get update -y && sudo apt-get install ttf-dejavu -y - - name: Install DejaVu, cairo, pango, gdk-pixbuf and libffi + - name: Install DejaVu, cairo, pango, gdk-pixbuf and libffi (MacOS) if: matrix.os == 'macos-latest' run: | brew tap homebrew/cask-fonts brew cask install font-dejavu-sans brew install cairo pango gdk-pixbuf libffi - - name: Install msys2 and DejaVu + - name: Install msys2 and DejaVu (Windows) if: matrix.os == 'windows-latest' run: | choco install -y --no-progress msys2 @@ -44,7 +44,7 @@ jobs: echo "::set-env name=PATH::$env:PATH" - name: Upgrade pip and setuptools run: python -m pip install --upgrade pip setuptools - - name: Upgrade cffi + - name: Upgrade cffi (Windows) if: matrix.os == 'windows-latest' run: python -m pip install --upgrade cffi - name: Launch tests From 6923e046f0b3ec2156ccc99ce0d0d2d7d7ccb362 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Wed, 13 May 2020 14:58:10 +0200 Subject: [PATCH 52/57] Remove Travis config as Actions is used --- .travis.yml | 58 ----------------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2d08fe3b3..000000000 --- a/.travis.yml +++ /dev/null @@ -1,58 +0,0 @@ -language: python -env: PYTHON=python - -git: - submodules: false - -jobs: - include: - - os: linux - python: 3.5 - - os: linux - python: 3.6 - - dist: bionic - python: 3.7 - - dist: bionic - python: 3.8 - - os: osx - language: generic - env: - - HOMEBREW_NO_AUTO_UPDATE=1 - - PYTHON=python3 - - os: windows - # Windows doesn't support python or even generic language - language: cpp - env: PYTHON=/c/Python38/python - allow_failures: - - os: windows - -addons: - apt: - packages: - - ttf-dejavu - -before_install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then export "PATH=$PATH;C:\msys64\mingw64\bin"; fi - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install -y python dejavufonts; fi - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then wget "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz"; fi - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then 7z e msys2-base-x86_64-20180531.tar.xz; fi - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then 7z x -y msys2-base-x86_64-20180531.tar -oc:\\; fi - # We need powershell because Travis' bash and MSYS2's bash rely on conflicting libraries - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then powershell "C:\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-gtk3 --noconfirm'"; fi - - # Pango 1.38+ is needed to make @font-face work, remove these two lines when it's available on Travis - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir -p ~/.fonts; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget "https://github.com/Kozea/Ahem/blob/master/Ahem.ttf?raw=true" -O ~/.fonts/Ahem.ttf; fi - - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap homebrew/cask-fonts; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install font-dejavu-sans; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install cairo pango gdk-pixbuf libffi; fi - - # As setup.py doesn't use pip, setuptools is not updated before installing dependencies - - $PYTHON -m pip install --upgrade pip setuptools - - # Upgrade cffi to avoid errors while installing cairocffi - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then $PYTHON -m pip install --upgrade cffi; fi - -script: - - $PYTHON setup.py test From 580af02e962c0cc90951e5c598c136223dcc06e9 Mon Sep 17 00:00:00 2001 From: Lucie Anglade Date: Wed, 13 May 2020 15:14:06 +0200 Subject: [PATCH 53/57] Rename DejaVu font for MacOS --- .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 c95fe33a9..6d9ba7907 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,7 @@ jobs: if: matrix.os == 'macos-latest' run: | brew tap homebrew/cask-fonts - brew cask install font-dejavu-sans + brew cask install font-dejavu brew install cairo pango gdk-pixbuf libffi - name: Install msys2 and DejaVu (Windows) if: matrix.os == 'windows-latest' From b15d2eb37a0deb61526e7e6ca55be83eeb157b98 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Tue, 25 Aug 2020 13:14:43 +0200 Subject: [PATCH 54/57] =?UTF-8?q?Don=E2=80=99t=20copy=20fonts=20for=20test?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related to msys2/MINGW-packages#5762. --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6d9ba7907..c89dfc934 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,7 +39,6 @@ jobs: run: | choco install -y --no-progress msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-ttf-dejavu mingw-w64-x86_64-gtk3 --noconfirm'" - xcopy "C:\tools\msys64\mingw64\share\fonts\TTF" "C:\Users\runneradmin\.fonts" /e /i $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - name: Upgrade pip and setuptools From acbeaf0c8b9908739607c94bb83d7c18463166ea Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Tue, 25 Aug 2020 20:42:09 +0200 Subject: [PATCH 55/57] Fix imports --- weasyprint/document.py | 3 +-- weasyprint/layout/preferred.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/weasyprint/document.py b/weasyprint/document.py index b7352aa03..a714e2f37 100644 --- a/weasyprint/document.py +++ b/weasyprint/document.py @@ -12,7 +12,6 @@ import warnings import cairocffi as cairo -from weasyprint.layout import LayoutContext from . import CSS from .css import get_all_computed_styles @@ -24,7 +23,7 @@ from .formatting_structure.build import build_formatting_structure from .html import W3C_DATE_RE from .images import get_image_from_uri as original_get_image_from_uri -from .layout import layout_document +from .layout import LayoutContext, layout_document from .layout.percentages import percentage from .logger import LOGGER, PROGRESS_LOGGER from .pdf import write_pdf_metadata diff --git a/weasyprint/layout/preferred.py b/weasyprint/layout/preferred.py index 024d47732..17b4827e6 100644 --- a/weasyprint/layout/preferred.py +++ b/weasyprint/layout/preferred.py @@ -718,7 +718,7 @@ def flex_max_content_width(context, box, outer=True): def trailing_whitespace_size(context, box): """Return the size of the trailing whitespace of ``box``.""" - from .inlines import split_text_box, split_first_line + from .inlines import split_first_line, split_text_box while isinstance(box, (boxes.InlineBox, boxes.LineBox)): if not box.children: From 64e1503451a2d94095ba059e719e1fe5cfe83655 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Tue, 25 Aug 2020 20:59:58 +0200 Subject: [PATCH 56/57] Drop Python 3.5 support --- .github/workflows/tests.yml | 5 +---- README.rst | 2 +- docs/install.rst | 2 +- setup.cfg | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c89dfc934..f358a0824 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,14 +9,11 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.5, 3.6, 3.7, 3.8, pypy3] + python-version: [3.6, 3.7, 3.8, pypy3] exclude: # Pillow wheel missing for this configuration - os: macos-latest python-version: pypy3 - # Strange bug during PDF generation - - os: windows-latest - python-version: 3.5 # Cannot find installed libraries - os: windows-latest python-version: pypy3 diff --git a/README.rst b/README.rst index e661b9fce..5c3bee773 100644 --- a/README.rst +++ b/README.rst @@ -17,7 +17,7 @@ WebKit or Gecko. The CSS layout engine is written in Python, designed for pagination, and meant to be easy to hack on. * Free software: BSD licensed -* Python 3.5+ +* Python 3.6+ * Website: https://weasyprint.org/ * Documentation: https://weasyprint.readthedocs.io/ * Source code and issue tracker: https://github.com/Kozea/WeasyPrint diff --git a/docs/install.rst b/docs/install.rst index 198020808..e3bbf83e1 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -3,7 +3,7 @@ Installing WeasyPrint |version| depends on: -* CPython_ ≥ 3.5.0 +* CPython_ ≥ 3.6.0 * cairo_ ≥ 1.15.4 [#]_ * Pango_ ≥ 1.38.0 [#]_ * setuptools_ ≥ 30.3.0 [#]_ diff --git a/setup.cfg b/setup.cfg index 4ddc2cf2c..d0a05c274 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,7 +23,6 @@ classifiers = Intended Audience :: Developers License :: OSI Approved :: BSD License Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 @@ -63,7 +62,7 @@ tests_require = pytest-cov pytest-flake8 pytest-isort -python_requires = >= 3.5 +python_requires = >= 3.6 [options.entry_points] console-scripts = weasyprint = weasyprint.__main__:main From 6ed7be1ca98886949709dc9d7064e744c098cab9 Mon Sep 17 00:00:00 2001 From: Guillaume Ayoub Date: Tue, 25 Aug 2020 21:09:30 +0200 Subject: [PATCH 57/57] =?UTF-8?q?Revert=20"Don=E2=80=99t=20copy=20fonts=20?= =?UTF-8?q?for=20tests"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b15d2eb37a0deb61526e7e6ca55be83eeb157b98. --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f358a0824..ce4576457 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,6 +36,7 @@ jobs: run: | choco install -y --no-progress msys2 powershell "C:\tools\msys64\usr\bin\bash -lc 'pacman -S mingw-w64-x86_64-ttf-dejavu mingw-w64-x86_64-gtk3 --noconfirm'" + xcopy "C:\tools\msys64\mingw64\share\fonts\TTF" "C:\Users\runneradmin\.fonts" /e /i $env:PATH += ";C:\tools\msys64\mingw64\bin" echo "::set-env name=PATH::$env:PATH" - name: Upgrade pip and setuptools