Skip to content

Commit

Permalink
Add django CMS 3.7 / Django 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
yakky committed Aug 10, 2019
1 parent e40a952 commit a6d9efc
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 24 deletions.
19 changes: 10 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# Config file for automatic testing at travis-ci.org

language: python

sudo: false
dist: xenial

python:
- 3.7
- 3.6
- 3.5
- 2.7
Expand All @@ -14,11 +12,11 @@ env:
- TOXENV='pep8'
- TOXENV='isort'
- TOXENV='docs'
- DJANGO='django22' CMS='cms37'
- DJANGO='django21' CMS='cms37'
- DJANGO='django21' CMS='cms36'
- DJANGO='django20' CMS='cms36'
- DJANGO='django111' CMS='cms37'
- DJANGO='django111' CMS='cms36'
- DJANGO='django111' CMS='cms35'
- DJANGO='django111' CMS='cms34'


# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
Expand All @@ -27,6 +25,7 @@ install:
- "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PYVER=py36; fi"
- "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then export PYVER=py37; fi"
- "if [[ ${DJANGO}z != 'z' ]]; then export TOXENV=$PYVER-$DJANGO-$CMS; fi"

# command to run tests, e.g. python setup.py test
Expand Down Expand Up @@ -54,6 +53,8 @@ matrix:
env: TOXENV='docs'

- python: 2.7
env: DJANGO='django21' CMS='cms36'
env: DJANGO='django22' CMS='cms37'
- python: 2.7
env: DJANGO='django20' CMS='cms36'
env: DJANGO='django21' CMS='cms37'
- python: 2.7
env: DJANGO='django21' CMS='cms36'
6 changes: 6 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
History
-------

0.7.0 (unreleased)
++++++++++++++++++

* Drop compatibility with Django < 1.11
* Drop compatibility with django CMS < 3.6

0.6.0 (2019-07-13)
++++++++++++++++++

Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ django CMS page extension to handle sitemap customization

Support Python version:

* Python 2.7, 3.5, 3.6
* Python 2.7, 3.5, 3.6, 3.7

Supported Django versions:

* Django 1.11 to 2.1
* Django 1.11 to 2.2

Supported django CMS versions:

* django CMS 3.4+
* django CMS 3.6+

.. note:: djangocms-page-sitemap 0.6 dropped compatibility with Django < 1.11 and python 3.4. 0.5.x releases will be made if necessary after 0.6 release.
.. note:: djangocms-page-sitemap 0.7 dropped compatibility with django CMS < 3.6. 0.6.x releases will be made if necessary after 0.6 release.


Features
Expand Down
3 changes: 1 addition & 2 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
-r requirements-test.txt
Django<2.0
html5lib<0.99999999
Django<3.0
2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
coverage
coveralls
flake8>=2.1.0
flake8>=2.1.0
tox>=2.0
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
],
include_package_data=True,
install_requires=[
'django-cms>=3.4',
'django-cms>=3.6',
],
license='GPLv2+',
zip_safe=False,
keywords='djangocms-page-sitemap',
test_suite='cms_helper.run',
classifiers=[
'Development Status :: 3 - Alpha',
'Development Status :: 5 - Production/Stable',
'Framework :: Django',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
Expand All @@ -52,10 +52,12 @@
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
],
)
11 changes: 5 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
[tox]
envlist = pep8,isort,docs,py{36,35,27}-django{21,20,111}-cms{36,35,34}
envlist = docs,pep8,isort,py{37,36,35}-django{22}-cms{37},py{37,36,35}-django{21,11}-cms{37,36}

[testenv]
commands = {env:COMMAND:python} setup.py test
deps =
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
djangocms-helper
cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip
cms35: https://github.com/divio/django-cms/archive/release/3.5.x.zip
django22: Django>=2.2,<2.3
django-app-helper
cms36: https://github.com/divio/django-cms/archive/release/3.6.x.zip
cms37: https://github.com/divio/django-cms/archive/release/3.7.x.zip
cmsdev: https://github.com/divio/django-cms/archive/develop.zip
-r{toxinidir}/requirements-test.txt

[testenv:isort]
deps = isort
commands = isort -c -rc djangocms_page_sitemap tests
commands = isort -c -rc
skip_install = true

[testenv:pep8]
Expand Down

0 comments on commit a6d9efc

Please sign in to comment.