Skip to content

Commit

Permalink
Merge f03ea41 into 020d549
Browse files Browse the repository at this point in the history
  • Loading branch information
Starou committed Mar 7, 2022
2 parents 020d549 + f03ea41 commit a87a6d0
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 41 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/runtests.yml
@@ -0,0 +1,53 @@
name: Django CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch:

jobs:
test:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.7, 3.8, 3.9]
django-version: [3.0.14, 3.1.14]
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 Dependencies
run: |
python -m pip install --upgrade pip
pip install django==${{ matrix.django-version }}
pip install libthumbor requests mock coverage coveralls
pip install .
- name: Test Python-${{ matrix.python-version }} Django-${{ matrix.django-version }}
run: |
cd tests && make coverage
- name: Coveralls Parallel
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
flag-name: run-py${{ matrix.python-version }}-dj${{ matrix.django-version }}
path-to-lcov: tests/coverage.lcov
parallel: true

finish:
needs: test
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: tests/coverage.lcov
parallel-finished: true
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -7,4 +7,5 @@ build
MANIFEST
*.sqlite
tests/.coverage
tests/coverage.lcov
django_thumborstorage.egg-info
29 changes: 0 additions & 29 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion MANIFEST.in
@@ -1,7 +1,7 @@
include LICENSE
include AUTHORS
graft tests
exclude tests/coveralls.yaml
exclude tests/.coverage
exclude tests/coverage.lcov
global-exclude *.pyc
global-exclude .DS_Store
8 changes: 2 additions & 6 deletions README.rst
Expand Up @@ -2,16 +2,12 @@
django-thumborstorage
=====================

.. image:: https://coveralls.io/repos/Starou/django-thumborstorage/badge.png?branch=master
:target: https://coveralls.io/r/Starou/django-thumborstorage?branch=master
.. image:: https://coveralls.io/repos/github/Starou/django-thumborstorage/badge.svg?branch=master
:target: https://coveralls.io/github/Starou/django-thumborstorage?branch=master

.. image:: https://img.shields.io/pypi/v/django-thumborstorage.svg
:target: https://pypi.python.org/pypi/django-thumborstorage

.. image:: https://travis-ci.org/Starou/django-thumborstorage.svg
:target: https://travis-ci.org/Starou/django-thumborstorage
:alt: Travis C.I.

A Django custom storage for Thumbor backend.

This app provide 2 classes ``ThumborStorage`` and ``ThumborMigrationStorage``. The last one
Expand Down
5 changes: 1 addition & 4 deletions tests/Makefile
@@ -1,9 +1,6 @@
coveralls:
@coverage run --rcfile=coveragerc runtests.py
@coveralls -y coveralls.yaml -d .coverage

coverage-report: coverage
@coverage report -m

coverage:
@coverage run --rcfile=coveragerc runtests.py
@coverage lcov
1 change: 0 additions & 1 deletion tests/coveralls.yaml

This file was deleted.

0 comments on commit a87a6d0

Please sign in to comment.