Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge 95b7772 into d18feaa
  • Loading branch information
yakky committed Oct 19, 2019
2 parents d18feaa + 95b7772 commit 3713dfe
Show file tree
Hide file tree
Showing 137 changed files with 6,596 additions and 4,105 deletions.
5 changes: 0 additions & 5 deletions .gitlab-ci.yml

This file was deleted.

136 changes: 52 additions & 84 deletions .travis.yml
@@ -1,115 +1,83 @@
# Config file for automatic testing at travis-ci.org

language: python

sudo: false
dist: xenial

python:
- 3.7
- 3.6
- 3.5
- 3.4
- 3.3
- 2.7
- 2.6

env:
matrix:
- DJANGO='django16' CMS='cms30'
- DJANGO='django16' CMS='cms31'
- DJANGO='django16' CMS='cms32'
- DJANGO='django17' CMS='cms30'
- DJANGO='django17' CMS='cms31'
- DJANGO='django17' CMS='cms32'
- DJANGO='django18' CMS='cms30'
- DJANGO='django18' CMS='cms31'
- DJANGO='django18' CMS='cms32'
- DJANGO='django19' CMS='cms32'
- TOXENV='pep8'
- TOXENV='isort'
- TOXENV='docs'
- DJANGO='django22' CMS='cms37'
- DJANGO='django21' CMS='cms37'
- DJANGO='django21' CMS='cms36'
- DJANGO='django21' CMS='cms35'
- DJANGO='django111' CMS='cms37'
- DJANGO='django111' CMS='cms36'
- DJANGO='django111' CMS='cms35'


# 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.6' ]]; then export PYVER=py26; fi"
- "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"
- "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
script: COMMAND='coverage run' tox -e$TOXENV
script: COMMAND='coverage run' tox -e$TOXENV -- --verbose=2

after_success: coveralls
before_install:
- pip install -U setuptools tox>=1.8 coveralls codecov wheel pip
after_success:
- codecov
- coveralls

matrix:
exclude:
- python: 2.6
env: TOXENV='pep8'
- python: 2.6
env: TOXENV='isort'
- python: 2.7
env: DJANGO='django22' CMS='cms37'
- python: 2.7
env: DJANGO='django21' CMS='cms37'
- python: 2.7
env: DJANGO='django21' CMS='cms36'
- python: 2.7
env: DJANGO='django21' CMS='cms35'
- python: 2.7
env: DJANGO='django20' CMS='cms37'
- python: 2.7
env: DJANGO='django20' CMS='cms36'
- python: 2.7
env: DJANGO='django20' CMS='cms35'
- python: 2.7
env: TOXENV='docs'
- python: 2.7
env: TOXENV='pep8'
- python: 2.7
env: TOXENV='isort'
- python: 3.3
- python: 3.5
env: TOXENV='docs'
- python: 3.5
env: TOXENV='pep8'
- python: 3.3
- python: 3.5
env: TOXENV='isort'
- python: 3.4
- python: 3.7
env: TOXENV='docs'
- python: 3.7
env: TOXENV='pep8'
- python: 3.4
- python: 3.7
env: TOXENV='isort'
- python: 2.6
env: DJANGO='django17' CMS='cms30'
- python: 2.6
env: DJANGO='django17' CMS='cms31'
- python: 2.6
env: DJANGO='django17' CMS='cms32'
- python: 2.6
env: DJANGO='django18' CMS='cms30'
- python: 2.6
env: DJANGO='django18' CMS='cms31'
- python: 2.6
env: DJANGO='django18' CMS='cms32'
- python: 2.6
env: DJANGO='django19' CMS='cms30'
- python: 2.6
env: DJANGO='django19' CMS='cms31'
- python: 2.6
env: DJANGO='django19' CMS='cms32'
- python: 2.7
env: DJANGO='django18' CMS='cms30'
- python: 2.7
env: DJANGO='django19' CMS='cms30'
- python: 3.3
env: DJANGO='django18' CMS='cms30'
- python: 3.3
env: DJANGO='django19' CMS='cms30'
- python: 3.3
env: DJANGO='django19' CMS='cms31'
- python: 3.3
env: DJANGO='django19' CMS='cms32'
- python: 3.4
env: DJANGO='django18' CMS='cms30'
- python: 3.4
env: DJANGO='django19' CMS='cms30'
- python: 3.5
env: DJANGO='django16' CMS='cms30'
- python: 3.5
env: DJANGO='django16' CMS='cms31'
- python: 3.5
env: DJANGO='django16' CMS='cms32'
- python: 3.5
env: DJANGO='django17' CMS='cms30'
- python: 3.5
env: DJANGO='django17' CMS='cms31'
- python: 3.5
env: DJANGO='django17' CMS='cms32'
- python: 3.5
env: DJANGO='django18' CMS='cms30'
- python: 3.5
env: DJANGO='django19' CMS='cms30'
allow_failures:
- python: 3.5
env: DJANGO='django22' CMS='cms37'
- python: 3.6
env: DJANGO='django22' CMS='cms37'
- python: 3.7
env: DJANGO='django22' CMS='cms37'

