Skip to content

Commit

Permalink
Merge branch 'develop' into fix-page-attribute-warning
Browse files Browse the repository at this point in the history
  • Loading branch information
goutnet committed May 19, 2021
2 parents 30c2d5b + b39faf0 commit 422459e
Show file tree
Hide file tree
Showing 699 changed files with 10,157 additions and 82,771 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
@@ -1,8 +1,8 @@
[run]
branch = False
source =
cms
menus
branch = False
omit =
cms/migrations/*
cms/south_migrations/*
Expand Down
78 changes: 0 additions & 78 deletions .github/CONTRIBUTING.rst

This file was deleted.

30 changes: 0 additions & 30 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

56 changes: 56 additions & 0 deletions .github/ISSUE_TEMPLATE/---bug-report.md
@@ -0,0 +1,56 @@
---
name: "\U0001F41E Bug report"
about: Something isn't working as expected? Here is the right place to report.
title: "[BUG]"
labels: 'priority: high, type: bug'
assignees: ''

---

<!--
Please fill in each section below, otherwise, your issue will be closed.
This info allows django CMS maintainers to diagnose (and fix!) your issue
as quickly as possible.
-->

## Description

<!--
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

<!--
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

<!--
A clear and concise description of what you expected to happen.
-->

## Actual behaviour

<!--
A clear and concise description of what is actually happening.
-->

## 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,
CMS/Python/Django versions, logs etc. here.
-->
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.
35 changes: 21 additions & 14 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -1,23 +1,30 @@
## Description

<!--
If this is a security-related patch stop immediately!
See http://docs.django-cms.org/en/latest/contributing/development-policies.html
If this is a security issue stop right here and follow our documentation:
http://docs.django-cms.org/en/latest/contributing/development-policies.html#reporting-security-issues
-->

## Related resources

### Summary

Fixes #


### Links to related discussion
<!--
Add here links to existing issues or conversation from GitHub
or any other resource.
-->

* #...
* #...

### Proposed changes in this pull request
## Checklist

<!--
Please check the following items before submitting, otherwise,
your pull request will be closed.
### General checklist
Use 'x' to check each item: [x] I have ...
-->

* [ ] I have updated the CHANGELOG.txt
* [ ] I have created backports if necessary
* [ ] I have updated the documentation and/or amended the upgrade section
if necessary
* [ ] I have opened this pull request against ``develop``
* [ ] I have added or modified the tests when changing logic
* [ ] I have followed [the conventionnal commits guidelines](http://conventionnalcommits.org/) to add meaningful information into the changelog
* [ ] 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

0 comments on commit 422459e

Please sign in to comment.