Add Python 3.6
Remove version check for installing dependencies
Clean up requires entries

.gitignore

@@ -1,8 +1,5 @@
/build
/env
/env26
/env27
/env32
/env*
*.egg
*.egg-info
*.pyc

.travis.yml

@@ -1,14 +1,38 @@
language: python
env:
    - TOXENV=py27
    - TOXENV=pypy
    - TOXENV=py33
    - TOXENV=py34
    - TOXENV=py35
    - TOXENV=docs
    - TOXENV=py2-cover,py3-cover,coverage
matrix:
    include:
        - python: 2.7
          env: TOXENV=py27
        - python: 3.4
          env: TOXENV=py34
        - python: 3.5
          env: TOXENV=py35
        - python: 3.6
          env: TOXENV=py36
        # aws s3 ls s3://travis-python-archives/binaries/ubuntu/14.04/x86_64/ | grep 'pypy.*bz2$'
        - python: pypy-5.4.1
          env: TOXENV=pypy
        - python: 3.5
          env: TOXENV=py2-cover,py3-cover,coverage
        - python: 3.5
          env: TOXENV=docs
        - python: nightly
          env: TOXENV=py37
    allow_failures:
        - env: TOXENV=py37

install:
    - travis_retry pip install tox
script:
    - travis_retry tox

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

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

CHANGES.txt

@@ -1,3 +1,13 @@
Unreleased
==========

- Drop Python 3.3 support.

- Add Python 3.6 support.

- Add testing for Python 3.7 support with allowed failures.


2.7 (2016-11-15)
================

README.rst

@@ -4,6 +4,6 @@ Jinja2 bindings for Pyramid
These are bindings for the `Jinja2 templating system <http://jinja.pocoo.org>`_
for the `Pyramid <https://trypyramid.com>`_ web framework.

See http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/ for
See https://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/ for
documentation or ``index.rst`` in the ``docs`` sub-directory of the source
distribution.

docs/conf.py

@@ -16,7 +16,8 @@
# directory is relative to the documentation root, use os.path.abspath to
# make it absolute, like shown here.
#sys.path.append(os.path.abspath('some/directory'))

import datetime
import pylons_sphinx_themes
import sys
import os

@@ -38,7 +39,8 @@

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

# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
@@ -87,8 +89,6 @@
# -----------------------

# Add and use Pylons theme
sys.path.append(os.path.abspath('_themes'))
import pylons_sphinx_themes
html_theme_path = pylons_sphinx_themes.get_html_themes_path()
html_theme = 'pyramid'

@@ -130,9 +130,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 = True
# Do not use smart quotes.
smartquotes = False

# Custom sidebar templates, maps document names to template names.
#html_sidebars = {}
@@ -188,7 +187,7 @@
#  author, document class [howto/manual]).
latex_documents = [
  ('index', 'pyramid_jinja2.tex', 'pyramid_jinja2 Documentation',
   'Pylons Developers', 'manual'),
   'Pylons Project Developers', 'manual'),
]

# The name of an image file (relative to this directory) to place at the

setup.py

@@ -26,28 +26,26 @@
    CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()

requires = [
    'Jinja2',
    'MarkupSafe',
    'pyramid>=1.3.0', # pyramid.path.DottedNameResolver
    'zope.deprecation',
]

if (3,) < sys.version_info < (3, 3):
    requires.extend([
        'Jinja2>=2.5.0,<2.7dev', #2.7 drops Python 3.2 compat.
        'MarkupSafe<0.16', #0.16 drops Python 3.2 compat
        ])
else:
    requires.extend([
        'Jinja2>=2.5.0',
        'MarkupSafe',
        ])

try:
    import wsgiref
except ImportError:
    requires.append('wsgiref')

testing_extras = ['WebTest', 'nose>=1.2.0', 'coverage']
docs_extras = ['Sphinx', 'pylons-sphinx-themes >= 0.3']
testing_extras = [
    'coverage',
    'nose>=1.2.0',
    'WebTest',
]
docs_extras = [
    'pylons-sphinx-themes >= 0.3',
    'Sphinx>=1.7.5',
]

setup(name='pyramid_jinja2',
      version='2.7',
@@ -61,13 +59,13 @@
        "Programming Language :: Python :: 2",
        "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",
        "Framework :: Pyramid",
        "License :: Repoze Public License",
        ],
      keywords='web wsgi pylons pyramid',
      keywords='web wsgi pylons pyramid jinja2',
      author="Rocky Burt",
      author_email="pylons-discuss@googlegroups.com",
      maintainer="Domen Kozar",

tox.ini

@@ -1,7 +1,7 @@
[tox]
envlist =
    py27,py33,py34,py35,pypy,pypy3,
    py27-pyramid{13,14,15},
    py27,py34,py35,py36,py37,pypy,
    py27-pyramid{18,19},
    docs,
    {py2,py3}-cover,coverage

@@ -10,25 +10,25 @@ 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
    pypy3: pypy3
    py2: python2.7
    py3: python3.5

deps =
    pyramid13: pyramid <= 1.3.99
    pyramid14: pyramid <= 1.4.99
    pyramid15: pyramid <= 1.5.99
    pyramid18: pyramid <= 1.8.99
    pyramid19: pyramid <= 1.9.99

commands =
    pip install pyramid_jinja2[testing]
    nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}

[testenv:docs]
basepython = python3.4
basepython = python3.5
whitelist_externals = make
commands =
    pip install pyramid_jinja2[docs]