Skip to content

Commit

Permalink
Add Github Actions support (django-cms#192)
Browse files Browse the repository at this point in the history
* Added github actions

* removed gh action on pull request

* fix syntax error

* fix syntax error

* code refactor

* isort fix

* Added coverage

* moved requirements to tests/requirements

* removed temp coverage

* Pin djangocms_text_ckeditor to 4.0.0

* updated coverage

* Bump djangocms_ckeditor html5lib to latest version >1

* pin tree beard 4.4

* remove travis.yml
  • Loading branch information
NarenderRajuB authored Apr 18, 2021
1 parent c783b2a commit 2e934cf
Show file tree
Hide file tree
Showing 12 changed files with 104 additions and 46 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Lint

on: [push, pull_request]

jobs:
flake8:
name: flake8
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install flake8
run: pip install --upgrade flake8
- name: Run flake8
uses: liskin/gh-problem-matcher-wrap@v1
with:
linters: flake8
run: flake8

isort:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
- run: python -m pip install isort
- name: isort
uses: liskin/gh-problem-matcher-wrap@v1
with:
linters: isort
run: isort -c -rc -df djangocms_link
40 changes: 40 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: CodeCov

on: [push, pull_request]

jobs:
unit-tests:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: [ 3.7, 3.8, 3.9, ] # latest release minus two
requirements-file: [
dj22_cms37.txt,
dj22_cms38.txt,
dj30_cms37.txt,
dj30_cms38.txt,
dj31_cms38.txt,
]
os: [
ubuntu-20.04,
]

steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}

uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r tests/requirements/${{ matrix.requirements-file }}
python setup.py install
- name: Run coverage
run: coverage run setup.py test

- name: Upload Coverage to Codecov
uses: codecov/codecov-action@v1
42 changes: 0 additions & 42 deletions .travis.yml

This file was deleted.

3 changes: 2 additions & 1 deletion djangocms_link/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ def is_select2_enabled():


if is_select2_enabled():
from djangocms_link.fields_select2 import Select2PageSearchField as PageSearchField # noqa
from djangocms_link.fields_select2 import \
Select2PageSearchField as PageSearchField # noqa
else:
from cms.forms.fields import PageSelectFormField as PageSearchField # noqa
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
'django-cms>=3.7',
'django-filer>=1.7',
'djangocms-attributes-field>=1',
'django-treebeard>=4.3,<4.5',
]


Expand Down
4 changes: 2 additions & 2 deletions tests/requirements.txt → tests/requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
django-select2>=5.11,<7 # 7 works in Django 2+
django-filer>=1.5.0
djangocms-text-ckeditor
html5lib<0.99999999
djangocms-text-ckeditor==4.0.0
html5lib>=1
django-app-helper
tox
coverage
Expand Down
4 changes: 4 additions & 0 deletions tests/requirements/dj22_cms37.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

Django>=2.2,<3.0
django-cms>=3.7,<3.8
4 changes: 4 additions & 0 deletions tests/requirements/dj22_cms38.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

Django>=2.2,<3.0
django-cms>=3.8,<3.9
4 changes: 4 additions & 0 deletions tests/requirements/dj30_cms37.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

Django>=3.0,<3.1
django-cms>=3.7,<3.8
4 changes: 4 additions & 0 deletions tests/requirements/dj30_cms38.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

Django>=3.0,<3.1
django-cms>=3.8,<3.9
4 changes: 4 additions & 0 deletions tests/requirements/dj31_cms38.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

Django>=3.1,<3.2
django-cms>=3.8,<3.9
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ known_django = django

[testenv]
deps =
-r{toxinidir}/tests/requirements.txt
-r{toxinidir}/tests/requirements/base.txt
dj22: Django>=2.2,<3.0
dj30: Django>=3.0,<3.1
dj31: Django>=3.1,<3.2
Expand Down

0 comments on commit 2e934cf

Please sign in to comment.