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

Feat: Migrate to Django CMS 4.1 compatible #39

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
7 changes: 0 additions & 7 deletions .circleci/Dockerfile

This file was deleted.

135 changes: 0 additions & 135 deletions .circleci/config.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: django CMS fil bootstrap linters.yml

on: [pull_request, push]

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
- run: pip install --upgrade flake8
- name: flake8
uses: liskin/gh-problem-matcher-wrap@v1
with:
linters: flake8
run: |
flake8
isort:
name: 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 ./

36 changes: 36 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: django CMS fil bootstrap test.yml

on: [pull_request, push]

jobs:
database-sqlite:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [ 3.9, '3.10'] # latest release minus two
requirements-file: [
django-32-cms40.txt,
django-42-cms40.txt,
django-42-cms41.txt,
]

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: |
sudo apt install gettext gcc -y
python -m pip install --upgrade pip
pip install pytest
pip install -r tests/requirements/${{ matrix.requirements-file }}
python setup.py install
- name: Test with python test runner
run: |
python setup.py test
env:
DATABASE_URL: sqlite://localhost/testdb.sqlite
9 changes: 9 additions & 0 deletions tests/requirements/django-42-cms41.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
-r requirements_base.txt

Django>=4.2,<5.0
django-cms>=4.1.0
djangocms-text-ckeditor==5.1.5
djangocms-versioning==2.1.0
https://github.com/FreemanPancake/djangocms-version-locking/tarball/feature/djangocms4x-compat#egg=djangocms-version-locking
https://github.com/django-cms/djangocms-moderation/tarball/master#egg=djangocms-moderation
https://github.com/django-cms/djangocms-alias/tarball/master#egg=djangocms-alias
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
envlist =
flake8
isort
py{38,39,310}-dj{32,42}-sqlite-cms{40}
py{38,39,310}-dj{32,42}-sqlite-cms{40,41}

skip_missing_interpreters=True

[testenv]
deps =
-r{toxinidir}/tests/requirements/requirements_base.txt

dj32: -r{toxinidir}/tests/requirements/django-32.txt
dj42: -r{toxinidir}/tests/requirements/django-42.txt
dj32_cms40: -r{toxinidir}/tests/requirements/django-32-cms40.txt
dj42_cms40: -r{toxinidir}/tests/requirements/django-42-cms40.txt
dj42_cms41: -r{toxinidir}/tests/requirements/django-42-cms41.txt

basepython =
py38: python3.8
Expand Down
Loading