summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2018-11-05 08:16:29 -0800
committerGitHub <noreply@github.com>2018-11-05 08:16:29 -0800
commitc81ffeb8133535aed1c15936136a08ab1bb3f647 (patch)
tree2d80e3c01b35020bbd4fb2c8dcfcb94749a17815
parent3ca906f84dda8c97d7500a924604fc83367ded9b (diff)
parentcb06e16c49dc44caf0ffd16f8de3ef520bd882f7 (diff)
downloadmarkupsafe-c81ffeb8133535aed1c15936136a08ab1bb3f647.tar.gz
Merge pull request #107 from pallets/release-1-1-0
Release 1.1.0
-rw-r--r--CHANGES.rst2
-rw-r--r--MANIFEST.in2
-rw-r--r--src/markupsafe/__init__.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index dbfb292..7666966 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,7 @@
Version 1.1.0
-------------
-Unreleased
+Released 2018-11-05
- Drop support for Python 2.6 and 3.3.
- Build wheels for Linux, Mac, and Windows, allowing systems without
diff --git a/MANIFEST.in b/MANIFEST.in
index 7b0dc24..92a16da 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,4 +5,4 @@ include tox.ini
graft docs
prune docs/_build
graft tests
-recursive-exclude *.py[co]
+global-exclude *.py[co]
diff --git a/src/markupsafe/__init__.py b/src/markupsafe/__init__.py
index e02c15d..5e09525 100644
--- a/src/markupsafe/__init__.py
+++ b/src/markupsafe/__init__.py
@@ -20,7 +20,7 @@ from ._compat import string_types
from ._compat import text_type
from ._compat import unichr
-__version__ = "1.1.dev"
+__version__ = "1.1.0"
__all__ = ["Markup", "soft_unicode", "escape", "escape_silent"]