Add Python 3.7 support for testing, allowing failures
Add tox env for py27/py35,pyramid18/19
Drop unsupported versions of Pyramid

.travis.yml

@@ -6,8 +6,6 @@ matrix:
    include:
        - python: 2.7
          env: TOXENV=py27
        - python: 3.3
          env: TOXENV=py33
        - python: 3.4
          env: TOXENV=py34
        - python: 3.5
@@ -21,7 +19,11 @@ matrix:
        - python: 3.5
          env: TOXENV=docs
        - python: 2.7
          env: TOXENV=py27-pyramid14
          env: TOXENV=py35-pyramid19
        - python: nightly
          env: TOXENV=py37
    allow_failures:
        - env: TOXENV=py37

install:
  - travis_retry pip install -U setuptools
@@ -31,6 +33,13 @@ install:
script:
  - travis_retry tox

cache:
  directories:
    - $HOME/.cache/pip

notifications:
  email:
    - pyramid-checkins@lists.repoze.org
  irc:
    channels:
      - "chat.freenode.net#pyramid"

docs/conf.py

@@ -17,11 +17,10 @@
# make it absolute, like shown here.
#sys.path.append(os.path.abspath('some/directory'))

import sys, os

import datetime
import pkg_resources

import pylons_sphinx_themes
import sys, os

# General configuration
# ---------------------
@@ -36,7 +35,7 @@
# Looks for pyramid's objects
intersphinx_mapping = {
    'pyramid':
    ('http://docs.pylonsproject.org/projects/pyramid/en/latest/', None)}
    ('https://docs.pylonsproject.org/projects/pyramid/en/latest/', None)}

# Add any paths that contain templates here, relative to this directory.
templates_path = ['.templates']
@@ -49,7 +48,8 @@

# General substitutions.
project = 'pyramid_debugtoolbar'
copyright = '2012, Agendaless Consulting <chrism@plope.com>'
thisyear = datetime.datetime.now().year
copyright = '2012-%s, Agendaless Consulting' % thisyear

# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
@@ -99,7 +99,9 @@
# Add and use Pylons theme
html_theme_path = pylons_sphinx_themes.get_html_themes_path()
html_theme = 'pyramid'
html_theme_options = dict(github_url='https://github.com/Pylons/pyramid_debugtoolbar')
html_theme_options = {
    'github_url': 'https://github.com/Pylons/pyramid_debugtoolbar'
}

# The style sheet to use for HTML and HTML Help pages. A file of that name
# must exist either in Sphinx' static/ path, or in one of the custom paths
@@ -133,9 +135,8 @@
# bottom, using the given strftime format.
html_last_updated_fmt = '%b %d, %Y'

# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
html_use_smartypants = False
# Do not use smart quotes.
smartquotes = False

# Custom sidebar templates, maps document names to template names.
#html_sidebars = {}
@@ -183,12 +184,12 @@
#  author, document class [howto/manual]).
latex_documents = [
  ('index', 'pyramid_debugtoolbar.tex', 'pyramid_debugtoolbar Documentation',
   'Repoze Developers', 'manual'),
   'Pylons Project Developers', 'manual'),
]

# The name of an image file (relative to this directory) to place at the
# top of the title page.
latex_logo = '.static/logo_hi.gif'
# latex_logo = '.static/logo_hi.gif'

# For "manual" documents, if this is true, then toplevel headings are
# parts, not chapters.

setup.py

@@ -39,7 +39,7 @@ def readfile(name):
    ]

docs_extras = [
    'Sphinx >= 1.3.1',  # Read The Docs minimum version
    'Sphinx >= 1.7.5',
    'pylons-sphinx-themes >= 0.3',
    ]

@@ -53,7 +53,6 @@ def readfile(name):
        "Programming Language :: Python",
        "Programming Language :: Python :: 2.7",
        "Programming Language :: Python :: 3",
        "Programming Language :: Python :: 3.3",
        "Programming Language :: Python :: 3.4",
        "Programming Language :: Python :: 3.5",
        "Programming Language :: Python :: 3.6",
@@ -72,7 +71,7 @@ def readfile(name):
      include_package_data=True,
      zip_safe=False,
      install_requires=install_requires,
      python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
      python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
      extras_require = {
          ':python_version<"3.3"': extra_requires,
          'testing':testing_extras,

tox.ini

@@ -1,8 +1,9 @@
[tox]
envlist =
    lint,
    py27,py33,py34,py35,py36,pypy,
    py27-pyramid14,
    py27,py34,py35,py36,py37,pypy,
    py27-pyramid{18,19},
    py35-pyramid{18,19},
    docs,
    {py2,py3}-cover,coverage

@@ -11,19 +12,15 @@ envlist =
# to defaults for others.
basepython =
    py27: python2.7
    py33: python3.3
    py34: python3.4
    py35: python3.5
    py36: python3.6
    py37: python3.7
    pypy: pypy
    py2: python2.7
    py3: python3.5

deps =
    pyramid14: pyramid <= 1.4.99
    pyramid15: pyramid <= 1.5.99
    pyramid16: pyramid <= 1.6.99
    pyramid17: pyramid <= 1.7.99
    pyramid18: pyramid <= 1.8.99
    pyramid19: pyramid <= 1.9.99