[Python-modules-commits] [python-mkdocs] 05/06: Rebase patches for new upstream

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch debian/experimental
in repository python-mkdocs.

commit 581b567a5c97785e62d197716d419f5066be2803
Author: Brian May <bam at debian.org>
Date:   Thu Mar 9 20:57:24 2017 +1100

    Rebase patches for new upstream
---
 debian/patches/0001-Remove-faulty-tests.patch      | 35 ----------------
 ...2-Use-themes-from-usr-share-mkdocs-themes.patch |  3 +-
 .../patches/0003-Support-reproducible-builds.patch | 49 ----------------------
 debian/patches/series                              |  2 -
 4 files changed, 1 insertion(+), 88 deletions(-)

diff --git a/debian/patches/0001-Remove-faulty-tests.patch b/debian/patches/0001-Remove-faulty-tests.patch
deleted file mode 100644
index 28711e1..0000000
--- a/debian/patches/0001-Remove-faulty-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3716188da3c089be4871b3fb6b8127817c43d361 Mon Sep 17 00:00:00 2001
-From: Brian May <bam at debian.org>
-Date: Mon, 2 May 2016 15:53:10 +1000
-Subject: Remove faulty tests
-
-See https://github.com/mkdocs/mkdocs/issues/923
----
- mkdocs/tests/config/config_options_tests.py | 1 -
- mkdocs/tests/config/config_tests.py         | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/mkdocs/tests/config/config_options_tests.py b/mkdocs/tests/config/config_options_tests.py
-index d16f675..9813334 100644
---- a/mkdocs/tests/config/config_options_tests.py
-+++ b/mkdocs/tests/config/config_options_tests.py
-@@ -179,7 +179,6 @@ class SiteDirTest(unittest.TestCase):
-             {'docs_dir': '.', 'site_dir': '.'},
-             {'docs_dir': 'docs', 'site_dir': ''},
-             {'docs_dir': '', 'site_dir': ''},
--            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
-         )
- 
-         for test_config in test_configs:
-diff --git a/mkdocs/tests/config/config_tests.py b/mkdocs/tests/config/config_tests.py
-index 04e51de..7c82535 100644
---- a/mkdocs/tests/config/config_tests.py
-+++ b/mkdocs/tests/config/config_tests.py
-@@ -192,7 +192,6 @@ class ConfigTests(unittest.TestCase):
-             {'docs_dir': '.', 'site_dir': '.'},
-             {'docs_dir': 'docs', 'site_dir': ''},
-             {'docs_dir': '', 'site_dir': ''},
--            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
-         )
- 
-         conf = {
diff --git a/debian/patches/0002-Use-themes-from-usr-share-mkdocs-themes.patch b/debian/patches/0002-Use-themes-from-usr-share-mkdocs-themes.patch
index 3d29f8a..fa9c97b 100644
--- a/debian/patches/0002-Use-themes-from-usr-share-mkdocs-themes.patch
+++ b/debian/patches/0002-Use-themes-from-usr-share-mkdocs-themes.patch
@@ -1,4 +1,3 @@
-From 31150740d5b7b66013f63192aced354883cb5022 Mon Sep 17 00:00:00 2001
 From: Brian May <bam at debian.org>
 Date: Mon, 2 May 2016 15:53:46 +1000
 Subject: Use themes from /usr/share/mkdocs/themes
@@ -9,7 +8,7 @@ See https://lists.debian.org/debian-python/2016/04/msg00042.html
  1 file changed, 2 insertions(+)
 
 diff --git a/mkdocs/__init__.py b/mkdocs/__init__.py
-index 170bf76..6fe2e34 100644
+index 987976c..41f7761 100644
 --- a/mkdocs/__init__.py
 +++ b/mkdocs/__init__.py
 @@ -5,6 +5,8 @@ from __future__ import unicode_literals
diff --git a/debian/patches/0003-Support-reproducible-builds.patch b/debian/patches/0003-Support-reproducible-builds.patch
deleted file mode 100644
index 3e3c627..0000000
--- a/debian/patches/0003-Support-reproducible-builds.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f37eb5e81c996800e2e69180fa225dfef3943c84 Mon Sep 17 00:00:00 2001
-From: Brian May <bam at debian.org>
-Date: Fri, 29 Jul 2016 08:06:08 +1000
-Subject: Support reproducible builds
-
-See https://github.com/mkdocs/mkdocs/issues/938
----
- mkdocs/commands/build.py | 3 ++-
- mkdocs/nav.py            | 6 +++++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/mkdocs/commands/build.py b/mkdocs/commands/build.py
-index 614173d..66fef62 100644
---- a/mkdocs/commands/build.py
-+++ b/mkdocs/commands/build.py
-@@ -5,6 +5,7 @@ from datetime import datetime
- import io
- import logging
- import os
-+import time
- 
- from jinja2.exceptions import TemplateNotFound
- import jinja2
-@@ -83,7 +84,7 @@ def get_global_context(nav, config):
-         'google_analytics': config['google_analytics'],
- 
-         'mkdocs_version': mkdocs.__version__,
--        'build_date_utc': datetime.utcnow(),
-+        'build_date_utc': datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))),
- 
-         'config': config
-     }
-diff --git a/mkdocs/nav.py b/mkdocs/nav.py
-index b72e21f..07f6505 100644
---- a/mkdocs/nav.py
-+++ b/mkdocs/nav.py
-@@ -137,7 +137,11 @@ class Page(object):
-         self.abs_url = url
-         self.active = False
-         self.url_context = url_context
--        self.update_date = datetime.datetime.now().strftime("%Y-%m-%d")
-+
-+        try:
-+            self.update_date = datetime.datetime.utcfromtimestamp(int(os.environ['SOURCE_DATE_EPOCH']))
-+        except KeyError:
-+            self.update_date = datetime.datetime.now().strftime("%Y-%m-%d")
- 
-         # Relative paths to the input markdown file and output html file.
-         self.input_path = path
diff --git a/debian/patches/series b/debian/patches/series
index 4c890a2..c4eb354 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-Remove-faulty-tests.patch
 0002-Use-themes-from-usr-share-mkdocs-themes.patch
-0003-Support-reproducible-builds.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-mkdocs.git