diff options
| -rw-r--r-- | AUTHORS.rst | 13 | ||||
| -rw-r--r-- | CHANGES.rst | 37 | ||||
| -rw-r--r-- | LICENSE.rst | 14 | ||||
| -rw-r--r-- | MANIFEST.in | 9 | ||||
| -rw-r--r-- | setup.py | 46 | ||||
| -rw-r--r-- | tox.ini | 2 |
6 files changed, 61 insertions, 60 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst deleted file mode 100644 index b513b20..0000000 --- a/AUTHORS.rst +++ /dev/null @@ -1,13 +0,0 @@ -MarkupSafe is developed and maintained by the Pallets team and -community contributors. It was created by Armin Ronacher. The core -maintainers are: - -* David Lord (davidism) -* Adrian Mönnich (ThiefMaster) -* Armin Ronacher (mitsuhiko) - -A full list of contributors is available from git with: - -.. code-block:: none - - git shortlog -sne diff --git a/CHANGES.rst b/CHANGES.rst index 463ed38..dbfb292 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,23 +1,26 @@ -.. currentmodule:: markupsafe - -MarkupSafe Changelog -==================== - - -Version 1.1 ------------ +Version 1.1.0 +------------- Unreleased -- ``escape`` wraps ``__html__`` result in ``Markup``, consistent with - documented behavior. (`#69`_) +- Drop support for Python 2.6 and 3.3. +- Build wheels for Linux, Mac, and Windows, allowing systems without + a compiler to take advantage of the C extension speedups. (`#104`_) +- Use newer CPython API on Python 3, resulting in a 1.5x speedup. + (`#64`_) +- ``escape`` wraps ``__html__`` result in ``Markup``, consistent with + documented behavior. (`#69`_) +.. _#64: https://github.com/pallets/markupsafe/pull/64 .. _#69: https://github.com/pallets/markupsafe/pull/69 +.. _#104: https://github.com/pallets/markupsafe/pull/104 Version 1.0 ----------- +Released 2017-03-07 + - Fixed custom types not invoking ``__unicode__`` when used with ``format()``. - Added ``__version__`` module attribute. @@ -27,18 +30,24 @@ Version 1.0 Version 0.18 ------------ +Released 2013-05-22 + - Fixed ``__mul__`` and string splitting on Python 3. Version 0.17 ------------ +Released 2013-05-21 + - Fixed a bug with broken interpolation on tuples. Version 0.16 ------------ +Released 2013-05-20 + - Improved Python 3 Support and removed 2to3. - Removed support for Python 3.2 and 2.5. @@ -46,6 +55,8 @@ Version 0.16 Version 0.15 ------------ +Released 2011-07-20 + - Fixed a typo that caused the library to fail to install on pypy and jython. @@ -53,12 +64,16 @@ Version 0.15 Version 0.14 ------------ +Released 2011-07-20 + - Release fix for 0.13. Version 0.13 ------------ +Released 2011-07-20 + - Do not attempt to compile extension for PyPy or Jython. - Work around some 64bit Windows issues. @@ -66,4 +81,6 @@ Version 0.13 Version 0.12 ------------ +Released 2011-02-17 + - Improved PyPy compatibility. diff --git a/LICENSE.rst b/LICENSE.rst index a62ef20..28c9258 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -1,19 +1,21 @@ +`BSD 3-Clause <https://opensource.org/licenses/BSD-3-Clause>`_ + Copyright © 2010 by the Pallets team. Some rights reserved. -Redistribution and use in source and binary forms of the software as -well as documentation, with or without modification, are permitted -provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: -* Redistributions of source code must retain the above copyright +- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright +- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the copyright holder nor the names of its +- Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/MANIFEST.in b/MANIFEST.in index e4855b7..7b0dc24 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,8 @@ -include AUTHORS.rst CHANGES.rst LICENSE.rst tox.ini -recursive-include src/markupsafe *.c +include CHANGES.rst +include LICENSE.rst +include README.rst +include tox.ini +graft docs +prune docs/_build graft tests +recursive-exclude *.py[co] @@ -1,17 +1,19 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- from __future__ import print_function +import sys + import io import re -import sys -from collections import OrderedDict from distutils.errors import ( - CCompilerError, DistutilsExecError, - DistutilsPlatformError + CCompilerError, + DistutilsExecError, + DistutilsPlatformError, +) +from setuptools import ( + Extension, + find_packages, + setup, ) - -from setuptools import Extension, setup, find_packages from setuptools.command.build_ext import build_ext with io.open('README.rst', 'rt', encoding='utf8') as f: @@ -58,14 +60,15 @@ def run_setup(with_binary): name='MarkupSafe', version=version, url='https://www.palletsprojects.com/p/markupsafe/', - project_urls=OrderedDict(( - ('Code', 'https://github.com/pallets/markupsafe'), - ('Issue tracker', 'https://github.com/pallets/markupsafe/issues'), - )), + project_urls={ + "Documentation": "https://markupsafe.palletsprojects.com/", + "Code": "https://github.com/pallets/markupsafe", + "Issue tracker": "https://github.com/pallets/markupsafe/issues", + }, license='BSD', author='Armin Ronacher', author_email='armin.ronacher@active-4.com', - maintainer='Pallets team', + maintainer='Pallets Team', maintainer_email='contact@palletsprojects.com', description='Safely add untrusted strings to HTML/XML markup.', long_description=readme, @@ -82,28 +85,15 @@ def run_setup(with_binary): 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Text Processing :: Markup :: HTML', ], - python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', - extras_require={ - 'dev': [ - 'pytest', - 'coverage', - 'tox', - 'sphinx', - 'pallets-sphinx-themes', - ], - 'docs': [ - 'sphinx', - 'pallets-sphinx-themes', - ], - }, packages=find_packages("src"), package_dir={"": "src"}, include_package_data=True, - zip_safe=False, + python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', cmdclass={'build_ext': ve_build_ext}, ext_modules=ext_modules if with_binary else [], ) @@ -10,7 +10,7 @@ setenv = COVERAGE_FILE = .coverage.{envname} deps = pytest-cov -commands = pytest --cov --cov-report= {posargs} +commands = pytest --tb=short --cov --cov-report= {posargs} [testenv:docs-html] deps = -r docs/requirements.txt |