diff -Nru routes-2.3.1/CHANGELOG.rst routes-2.4.1/CHANGELOG.rst --- routes-2.3.1/CHANGELOG.rst 2016-03-30 14:58:46.000000000 +0000 +++ routes-2.4.1/CHANGELOG.rst 2017-01-01 18:18:14.000000000 +0000 @@ -1,6 +1,13 @@ Routes Changelog %%%%%%%%%%%%%%%% +Release 2.4.0 (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 -Nru routes-2.3.1/debian/changelog routes-2.4.1/debian/changelog --- routes-2.3.1/debian/changelog 2016-07-31 16:58:03.000000000 +0000 +++ routes-2.4.1/debian/changelog 2017-07-20 18:35:37.000000000 +0000 @@ -1,6 +1,13 @@ +routes (2.4.1-1) unstable; urgency=medium + + * New upstream release + * Standards-Version bumped to 4.0.0 (no changes needed) + + -- Piotr Ożarowski Thu, 20 Jul 2017 20:35:37 +0200 + routes (2.3.1-2) unstable; urgency=medium - * Documentation is back (lost in last upload while rewritting debian/rules; + * Documentation is back (lost in last upload while rewriting debian/rules; closes: 833047) * Install CHANGELOG.rst as upstream changelog (closes: 833049) diff -Nru routes-2.3.1/debian/control routes-2.4.1/debian/control --- routes-2.3.1/debian/control 2016-07-31 16:26:49.000000000 +0000 +++ routes-2.4.1/debian/control 2017-07-20 18:35:37.000000000 +0000 @@ -13,8 +13,8 @@ python-webob, python3-webob, python-webtest, python3-webtest, python-six, python3-six -Standards-Version: 3.9.8 -Homepage: http://routes.readthedocs.org/ +Standards-Version: 4.0.0 +Homepage: https://routes.readthedocs.io/ Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/routes.git Vcs-Browser: https://anonscm.debian.org/git/python-modules/packages/routes.git X-Python-Version: >= 2.6 diff -Nru routes-2.3.1/debian/.git-dpm routes-2.4.1/debian/.git-dpm --- routes-2.3.1/debian/.git-dpm 2016-07-31 16:26:49.000000000 +0000 +++ routes-2.4.1/debian/.git-dpm 2017-07-20 18:34:47.000000000 +0000 @@ -1,11 +1,11 @@ # see git-dpm(1) from git-dpm package -53a83305397bee01c4dc4e48ad18703cde007353 -53a83305397bee01c4dc4e48ad18703cde007353 -2e615fd7f67621c075ac7429bc998f0498a2b6a0 -ccb3bbcc111d42efbe5047192192be55013ff436 -routes_2.3.1.orig.tar.gz -20068274301a7f5fd63d7881a851641fb2390468 -181694 +65520a4394e347dcc3c0a1e392a7b8eb29609fbe +65520a4394e347dcc3c0a1e392a7b8eb29609fbe +c7c6c1dfaf242d990aebdabc58586d54e5b444b9 +c7c6c1dfaf242d990aebdabc58586d54e5b444b9 +routes_2.4.1.orig.tar.gz +7d0f75875aa571399c488b435e4cf738507a2f49 +182403 debianTag="debian/%e%v" patchedTag="patched/%e%v" upstreamTag="upstream/%e%u" diff -Nru routes-2.3.1/debian/patches/drop_changes_from_description.patch routes-2.4.1/debian/patches/drop_changes_from_description.patch --- routes-2.3.1/debian/patches/drop_changes_from_description.patch 2016-07-31 16:26:49.000000000 +0000 +++ routes-2.4.1/debian/patches/drop_changes_from_description.patch 2017-07-20 18:34:47.000000000 +0000 @@ -1,4 +1,4 @@ -From 53a83305397bee01c4dc4e48ad18703cde007353 Mon Sep 17 00:00:00 2001 +From 65520a4394e347dcc3c0a1e392a7b8eb29609fbe Mon Sep 17 00:00:00 2001 From: SVN-Git Migration Date: Thu, 8 Oct 2015 13:43:58 -0700 Subject: drop_changes_from_description @@ -9,7 +9,7 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py -index 742c645..81d2877 100644 +index 4255f6d..b389db9 100644 --- a/setup.py +++ b/setup.py @@ -9,8 +9,8 @@ from setuptools import setup, find_packages diff -Nru routes-2.3.1/debian/patches/remove_missing_todo_include_from_docs.patch routes-2.4.1/debian/patches/remove_missing_todo_include_from_docs.patch --- routes-2.3.1/debian/patches/remove_missing_todo_include_from_docs.patch 2016-07-31 16:26:49.000000000 +0000 +++ routes-2.4.1/debian/patches/remove_missing_todo_include_from_docs.patch 2017-07-20 18:34:47.000000000 +0000 @@ -1,4 +1,4 @@ -From bb81c383f2a8062443238b7e6cb401085ae13658 Mon Sep 17 00:00:00 2001 +From 2b24c1004344e8236217e27c5a7c35d3c83cc164 Mon Sep 17 00:00:00 2001 From: SVN-Git Migration Date: Thu, 8 Oct 2015 13:43:57 -0700 Subject: remove_missing_todo_include_from_docs diff -Nru routes-2.3.1/docs/conf.py routes-2.4.1/docs/conf.py --- routes-2.3.1/docs/conf.py 2016-03-30 14:54:28.000000000 +0000 +++ routes-2.4.1/docs/conf.py 2017-01-01 18:18:14.000000000 +0000 @@ -36,15 +36,15 @@ # General substitutions. project = 'Routes' -copyright = '2005-2016, Ben Bangert, Mike Orr, and numerous contributers' +copyright = '2005-2017, 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.3' +version = '2.4' # The full version, including alpha/beta/rc tags. -release = '2.3.1' +release = '2.4.1' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff -Nru routes-2.3.1/PKG-INFO routes-2.4.1/PKG-INFO --- routes-2.3.1/PKG-INFO 2016-03-30 15:02:17.000000000 +0000 +++ routes-2.4.1/PKG-INFO 2017-01-01 18:18:45.000000000 +0000 @@ -1,8 +1,8 @@ Metadata-Version: 1.1 Name: Routes -Version: 2.3.1 +Version: 2.4.1 Summary: Routing Recognition and Generation Tools -Home-page: http://routes.readthedocs.org/ +Home-page: https://routes.readthedocs.io/ Author: Ben Bangert Author-email: ben@groovie.org License: MIT @@ -24,6 +24,13 @@ Routes Changelog %%%%%%%%%%%%%%%% + Release 2.4.0 (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 -Nru routes-2.3.1/routes/mapper.py routes-2.4.1/routes/mapper.py --- routes-2.3.1/routes/mapper.py 2016-03-30 14:52:54.000000000 +0000 +++ routes-2.4.1/routes/mapper.py 2017-01-01 18:18:14.000000000 +0000 @@ -1230,7 +1230,7 @@ Example:: map = Mapper() - map.redirect('/legacyapp/archives/{url:.*}, '/archives/{url}) + map.redirect('/legacyapp/archives/{url:.*}', '/archives/{url}') map.redirect('/home/index', '/', _redirect_code='301 Moved Permanently') diff -Nru routes-2.3.1/routes/middleware.py routes-2.4.1/routes/middleware.py --- routes-2.3.1/routes/middleware.py 2016-03-28 15:36:53.000000000 +0000 +++ routes-2.4.1/routes/middleware.py 2017-01-01 18:18:14.000000000 +0000 @@ -5,7 +5,7 @@ from webob import Request from routes.base import request_config -from routes.util import URLGenerator, url_for +from routes.util import URLGenerator log = logging.getLogger('routes.middleware') @@ -13,7 +13,7 @@ class RoutesMiddleware(object): """Routing middleware that handles resolving the PATH_INFO in addition to optionally recognizing method overriding. - + .. Note:: This module requires webob to be installed. To depend on it, you may list routes[middleware] in your ``requirements.txt`` diff -Nru routes-2.3.1/routes/route.py routes-2.4.1/routes/route.py --- routes-2.3.1/routes/route.py 2015-07-22 04:40:34.000000000 +0000 +++ routes-2.4.1/routes/route.py 2017-01-01 18:18:14.000000000 +0000 @@ -1,6 +1,5 @@ import re import sys -from six.moves import urllib if sys.version < '2.4': from sets import ImmutableSet as frozenset diff -Nru routes-2.3.1/Routes.egg-info/PKG-INFO routes-2.4.1/Routes.egg-info/PKG-INFO --- routes-2.3.1/Routes.egg-info/PKG-INFO 2016-03-30 15:02:17.000000000 +0000 +++ routes-2.4.1/Routes.egg-info/PKG-INFO 2017-01-01 18:18:45.000000000 +0000 @@ -1,8 +1,8 @@ Metadata-Version: 1.1 Name: Routes -Version: 2.3.1 +Version: 2.4.1 Summary: Routing Recognition and Generation Tools -Home-page: http://routes.readthedocs.org/ +Home-page: https://routes.readthedocs.io/ Author: Ben Bangert Author-email: ben@groovie.org License: MIT @@ -24,6 +24,13 @@ Routes Changelog %%%%%%%%%%%%%%%% + Release 2.4.0 (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 -Nru routes-2.3.1/Routes.egg-info/requires.txt routes-2.4.1/Routes.egg-info/requires.txt --- routes-2.3.1/Routes.egg-info/requires.txt 2016-03-30 15:02:17.000000000 +0000 +++ routes-2.4.1/Routes.egg-info/requires.txt 2017-01-01 18:18:45.000000000 +0000 @@ -2,4 +2,4 @@ repoze.lru>=0.3 [middleware] -webob \ No newline at end of file +webob diff -Nru routes-2.3.1/setup.cfg routes-2.4.1/setup.cfg --- routes-2.3.1/setup.cfg 2016-03-30 15:02:17.000000000 +0000 +++ routes-2.4.1/setup.cfg 2017-01-01 18:18:45.000000000 +0000 @@ -1,3 +1,10 @@ +[aliases] +clean_egg_info = egg_info -RDb '' +release = clean_egg_info sdist bdist_wheel + +[bdist_wheel] +universal = 1 + [egg_info] tag_build = tag_date = 0 diff -Nru routes-2.3.1/setup.py routes-2.4.1/setup.py --- routes-2.3.1/setup.py 2016-03-30 14:53:35.000000000 +0000 +++ routes-2.4.1/setup.py 2017-01-01 18:18:14.000000000 +0000 @@ -1,4 +1,4 @@ -__version__ = '2.3.1' +__version__ = '2.4.1' import io import os @@ -47,7 +47,7 @@ keywords='routes webob dispatch', author="Ben Bangert", author_email="ben@groovie.org", - url='http://routes.readthedocs.org/', + url='https://routes.readthedocs.io/', license="MIT", test_suite="nose.collector", include_package_data=True,