changed debian/source/format to native
This commit is contained in:
parent
b5fd95cf50
commit
499a6c756f
|
@ -1,22 +0,0 @@
|
|||
From: =?utf-8?b?T25kxZllaiBOb3bDvQ==?= <onovy@debian.org>
|
||||
Date: Fri, 23 Sep 2016 13:52:43 +0200
|
||||
Subject: Fixed bytes unit tests fail on Python 3.5
|
||||
|
||||
Forwarded: https://github.com/PythonCharmers/python-future/pull/243
|
||||
---
|
||||
tests/test_future/test_bytes.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/tests/test_future/test_bytes.py b/tests/test_future/test_bytes.py
|
||||
index b9b157d..bf3135f 100644
|
||||
--- a/tests/test_future/test_bytes.py
|
||||
+++ b/tests/test_future/test_bytes.py
|
||||
@@ -7,6 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function
|
||||
from future.builtins import *
|
||||
from future import utils
|
||||
|
||||
+import sys
|
||||
+
|
||||
from numbers import Integral
|
||||
from future.tests.base import unittest, expectedFailurePY2
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
From: Thomas Goirand <zigo@debian.org>
|
||||
Date: Tue, 15 Sep 2015 18:30:11 -0400
|
||||
Subject: Do not use the bootstrap sphinx theme
|
||||
|
||||
This patch removes the use of the bootstrap sphinx theme which isn't yet in
|
||||
Debian (and for which I have no time to work on).
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2015-04-10
|
||||
|
||||
Patch-Name: do-not-use-bootstrap.patch
|
||||
---
|
||||
docs/_templates/sidebartoc.html | 2 +-
|
||||
docs/conf.py | 74 -----------------------------------------
|
||||
2 files changed, 1 insertion(+), 75 deletions(-)
|
||||
|
||||
diff --git a/docs/_templates/sidebartoc.html b/docs/_templates/sidebartoc.html
|
||||
index 0d119af..2edf636 100644
|
||||
--- a/docs/_templates/sidebartoc.html
|
||||
+++ b/docs/_templates/sidebartoc.html
|
||||
@@ -1 +1 @@
|
||||
-{{ toctree(maxdepth=theme_globaltoc_depth|toint, collapse=True, includehidden=theme_globaltoc_includehidden|tobool) }}
|
||||
+{{ toctree(maxdepth=toint, collapse=True, includehidden=theme_globaltoc_includehidden|tobool) }}
|
||||
diff --git a/docs/conf.py b/docs/conf.py
|
||||
index fd106fa..ccb73fb 100644
|
||||
--- a/docs/conf.py
|
||||
+++ b/docs/conf.py
|
||||
@@ -14,7 +14,6 @@
|
||||
from __future__ import absolute_import, print_function
|
||||
import sys, os
|
||||
from future import __version__
|
||||
-import sphinx_bootstrap_theme
|
||||
|
||||
# If extensions (or modules to document with autodoc) are in another directory,
|
||||
# add these directories to sys.path here. If the directory is relative to the
|
||||
@@ -98,79 +97,6 @@ pygments_style = 'sphinx' # 'futureext.FutureStyle'
|
||||
|
||||
|
||||
# -- Options for HTML output ---------------------------------------------------
|
||||
-
|
||||
-# The theme to use for HTML and HTML Help pages. See the documentation for
|
||||
-# a list of builtin themes.
|
||||
-html_theme = 'bootstrap'
|
||||
-html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
|
||||
-
|
||||
-# Theme options are theme-specific and customize the look and feel of a theme
|
||||
-# further. For a list of options available for each theme, see the
|
||||
-# documentation.
|
||||
-html_theme_options = {
|
||||
- # Navigation bar title. (Default: ``project`` value)
|
||||
- #'navbar_title': "Python-Future",
|
||||
-
|
||||
- # Tab name for entire site. (Default: "Site")
|
||||
- 'navbar_site_name': "Contents",
|
||||
-
|
||||
- # A list of tuples containing pages or urls to link to.
|
||||
- # Valid tuples should be in the following forms:
|
||||
- # (name, page) # a link to a page
|
||||
- # (name, "/aa/bb", 1) # a link to an arbitrary relative url
|
||||
- # (name, "http://example.com", True) # arbitrary absolute url
|
||||
- # Note the "1" or "True" value above as the third argument to indicate
|
||||
- # an arbitrary url.
|
||||
- 'navbar_links': [
|
||||
- ("Overview", "overview"),
|
||||
- ("Cheat Sheet", "compatible_idioms.html", True),
|
||||
- ("FAQ", "faq.html", True),
|
||||
- # ("Link", "http://example.com", True),
|
||||
- ],
|
||||
-
|
||||
- # Render the next and previous page links in navbar. (Default: true)
|
||||
- 'navbar_sidebarrel': False,
|
||||
-
|
||||
- # Render the current pages TOC in the navbar. (Default: true)
|
||||
- 'navbar_pagenav': True,
|
||||
-
|
||||
- # Global TOC depth for "site" navbar tab. (Default: 1)
|
||||
- # Switching to -1 shows all levels.
|
||||
- 'globaltoc_depth': 3,
|
||||
-
|
||||
- # Include hidden TOCs in Site navbar?
|
||||
- #
|
||||
- # Note: If this is "false", you cannot have mixed ``:hidden:`` and
|
||||
- # non-hidden ``toctree`` directives in the same page, or else the build
|
||||
- # will break.
|
||||
- #
|
||||
- # Values: "true" (default) or "false"
|
||||
- 'globaltoc_includehidden': "true",
|
||||
-
|
||||
- # HTML navbar class (Default: "navbar") to attach to <div> element.
|
||||
- # For black navbar, do "navbar navbar-inverse"
|
||||
- 'navbar_class': "navbar navbar-inverse",
|
||||
-
|
||||
- # Fix navigation bar to top of page?
|
||||
- # Values: "true" (default) or "false"
|
||||
- 'navbar_fixed_top': "true",
|
||||
-
|
||||
- # Location of link to source.
|
||||
- # Options are "nav" (default), "footer" or anything else to exclude.
|
||||
- 'source_link_position': "none",
|
||||
-
|
||||
- # Bootswatch (http://bootswatch.com/) theme.
|
||||
- #
|
||||
- # Options are nothing with "" (default) or the name of a valid theme
|
||||
- # such as "amelia" or "cosmo" or "united".
|
||||
- 'bootswatch_theme': "cerulean",
|
||||
-
|
||||
- # Choose Bootstrap version.
|
||||
- # Values: "3" (default) or "2" (in quotes)
|
||||
- 'bootstrap_version': "3",
|
||||
-}
|
||||
-
|
||||
-
|
||||
# Add any paths that contain custom themes here, relative to this directory.
|
||||
#html_theme_path = []
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From: Vincent Bernat <bernat@debian.org>
|
||||
Date: Tue, 3 May 2016 21:51:13 +0200
|
||||
Subject: Do not ship a configparser module
|
||||
|
||||
This module is already backported in python-configparser package.
|
||||
|
||||
Bug-Debian: https://bugs.debian.org/822157
|
||||
Bug: https://github.com/PythonCharmers/python-future/issues/118
|
||||
|
||||
Last-Change: Thu, 13 Sep 2018 11:27:00 +0200 (by Andreas Tille <tille@debian.org>
|
||||
Most changes adopted upstream
|
||||
---
|
||||
setup.py | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 11d694c..96090d6 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -133,7 +133,6 @@ try:
|
||||
'builtins',
|
||||
# Catch the case that configparser is in the build folder
|
||||
# from a previous version of `future`:
|
||||
- 'configparser',
|
||||
'copyreg',
|
||||
'html',
|
||||
'http',
|
|
@ -1,50 +0,0 @@
|
|||
From: Thomas Goirand <zigo@debian.org>
|
||||
Date: Tue, 15 Sep 2015 18:30:12 -0400
|
||||
Subject: Removes privacy breach in docs
|
||||
|
||||
This patch removes links to external websites when generating Sphinx docs.
|
||||
Note to the author: using google-analytics in a Sphinx doc is just horrible.
|
||||
Please stop doing this!
|
||||
Forwarded: no
|
||||
Last-Update: 2015-04-10
|
||||
|
||||
Patch-Name: removes-privacy-breach-in-docs.patch
|
||||
---
|
||||
README.rst | 3 ---
|
||||
docs/_templates/layout.html | 9 ---------
|
||||
2 files changed, 12 deletions(-)
|
||||
|
||||
diff --git a/README.rst b/README.rst
|
||||
index ea80653..9a3383e 100644
|
||||
--- a/README.rst
|
||||
+++ b/README.rst
|
||||
@@ -22,9 +22,6 @@ are `Mezzanine <http://mezzanine.jupo.org/>`_ and `ObsPy
|
||||
Features
|
||||
--------
|
||||
|
||||
-.. image:: https://travis-ci.org/PythonCharmers/python-future.svg?branch=master
|
||||
- :target: https://travis-ci.org/PythonCharmers/python-future
|
||||
-
|
||||
- ``future.builtins`` package (also available as ``builtins`` on Py2) provides
|
||||
backports and remappings for 20 builtins with different semantics on Py3
|
||||
versus Py2
|
||||
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
|
||||
index c979ab2..57b385c 100644
|
||||
--- a/docs/_templates/layout.html
|
||||
+++ b/docs/_templates/layout.html
|
||||
@@ -13,15 +13,6 @@
|
||||
{% block footer %}
|
||||
{{ super() }}
|
||||
<div class="footer">
|
||||
-<script type="text/javascript">
|
||||
- (function() {
|
||||
- var ga = document.createElement('script');
|
||||
- ga.src = ('https:' == document.location.protocol ?
|
||||
- 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
- ga.setAttribute('async', 'true');
|
||||
- document.documentElement.firstChild.appendChild(ga);
|
||||
- })();
|
||||
-</script>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
do-not-use-bootstrap.patch
|
||||
removes-privacy-breach-in-docs.patch
|
||||
remove-configparser-module.patch
|
||||
0005-Fixed-bytes-unit-tests-fail-on-Python-3.5.patch
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
Loading…
Reference in New Issue