Skip to content
This repository has been archived by the owner on Jan 20, 2022. It is now read-only.

Adding Django 2.x support #171

Merged
merged 101 commits into from
Feb 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
d0e1549
removed boilerpalte support
FinalAngel Dec 18, 2018
90b2bdc
added on_delete for Django 2.x
FinalAngel Dec 18, 2018
d484c86
added on_delete for Django 2.x
FinalAngel Dec 18, 2018
6662c20
adapted urlresolvers
FinalAngel Dec 27, 2018
027da68
simplify json
FinalAngel Dec 27, 2018
3929fb7
added on_delete
FinalAngel Dec 27, 2018
3938a2e
use simple_tag
FinalAngel Dec 27, 2018
3128370
Changed setup and travis setup
bplociennik Jan 3, 2019
df74a14
Removed localhost from allowed hosts
bplociennik Jan 4, 2019
65ed5b7
Add flake8
bplociennik Jan 4, 2019
1b3185c
Fix tests for cms40
bplociennik Jan 4, 2019
7b41c53
Add missing migrations
bplociennik Jan 4, 2019
5ee4bea
Fix tests for cms40
bplociennik Jan 4, 2019
6f9cf25
Removed range for Django version in setup
bplociennik Jan 7, 2019
ec0e648
Set filer min version in setup
bplociennik Jan 7, 2019
2bbc272
Bumped version of emailit in setup
bplociennik Jan 7, 2019
c82ee2b
Include sizefield package to aldryn-forms
bplociennik Jan 7, 2019
66f5109
Added readme and license for sizefield package
bplociennik Jan 8, 2019
9eda4a0
Changed import sizefield
bplociennik Jan 8, 2019
48926e3
Fix import order
bplociennik Jan 8, 2019
654a2a8
Change import
bplociennik Jan 8, 2019
7f02871
Restore normal version
bplociennik Jan 8, 2019
413b205
Adapt forms with new changes
bplociennik Feb 1, 2019
52c5632
Fixed issue with sending multiple forms (#174)
vthaian Feb 4, 2019
9c37dc5
Bumped version to 3.0.5 (#176)
vthaian Feb 4, 2019
c94ef8f
removed boilerpalte support
FinalAngel Dec 18, 2018
736574e
added on_delete for Django 2.x
FinalAngel Dec 18, 2018
f6ea41a
added on_delete for Django 2.x
FinalAngel Dec 18, 2018
27aea74
adapted urlresolvers
FinalAngel Dec 27, 2018
64d0cc2
simplify json
FinalAngel Dec 27, 2018
23add03
added on_delete
FinalAngel Dec 27, 2018
2350a40
use simple_tag
FinalAngel Dec 27, 2018
258c82d
Changed setup and travis setup
bplociennik Jan 3, 2019
ae33847
Removed localhost from allowed hosts
bplociennik Jan 4, 2019
4f67c1b
Add flake8
bplociennik Jan 4, 2019
480b9b3
Fix tests for cms40
bplociennik Jan 4, 2019
04f02d7
Add missing migrations
bplociennik Jan 4, 2019
9202e9b
Fix tests for cms40
bplociennik Jan 4, 2019
ca44b69
Removed range for Django version in setup
bplociennik Jan 7, 2019
a6b0df2
Set filer min version in setup
bplociennik Jan 7, 2019
a7fafb7
Bumped version of emailit in setup
bplociennik Jan 7, 2019
4e7efda
Include sizefield package to aldryn-forms
bplociennik Jan 7, 2019
e73726c
Added readme and license for sizefield package
bplociennik Jan 8, 2019
c31fbb6
Fix import order
bplociennik Jan 8, 2019
0a711a3
Changed import sizefield
bplociennik Jan 8, 2019
b3e8256
Restore normal version
bplociennik Jan 8, 2019
7d34b57
Adapt forms with new changes
bplociennik Feb 1, 2019
b799b65
Fixed changelog
bplociennik Feb 4, 2019
42d7e0a
Changed tests asserts
bplociennik Feb 4, 2019
433aad9
Fix typo
bplociennik Feb 4, 2019
45f159c
removed boilerpalte support
FinalAngel Dec 18, 2018
4a6bd42
added on_delete for Django 2.x
FinalAngel Dec 18, 2018
34fbfab
added on_delete for Django 2.x
FinalAngel Dec 18, 2018
5529648
adapted urlresolvers
FinalAngel Dec 27, 2018
1d16c51
simplify json
FinalAngel Dec 27, 2018
a9ae042
added on_delete
FinalAngel Dec 27, 2018
eacb3e5
use simple_tag
FinalAngel Dec 27, 2018
23ada69
Changed setup and travis setup
bplociennik Jan 3, 2019
a4e6b34
Removed localhost from allowed hosts
bplociennik Jan 4, 2019
5fa19b3
Add flake8
bplociennik Jan 4, 2019
502a9fe
Fix tests for cms40
bplociennik Jan 4, 2019
9557886
Add missing migrations
bplociennik Jan 4, 2019
4a3c136
Fix tests for cms40
bplociennik Jan 4, 2019
dc6bfbd
Removed range for Django version in setup
bplociennik Jan 7, 2019
86ab4fc
Set filer min version in setup
bplociennik Jan 7, 2019
d0573d8
Bumped version of emailit in setup
bplociennik Jan 7, 2019
0ead2f7
Include sizefield package to aldryn-forms
bplociennik Jan 7, 2019
df6a618
Added readme and license for sizefield package
bplociennik Jan 8, 2019
58a8665
Fix import order
bplociennik Jan 8, 2019
bd1b244
Changed import sizefield
bplociennik Jan 8, 2019
8206dab
Adapt forms with new changes
bplociennik Feb 1, 2019
dc81e1b
Changed tests asserts
bplociennik Feb 4, 2019
119245a
removed boilerpalte support
FinalAngel Dec 18, 2018
acb50c4
added on_delete for Django 2.x
FinalAngel Dec 18, 2018
28f3da4
added on_delete for Django 2.x
FinalAngel Dec 18, 2018
97ca26a
adapted urlresolvers
FinalAngel Dec 27, 2018
971bb92
simplify json
FinalAngel Dec 27, 2018
2b0536f
use simple_tag
FinalAngel Dec 27, 2018
462f2d1
Changed setup and travis setup
bplociennik Jan 3, 2019
513d44d
Removed localhost from allowed hosts
bplociennik Jan 4, 2019
bc92c2d
Add flake8
bplociennik Jan 4, 2019
2bed9b6
Add missing migrations
bplociennik Jan 4, 2019
7cbb28b
Fix tests for cms40
bplociennik Jan 4, 2019
6821abb
Removed range for Django version in setup
bplociennik Jan 7, 2019
329eb67
Set filer min version in setup
bplociennik Jan 7, 2019
c0ad727
Bumped version of emailit in setup
bplociennik Jan 7, 2019
c329517
Include sizefield package to aldryn-forms
bplociennik Feb 4, 2019
46c119d
Fix isort
bplociennik Feb 4, 2019
1a52d02
Added readme and license for sizefield package
bplociennik Jan 8, 2019
ba40c24
Fix import order
bplociennik Jan 8, 2019
2d06b25
Adapt forms with new changes
bplociennik Feb 1, 2019
a422ab3
Update files
bplociennik Feb 4, 2019
024d8b0
Change order imports
bplociennik Feb 4, 2019
b378031
Add cms-text-ckeditor to requirements
bplociennik Feb 4, 2019
acba54c
Removed typo in migration
bplociennik Feb 4, 2019
d655a17
Fix for non utf chars
bplociennik Feb 4, 2019
c213dc8
Removed invalid char from README
bplociennik Feb 4, 2019
2c3c4a6
Next fixes
bplociennik Feb 4, 2019
22387fd
Add missing packages
bplociennik Feb 4, 2019
e6c80c9
Fix test to work with all Django versions
bplociennik Feb 4, 2019
e0343ef
Fix test
bplociennik Feb 4, 2019
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
31 changes: 31 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# editorconfig.org

root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
max_line_length = 80

[*.py]
max_line_length = 120
quote_type = single

[*.{scss,js,html}]
max_line_length = 120
indent_style = space
quote_type = double

[*.js]
max_line_length = 120
quote_type = single

[*.rst]
max_line_length = 80

[*.yml]
indent_size = 2
81 changes: 26 additions & 55 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,43 +1,17 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
*.egg-info
*.log
*.pot
.DS_Store
.coverage/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.idea/
.project/
.pydevproject/
.settings/
.tox/

.coverage
.coverage.*
.cache
Expand Down Expand Up @@ -69,9 +43,15 @@ docs/_build/
# PyBuilder
target/

# PyCharm
.idea

# Jupyter Notebook
.ipynb_checkpoints

# PyCharm
.idea

# pyenv
.python-version

Expand All @@ -84,25 +64,16 @@ celerybeat-schedule
# Environments
.env
.venv
__pycache__/
build/
dist/
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
/~
/node_modules
.sass-cache
*.css.map
npm-debug.log
package-lock.json

# Custom
*.sqlite3
*.sqlite
local.sqlite
90 changes: 68 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,77 @@
# Config file for automatic testing at travis-ci.org

language: python

sudo: false

python:
- 3.5
- 2.7
matrix:
include:
- python: 3.5
env: TOX_ENV='flake8'
- python: 3.5
env: TOX_ENV='isort'
# Django 1.11
- python: 3.5
env: DJANGO='dj111' CMS='cms34'
- python: 3.5
env: DJANGO='dj111' CMS='cms35'
- python: 3.5
env: DJANGO='dj111' CMS='cms36'
- python: 3.5
env: DJANGO='dj111' CMS='cms40'

- python: 3.4
env: DJANGO='dj111' CMS='cms34'
- python: 3.4
env: DJANGO='dj111' CMS='cms35'
- python: 3.4
env: DJANGO='dj111' CMS='cms36'
- python: 3.4
env: DJANGO='dj111' CMS='cms40'

- python: 2.7
env: DJANGO='dj111' CMS='cms34'
- python: 2.7
env: DJANGO='dj111' CMS='cms35'
- python: 2.7
env: DJANGO='dj111' CMS='cms36'
- python: 2.7
env: DJANGO='dj111' CMS='cms40'
# Django 2.0
- python: 3.4
env: DJANGO='dj20' CMS='cms36'
- python: 3.5
env: DJANGO='dj20' CMS='cms36'
- python: 3.6
env: DJANGO='dj20' CMS='cms36'
- python: 3.4
env: DJANGO='dj20' CMS='cms40'
- python: 3.5
env: DJANGO='dj20' CMS='cms40'
- python: 3.6
env: DJANGO='dj20' CMS='cms40'
# Django 2.1
- python: 3.5
env: DJANGO='dj21' CMS='cms36'
- python: 3.6
env: DJANGO='dj21' CMS='cms36'
- python: 3.5
env: DJANGO='dj21' CMS='cms40'
- python: 3.6
env: DJANGO='dj21' CMS='cms40'

env:
matrix:
- DJANGO='django18' CMS='cms33'
- DJANGO='django19' CMS='cms33'
- DJANGO='django18' CMS='cms34'
- DJANGO='django19' CMS='cms34'
- DJANGO='django18' CMS='cms35'
- DJANGO='django19' CMS='cms35'
cache:
directories:
- $HOME/.wheelhouse

# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install:
- pip install -U tox>=1.8 coveralls
- "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi"
- pip install coverage isort tox
- "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PY_VER=py27; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PY_VER=py34; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PY_VER=py36; fi"
- "if [[ ${DJANGO}z != 'z' ]]; then export TOX_ENV=$PY_VER-$DJANGO-$CMS; fi"

# command to run tests, e.g. python setup.py test
script: COMMAND='coverage run' tox -e"$PYVER-$DJANGO-$CMS",pep8
script:
- tox -e $TOX_ENV

after_success: coveralls
after_success:
- bash <(curl -s https://codecov.io/bash)
Loading