Skip to content

Commit

Permalink
Merge ce2f41a into 6f128ec
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasKs committed Jan 19, 2021
2 parents 6f128ec + ce2f41a commit d582cfd
Show file tree
Hide file tree
Showing 11 changed files with 132 additions and 419 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: coverage

on:
pull_request:
push:
branches:
- master

jobs:
codecov:
# ---------------------------------------------------
# Documentation and examples can be found at
# https://github.com/snok/install-poetry
# ---------------------------------------------------
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install poetry
uses: snok/install-poetry@v1.1.1
with:
virtualenvs-create: true
virtualenvs-in-project: true
- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v2
with:
path: .venv
key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
- name: Install dependencies
run: poetry install
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
- name: Test with pytest
run: |
poetry run coverage run manage.py test -v 2
poetry run coverage xml
- name: Upload coverage
uses: codecov/codecov-action@v1
with:
file: ./coverage.xml
fail_ci_if_error: true
72 changes: 72 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: test

on: pull_request

jobs:
linting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3"
- uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- run: python -m pip install flake8 # isort black
- run: |
flake8 .
# black . --check
# isort .
test:
# ---------------------------------------------------
# Documentation and examples can be found at
# https://github.com/snok/install-poetry
# ---------------------------------------------------
needs: linting
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [ "3.6", "3.7", "3.8", "3.9"]
django-version: [ "2.2", "3.0", "3.1" ]
drf-version: [ "3.10", "3.11", "3.12" ]
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install poetry
uses: snok/install-poetry@v1.0.0
with:
virtualenvs-create: true
virtualenvs-in-project: true
- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v2
with:
path: .venv
key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
- name: Install dependencies
run: poetry install
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
- name: Install django ${{ matrix.django-version }}
run: |
source .venv/bin/activate
poetry add "Django==${{ matrix.django-version }}"
- name: Install DRF
run: |
source .venv/bin/activate
poetry add "djangorestframework==${{ matrix.drf-version }}"
- run: pip install pyjwt==1.7.1
- name: Run tests
run: |
source .venv/bin/activate
poetry run coverage run manage.py test -v 2
poetry run coverage report -m
122 changes: 0 additions & 122 deletions .travis.yml

This file was deleted.

10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ ADFS Authentication for Django
:target: https://pypi.python.org/pypi/django-auth-adfs#downloads
.. image:: https://img.shields.io/pypi/djversions/django-auth-adfs.svg
:target: https://pypi.python.org/pypi/django-auth-adfs
.. image:: https://travis-ci.org/jobec/django-auth-adfs.svg?branch=master
:target: https://travis-ci.org/jobec/django-auth-adfs
.. image:: https://codecov.io/github/jobec/django-auth-adfs/coverage.svg?branch=master
:target: https://codecov.io/github/jobec/django-auth-adfs?branch=master
.. image:: https://travis-ci.org/snok/django-auth-adfs.svg?branch=master
:target: https://travis-ci.org/snok/django-auth-adfs
.. image:: https://codecov.io/github/snok/django-auth-adfs/coverage.svg?branch=master
:target: https://codecov.io/github/snok/django-auth-adfs?branch=master

A Django authentication backend for Microsoft ADFS and Azure AD

* Free software: BSD License
* Homepage: https://github.com/jobec/django-auth-adfs
* Homepage: https://github.com/snok/django-auth-adfs
* Documentation: http://django-auth-adfs.readthedocs.io/

Features
Expand Down
1 change: 0 additions & 1 deletion django_auth_adfs/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ class MFARequired(Exception):
Exception to indicate that a MFA auth is required.
"""
pass

10 changes: 5 additions & 5 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ ADFS Authentication for Django
:target: https://pypi.python.org/pypi/django-auth-adfs#downloads
.. image:: https://img.shields.io/pypi/djversions/django-auth-adfs.svg
:target: https://pypi.python.org/pypi/django-auth-adfs
.. image:: https://travis-ci.org/jobec/django-auth-adfs.svg?branch=master
:target: https://travis-ci.org/jobec/django-auth-adfs
.. image:: https://codecov.io/github/jobec/django-auth-adfs/coverage.svg?branch=master
:target: https://codecov.io/github/jobec/django-auth-adfs?branch=master
.. image:: https://travis-ci.org/snok/django-auth-adfs.svg?branch=master
:target: https://travis-ci.org/snok/django-auth-adfs
.. image:: https://codecov.io/github/snok/django-auth-adfs/coverage.svg?branch=master
:target: https://codecov.io/github/snok/django-auth-adfs?branch=master

A Django authentication backend for Microsoft ADFS and Azure AD

* Free software: BSD License
* Homepage: https://github.com/jobec/django-auth-adfs
* Homepage: https://github.com/snok/django-auth-adfs
* Documentation: http://django-auth-adfs.readthedocs.io/

Features
Expand Down
Loading

0 comments on commit d582cfd

Please sign in to comment.