From b761ffffccfdaca2e7288c44693183fc0603205e Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 17:58:29 -0300 Subject: [PATCH 01/10] Add basic workflow with github actions --- .github/workflows/python-tests.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/python-tests.yml diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml new file mode 100644 index 0000000..fe97a03 --- /dev/null +++ b/.github/workflows/python-tests.yml @@ -0,0 +1,23 @@ +name: Run unit tests + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.6, 3.7, 3.8, pypy3] + + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install Tox and any other packages + run: pip install tox + - name: Run Tox + # Run tox using the version of Python in `PATH` + run: tox -e py From e58276ed90345c6ed47059de4f497298d385e3af Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 17:59:01 -0300 Subject: [PATCH 02/10] Remove travis --- .travis.yml | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a019d9b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,44 +0,0 @@ -language: python -cache: pip -dist: xenial - -matrix: - include: - - python: 3.6 - before_install: - - sudo add-apt-repository ppa:mc3man/xerus-media -y - - sudo apt-get update -qq - - sudo apt-get install -qq ubuntu-restricted-extras ffmpeg - before_script: - ffmpeg --help - - python: 3.7 - before_install: - - sudo add-apt-repository ppa:mc3man/xerus-media -y - - sudo apt-get update -qq - - sudo apt-get install -qq ubuntu-restricted-extras ffmpeg - before_script: - ffmpeg --help - - python: 3.8 - before_install: - - sudo add-apt-repository ppa:mc3man/xerus-media -y - - sudo apt-get update -qq - - sudo apt-get install -qq ubuntu-restricted-extras ffmpeg - before_script: - ffmpeg --help - - python: 3.8 - env: TOXENV=doc - - python: 3.8 - env: TOXENV=check - allow_failures: - - env: TOXENV=check - -install: pip install -U tox-travis - -script: tox -- -v - -after_success: - - pip install codecov - - codecov - -notifications: - irc: "chat.freenode.net#sigal" From 90b9c75284c550abcc2d245c78cc6c2505520e91 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 18:04:33 -0300 Subject: [PATCH 03/10] Add codecov --- .github/workflows/python-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index fe97a03..2f959bb 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -1,6 +1,6 @@ name: Run unit tests -on: [push] +on: [push, pull_request] jobs: build: @@ -21,3 +21,5 @@ jobs: - name: Run Tox # Run tox using the version of Python in `PATH` run: tox -e py + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v1 From 18781616134ba397e37238cde282d47c014ab7cf Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 18:16:40 -0300 Subject: [PATCH 04/10] Add FFmpeg --- .github/workflows/python-tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 2f959bb..f5f7997 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -16,7 +16,11 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Install Tox and any other packages + - name: Install FFmpeg + run: | + sudo apt install ffmpeg + ffmpeg -version + - name: Install Tox run: pip install tox - name: Run Tox # Run tox using the version of Python in `PATH` From a9b4bd8d8c7ab9168995d9cbdbaf3b016ce2b7bc Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 19:25:50 -0300 Subject: [PATCH 05/10] Test older Pillow versions --- .github/workflows/python-tests.yml | 17 ++++++++++++++--- tox.ini | 16 ++++++++++------ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index f5f7997..bdc654e 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -1,6 +1,15 @@ name: Run unit tests on: [push, pull_request] +# on: +# pull_request: +# push: +# branches: +# - master +# tags: +# schedule: +# # Run everyday at 03:53 UTC +# - cron: 53 3 * * * jobs: build: @@ -8,6 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: + fail-fast: false python-version: [3.6, 3.7, 3.8, pypy3] steps: @@ -21,9 +31,10 @@ jobs: sudo apt install ffmpeg ffmpeg -version - name: Install Tox - run: pip install tox + run: python -m pip install tox tox-gh-actions - name: Run Tox - # Run tox using the version of Python in `PATH` - run: tox -e py + run: tox - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 + with: + file: ./coverage.xml diff --git a/tox.ini b/tox.ini index 57777b3..e51d355 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,22 @@ [tox] -envlist = py{36,37,38} +envlist = py{36,37,38}{,-pillow6,-pillow7},pypy3 skip_missing_interpreters = True -[travis] +[gh-actions] python = - 3.6: py36 - 3.7: py37 - 3.8: py38 + 3.6: py36-pillow6 + 3.7: py37-pillow7 + 3.8: py38, check + pypy3: pypy3 [testenv] +deps = + pillow6: Pillow==6.0.0 + pillow7: Pillow==7.0.0 extras = all tests -commands = pytest --cov sigal --cov-report term-missing tests/ +commands = pytest --cov sigal --cov-report term --cov-report=xml tests/ [testenv:check] deps = From a3fd3be91984a19bbb4d3bbeafbf1d3e2a603d7c Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 19:32:21 -0300 Subject: [PATCH 06/10] Add badge and coverage --- .github/workflows/python-tests.yml | 5 +++-- README.rst | 6 +++--- tox.ini | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index bdc654e..11a68b3 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -17,7 +17,6 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - fail-fast: false python-version: [3.6, 3.7, 3.8, pypy3] steps: @@ -34,7 +33,9 @@ jobs: run: python -m pip install tox tox-gh-actions - name: Run Tox run: tox + - name: Convert coverage + run: python -m coverage xml - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: - file: ./coverage.xml + fail_ci_if_error: true diff --git a/README.rst b/README.rst index be7bec1..27ca6d7 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,9 @@ Sigal - Simple Static Gallery Generator ======================================= -.. image:: https://secure.travis-ci.org/saimn/sigal.png?branch=master - :target: https://travis-ci.org/saimn/sigal - :alt: Travis-ci: continuous integration status. +.. image:: https://github.com/saimn/sigal/workflows/CI/badge.svg?branch=master + :target: https://github.com/saimn/sigal/actions?workflow=CI + :alt: CI Status .. image:: https://codecov.io/gh/saimn/sigal/branch/master/graph/badge.svg :target: https://codecov.io/gh/saimn/sigal diff --git a/tox.ini b/tox.ini index e51d355..44af624 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ deps = extras = all tests -commands = pytest --cov sigal --cov-report term --cov-report=xml tests/ +commands = pytest --cov sigal --cov-report term tests/ [testenv:check] deps = From 47830f90b8d330e3d70a183466f5847046285f3d Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 19:37:44 -0300 Subject: [PATCH 07/10] Fetch all history to get a correct version --- .github/workflows/python-tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 11a68b3..b2635c0 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -10,7 +10,8 @@ on: [push, pull_request] # schedule: # # Run everyday at 03:53 UTC # - cron: 53 3 * * * - +# workflow_dispatch: + jobs: build: @@ -21,6 +22,8 @@ jobs: steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: From 44daa48c4cbb4f44547df0d89dbef697cd5be81a Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 19:40:24 -0300 Subject: [PATCH 08/10] Install coverage --- .github/workflows/python-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index b2635c0..29b0b10 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -11,7 +11,7 @@ on: [push, pull_request] # # Run everyday at 03:53 UTC # - cron: 53 3 * * * # workflow_dispatch: - + jobs: build: @@ -33,7 +33,7 @@ jobs: sudo apt install ffmpeg ffmpeg -version - name: Install Tox - run: python -m pip install tox tox-gh-actions + run: python -m pip install tox tox-gh-actions coverage - name: Run Tox run: tox - name: Convert coverage From 92010145859444108bd5265c93d8ba172d38c7e5 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 19:41:44 -0300 Subject: [PATCH 09/10] Change Pillow versions --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 44af624..fe2e77b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,11 @@ [tox] -envlist = py{36,37,38}{,-pillow6,-pillow7},pypy3 +envlist = py{36,37,38}{,-pillow70,-pillow71},pypy3 skip_missing_interpreters = True [gh-actions] python = - 3.6: py36-pillow6 - 3.7: py37-pillow7 + 3.6: py36-pillow70 + 3.7: py37-pillow71 3.8: py38, check pypy3: pypy3 From 91c861530a2e560a348e1203e2c950576a374607 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Sun, 4 Oct 2020 21:52:18 -0300 Subject: [PATCH 10/10] Setup cron --- .github/workflows/python-tests.yml | 21 ++++++++++----------- tox.ini | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 29b0b10..a233f4a 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -1,16 +1,15 @@ name: Run unit tests -on: [push, pull_request] -# on: -# pull_request: -# push: -# branches: -# - master -# tags: -# schedule: -# # Run everyday at 03:53 UTC -# - cron: 53 3 * * * -# workflow_dispatch: +on: + pull_request: + push: + branches: + - master + tags: + workflow_dispatch: + schedule: + # Run every Sunday at 03:53 UTC + - cron: 53 3 * * * jobs: build: diff --git a/tox.ini b/tox.ini index fe2e77b..d5bb105 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,12 @@ [tox] -envlist = py{36,37,38}{,-pillow70,-pillow71},pypy3 +envlist = py{36,37,38}-pillow{70,71,-latest},pypy3,check skip_missing_interpreters = True [gh-actions] python = 3.6: py36-pillow70 3.7: py37-pillow71 - 3.8: py38, check + 3.8: py38-pillow-latest, check pypy3: pypy3 [testenv]