Merge branch 'develop'

nephila · Nov 14, 2020 · 9a13a70 · 9a13a70
2 parents e382687 + d2f9917
commit 9a13a70
Show file tree

Hide file tree

Showing 106 changed files with 2,814 additions and 1,615 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,13 +8,13 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-max_line_length = 80
+max_line_length = 120
 
 [*.md]
 trim_trailing_whitespace = false
 
 [*.rst]
-max_line_length = 80
+max_line_length = 120
 
 [*.py]
 max_line_length = 120
@@ -28,7 +28,7 @@ max_line_length = 120
 indent_size = 2
 max_line_length = 120
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2
 
 [Makefile]

diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -0,0 +1,48 @@
+---
+name: "\U0001F41B Bug report"
+about: Create a report to help us improve
+title: ''
+labels: 'type: bug'
+assignees: ''
+
+---
+
+<!--
+Please fill in each section to help maintainers to be helpful and quick to respond.
+-->
+
+## Description
+
+<!--
+Describe issue in general terms.
+-->
+
+## Steps to reproduce
+
+<!--
+Provide clear steps to reproduce the issue.
+-->
+
+## Versions
+
+<!--
+Provide at least Python, Django and application version.
+-->
+
+## Expected behaviour
+
+<!--
+Provide what you would have expected to happen.
+-->
+
+## Actual behaviour
+
+<!--
+Provide what happened.
+-->
+
+## Additional information
+
+<!--
+Add any other information.
+-->
diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -0,0 +1,42 @@
+---
+name: "\U0001F389 Feature request"
+about: Share your idea, let's discuss it!
+title: ''
+labels: 'type: feature'
+assignees: ''
+
+---
+
+<!--
+Please fill in each section to help maintainers to be helpful and quick to respond.
+-->
+
+## Description
+
+<!--
+Describe the feature in general terms.
+-->
+
+## Use cases
+
+<!--
+What use cases these feature will address?
+-->
+
+## Proposed solution
+
+<!--
+A clear and concise description of what you want to happen.
+-->
+
+## Alternatives
+
+<!--
+A clear and concise description of any alternative solutions or features you've considered.
+-->
+
+## Additional information
+
+<!--
+Add any other information.
+-->
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+  reviewers:
+  - yakky
+  versioning-strategy: lockfile-only
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,41 @@
+name: Code quality
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    strategy:
+      matrix:
+        python-version: [3.8]
+        toxenv: [pep8, isort, black, pypi-description, docs, towncrier]
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
+        ref: ${{ github.event.pull_request.head.ref }}
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Cache pip
+      uses: actions/cache@v1
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.toxenv }}
+    - name: Cache tox
+      uses: actions/cache@v1
+      with:
+        path: .tox
+        key: ${{ runner.os }}-lint-${{ matrix.toxenv }}-${{ hashFiles('setup.cfg') }}
+        restore-keys: |
+          ${{ runner.os }}-lint-${{ matrix.toxenv }}-
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools tox>=1.8
+    - name: Test with tox
+      run: |
+        tox -e${{ matrix.toxenv }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,19 +8,25 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python
       uses: actions/setup-python@v1
       with:
         python-version: '3.x'
-    - name: Cache tox
+    - name: Cache pip
       uses: actions/cache@v1
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-tox-release-${{ hashFiles('requirements.txt') }}
+        key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.toxenv }}
+    - name: Cache tox
+      uses: actions/cache@v1
+      with:
+        path: .tox
+        key: ${{ runner.os }}-tox-release-${{ hashFiles('setup.cfg') }}
         restore-keys: |
           ${{ runner.os }}-tox-release-
-          ${{ runner.os }}-
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools tox>=1.8

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,70 +1,27 @@
-name: Linting - Tests
+name: Tox tests
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
-
-  lint:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.8]
-        toxenv: [pep8, isort, black, pypi-description, docs]
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Cache pip
-      uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-lint-${{ hashFiles('requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-lint-
-          ${{ runner.os }}-
-    - name: Cache tox
-      uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-tox-lint-${{ hashFiles('requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-tox-lint-
-          ${{ runner.os }}-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip setuptools tox>=1.8 coveralls codecov
-    - name: Test with tox
-      run: |
-        tox -e${{ matrix.toxenv }}
-
   test:
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.continue-on-error }}
     strategy:
       matrix:
-        python-version: [3.8, 3.7, 3.6, 3.5, 2.7]
-        django: [30, 22, 111]
-        cms: [no, 37, 36, 35, 34]
+        python-version: [3.8, 3.7, 3.6, 3.5]
+        django: [31, 30, 22]
+        cms: [nocms, cms37, cms38, async]
+        continue-on-error: [false]
         exclude:
-          - django: 30
-            cms: 36
-          - django: 30
-            cms: 35
-          - django: 30
-            cms: 34
-          - python-version: 3.7
-            django: 111
-          - python-version: 3.6
-            django: 111
           - python-version: 3.5
-            django: 111
-          - python-version: 2.7
             django: 30
-          - python-version: 2.7
-            django: 22
+          - python-version: 3.5
+            django: 31
+          - django: 31
+            cms: cms37
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
@@ -73,31 +30,30 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
+        key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
         restore-keys: |
-          ${{ runner.os }}-pip-
-          ${{ runner.os }}-
+          ${{ runner.os }}-pip-${{ matrix.toxenv }}
     - name: Cache tox
       uses: actions/cache@v1
       with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-tox-${{ hashFiles('requirements.txt') }}
+        path: .tox
+        key: ${{ runner.os }}-tox-${{ format('{{py{0}-django{1}-{2}}}', matrix.python-version, matrix.django, matrix.cms) }}-${{ hashFiles('setup.cfg') }}
         restore-keys: |
-          ${{ runner.os }}-tox-
-          ${{ runner.os }}-
+          ${{ runner.os }}-tox-${{ format('{{py{0}-django{1}-{2}}}', matrix.python-version, matrix.django, matrix.cms) }}-
     - name: Install dependencies
       run: |
         sudo apt-get install gettext
-        python -m pip install --upgrade pip setuptools tox>=1.8 coveralls codecov 'coverage<5'
+        python -m pip install --upgrade pip tox>=3.5
     - name: Test with tox
       env:
-        TOX_ENV: ${{ format('{{py{0}-django{1}-cms{2}}}', matrix.python-version, matrix.django, matrix.cms) }}
+        TOX_ENV: ${{ format('py-django{1}-{2}', matrix.python-version, matrix.django, matrix.cms) }}
         COMMAND: coverage run
-        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        COVERALLS_SERVICE_NAME: github
       run: |
         tox -e$TOX_ENV
-        python -mcoverage xml
-        coveralls
+        .tox/$TOX_ENV/bin/coverage xml
+        .tox/$TOX_ENV/bin/coveralls
     - uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}