cache:
directories:
- $HOME/.cache/pip
cache: pip
5 changes: 5 additions & 0 deletions HISTORY.rst
Expand Up @@ -6,6 +6,11 @@ History
0.6.0 (unreleased)
++++++++++++++++++

* Add support for Django 1.11, 2.1, 2.2
* Add support for django CMS 3.5, 3.6, 3.7
* Update highligth.js to 9.15.10
* Drop support for Django < 1.11
* Drop support for django CMS < 3.5
* Added support for setting language

0.5.0 (2016-05-08)
Expand Down
21 changes: 13 additions & 8 deletions Makefile
@@ -1,4 +1,5 @@
.PHONY: clean-pyc clean-build docs
.PHONY: clean-pyc clean-build docs livehtml
PYTHON = python

help:
@echo "clean-build - remove build artifacts"
Expand All @@ -24,23 +25,27 @@ clean-pyc:
find . -name '*~' -exec rm -f {} +

lint:
flake8 djangocms_highlightjs tests
djangocms-helper djangocms_highlightjs pyflakes --cms
tox -epep8,isort

test:
djangocms-helper djangocms_highlightjs test --cms --nose
python cms_helper.py djangocms_highlightjs test

test-all:
tox

coverage:
coverage erase
coverage run `which djangocms-helper` djangocms_highlightjs test --cms --nose
coverage run cms_helper.py djangocms_highlightjs
coverage report -m

release: clean
python setup.py sdist bdist_wheel upload

sdist: clean
python setup.py sdist
ls -l dist
ls -l dist

