Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into improvement/page-tree
- Loading branch information
Showing
38 changed files
with
476 additions
and
266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
blank_issues_enabled: true | ||
contact_links: | ||
- name: Question | ||
url: https://www.django-cms.org/en/support/ | ||
about: Please use our community channels to ask for questions. | ||
- name: Feature Request | ||
url: https://discourse.django-cms.org/c/feature-requests | ||
about: Please submit and discuss feature requests via discourse forum. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
name: Docs | ||
|
||
on: [push, pull_request] | ||
|
||
jobs: | ||
docs: | ||
runs-on: ubuntu-latest | ||
name: docs | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v2 | ||
- name: Set up Python | ||
uses: actions/setup-python@v2 | ||
with: | ||
python-version: 3.9 | ||
- name: Cache dependencies | ||
uses: actions/cache@v2 | ||
with: | ||
path: ~/.cache/pip | ||
key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }} | ||
restore-keys: | | ||
${{ runner.os }}-pip- | ||
- run: python -m pip install -r docs/requirements.txt | ||
- name: Build docs | ||
run: | | ||
cd docs | ||
sphinx-build -b dirhtml -n -d build/doctrees . build/dirhtml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
name: django CMS frontend.yml | ||
|
||
on: [push, pull_request] | ||
|
||
jobs: | ||
frontend: | ||
runs-on: ubuntu-20.04 | ||
strategy: | ||
matrix: | ||
node-version: [6.x] | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: Use Node.js ${{ matrix.node-version }} | ||
uses: actions/setup-node@v1 | ||
with: | ||
node-version: ${{ matrix.node-version }} | ||
- run: npm install | ||
- run: npm install -g gulp@3.9.1 | ||
- run: | | ||
gulp tests:unit | ||
gulp lint |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
name: django CMS linters.yml | ||
|
||
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 | ||
- run: pip install --upgrade flake8 | ||
- name: flake8 | ||
uses: liskin/gh-problem-matcher-wrap@v1 | ||
with: | ||
linters: flake8 | ||
run: | | ||
flake8 --exit-zero | ||
# TODO: re-enable it in another PR, want to keep | ||
# the actions Pr clean | ||
# 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 --check --diff cms |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,135 @@ | ||
name: django CMS test.yml | ||
|
||
on: [push, pull_request] | ||
|
||
jobs: | ||
database-postgres: | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
python-version: [ 3.7, 3.8, 3.9, ] # latest release minus two | ||
requirements-file: [ | ||
django-2.2.txt, | ||
django-3.0.txt, | ||
django-3.1.txt, | ||
] | ||
os: [ | ||
ubuntu-20.04, | ||
] | ||
|
||
services: | ||
postgres: | ||
image: postgres:12 | ||
env: | ||
POSTGRES_USER: postgres | ||
POSTGRES_PASSWORD: postgres | ||
POSTGRES_DB: postgres | ||
ports: | ||
- 5432:5432 | ||
# needed because the postgres container does not provide a healthcheck | ||
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 | ||
|
||
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 test_requirements/${{ matrix.requirements-file }} | ||
python setup.py install | ||
- name: Test with django test runner | ||
run: | | ||
python manage.py test | ||
database-mysql: | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
python-version: [ 3.7, 3.8, 3.9, ] # latest release minus two | ||
requirements-file: [ | ||
django-2.2.txt, | ||
django-3.0.txt, | ||
django-3.1.txt, | ||
] | ||
os: [ | ||
ubuntu-20.04, | ||
] | ||
|
||
services: | ||
mysql: | ||
image: mysql:5.7 | ||
env: | ||
MYSQL_ALLOW_EMPTY_PASSWORD: yes | ||
MYSQL_DATABASE: djangocms_test | ||
ports: | ||
- 3306:3306 | ||
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 | ||
|
||
|
||
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 test_requirements/${{ matrix.requirements-file }} | ||
python setup.py install | ||
- name: Test with django test runner | ||
run: | | ||
python manage.py test | ||
env: | ||
DATABASE_URL: mysql://root@127.0.0.1/djangocms_test | ||
|
||
database-sqlite: | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
python-version: [ 3.7, 3.8, 3.9, ] # latest release minus two | ||
requirements-file: [ | ||
django-2.2.txt, | ||
django-3.0.txt, | ||
django-3.1.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: | | ||
sudo apt install gettext gcc -y | ||
python -m pip install --upgrade pip | ||
pip install pytest | ||
pip install -r test_requirements/${{ matrix.requirements-file }} | ||
python setup.py install | ||
- name: Test with django test runner | ||
run: | | ||
python manage.py test | ||
env: | ||
DATABASE_URL: sqlite://localhost/testdb.sqlite |
Oops, something went wrong.