Skip to content

Commit

Permalink
Merge branch 'main' into isaml2auht-interface
Browse files Browse the repository at this point in the history
  • Loading branch information
amercader authored Feb 22, 2021
2 parents 31d7611 + 5ae1564 commit febb88f
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 13 deletions.
19 changes: 18 additions & 1 deletion .github/workflows/pr_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ '3.6', '3.7', '3.8' ]
name: Python ${{ matrix.python-version }} extension test

services:
postgresql:
Expand Down Expand Up @@ -68,7 +72,8 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: '3.8'
python-version: ${{ matrix.python-version }}
architecture: x64

- name: Install pytest
run: |
Expand All @@ -87,3 +92,15 @@ jobs:
- name: Coveralls
uses: AndreMiras/coveralls-python-action@develop
with:
parallel: true
flag-name: Unit Test

coveralls_finish:
needs: test
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: AndreMiras/coveralls-python-action@develop
with:
parallel-finished: true
11 changes: 8 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@
:target: https://github.com/keitaroinc/ckanext-saml2auth/actions

.. image:: https://coveralls.io/repos/github/keitaroinc/ckanext-saml2auth/badge.svg?branch=main
:target: https://coveralls.io/github/keitaroinc/ckanext-saml2auth?branch=main
:target: https://coveralls.io/github/keitaroinc/ckanext-saml2auth?branch=main

.. image:: https://img.shields.io/badge/python-3.8-blue.svg
:target: https://www.python.org/downloads/release/python-384/
.. image:: https://img.shields.io/pypi/v/ckanext-saml2auth
:target: https://pypi.org/project/ckanext-saml2auth

.. image:: https://img.shields.io/badge/python-3.6%20%7C%203.7%20%7C%203.8-blue
:target: https://www.python.org

.. image:: https://img.shields.io/badge/ckan-2.9-red
:target: https://www.ckan.org


==================
Expand Down
20 changes: 11 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# http://packaging.python.org/en/latest/tutorial.html#version
version='0.0.1',
version='1.0.2',

description='''An extension to enable Single Sign On(SSO) for CKAN data portals via SAML2 Authentication.''',
long_description=long_description,
long_description_content_type='text/x-rst',

# The project's main homepage.
url='https://github.com/duskobogdanovski/'\
url='https://github.com/keitaroinc/'\
'ckanext-saml2auth',

# Author details
author='''Keitaro''',
author_email='''dusko.bogdanovski@keitaro.com''',
author='''Keitaro Inc''',
author_email='''info@keitaro.com''',

# Choose your license
license='AGPL',
Expand All @@ -39,20 +39,22 @@
# 3 - Alpha
# 4 - Beta
# 5 - Production/Stable
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',

# Pick your license as you wish (should match "license" above)
'License :: OSI Approved :: GNU Affero General Public License v3 or'\
'later (AGPLv3+)',
'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',

# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],


# What does your project relate to?
keywords='''CKAN saml2 sso''',
keywords='''CKAN ckanext saml2 sso''',

# You can just specify the packages manually here if your project is
# simple. Or you can use find_packages().
Expand Down

0 comments on commit febb88f

Please sign in to comment.