release: clean
python setup.py clean --all sdist bdist_wheel
python -mtwine upload dist/*

livehtml:
sphinx-autobuild -b html -p5000 -H0.0.0.0 -E -j auto -d docs/_build/doctrees --poll docs docs/_build/html
60 changes: 33 additions & 27 deletions README.rst
Expand Up @@ -2,43 +2,21 @@
djangocms-highlightjs
=====================

|Gitter| |PyPiVersion| |PyVersion| |Status| |TestCoverage| |CodeClimate| |License|

.. image:: https://img.shields.io/pypi/v/djangocms-highlightjs.svg
:target: https://pypi.python.org/pypi/djangocms-highlightjs
:alt: Latest PyPI version

.. image:: https://img.shields.io/travis/nephila/djangocms-highlightjs.svg
:target: https://travis-ci.org/nephila/djangocms-highlightjs
:alt: Latest Travis CI build status

.. image:: https://img.shields.io/pypi/dm/djangocms-highlightjs.svg
:target: https://pypi.python.org/pypi/djangocms-highlightjs
:alt: Monthly downloads

.. image:: https://coveralls.io/repos/nephila/djangocms-highlightjs/badge.png
:target: https://coveralls.io/r/nephila/djangocms-highlightjs
:alt: Test coverage

highlight.js plugin for django CMS 3.0
highlight.js plugin for django CMS

Support Python version:

* Python 2.6
* Python 2.7
* Python 3.3
* Python 3.4
* Python 3.5
* Python 2.7, python 3.5+

Supported Django versions:

* Django 1.6
* Django 1.7
* Django 1.8
* Django 1.9
* Django 1.11, 2.0, 2.1, 2.2

Supported django CMS versions:

* django CMS 3.x
* django CMS 3.5+

Documentation
-------------
Expand Down Expand Up @@ -70,3 +48,31 @@ Features

.. _highlight.js: http://highlightjs.org/


.. |Gitter| image:: https://img.shields.io/badge/GITTER-join%20chat-brightgreen.svg?style=flat-square
:target: https://gitter.im/nephila/applications
:alt: Join the Gitter chat

.. |PyPiVersion| image:: https://img.shields.io/pypi/v/djangocms-highlightjs.svg?style=flat-square
:target: https://pypi.python.org/pypi/djangocms-highlightjs
:alt: Latest PyPI version

.. |PyVersion| image:: https://img.shields.io/pypi/pyversions/djangocms-highlightjs.svg?style=flat-square
:target: https://pypi.python.org/pypi/djangocms-highlightjs
:alt: Python versions

.. |Status| image:: https://img.shields.io/travis/nephila/djangocms-highlightjs.svg?style=flat-square
:target: https://travis-ci.org/nephila/djangocms-highlightjs
:alt: Latest Travis CI build status

.. |TestCoverage| image:: https://img.shields.io/coveralls/nephila/djangocms-highlightjs/master.svg?style=flat-square
:target: https://coveralls.io/r/nephila/djangocms-highlightjs?branch=master
:alt: Test coverage

.. |License| image:: https://img.shields.io/github/license/nephila/djangocms-highlightjs.svg?style=flat-square
:target: https://pypi.python.org/pypi/djangocms-highlightjs/
:alt: License

.. |CodeClimate| image:: https://codeclimate.com/github/nephila/djangocms-highlightjs/badges/gpa.svg?style=flat-square
:target: https://codeclimate.com/github/nephila/djangocms-highlightjs
:alt: Code Climate
13 changes: 12 additions & 1 deletion cms_helper.py
Expand Up @@ -2,6 +2,8 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import, print_function, unicode_literals

import sys


def gettext(s): return s # NOQA

Expand Down Expand Up @@ -43,8 +45,17 @@ def gettext(s): return s # NOQA


def run():
from djangocms_helper import runner
from app_helper import runner
runner.cms('djangocms_highlightjs')


def setup():
from app_helper import runner
runner.setup('djangocms_highlightjs', sys.modules[__name__], use_cms=True)


if __name__ == '__main__':
run()

if __name__ == 'cms_helper':
setup()
2 changes: 1 addition & 1 deletion djangocms_highlightjs/__init__.py
@@ -1 +1 @@
__version__ = '0.6.0a1'
__version__ = '0.6.0a3'
6 changes: 1 addition & 5 deletions djangocms_highlightjs/cms_plugins.py
Expand Up @@ -3,12 +3,12 @@

from cms.plugin_base import CMSPluginBase
from cms.plugin_pool import plugin_pool
from django.templatetags.static import static
from django.utils.translation import ugettext_lazy as _

from .models import HighlightText


@plugin_pool.register_plugin
class HighlightPlugin(CMSPluginBase):
name = _('highlight.js code')
model = HighlightText
Expand All @@ -24,7 +24,3 @@ def render(self, context, instance, placeholder):
'highlight': 'djangocms_highlightjs/js/highlight.pack.js'
})
return context

def icon_src(self, instance):
return static('djangocms_highlightjs/img/icon.png')
plugin_pool.register_plugin(HighlightPlugin)
4 changes: 2 additions & 2 deletions djangocms_highlightjs/migrations/0001_initial.py
Expand Up @@ -9,14 +9,14 @@
class Migration(migrations.Migration):

dependencies = [
('cms', '__latest__'),
('cms', '0020_old_tree_cleanup'),
]

operations = [
migrations.CreateModel(
name='HighlightText',
fields=[
('cmsplugin_ptr', models.OneToOneField(primary_key=True, auto_created=True, to='cms.CMSPlugin', serialize=False, parent_link=True)),
('cmsplugin_ptr', models.OneToOneField(primary_key=True, auto_created=True, to='cms.CMSPlugin', serialize=False, parent_link=True, on_delete=models.CASCADE)),
('body', models.TextField(verbose_name='Code')),
('filename', models.CharField(default='', verbose_name='Filename', max_length=100, blank=True)),
('theme', models.CharField(verbose_name='Rendering theme', max_length=100, choices=HIGHLIGHT_THEMES)),
Expand Down

0 comments on commit 3713dfe

Please sign in to comment.