From a66df023fb44bc4e54d6b496ce9d39a41bdc9629 Mon Sep 17 00:00:00 2001 From: Marko Bocevski Date: Sat, 20 Feb 2021 23:37:58 +0100 Subject: [PATCH 1/2] Create pypi configuration (#41) --- README.rst | 5 ++++- setup.py | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index 03ac61af..e23a0ba9 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,10 @@ :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/pypi/v/ckanext-saml2auth + :target: https://pypi.org/project/ckanext-saml2auth .. image:: https://img.shields.io/badge/python-3.8-blue.svg :target: https://www.python.org/downloads/release/python-384/ diff --git a/setup.py b/setup.py index 5c1e0f39..64554c31 100644 --- a/setup.py +++ b/setup.py @@ -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', @@ -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(). From 5ae1564616230a8fbc073d10dbddd450e19857c6 Mon Sep 17 00:00:00 2001 From: Marko Bocevski Date: Sat, 20 Feb 2021 23:58:29 +0100 Subject: [PATCH 2/2] Test with python 3.6, 3.7 and 3.8 (#23) * Test with python 3.6, 3.7, 3.8 and 3.9 * Update badge with python supported versions * Test with python 3.6, 3.7, 3.8 only * Add CKAN version supported --- .github/workflows/pr_checks.yml | 19 ++++++++++++++++++- README.rst | 6 ++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index b2abc844..7b15400f 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -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: @@ -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: | @@ -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 diff --git a/README.rst b/README.rst index e23a0ba9..b3131fdb 100644 --- a/README.rst +++ b/README.rst @@ -7,9 +7,11 @@ .. image:: https://img.shields.io/pypi/v/ckanext-saml2auth :target: https://pypi.org/project/ckanext-saml2auth -.. 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/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 ==================