From b95d581de491b5abd5c0d08bb3899d6e5a7ee10e Mon Sep 17 00:00:00 2001
From: Ben Bangert <ben@groovie.org>
Date: Tue, 13 Oct 2020 12:14:38 -0700
Subject: chore: tag 2.5.0

---
 .travis.yml   | 18 ++++--------------
 CHANGELOG.rst | 18 ++++++++++++++++--
 docs/conf.py  |  6 +++---
 setup.cfg     |  2 +-
 setup.py      |  2 +-
 5 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9a351f..2496887 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,15 @@
 language: python
 python:
-  - '2.7'
-  - '3.5'
-  - '3.6'
+  - "2.7"
+  - "3.5"
+  - "3.6"
   - nightly
   - pypy
   - pypy3
 matrix:
   allow_failures:
-  - python: nightly
+    - python: nightly
 install: pip install tox-travis
 script: tox
 after_success:
   - codecov
-deploy:
-  provider: pypi
-  user: bbangert
-  password:
-    secure: OB4kVoPEymiU06AHjFxA4ORRIhvl46bmstkxB3gBxOLylUUpvMjspXIUX/dPww3PceiklUbot/Tww8ITn00hJYd7qF6vsOyDXMF3XyQ7a5mqDsGTbWYOVqpv/tn4+lvDMNVHRy2cY68BGsUEU/ePLi0oqhdBgct82bYkKrXrav0=
-  on:
-    tags: true
-    python: 3.5
-  distributions: release
-  skip_upload_docs: true
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c6271cd..4d72c9b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,13 +1,27 @@
 Routes Changelog
 %%%%%%%%%%%%%%%%
 
-Release 2.4.0 (January 1, 2017)
+Release 2.5.0 (October 13, 2020)
+================================
+
+* Add graceful fallback for invalid character encoding from request object. Patch by Phillip Baker.
+  PR #94.
+* Enhanced performance for matching routes that share the same static prefix. Patch by George Sakkis.
+  PR #89.
+* Fixed issue with child routes not passing route conditions to the Mapper.connect call. Patch by
+  Robin Abbi. PR #88.
+* Fixed documentation to reflect default value for minimization. Patch by Marcin Raczyński. PR #86.
+* Allow backslash to escape special characters in route paths. Patch by Orhan Kavrakoğlu. PR #83.
+* Resolve invalid escape sequences. Patch by Stephen Finucane. PR #85.
+* Remove support for Python 2.6, 3.3, and 3.4. Patch by Stephen Finucane. PR #85.
+* Remove obsolete Python 2.3 compat code. Patch by Jakub Wilk. PR #80.
+
+Release 2.4.1 (January 1, 2017)
 ===============================
 
 * Release as a universal wheel. PR #75.
 * Convert readthedocs links for their .org -> .io migration for hosted projects. PR #67.
 
-
 Release 2.3.1 (March 30, 2016)
 ==============================
 * Backwards compatability fix - connect should work with mandatory
diff --git a/docs/conf.py b/docs/conf.py
index 0419479..35b5dbf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -36,15 +36,15 @@ master_doc = 'index'
 
 # General substitutions.
 project = 'Routes'
-copyright = '2005-2017, Ben Bangert, Mike Orr, and numerous contributers'
+copyright = '2005-2020, Ben Bangert, Mike Orr, and numerous contributers'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '2.4'
+version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.1'
+release = '2.5.0'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/setup.cfg b/setup.cfg
index f6fa8c3..a2122d3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [aliases]
-clean_egg_info = egg_info -RDb ''
+clean_egg_info = egg_info -Db ''
 release = clean_egg_info sdist bdist_wheel
 
 [bdist_wheel]
diff --git a/setup.py b/setup.py
index 0b527da..708075a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-__version__ = '2.4.1'
+__version__ = '2.5.0'
 
 import io
 import os
-- 
cgit v1.2.1