diff --git a/.travis.yml b/.travis.yml index 87283bf8..90f1ea94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,6 @@ sudo: false language: python matrix: include: - - python: 3.5 - dist: xenial - env: TOX_ENV=flake8 - - python: 3.5 - dist: xenial - env: TOX_ENV=py37-django22 - - python: 3.5 - dist: xenial - env: TOX_ENV=py37-django30 - - python: 3.6 dist: xenial env: TOX_ENV=flake8 diff --git a/docs/conf.py b/docs/conf.py index 5dbead12..1e658949 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -36,7 +36,7 @@ # General substitutions. project = "django-tinymce" authors = "Joost Cassee, Aljosa Mohorovic" -copyright = "2008-2016, %s" % authors +copyright = f"2008-2016, {authors}" # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. @@ -88,7 +88,7 @@ # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = "%s %s documentation" % (project, version) +html_title = f"{project} {version} documentation" # A shorter title for the navigation bar. Default is the same as html_title. # html_short_title = None @@ -143,7 +143,7 @@ html_file_suffix = '.html' # Output file base name for HTML help builder. -htmlhelp_basename = '%sdoc' % project +htmlhelp_basename = f'{project}doc' # Options for LaTeX output @@ -158,7 +158,7 @@ # Grouping the document tree into LaTeX files. List of tuples (source # start file, target name, title, author, document class [howto/manual]). latex_documents = [ - (master_doc, '%s.tex' % project, '%s Documentation' % project, + (master_doc, f'{project}.tex', f'{project} Documentation', authors, 'manual'), ] diff --git a/testtinymce/urls.py b/testtinymce/urls.py index e2bf7d77..d76bd85c 100644 --- a/testtinymce/urls.py +++ b/testtinymce/urls.py @@ -1,4 +1,3 @@ -from django.conf import settings from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.contrib import admin from django.conf.urls import include, url @@ -10,8 +9,6 @@ urlpatterns = [ url(r'^tinymce/', include(tinymce.urls)), url(r'^admin/', admin.site.urls), - #url(r'^%s(?P.*)$' % settings.MEDIA_URL[1:], - # 'django.views.static.serve', {"document_root": settings.MEDIA_ROOT}), ] urlpatterns += staticfiles_urlpatterns() diff --git a/tox.ini b/tox.ini index 2d94e46f..f35576e8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,5 @@ [tox] envlist = - py35-django{22,30}, py36-django{22,30}, py37-django{22,30}, py38-django{22,30},