Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

global: migrate CI to GH Actions #220

Merged
merged 1 commit into from
Dec 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ indent_size = 4
[*.{css,html,js,json,yml}]
indent_size = 2

# Matches the exact files either package.json or .travis.yml
[{package.json,.travis.yml}]
# Matches the exact files either package.json or .github/workflows/*.yml
[{package.json,.github/workflows/*.yml}]
indent_size = 2

# Dockerfile
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/pypi-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Publish

on:
push:
tags:
- v*

jobs:
Publish:

runs-on: ubuntu-20.04

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel

- name: Build package
# Remove `compile_catalog` if the package has no translations.
run: |
python setup.py compile_catalog sdist bdist_wheel

- name: Publish on PyPI
uses: pypa/gh-action-pypi-publish@v1.3.1
with:
user: __token__
# The token is provided by the inveniosoftware organization
password: ${{ secrets.pypi_token }}
96 changes: 96 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
name: CI

on:
push:
branches: master
pull_request:
branches: master
schedule:
# * is a special character in YAML so you have to quote this string
- cron: '0 3 * * 6'
workflow_dispatch:
inputs:
reason:
description: 'Reason'
required: false
default: 'Manual trigger'

jobs:
Tests:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
requirements-level: [min, pypi]
db-service: [postgresql9, postgresql11, mysql5, mysql8]

exclude:
- python-version: 3.8
requirements-level: min

- db-service: postgresql11
python-version: 3.6

- db-service: mysql8
python-version: 3.6

include:
- db-service: postgresql9
DB: postgresql
POSTGRESQL_VERSION: POSTGRESQL_9_LATEST
SQLALCHEMY_DATABASE_URI: "postgresql+psycopg2://invenio:invenio@localhost:5432/invenio"
EXTRAS: "all,postgresql"

- db-service: postgresql11
DB: postgresql
POSTGRESQL_VERSION: POSTGRESQL_11_LATEST
SQLALCHEMY_DATABASE_URI: "postgresql+psycopg2://invenio:invenio@localhost:5432/invenio"
EXTRAS: "all,postgresql"

- db-service: mysql5
DB: mysql
MYSQL_VERSION: MYSQL_5_LATEST
SQLALCHEMY_DATABASE_URI: "mysql+pymysql://invenio:invenio@localhost:3306/invenio"
EXTRAS: "all,mysql"

- db-service: mysql8
DB: mysql
MYSQL_VERSION: MYSQL_8_LATEST
SQLALCHEMY_DATABASE_URI: "mysql+pymysql://invenio:invenio@localhost:3306/invenio"
EXTRAS: "all,mysql"

env:
SQLALCHEMY_DATABASE_URI: ${{matrix.SQLALCHEMY_DATABASE_URI}}
POSTGRESQL_VERSION: ${{matrix.POSTGRESQL_VERSION}}
MYSQL_VERSION: ${{matrix.MYSQL_VERSION}}
DB: ${{ matrix.DB }}

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Generate dependencies
run: |
python -m pip install --upgrade pip setuptools py wheel requirements-builder
requirements-builder -e ${{ matrix.EXTRAS }} ${{ matrix.requirements-file }} --level=${{ matrix.requirements-level }} setup.py > .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt

- name: Cache pip
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('.${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt') }}

- name: Install dependencies
run: |
pip install -r .${{matrix.requirements-level}}-${{ matrix.python-version }}-requirements.txt
pip install .[${{ matrix.EXTRAS }}]
pip freeze

- name: Run tests
run: |
./run-tests.sh
79 changes: 0 additions & 79 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,6 @@ Before you submit a pull request, check that it meets these guidelines:
1. The pull request should include tests and must not decrease test coverage.
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring.
3. The pull request should work for Python 2.7, 3.3, 3.4 and 3.5. Check
https://travis-ci.com/inveniosoftware/invenio-oauth2server/pull_requests
3. The pull request should work for Python 3.6, 3.7 and 3.8. Check
https://github.com/inveniosoftware/invenio-oauth2server/actions?query=event%3Apull_request
and make sure that the tests pass for all supported Python versions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ recursive-include examples *.py
recursive-include examples *.txt
recursive-include examples *.html
recursive-include examples *.sh
recursive-include .github/workflows *.yml
recursive-include invenio_oauth2server *.html
recursive-include invenio_oauth2server *.mo
recursive-include invenio_oauth2server *.po
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
.. image:: https://img.shields.io/github/license/inveniosoftware/invenio-oauth2server.svg
:target: https://github.com/inveniosoftware/invenio-oauth2server/blob/master/LICENSE

.. image:: https://img.shields.io/travis/inveniosoftware/invenio-oauth2server.svg
:target: https://travis-ci.org/inveniosoftware/invenio-oauth2server
.. image:: https://github.com/inveniosoftware/invenio-oauth2server/workflows/CI/badge.svg
:target: https://github.com/inveniosoftware/invenio-oauth2server/actions

.. image:: https://img.shields.io/coveralls/inveniosoftware/invenio-oauth2server.svg
:target: https://coveralls.io/r/inveniosoftware/invenio-oauth2server
Expand Down
3 changes: 2 additions & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
# under the terms of the MIT License; see LICENSE file for more details.

[pytest]
addopts = --pep8 --ignore=docs --cov=invenio_oauth2server --cov-report=term-missing
addopts = --isort --pydocstyle --pycodestyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_oauth2server --cov-report=term-missing tests invenio_oauth2server
testpaths = tests invenio_oauth2server
21 changes: 16 additions & 5 deletions run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,22 @@
#
# Invenio is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
# Usage:
# env DB=postgresql ./run-tests.sh

# Quit on errors
set -o errexit

pydocstyle invenio_oauth2server && \
isort -rc -c -df **/*.py && \
check-manifest --ignore ".travis-*" && \
sphinx-build -qnNW docs docs/_build/html && \
python setup.py test && \
# Quit on unbound symbols
set -o nounset

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Major: ⚠️ We are setting postgreqlX and mysqlX in the build matrix but we never call docker-services-cli here, so basically test won't be able to connect to a DB that isn't running.

pydocstyle invenio_oauth2server
isort -rc -c -df **/*.py
check-manifest --ignore ".travis-*"
sphinx-build -qnNW docs docs/_build/html
docker-services-cli up ${DB}
python setup.py test
sphinx-build -qnNW -b doctest docs docs/_build/doctest
Copy link
Member

@diegodelemos diegodelemos Dec 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tests_exit_code=$?
docker-services-cli down
exit "$tests_exit_code"
13 changes: 1 addition & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,7 @@
history = open('CHANGES.rst').read()

tests_require = [
'SQLAlchemy-Continuum>=1.2.1',
'check-manifest>=0.25',
'coverage>=4.0',
'invenio-assets>=1.0.0',
'invenio-i18n>=1.0.0',
'invenio-theme>=1.0.0',
'isort>=4.2.2',
'mock>=1.3.0',
'pydocstyle>=1.0.0',
'pytest-cov>=1.8.0',
'pytest-pep8>=1.0.6',
'pytest>=3.8.0,<5.0.0',
'pytest-invenio>=1.4.0',
]

extras_require = {
Expand Down