Skip to content

Commit

Permalink
Merge branch 'develop' into improvement/page-tree
Browse files Browse the repository at this point in the history
  • Loading branch information
vinitkumar committed Apr 22, 2021
2 parents e9b13c2 + 4012e39 commit df858d2
Show file tree
Hide file tree
Showing 38 changed files with 476 additions and 266 deletions.
18 changes: 14 additions & 4 deletions .github/ISSUE_TEMPLATE/---bug-report.md
@@ -1,8 +1,8 @@
---
name: "\U0001F41E Bug report"
about: Something isn't working as expected? Here is the right place to report.
title: ''
labels: ''
title: "[BUG]"
labels: 'priority: high, type: bug'
assignees: ''

---
Expand All @@ -20,10 +20,15 @@ If this is a security issue stop immediately and follow the instructions at:
http://docs.django-cms.org/en/latest/contributing/development-policies.html#reporting-security-issues
-->

## Steps to reproduce
## Steps to reproduce

<!--
Clear steps describing how to reproduce the issue.
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-->

## Expected behaviour
Expand All @@ -38,7 +43,12 @@ A clear and concise description of what you expected to happen.
A clear and concise description of what is actually happening.
-->

## Additional information
## Screenshots

<!--If applicable, add screenshots to help explain your problem.
-->

## Additional information (CMS/Python/Django versions)

<!--
Add any other context about the problem such as environment,
Expand Down
13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/---feature-requests.md

This file was deleted.

19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/---question.md

This file was deleted.

8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
@@ -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.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -27,3 +27,4 @@ Use 'x' to check each item: [x] I have ...
* [ ] I have opened this pull request against ``develop``
* [ ] I have updated the **CHANGELOG.rst**
* [ ] I have added or modified the tests when changing logic
* [ ] I have read the [contribution guidelines ](https://github.com/django-cms/django-cms/blob/develop/CONTRIBUTING.rst) and I have joined #workgroup-pr-review on [Slack](https://www.django-cms.org/slack) to find a “pr review buddy” who is going to review my pull request.
27 changes: 27 additions & 0 deletions .github/workflows/docs.yml
@@ -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
22 changes: 22 additions & 0 deletions .github/workflows/frontend.yml
@@ -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
40 changes: 40 additions & 0 deletions .github/workflows/linters.yml
@@ -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
135 changes: 135 additions & 0 deletions .github/workflows/test.yml
@@ -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

0 comments on commit df858d2

Please sign in to comment.