- 1.1.0
diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index 7f073cd..253b819 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -8,7 +8,57 @@
.. changelog::
:version: 1.1.0
- :include_notes_from: unreleased
+ :released: Thu Aug 1 2019
+
+ .. change::
+ :tags: bug, py3k, windows
+ :tickets: 301
+
+ Replaced usage of time.clock() on windows as well as time.time() elsewhere
+ for microsecond timestamps with timeit.default_timer(), as time.clock() is
+ being removed in Python 3.8. Pull request courtesy Christoph Reiter.
+
+
+ .. change::
+ :tags: bug, py3k
+ :tickets: 295
+
+ Replaced usage of ``inspect.getfullargspec()`` with the vendored version
+ used by SQLAlchemy, Alembic to avoid future deprecation warnings. Also
+ cleans up an additional version of the same function that's apparently
+ been floating around for some time.
+
+
+ .. change::
+ :tags: changed, setup
+ :tickets: 303
+
+ Removed the "python setup.py test" feature in favor of a straight run of
+ "tox". Per Pypa / pytest developers, "setup.py" commands are in general
+ headed towards deprecation in favor of tox. The tox.ini script has been
+ updated such that running "tox" with no arguments will perform a single run
+ of the test suite against the default installed Python interpreter.
+
+ .. seealso::
+
+ https://github.com/pypa/setuptools/issues/1684
+
+ https://github.com/pytest-dev/pytest/issues/5534
+
+ .. change::
+ :tags: changed, py3k, installer
+ :tickets: 249
+
+ Mako 1.1 now supports Python versions:
+
+ * 2.7
+ * 3.4 and higher
+
+ This includes that setup.py no longer includes any conditionals, allowing
+ for a pure Python wheel build, however this is not necessarily part of the
+ Pypi release process as of yet. The test suite also raises for Python
+ deprecation warnings.
+
1.0
===
diff --git a/doc/build/conf.py b/doc/build/conf.py
index 04b9423..15256f4 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -88,7 +88,7 @@
# The short X.Y version.
version = mako.__version__
# The full version, including alpha/beta/rc tags.
-release = "1.0.14"
+release = "1.1.0"
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/doc/build/unreleased/249.rst b/doc/build/unreleased/249.rst
deleted file mode 100644
index da9767c..0000000
--- a/doc/build/unreleased/249.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. change::
- :tags: changed, py3k, installer
- :tickets: 249
-
- Mako 1.1 now supports Python versions:
-
- * 2.7
- * 3.4 and higher
-
- This includes that setup.py no longer includes any conditionals, allowing
- for a pure Python wheel build, however this is not necessarily part of the
- Pypi release process as of yet. The test suite also raises for Python
- deprecation warnings.
-
diff --git a/doc/build/unreleased/295.rst b/doc/build/unreleased/295.rst
deleted file mode 100644
index 147d23b..0000000
--- a/doc/build/unreleased/295.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
- :tags: bug, py3k
- :tickets: 295
-
- Replaced usage of ``inspect.getfullargspec()`` with the vendored version
- used by SQLAlchemy, Alembic to avoid future deprecation warnings. Also
- cleans up an additional version of the same function that's apparently
- been floating around for some time.
-
diff --git a/doc/build/unreleased/301.rst b/doc/build/unreleased/301.rst
deleted file mode 100644
index 7e9f1d2..0000000
--- a/doc/build/unreleased/301.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
- :tags: bug, py3k, windows
- :tickets: 301
-
- Replaced usage of time.clock() on windows as well as time.time() elsewhere
- for microsecond timestamps with timeit.default_timer(), as time.clock() is
- being removed in Python 3.8. Pull request courtesy Christoph Reiter.
-
diff --git a/doc/build/unreleased/303.rst b/doc/build/unreleased/303.rst
deleted file mode 100644
index ac65612..0000000
--- a/doc/build/unreleased/303.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. change::
- :tags: changed, setup
- :tickets: 303
-
- Removed the "python setup.py test" feature in favor of a straight run of
- "tox". Per Pypa / pytest developers, "setup.py" commands are in general
- headed towards deprecation in favor of tox. The tox.ini script has been
- updated such that running "tox" with no arguments will perform a single run
- of the test suite against the default installed Python interpreter.
-
- .. seealso::
-
- https://github.com/pypa/setuptools/issues/1684
-
- https://github.com/pytest-dev/pytest/issues/5534
