From 6ded9db39463372e5205a36bea72d6de516ece69 Mon Sep 17 00:00:00 2001
From: Christian Hammond <christian@beanbaginc.com>
Date: Fri, 4 Nov 2016 16:57:38 -0700
Subject: Add support for partials and path segments for Handlebars.

This introduces support for some missing features to the Handlebars lexer:
Partials and path segments. Partials mostly appeared to work before, but the
`>` in `{{> ... }}` would appear as a syntax error, as could other
components of the partial. This change introduces support for:

* Standard partials: `{{> partialName}}`
* Partials with parameters: `{{> partialName varname="value"}}`
* Ddynamic partials: `{{> (partialFunc)}}`
* Ddynamic partials with lookups: `{{> (lookup ../path "partialName")}}`
* Partial blocks: `{{> @partial-block}}`
* Inline partials: `{{#*inline}}..{{/inline}}`

It also introduces support for path segments, which can reference content in
the current context or in a parent context. For instance, `this.name`,
`this/name`, `./name`, `../name`, `this/name`, etc. These are all now tracked
as variables.
---
 setup.py | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100755 setup.py

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
new file mode 100755
index 00000000..6442fd10
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""Pygments
+    ~~~~~~~~
+
+    Pygments is a syntax highlighting package written in Python.
+
+    It is a generic syntax highlighter suitable for use in code hosting, forums,
+    wikis or other applications that need to prettify source code.  Highlights
+    are:
+
+    * a wide range of over 300 languages and other text formats is supported
+    * special attention is paid to details, increasing quality by a fair amount
+    * support for new languages and formats are added easily
+    * a number of output formats, presently HTML, LaTeX, RTF, SVG, all image \
+      formats that PIL supports and ANSI sequences
+    * it is usable as a command-line tool and as a library
+
+    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+try:
+    from setuptools import setup, find_packages
+    have_setuptools = True
+except ImportError:
+    from distutils.core import setup
+    def find_packages(*args, **kwargs):
+        return [
+            'pygments',
+            'pygments.lexers',
+            'pygments.formatters',
+            'pygments.styles',
+            'pygments.filters',
+        ]
+    have_setuptools = False
+
+if have_setuptools:
+    add_keywords = dict(
+        entry_points = {
+            'console_scripts': ['pygmentize = pygments.cmdline:main'],
+        },
+    )
+else:
+    add_keywords = dict(
+        scripts = ['pygmentize'],
+    )
+
+setup(
+    name = 'Pygments',
+    version = '2.2',
+    url = 'http://pygments.org/',
+    license = 'BSD License',
+    author = 'Georg Brandl',
+    author_email = 'georg@python.org',
+    description = 'Pygments is a syntax highlighting package written in Python.',
+    long_description = __doc__,
+    keywords = 'syntax highlighting',
+    packages = find_packages(exclude=['ez_setup']),
+    platforms = 'any',
+    zip_safe = False,
+    include_package_data = True,
+    classifiers = [
+        'License :: OSI Approved :: BSD License',
+        'Intended Audience :: Developers',
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: System Administrators',
+        'Development Status :: 6 - Mature',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
+        'Operating System :: OS Independent',
+        'Topic :: Text Processing :: Filters',
+        'Topic :: Utilities',
+    ],
+    **add_keywords
+)
-- 
cgit v1.2.1


From 00126a1401eefcf0280384d9bf59783e81db41ed Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 22 Jan 2017 18:38:11 +0100
Subject: Copyright update.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 6442fd10..5ef51ab5 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
       formats that PIL supports and ANSI sequences
     * it is usable as a command-line tool and as a library
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-- 
cgit v1.2.1


From f442d0e155a062c4a851cfb344056d8abbf8d865 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 22 Jan 2017 22:04:28 +0100
Subject: Bump to 2.2.0 final.

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 5ef51ab5..1705923c 100755
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ else:
 
 setup(
     name = 'Pygments',
-    version = '2.2',
+    version = '2.2.0',
     url = 'http://pygments.org/',
     license = 'BSD License',
     author = 'Georg Brandl',
@@ -56,7 +56,7 @@ setup(
     description = 'Pygments is a syntax highlighting package written in Python.',
     long_description = __doc__,
     keywords = 'syntax highlighting',
-    packages = find_packages(exclude=['ez_setup']),
+    packages = find_packages(),
     platforms = 'any',
     zip_safe = False,
     include_package_data = True,
-- 
cgit v1.2.1