Skip to content

Commit 6247e01

Browse files
committed
update project files
1 parent d9270db commit 6247e01

File tree

6 files changed

+61
-60
lines changed

6 files changed

+61
-60
lines changed

AUTHORS.rst

Lines changed: 0 additions & 13 deletions
This file was deleted.

CHANGES.rst

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
.. currentmodule:: markupsafe
2-
3-
MarkupSafe Changelog
4-
====================
5-
6-
7-
Version 1.1
8-
-----------
1+
Version 1.1.0
2+
-------------
93

104
Unreleased
115

12-
- ``escape`` wraps ``__html__`` result in ``Markup``, consistent with
13-
documented behavior. (`#69`_)
6+
- Drop support for Python 2.6 and 3.3.
7+
- Build wheels for Linux, Mac, and Windows, allowing systems without
8+
a compiler to take advantage of the C extension speedups. (`#104`_)
9+
- Use newer CPython API on Python 3, resulting in a 1.5x speedup.
10+
(`#64`_)
11+
- ``escape`` wraps ``__html__`` result in ``Markup``, consistent with
12+
documented behavior. (`#69`_)
1413

14+
.. _#64: https://github.com/pallets/markupsafe/pull/64
1515
.. _#69: https://github.com/pallets/markupsafe/pull/69
16+
.. _#104: https://github.com/pallets/markupsafe/pull/104
1617

1718

1819
Version 1.0
1920
-----------
2021

22+
Released 2017-03-07
23+
2124
- Fixed custom types not invoking ``__unicode__`` when used with
2225
``format()``.
2326
- Added ``__version__`` module attribute.
@@ -27,43 +30,57 @@ Version 1.0
2730
Version 0.18
2831
------------
2932

33+
Released 2013-05-22
34+
3035
- Fixed ``__mul__`` and string splitting on Python 3.
3136

3237

3338
Version 0.17
3439
------------
3540

41+
Released 2013-05-21
42+
3643
- Fixed a bug with broken interpolation on tuples.
3744

3845

3946
Version 0.16
4047
------------
4148

49+
Released 2013-05-20
50+
4251
- Improved Python 3 Support and removed 2to3.
4352
- Removed support for Python 3.2 and 2.5.
4453

4554

4655
Version 0.15
4756
------------
4857

58+
Released 2011-07-20
59+
4960
- Fixed a typo that caused the library to fail to install on pypy and
5061
jython.
5162

5263

5364
Version 0.14
5465
------------
5566

67+
Released 2011-07-20
68+
5669
- Release fix for 0.13.
5770

5871

5972
Version 0.13
6073
------------
6174

75+
Released 2011-07-20
76+
6277
- Do not attempt to compile extension for PyPy or Jython.
6378
- Work around some 64bit Windows issues.
6479

6580

6681
Version 0.12
6782
------------
6883

84+
Released 2011-02-17
85+
6986
- Improved PyPy compatibility.

LICENSE.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1+
`BSD 3-Clause <https://opensource.org/licenses/BSD-3-Clause>`_
2+
13
Copyright © 2010 by the Pallets team.
24

35
Some rights reserved.
46

5-
Redistribution and use in source and binary forms of the software as
6-
well as documentation, with or without modification, are permitted
7-
provided that the following conditions are met:
7+
Redistribution and use in source and binary forms, with or without
8+
modification, are permitted provided that the following conditions are
9+
met:
810

9-
* Redistributions of source code must retain the above copyright
11+
- Redistributions of source code must retain the above copyright
1012
notice, this list of conditions and the following disclaimer.
1113

12-
* Redistributions in binary form must reproduce the above copyright
14+
- Redistributions in binary form must reproduce the above copyright
1315
notice, this list of conditions and the following disclaimer in the
1416
documentation and/or other materials provided with the distribution.
1517

16-
* Neither the name of the copyright holder nor the names of its
18+
- Neither the name of the copyright holder nor the names of its
1719
contributors may be used to endorse or promote products derived from
1820
this software without specific prior written permission.
1921

MANIFEST.in

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
include AUTHORS.rst CHANGES.rst LICENSE.rst tox.ini
2-
recursive-include src/markupsafe *.c
1+
include CHANGES.rst
2+
include LICENSE.rst
3+
include README.rst
4+
include tox.ini
5+
graft docs
6+
prune docs/_build
37
graft tests
8+
recursive-exclude *.py[co]

setup.py

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
#!/usr/bin/env python
2-
# -*- coding: utf-8 -*-
31
from __future__ import print_function
42

3+
import sys
4+
55
import io
66
import re
7-
import sys
8-
from collections import OrderedDict
97
from distutils.errors import (
10-
CCompilerError, DistutilsExecError,
11-
DistutilsPlatformError
8+
CCompilerError,
9+
DistutilsExecError,
10+
DistutilsPlatformError,
11+
)
12+
from setuptools import (
13+
Extension,
14+
find_packages,
15+
setup,
1216
)
13-
14-
from setuptools import Extension, setup, find_packages
1517
from setuptools.command.build_ext import build_ext
1618

1719
with io.open('README.rst', 'rt', encoding='utf8') as f:
@@ -58,14 +60,15 @@ def run_setup(with_binary):
5860
name='MarkupSafe',
5961
version=version,
6062
url='https://www.palletsprojects.com/p/markupsafe/',
61-
project_urls=OrderedDict((
62-
('Code', 'https://github.com/pallets/markupsafe'),
63-
('Issue tracker', 'https://github.com/pallets/markupsafe/issues'),
64-
)),
63+
project_urls={
64+
"Documentation": "https://markupsafe.palletsprojects.com/",
65+
"Code": "https://github.com/pallets/markupsafe",
66+
"Issue tracker": "https://github.com/pallets/markupsafe/issues",
67+
},
6568
license='BSD',
6669
author='Armin Ronacher',
6770
author_email='[email protected]',
68-
maintainer='Pallets team',
71+
maintainer='Pallets Team',
6972
maintainer_email='[email protected]',
7073
description='Safely add untrusted strings to HTML/XML markup.',
7174
long_description=readme,
@@ -82,28 +85,15 @@ def run_setup(with_binary):
8285
'Programming Language :: Python :: 3.4',
8386
'Programming Language :: Python :: 3.5',
8487
'Programming Language :: Python :: 3.6',
88+
'Programming Language :: Python :: 3.7',
8589
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
8690
'Topic :: Software Development :: Libraries :: Python Modules',
8791
'Topic :: Text Processing :: Markup :: HTML',
8892
],
89-
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
90-
extras_require={
91-
'dev': [
92-
'pytest',
93-
'coverage',
94-
'tox',
95-
'sphinx',
96-
'pallets-sphinx-themes',
97-
],
98-
'docs': [
99-
'sphinx',
100-
'pallets-sphinx-themes',
101-
],
102-
},
10393
packages=find_packages("src"),
10494
package_dir={"": "src"},
10595
include_package_data=True,
106-
zip_safe=False,
96+
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
10797
cmdclass={'build_ext': ve_build_ext},
10898
ext_modules=ext_modules if with_binary else [],
10999
)

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ setenv =
1010
COVERAGE_FILE = .coverage.{envname}
1111
deps =
1212
pytest-cov
13-
commands = pytest --cov --cov-report= {posargs}
13+
commands = pytest --tb=short --cov --cov-report= {posargs}
1414

1515
[testenv:docs-html]
1616
deps = -r docs/requirements.txt

0 commit comments

Comments
 (0)