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: Backport cms 4.0.x - Django 3.2 with Python 3.8 & 3.9 support, including update tooling #77

Closed
wants to merge 47 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b423137
Temporarely pin tests to django CMS 3.7.1 (#53)
yakky May 2, 2020
ea486d2
Compatibility with Django-CMS 3.7.2 (#52)
fp4code May 2, 2020
c4885df
Enable django CMS 3.7.2 on python 3 (#54)
yakky May 2, 2020
2cb67c3
Release 0.8.1
yakky May 2, 2020
c16fae8
Bump develop version [ci skip]
yakky May 2, 2020
05c93d5
Update tooling and drop Python 2 / Django < 2.2 (#62)
protoroto Nov 12, 2020
4075185
Update authors file
yakky Dec 20, 2020
fa32521
Add configuration for django-app-enabler (#65)
yakky Dec 21, 2020
1d6d553
Compile po file
yakky Dec 21, 2020
9184de4
Release 1.0.0
yakky Dec 21, 2020
e1efa53
Initial port of tools changes
Aiky30 Dec 21, 2021
bda90b6
Updated the history
Aiky30 Dec 21, 2021
0ff3e57
Update the test suite to cms4
Aiky30 Dec 21, 2021
5b9a7d1
Bring the github workflows in line with the tox configuration
Aiky30 Dec 21, 2021
5634acd
Fix mismatch of python / django versions in tox and GH actions
Aiky30 Dec 21, 2021
15302a1
Fix various mismatch issues
Aiky30 Dec 21, 2021
0258afd
Removed all py2 # -*- coding: utf-8 -*-
Aiky30 Dec 21, 2021
8bdbe17
Use a dj 3.2 compatible version
Aiky30 Dec 21, 2021
d625403
Removed all __future__ imports
Aiky30 Dec 21, 2021
9b1cd1a
Removed @python_2_unicode_compatible
Aiky30 Dec 21, 2021
4ce98ca
Update django limitation from 3.3 to 4.0
Aiky30 Dec 22, 2021
dd1bb82
Fix isort failures
Aiky30 Dec 22, 2021
812a0f0
Fix installation dependancies
Aiky30 Dec 22, 2021
591df62
fixed lint failures
Aiky30 Dec 22, 2021
a54ae9a
Fix missing secret key for the test suite
Aiky30 Dec 22, 2021
f0a17c5
Fixed failing tests
Aiky30 Dec 22, 2021
2d4c09e
Fix deprecation notices
Aiky30 Dec 22, 2021
774ff10
Replace changelog entry with towncrier configuraton
Aiky30 Dec 22, 2021
2dfb2fc
Fixed versioning tests
Aiky30 Dec 22, 2021
acc9942
Requirements added
Aiky30 Dec 22, 2021
fae85d1
Upgrade to GitHub-native Dependabot (#69)
dependabot-preview[bot] Aug 27, 2022
9db580b
feat: Backport cms 4.0.x - Django 3.2 with Python 3.8 & 3.9 support, …
yakky Aug 27, 2022
deefc8c
Update Python / Django / django CMS compatibility (#75)
yakky Aug 27, 2022
0193739
bug/73-fix serialization issue (#72)
kinkerl Aug 27, 2022
6f6f2fc
Merge branch 'develop' into feature/issue-74-update-django-cms4
yakky Aug 27, 2022
3ce5db8
Exclude whitespace checks on setup.cfg
yakky Aug 27, 2022
120f365
Fix error when populating the toolbar on page types (#76)
yakky Aug 27, 2022
defde22
Update invoke tasks
yakky Aug 27, 2022
f8cabca
Fix tests
yakky Aug 27, 2022
422eed3
Merge branch 'develop' into feature/issue-74-update-django-cms4
yakky Aug 27, 2022
d2a4962
Replace force_text with force_str
yakky Aug 27, 2022
fa5425f
Update authors
yakky Aug 27, 2022
766dc6e
Release 1.1.0
yakky Aug 27, 2022
6c7d744
Bump develop version [ci skip]
yakky Aug 27, 2022
10c4d66
Bump develop version 2.0.0.dev1
yakky Aug 27, 2022
b1d417f
Merge remote-tracking branch 'origin/develop' into feature/issue-74-u…
yakky Aug 27, 2022
7c3c42c
Port fix for issue #73
yakky Aug 27, 2022
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
3 changes: 3 additions & 0 deletions .checkignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tests/*
docs/*
djangocms_page_sitemap/migrations/*
1 change: 0 additions & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ languages:
Python: true
exclude_paths:
- 'djangocms_page_sitemap/migrations/*'
- 'djangocms_page_sitemap/south_migrations/*'
- 'tests/*'
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ branch = True
source = djangocms_page_sitemap

[report]
omit = ../*migrations*,../*tests*
omit = *migrations*,*tests*,*test_utils*
# Regexes for lines to exclude from consideration
exclude_lines =
# Have to re-enable the standard pragma
Expand Down
2 changes: 2 additions & 0 deletions .csslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--exclude-exts=.min.css
--ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes
10 changes: 5 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@ 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 = 100
max_line_length = 120

[*.{scss,html}]
indent_size = 2
indent_style = space
max_line_length = 120

[*.js]
[*.{js,vue,json}]
indent_size = 2
max_line_length = 120

[*.yml]
[*.{yml,yaml}]
indent_size = 2

[Makefile]
Expand Down
48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/---bug-report.md
Original file line number Diff line number Diff line change
@@ -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.
-->
42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/---feature-request.md
Original file line number Diff line number Diff line change
@@ -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.
-->
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
ignore:
- dependency-name: coverage
versions:
- ">= 5.0.a, < 5.1"
18 changes: 18 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Description

Describe:

* Content of the pull request
* Feature added / Problem fixed

## References

Provide any github issue fixed (as in ``Fix #XYZ``)

# Checklist

* [ ] I have read the [contribution guide](https://djangocms-page-sitemap.readthedocs.io/en/latest/contributing.html)
* [ ] Code lint checked via `inv lint`
* [ ] ``changes`` file included (see [docs](https://djangocms-page-sitemap.readthedocs.io/en/latest/contributing.html#pull-request-guidelines))
* [ ] Usage documentation added in case of new features
* [ ] Tests added
41 changes: 41 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -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.10.x]
toxenv: [pep8, isort, black, pypi-description, docs, towncrier]
steps:
- uses: actions/checkout@v3
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@v4
with:
python-version: ${{ matrix.python-version }}
- name: Cache pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.toxenv }}
- name: Cache tox
uses: actions/cache@v3
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>=3.23
- name: Test with tox
run: |
tox -e${{ matrix.toxenv }}
38 changes: 38 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Upload Python Package

on:
release:
types: [published,prereleased]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Cache pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.toxenv }}
- name: Cache tox
uses: actions/cache@v3
with:
path: .tox
key: ${{ runner.os }}-tox-release-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-tox-release-
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools tox>=3.23
- name: Build and publish
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
tox -erelease
58 changes: 58 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Tox tests

on: [push, pull_request]

jobs:
test:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9, 3.8, 3.7]
django: [32, 22]
cms: [40]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Cache pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.toxenv }}
- name: Cache tox
uses: actions/cache@v3
with:
path: .tox
key: ${{ runner.os }}-tox-${{ format('{{py{0}-django{1}-cms{2}}}', matrix.python-version, matrix.django, matrix.cms) }}-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-tox-${{ format('{{py{0}-django{1}-cms{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>3.23
- name: Test with tox
env:
TOX_ENV: ${{ format('py-django{1}-cms{2}', matrix.python-version, matrix.django, matrix.cms) }}
COMMAND: coverage run
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_SERVICE_NAME: github
run: |
tox -e$TOX_ENV
.tox/$TOX_ENV/bin/coverage xml
.tox/$TOX_ENV/bin/coveralls
- uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: unittests
files: ./coverage.xml
fail_ci_if_error: false
services:
redis:
image: redis
ports:
- 6379:6379
Loading