Skip to content

Commit

Permalink
Merge pull request #12 from bellisk/tests/switch-to-github-actions-tests
Browse files Browse the repository at this point in the history
Tests/switch to GitHub actions tests
  • Loading branch information
bellisk authored Jun 25, 2024
2 parents 89556b4 + e680605 commit 87e1e50
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 168 deletions.
72 changes: 72 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Tests
on: [push, pull_request]
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install requirements
run: pip install flake8 pycodestyle
- name: Check syntax and complexity
run: |
flake8 . --count --select=C901,E901,E999,F401,F821,F822,F823 --show-source --statistics
test:
needs: lint
strategy:
matrix:
ckan-version: [2.8, 2.7]
fail-fast: false

name: CKAN ${{ matrix.ckan-version }}
runs-on: ubuntu-latest
container:
image: openknowledge/ckan-dev:${{ matrix.ckan-version }}
services:
solr:
image: ckan/ckan-solr:${{ matrix.ckan-version }}
postgres:
image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: postgres
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
redis:
image: redis:3
env:
CKAN_SQLALCHEMY_URL: postgresql://ckan_default:pass@postgres/ckan_test
CKAN_DATASTORE_WRITE_URL: postgresql://datastore_write:pass@postgres/datastore_test
CKAN_DATASTORE_READ_URL: postgresql://datastore_read:pass@postgres/datastore_test
CKAN_SOLR_URL: http://solr:8983/solr/ckan
CKAN_REDIS_URL: redis://redis:6379/1
CKAN_SITE_URL: http://test.ckan.net
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

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

- name: Install requirements
run: |
# Replace default path to CKAN core config file with the one on the container
sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini
pip install -r requirements.txt
pip install -r dev-requirements.txt
pip install -e .
- name: Setup extension
run: |
paster --plugin=ckan db init -c test.ini
- name: Run tests
run: nosetests --ckan --nologcapture --with-pylons=test.ini --with-coverage --cover-package=ckanext.subscribe --cover-inclusive --cover-erase --cover-tests ckanext/subscribe

- name: Coveralls
run: |
# Upgrade certi to fix SSL error due to the version installed in CKAN-2.8 image
pip install --upgrade certifi
coveralls
46 changes: 0 additions & 46 deletions .travis.yml

This file was deleted.

13 changes: 6 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
.. You should enable this project on travis-ci.org and coveralls.io to make
these badges work. The necessary Travis and Coverage config files have been
generated for you.
.. image:: https://github.com/bellisk/ckanext-subscribe/actions/workflows/test.yml/badge.svg
:target: https://github.com/bellisk/ckanext-subscribe/actions/workflows/test.yml

.. image:: https://travis-ci.org/davidread/ckanext-subscribe.svg?branch=master
:target: https://travis-ci.org/davidread/ckanext-subscribe

.. image:: https://coveralls.io/repos/github/davidread/ckanext-subscribe/badge.svg?branch=master
:target: https://coveralls.io/github/davidread/ckanext-subscribe?branch=master
.. image:: https://coveralls.io/repos/github/bellisk/ckanext-subscribe/badge.svg?branch=master
:target: https://coveralls.io/github/bellisk/ckanext-subscribe?branch=master

.. image:: https://img.shields.io/pypi/v/ckanext-subscribe.svg
:target: https://pypi.org/project/ckanext-subscribe/
Expand Down Expand Up @@ -39,7 +38,7 @@ as in this extension, is more appropriate.

.. image:: doc/sign-up.png

More screenshots: https://github.com/davidread/ckanext-subscribe/tree/master/doc
More screenshots: https://github.com/bellisk/ckanext-subscribe/tree/master/doc

------------
Requirements
Expand Down Expand Up @@ -258,7 +257,7 @@ Developer installation
To install ckanext-subscribe for development, activate your CKAN virtualenv and
do::

git clone https://github.com/davidread/ckanext-subscribe.git
git clone https://github.com/bellisk/ckanext-subscribe.git
cd ckanext-subscribe
python setup.py develop
pip install -r dev-requirements.txt
Expand Down
99 changes: 0 additions & 99 deletions bin/travis-build.bash

This file was deleted.

14 changes: 0 additions & 14 deletions bin/travis-run.sh

This file was deleted.

2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
flake8 # for the travis build
coveralls # for reporting test coverage to coveralls.io in .github/workflows/test.yml
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
long_description_content_type='text/x-rst',

# The project's main homepage.
url='https://github.com/davidread/ckanext-subscribe',
url='https://github.com/bellisk/ckanext-subscribe',

# Author details
author='''David Read''',
author_email='''[email protected]''',
maintainer="""Liip AG""",
maintainer_email="""[email protected]""",

# Choose your license
license='AGPL',
Expand Down

0 comments on commit 87e1e50

Please sign in to comment.