Skip to content

Commit

Permalink
Drop support for py35.
Browse files Browse the repository at this point in the history
  • Loading branch information
Natim committed Apr 10, 2020
1 parent 21c87f5 commit d771a21
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
10 changes: 0 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -88,7 +88,7 @@

# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> 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
Expand Down Expand Up @@ -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
Expand All @@ -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'),
]

Expand Down
3 changes: 0 additions & 3 deletions testtinymce/urls.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,8 +9,6 @@
urlpatterns = [
url(r'^tinymce/', include(tinymce.urls)),
url(r'^admin/', admin.site.urls),
#url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],
# 'django.views.static.serve', {"document_root": settings.MEDIA_ROOT}),
]

urlpatterns += staticfiles_urlpatterns()
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[tox]
envlist =
py35-django{22,30},
py36-django{22,30},
py37-django{22,30},
py38-django{22,30},
Expand Down

0 comments on commit d771a21

Please sign in to comment.